[postgis-java] 01/03: Imported Upstream version 2.1.7.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Sep 27 21:44:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository postgis-java.
commit 4526ec254b6eefaf7830b6c633215f19565ebdea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Sep 26 17:11:25 2015 +0200
Imported Upstream version 2.1.7.1
---
.gitignore | 4 +
.idea/.name | 1 +
.idea/compiler.xml | 50 ++
.idea/copyright/profiles_settings.xml | 3 +
.idea/encodings.xml | 9 +
...Maven__ch_qos_logback_logback_classic_1_1_3.xml | 13 +
.../Maven__ch_qos_logback_logback_core_1_1_3.xml | 13 +
.../libraries/Maven__com_beust_jcommander_1_48.xml | 13 +
.../Maven__com_vividsolutions_jts_1_12.xml | 13 +
.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml | 13 +
.../Maven__org_slf4j_slf4j_api_1_7_12.xml | 13 +
.idea/libraries/Maven__org_testng_testng_6_9_4.xml | 13 +
...aven__postgresql_postgresql_9_1_901_1_jdbc4.xml | 13 +
.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml | 13 +
.idea/modules.xml | 11 +
.idea/vcs.xml | 6 +
README.md | 3 +
ejb2/CHANGES | 6 +
ejb2/COPYING | 341 ++++++++++++
ejb2/COPYING_LGPL | 510 ++++++++++++++++++
ejb2/README | 177 +++++++
ejb2/build.xml | 272 ++++++++++
ejb2/prepare-jboss.xml | 39 ++
ejb2/resources/application.xml | 19 +
ejb2/resources/build.properties | 12 +
ejb2/resources/jndi/jndi.properties | 3 +
ejb2/resources/postgis-ejb2-ds.xml | 17 +
ejb2/src/com/geodetix/geo/client/Client.java | 246 +++++++++
.../com/geodetix/geo/dao/PostGisGeometryDAO.java | 153 ++++++
.../geodetix/geo/dao/PostGisGeometryDAOImpl.java | 579 +++++++++++++++++++++
ejb2/src/com/geodetix/geo/ejb/GeometryBean.java | 298 +++++++++++
.../com/geodetix/geo/ejb/GeometryFacadeBean.java | 238 +++++++++
.../exception/ApplicationGeoLayerException.java | 66 +++
ejb3/.classpath | 11 +
ejb3/.project | 18 +
ejb3/.settings/org.eclipse.jdt.core.prefs | 7 +
ejb3/EJB3Spatial.odt | Bin 0 -> 56432 bytes
ejb3/README.txt | 27 +
ejb3/build.xml | 70 +++
ejb3/jboss/geodata-ds.xml | 13 +
ejb3/jboss/ingest-service.xml | 7 +
ejb3/src/META-INF/persistence.xml | 5 +
ejb3/src/jndi.properties | 3 +
ejb3/src/org/postgis/ejb/PersonEntity.java | 95 ++++
ejb3/src/org/postgis/ejb/UserBean.java | 123 +++++
ejb3/src/org/postgis/ejb/UserBeanRemote.java | 34 ++
ejb3/src/org/postgis/ejb/mdb/IngestMDB.java | 98 ++++
.../org/postgis/hibernate/ContainsExpression.java | 82 +++
ejb3/src/org/postgis/hibernate/GeometryType.java | 149 ++++++
.../postgis/hibernate/IntersectsExpression.java | 82 +++
ejb3/src/org/postgis/hibernate/PostGISDialect.java | 75 +++
.../org/postgis/hibernate/WithinExpression.java | 82 +++
jdbc/COPYING_LGPL | 510 ++++++++++++++++++
jdbc/README | 236 +++++++++
jdbc/pom.xml | 61 +++
jdbc/postgis-jdbc.iml | 23 +
jdbc/src/main/java/examples/TestAutoregister.java | 181 +++++++
jdbc/src/main/java/org/postgis/ComposedGeom.java | 271 ++++++++++
jdbc/src/main/java/org/postgis/DriverWrapper.java | 325 ++++++++++++
.../java/org/postgis/DriverWrapperAutoprobe.java | 109 ++++
.../src/main/java/org/postgis/DriverWrapperLW.java | 83 +++
jdbc/src/main/java/org/postgis/Geometry.java | 335 ++++++++++++
.../main/java/org/postgis/GeometryCollection.java | 79 +++
jdbc/src/main/java/org/postgis/LineString.java | 101 ++++
jdbc/src/main/java/org/postgis/LinearRing.java | 74 +++
.../src/main/java/org/postgis/MultiLineString.java | 95 ++++
jdbc/src/main/java/org/postgis/MultiPoint.java | 49 ++
jdbc/src/main/java/org/postgis/MultiPolygon.java | 73 +++
jdbc/src/main/java/org/postgis/PGbox2d.java | 65 +++
jdbc/src/main/java/org/postgis/PGbox3d.java | 58 +++
jdbc/src/main/java/org/postgis/PGboxbase.java | 173 ++++++
jdbc/src/main/java/org/postgis/PGgeometry.java | 168 ++++++
jdbc/src/main/java/org/postgis/PGgeometryLW.java | 65 +++
jdbc/src/main/java/org/postgis/Point.java | 296 +++++++++++
.../main/java/org/postgis/PointComposedGeom.java | 95 ++++
jdbc/src/main/java/org/postgis/Polygon.java | 69 +++
jdbc/src/main/java/org/postgis/Version.java | 119 +++++
.../main/java/org/postgis/binary/BinaryParser.java | 232 +++++++++
.../main/java/org/postgis/binary/BinaryWriter.java | 357 +++++++++++++
.../main/java/org/postgis/binary/ByteGetter.java | 73 +++
.../main/java/org/postgis/binary/ByteSetter.java | 84 +++
.../main/java/org/postgis/binary/ValueGetter.java | 111 ++++
.../main/java/org/postgis/binary/ValueSetter.java | 129 +++++
jdbc/src/main/javadoc/overview.html | 5 +
.../main/resources/org/postgis/version.properties | 1 +
.../org/postgresql/driverconfig.properties | 8 +
.../java/org/postgis/AutoRegistrationTest.java | 131 +++++
jdbc/src/test/java/org/postgis/BoxesTest.java | 145 ++++++
jdbc/src/test/java/org/postgis/DatatypesTest.java | 118 +++++
.../test/java/org/postgis/EmptyGeometriesTest.java | 137 +++++
jdbc/src/test/java/org/postgis/ParserTest.java | 468 +++++++++++++++++
jdbc/src/test/java/org/postgis/ServerTest.java | 144 +++++
jdbc/src/test/java/org/postgis/VersionPrinter.java | 195 +++++++
jdbc/src/test/resources/logback-test.xml | 15 +
jdbc/src/test/resources/testng.xml | 22 +
jdbc/todo.txt | 27 +
jdbc_jtsparser/pom.xml | 60 +++
jdbc_jtsparser/postgis-jdbc-jtsparser.iml | 25 +
.../src/main/java/org/postgis/jts/JTSShape.java | 279 ++++++++++
.../main/java/org/postgis/jts/JtsBinaryParser.java | 240 +++++++++
.../main/java/org/postgis/jts/JtsBinaryWriter.java | 392 ++++++++++++++
.../src/main/java/org/postgis/jts/JtsGeometry.java | 158 ++++++
.../main/java/org/postgis/jts/JtsGisWrapper.java | 154 ++++++
.../src/main/java/org/postgis/jts/JtsWrapper.java | 159 ++++++
jdbc_jtsparser/src/main/javadoc/overview.html | 1 +
.../test/java/org/postgis/jts/JtsParserTest.java | 442 ++++++++++++++++
jdbc_jtsparser/src/test/resources/logback-test.xml | 15 +
jdbc_jtsparser/src/test/resources/testng.xml | 16 +
pom.xml | 304 +++++++++++
postgis-java-aggregator.iml | 18 +
postgis-jdbc-java2d/pom.xml | 55 ++
postgis-jdbc-java2d/postgis-jdbc-java2d.iml | 23 +
.../src/main/java/examples/TestJava2d.java | 177 +++++++
.../java/org/postgis/java2d/Java2DWrapper.java | 173 ++++++
.../java/org/postgis/java2d/PGShapeGeometry.java | 183 +++++++
.../java/org/postgis/java2d/ShapeBinaryParser.java | 237 +++++++++
.../postgis/java2d/SimpleJava2DWrapperTest.java | 29 ++
.../src/test/resources/logback-test.xml | 15 +
postgis-jdbc-java2d/src/test/resources/testng.xml | 16 +
119 files changed, 13447 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4cfdf9a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# Created by .ignore support plugin (hsz.mobi)
+.idea/misc.xml
+.idea/workspace.xml
+.idea/dictionaries
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..94cdcff
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+postgis-aggregator
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..a43f527
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ <profile default="false" name="Annotation profile for postgis-jdbc" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <processorPath useClasspath="true" />
+ <module name="postgis-jdbc" />
+ </profile>
+ <profile default="false" name="Annotation profile for postgis-jdbc-jtsparser" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <processorPath useClasspath="true" />
+ <module name="postgis-jdbc-jtsparser" />
+ </profile>
+ <profile default="false" name="Annotation profile for postgis-jdbc-java2d" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <processorPath useClasspath="true" />
+ <module name="postgis-jdbc-java2d" />
+ </profile>
+ </annotationProcessing>
+ <bytecodeTargetLevel>
+ <module name="postgis-aggregator" target="1.8" />
+ <module name="postgis-java-aggregator" target="1.7" />
+ <module name="postgis-jdbc" target="1.7" />
+ <module name="postgis-jdbc-java2d" target="1.7" />
+ <module name="postgis-jdbc-jtsparser" target="1.7" />
+ </bytecodeTargetLevel>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..9d07f6c
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/jdbc" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/jdbc_jtsparser" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/postgis-jdbc-java2d" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml
new file mode 100644
index 0000000..6c9fc33
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-classic:1.1.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml
new file mode 100644
index 0000000..fd35ca4
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-core:1.1.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_48.xml b/.idea/libraries/Maven__com_beust_jcommander_1_48.xml
new file mode 100644
index 0000000..9110296
--- /dev/null
+++ b/.idea/libraries/Maven__com_beust_jcommander_1_48.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.beust:jcommander:1.48">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml b/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml
new file mode 100644
index 0000000..5bdfa13
--- /dev/null
+++ b/.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.vividsolutions:jts:1.12">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
new file mode 100644
index 0000000..d6f17aa
--- /dev/null
+++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.beanshell:bsh:2.0b4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
new file mode 100644
index 0000000..411efc6
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:slf4j-api:1.7.12">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_testng_testng_6_9_4.xml b/.idea/libraries/Maven__org_testng_testng_6_9_4.xml
new file mode 100644
index 0000000..b0a9080
--- /dev/null
+++ b/.idea/libraries/Maven__org_testng_testng_6_9_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.testng:testng:6.9.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml b/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml
new file mode 100644
index 0000000..b79d684
--- /dev/null
+++ b/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: postgresql:postgresql:9.1-901-1.jdbc4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/postgresql/postgresql/9.1-901-1.jdbc4/postgresql-9.1-901-1.jdbc4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/postgresql/postgresql/9.1-901-1.jdbc4/postgresql-9.1-901-1.jdbc4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/postgresql/postgresql/9.1-901-1.jdbc4/postgresql-9.1-901-1.jdbc4-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml
new file mode 100644
index 0000000..6f3f5c5
--- /dev/null
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: xerces:xercesImpl:2.4.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..d94906a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/postgis-java-aggregator.iml" filepath="$PROJECT_DIR$/postgis-java-aggregator.iml" />
+ <module fileurl="file://$PROJECT_DIR$/jdbc/postgis-jdbc.iml" filepath="$PROJECT_DIR$/jdbc/postgis-jdbc.iml" />
+ <module fileurl="file://$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" filepath="$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" />
+ <module fileurl="file://$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" filepath="$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..fb4a637
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# PostGIS-Java
+
+Java bindings and other java-related projects for PostGIS
diff --git a/ejb2/CHANGES b/ejb2/CHANGES
new file mode 100644
index 0000000..226efe3
--- /dev/null
+++ b/ejb2/CHANGES
@@ -0,0 +1,6 @@
+PostGIS-EJB2-POC 1.0
+2006/08/29
+
+- Initial release!
+- EJB 2.x support
+- XDoclet code generation
diff --git a/ejb2/COPYING b/ejb2/COPYING
new file mode 100644
index 0000000..a52b16e
--- /dev/null
+++ b/ejb2/COPYING
@@ -0,0 +1,341 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/ejb2/COPYING_LGPL b/ejb2/COPYING_LGPL
new file mode 100644
index 0000000..b124cf5
--- /dev/null
+++ b/ejb2/COPYING_LGPL
@@ -0,0 +1,510 @@
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard. To achieve this, non-free programs must
+be allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at least
+ three years, to give the same user the materials specified in
+ Subsection 6a, above, for a charge no more than the cost of
+ performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James
+ Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/ejb2/README b/ejb2/README
new file mode 100644
index 0000000..d67ef69
--- /dev/null
+++ b/ejb2/README
@@ -0,0 +1,177 @@
+Using PostGIS Geometry Types with EJB2 -- Proof of Concept
+----------------------------------------------------------
+Copyright (C) 2006 by the Geodetix s.r.l. Company. See
+http://www.geodetix.it/ for further information.
+
+Version 1.0.0 (2006/08/29)
+
+Table of Contents
+-----------------
+
+0. Licensing
+1. Introduction
+2. Directory Contents
+3. Software Requirements
+4. Installation
+5. Running
+6. Code Details
+
+
+0. Licensing
+------------
+The "Using PostGIS Geometry Types with EJB2 -- Proof of Concept" software is
+a short collection of examples related to the use of PostGIS Java API with
+the EJB 2.x technology.
+Copyright (C) 2006 by the Geodetix s.r.l. Company. See
+http://www.geodetix.it/ for further information.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+1. Introduction
+---------------
+Our software is a simple proof-of-concept application illustrating how the
+PostGIS provided Java geometric types could be integrated with a set of
+Enterprise Java Bean 2.x components.
+
+To achieve such a goal, an attribute of type org.postgis.Geometry has been
+added to a BMP (Bean managed Persistence) Entity Bean. Furthermore, by using
+the DAO (Data Access Object) Pattern, the persistence code has been clearly
+separated from the business logic.
+
+Not to add further complexity, some proper programming behaviours were omitted.
+For example the use of PostGIS geometric types directly inside the Entity Bean
+code could be avoided by using a WKT compliant string attribute. Another issue
+is about security: table creational methods exposed in the
+com.geodetix.geo.ejb.GeometryBean home interface should be protected by
+a proper role-base security policy, to avoid normal users deleting database
+tables.
+
+Nevertheless our application, even if quite simple, still holds a lot of
+generality and some of the implemented patterns or components are readily
+usable in real-world applications.
+
+
+2. Directory Contents
+---------------------
+
+ ./ Build scripts (build.*), README and licensing information
+ ./src Java source packages and files
+ ./resources EJB specific configuration files
+ ./lib JAR libraries needed to compile and run
+
+
+3. Software Requirements
+------------------------
+We here list all third-party libraries with their versions tested to work
+with the application.
+
+PostGIS JDBC driver version 1.1.3
+http://www.postgis.org/
+
+PostgreSQL JDBC driver version 8.1-404 jdbc3
+http://jdbc.postgresql.org/
+
+XDoclet lib version 1.2.3
+http://xdoclet.sourceforge.net
+
+Apache ANT version 1.6.5
+http://ant.apache.org/
+
+JBOSS Application Server version 4.0.4.GA-Patch1
+http://www.jboss.org/
+
+Note that our tool is application server agnostic and could be easily ported
+to any EJB 2.x compliant Container by modifying the provided deployment
+ant file which is, in turn, written for the JBoss Application Server.
+
+
+4. Installation
+---------------
+After downloading (and compiling, if necessary) all of the required software,
+follow these steps:
+
+- copy the PostGIS driver (postgis_1.1.3.jar) into the ./lib/commonlib
+directory
+
+- copy the PostgreSQL driver (postgresql-8.1-404.jdbc3.jar) into the
+./lib/compiletimelib directory
+
+- copy the XDoclet libraries (contained in xdoclet-lib-1.2.3.tgz) into the
+./lib/xdocletlib directory
+
+- install Apache ANT (follow the installation istructions provided
+with the tool)
+
+- install the JBoss Application Server
+
+- make sure that your JBOSS_HOME environment variable correctly points to
+the JBoss installation directory (i.e. /opt/jboss-4.0.4.GA)
+
+- create a new PostGIS database according to what specified in the
+./resources/build.properties with the "database.name", "database.login",
+"database.password" properties (eventually change them to fit your needs).
+
+
+5. Running
+----------
+Start the JBoss application server with the provided scripts
+(run.bat or run.sh).
+
+From the main application directory (./) execute these commands:
+
+> ant install-JDBC-driver
+This command installs the PostgreSQL driver into JBoss
+
+> ant install-DataSource
+This command installs the DataSource Connector into JBoss
+
+> ant javadoc
+This command generates the application API documentation into the ./javadoc
+directory (use index.html to start).
+
+> ant deploy
+Installs the application into JBoss
+
+> ant run-client
+Allows to test the installed application
+
+
+6. Code Details
+---------------
+The main components made available in the application are:
+
+- GeometryBean.java
+It is an entity bean containing a geometrical attribute of org.postgis.Geometry
+type which could contain every geometrical type (i.e. POINT, LINESTRING, etc.).
+The user can choose wether to create a NON-OpenGIS or an OpenGIS-compliant
+bean. The first ones can contain different geometric types in the same table
+with undefined SRID (-1), while the second ones can only contain object of the
+same type and SRID in one table;
+
+- PostgisGeometryDaoIml.java
+A DAO (Data Access Object) implementing persistence operations for the
+GeometryBean EJB in a PostGIS database;
+
+- GeometryFacadeBean.java
+A stateless session bean implementing the interface between the geometric
+entity beans and the client applications;
+
+- Client.java
+It is a simple client executing some tests thus illustrating the use of the
+provided API.
+
+Further informations could be gathered from the source code and by reading the
+javadoc API documentation.
diff --git a/ejb2/build.xml b/ejb2/build.xml
new file mode 100644
index 0000000..beaf506
--- /dev/null
+++ b/ejb2/build.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="postgis-ejb2-poc" default="clean" basedir=".">
+ <description>Using PostGIS Geometry Types with EJB2 - Proof of Concept</description>
+
+ <!-- ENVIROMENT VARIABLES -->
+ <property environment="env"/>
+
+ <!-- JBOSS PROPERTIES -->
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server.config" value="default"/>
+ <property name="jboss.server.lib" value="${jboss.home}/server/default/lib"/>
+ <property name="jboss.config.dir" value="${jboss.home}/server/default/conf"/>
+ <property name="jboss.deploy.dir" value="${jboss.home}/server/default/deploy"/>
+
+ <!-- REGULAR DIRECTORIES -->
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="build"/>
+ <property name="distro.dir" value="distro"/>
+ <property name="resources.dir" value="resources"/>
+ <property name="lib.dir" value="lib"/>
+ <property name="compiletime.lib.dir" value="${lib.dir}/compiletimelib"/>
+ <property name="common.jar.dir" value="common"/>
+ <property name="common.lib.dir" value="${lib.dir}/commonlib"/>
+ <property name="merge.dir" value="merge"/>
+ <property name="ejb.jar.dir" value="ejbjars"/>
+ <property name="javadoc.dir" value="javadoc"/>
+
+ <!-- GENERATED DIRECTORIES -->
+ <property name="gen.src.dir" value="gensrc"/>
+ <property name="generated.dir" value="generated"/>
+ <property name="ejb.deployment.dir" value="${generated.dir}/ejbdeploy"/>
+
+ <!-- WHERE TO DEPLOY THE FINISHED EAR FILE -->
+ <property name="deploy.path" value="${jboss.home}/server/${jboss.server.config}/deploy"/>
+
+ <!-- WHERE XDOCLET JARS ARE -->
+ <property name="xdoclet.lib.dir" value="${lib.dir}/xdocletlib"/>
+
+ <!-- PATH DEFINITION -->
+ <path id="classpath">
+ <fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="${compiletime.lib.dir}" includes="*.jar"/>
+ <fileset dir="${common.lib.dir}" includes="*.jar"/>
+ <fileset dir="${xdoclet.lib.dir}" includes="*.jar"/>
+ <fileset dir="${jboss.server.lib}" includes="*.jar"/>
+ <fileset dir="${jboss.home}/client" includes="**/*.jar"/>
+ <pathelement location="${resources.dir}/jndi"/>
+ <pathelement location="${build.dir}"/>
+ </path>
+
+ <!-- LOAD USER DEFINED PROPERTIES -->
+ <!-- You can add your variables and/or properties in this file -->
+ <property file="${resources.dir}/build.properties" />
+
+ <!-- DATABASE RELATED PROPERTIES -->
+ <property name="datasource.name" value="postgis-ejb2-ds"/>
+ <property name="datasource.file.name" value="postgis-ejb2-ds.xml"/>
+ <property name="database.connection.port" value="5432"/>
+ <property name="database.driver" value="org.postgresql.Driver"/>
+ <property name="database.connection.url" value="jdbc:postgresql://${database.host}:${database.connection.port}/${database.name}"/>
+
+ <!-- IMPORT RELATED BUILD FILES -->
+ <import file="${basedir}/prepare-jboss.xml" />
+
+
+ <target name="clean" description="Delete all temporary directories and files created in the build.">
+ <echo message="Delete all temporary directories and files created in the build."/>
+
+ <delete dir="${gen.src.dir}"/>
+ <delete dir="${ejb.deployment.dir}"/>
+ <delete dir="${ejb.jar.dir}"/>
+ <delete dir="${common.jar.dir}"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${distro.dir}"/>
+ <delete dir="${generated.dir}"/>
+ <delete dir="${javadoc.dir}"/>
+
+ <delete>
+ <fileset dir="${basedir}" includes="**/*.bak"/>
+ </delete>
+ </target>
+
+
+ <target name="deploy" description="Deploy the application into JBOSS." depends="build-ear">
+ <echo message="Deploy EAR file."/>
+ <copy file="${distro.dir}/${ant.project.name}.ear" todir="${deploy.path}"/>
+ </target>
+
+
+ <target name="undeploy" description="Undeploy the Application." >
+ <echo message="Undeploy EAR file."/>
+ <delete file="${deploy.path}/${ant.project.name}.ear" />
+ </target>
+
+
+ <target name="generate-ejb">
+ <echo message="Generate files with XDoclet."/>
+
+ <taskdef name="ejbdoclet"
+ classname="xdoclet.modules.ejb.EjbDocletTask"
+ classpathref="classpath"/>
+
+ <!-- Generate EJB "stuff" -->
+ <ejbdoclet destdir="${gen.src.dir}" mergeDir="${merge.dir}" ejbSpec="2.1">
+ <packageSubstitution packages="ejb" substituteWith="interfaces"/>
+
+ <fileset dir="${src.dir}">
+ <include name="**/*Bean.java" />
+ <include name="**/*Service.java" />
+ </fileset>
+
+ <!-- Generate a deployment descriptor file, including all beans processed. -->
+ <deploymentdescriptor destdir="${ejb.deployment.dir}"/>
+
+ <!-- Generate JBOSS specific files -->
+ <jboss destdir="${ejb.deployment.dir}" version="4.0" />
+
+ <!-- Generate all of the home and logical interfaces, unless told otherwise in the meta-information. -->
+ <homeinterface/>
+ <remoteinterface/>
+ <localinterface/>
+ <localhomeinterface/>
+
+ <!-- Generate a value object if the bean has a @ejb.value-object tag.-->
+ <valueobject>
+ <packageSubstitution packages="ejb"
+ substituteWith="value"/>
+ </valueobject>
+
+ <!-- Generate a utility object for each EJB. -->
+ <utilobject includeGUID="true"
+ cacheHomes="true"
+ kind="physical">
+ <packageSubstitution packages="ejb"
+ substituteWith="util"/>
+ </utilobject>
+
+ <!-- Generate complete entity and session classes (including ejbXXX() methods) based on the implementation class. -->
+ <entitybmp/>
+ <entitycmp/>
+ <session/>
+
+ <entitypk>
+ <packageSubstitution packages="ejb"
+ substituteWith="pk"/>
+ </entitypk>
+
+ <dao pattern="{0}Dao">
+ <packageSubstitution packages="ejb"
+ substituteWith="dao"/>
+ </dao>
+
+ </ejbdoclet>
+ </target>
+
+
+ <target name="build-common-jar" >
+ <mkdir dir="${common.jar.dir}"/>
+
+ <jar destfile="${common.jar.dir}/common.jar">
+ <fileset dir="${common.lib.dir}" includes="*.jar"/>
+ </jar>
+ </target>
+
+
+ <target name="build-ear"
+ depends="build-ejb-jar,build-common-jar"
+ description="Build .ear file and put it into distro dir.">
+ <mkdir dir="${distro.dir}"/>
+
+ <ear destfile="${distro.dir}/${ant.project.name}.ear"
+ appxml="${resources.dir}/application.xml">
+ <fileset dir="${ejb.jar.dir}" includes="*.jar"/>
+ <fileset dir="${common.jar.dir}" includes="*.jar"/>
+ </ear>
+ </target>
+
+
+ <target name="build-ejb-jar" depends="compile" >
+ <mkdir dir="${ejb.jar.dir}"/>
+
+ <jar jarfile="${ejb.jar.dir}/ejb.jar">
+ <fileset dir="${build.dir}">
+ <include name="**/ejb/*.class"/>
+ <include name="**/exception/*.class"/>
+ <include name="**/util/*.class"/>
+ <include name="**/dao/*.class"/>
+ <include name="**/value/*.class"/>
+ <include name="**/interfaces/*.class"/>
+ <exclude name="**/client/*.class"/>
+ </fileset>
+
+ <metainf dir="${ejb.deployment.dir}">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jbosscmp-jdbc.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
+
+ <target name="compile" depends="clean,generate-ejb" description="Compile EJB source code.">
+ <echo message="Compile source code."/>
+
+ <mkdir dir="${build.dir}"/>
+
+ <javac debug="on"
+ deprecation="on"
+ optimize="on"
+ encoding="iso-8859-1"
+ listfiles="no"
+ destdir="${build.dir}"
+ classpathref="classpath">
+ <src path="${gen.src.dir};${src.dir}"/>
+ <exclude name="**/client/*.java"/>
+ </javac>
+ </target>
+
+
+ <target name="compile-client" depends="compile" description="Compile Client source code.">
+ <echo message="Compile Client source code."/>
+
+ <delete>
+ <fileset dir="${build.dir}" includes="**/client/*.*"/>
+ </delete>
+
+ <mkdir dir="${build.dir}"/>
+
+ <javac debug="on"
+ deprecation="on"
+ optimize="on"
+ encoding="iso-8859-1"
+ listfiles="no"
+ destdir="${build.dir}"
+ classpathref="classpath">
+ <src path="${gen.src.dir};${src.dir}"/>
+ <include name="**/client/*.java"/>
+ </javac>
+ </target>
+
+
+ <target name="run-client" description="Execute Client." depends="compile-client">
+ <java classname="com.geodetix.geo.client.Client" dir="." fork="true" classpathref="classpath" />
+ </target>
+
+
+ <target name="javadoc"
+ depends="compile"
+ description="Create Project API documentation.">
+ <delete dir="${javadoc.dir}" />
+ <mkdir dir="${javadoc.dir}"/>
+ <javadoc destdir="${javadoc.dir}" sourcepath="${gen.src.dir};${src.dir}">
+ <classpath refid="classpath"/>
+ <packageset dir="${gen.src.dir}" defaultexcludes="yes">
+ <include name="**"/>
+ <exclude name="**/ejb/**"/>
+ </packageset>
+
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="**/exception/**"/>
+ <include name="**/client/**"/>
+ <include name="**/dao/**"/>
+ <exclude name="**/ejb/**"/>
+ </packageset>
+
+ <doctitle><![CDATA[<h1>Using PostGIS Geometry Types with EJB2 <br> Proof of Concept</h1>]]></doctitle>
+ <bottom><![CDATA[<i>Copyright © 2006 <a href="http://www.geodetix.it" target="_new">Geodetix S.r.l.</a> All Rights Reserved.</i>]]></bottom>
+ </javadoc>
+ </target>
+
+</project>
diff --git a/ejb2/prepare-jboss.xml b/ejb2/prepare-jboss.xml
new file mode 100644
index 0000000..16e9c4b
--- /dev/null
+++ b/ejb2/prepare-jboss.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project basedir=".">
+
+ <!-- PROPERTY DEFINITIONS -->
+ <property name="tmp.dir" value="tmp"/>
+
+ <target name="install-DataSource" description="Copy DataSource definition file into JBOSS deploy dir." >
+ <echo message="Copy DataSource definition file into JBOSS deploy dir"/>
+
+ <copy file="${resources.dir}/${datasource.file.name}" todir="${tmp.dir}"/>
+
+ <mkdir dir="${tmp.dir}"/>
+
+ <replace file="${tmp.dir}/${datasource.file.name}">
+ <replacefilter token="@datasource.name@" value="${datasource.name}"/>
+ <replacefilter token="@database.connection.url@" value="${database.connection.url}"/>
+ <replacefilter token="@database.driver@" value="${database.driver}"/>
+ <replacefilter token="@database.login@" value="${database.login}"/>
+ <replacefilter token="@database.password@" value="${database.password}"/>
+ </replace>
+
+ <copy file="${tmp.dir}/${datasource.file.name}" todir="${jboss.deploy.dir}"/>
+
+ <delete dir="${tmp.dir}" />
+ </target>
+
+
+ <target name="install-JDBC-driver" description="Copy Postgresql JDBC Driver into JBOSS deploy dir." >
+ <echo message="Postgresql JDBC Driver into JBOSS deploy dir"/>
+
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${compiletime.lib.dir}">
+ <include name="postgres*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
diff --git a/ejb2/resources/application.xml b/ejb2/resources/application.xml
new file mode 100644
index 0000000..6f5654a
--- /dev/null
+++ b/ejb2/resources/application.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
+ 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+
+ <display-name>postgis-ejb2-poc</display-name>
+
+ <description>Using PostGIS Geometry Types with EJB2 - Proof of Concept</description>
+
+ <module>
+ <ejb>ejb.jar</ejb>
+ </module>
+
+ <module>
+ <java>common.jar</java>
+ </module>
+
+</application>
diff --git a/ejb2/resources/build.properties b/ejb2/resources/build.properties
new file mode 100644
index 0000000..9209cc0
--- /dev/null
+++ b/ejb2/resources/build.properties
@@ -0,0 +1,12 @@
+# You can change these properties to fit your environment.
+# This should be the only file to modify.
+# Note that you should NOT leave spaces after a property value
+
+# Name of the created database
+database.name=ejb2poc
+# User owner of the database tables
+database.login=CHANGEIT
+# Password for the db user
+database.password=CHANGEIT
+# IP or hostname of the machine running the database server
+database.host=127.0.0.1
diff --git a/ejb2/resources/jndi/jndi.properties b/ejb2/resources/jndi/jndi.properties
new file mode 100644
index 0000000..8e65c86
--- /dev/null
+++ b/ejb2/resources/jndi/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost
diff --git a/ejb2/resources/postgis-ejb2-ds.xml b/ejb2/resources/postgis-ejb2-ds.xml
new file mode 100644
index 0000000..ec10549
--- /dev/null
+++ b/ejb2/resources/postgis-ejb2-ds.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ================================================== -->
+<!-- Datasource config for Postgres -->
+<!-- DO NOT EDIT, it is a template configuration file! -->
+<!-- ================================================== -->
+
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>@datasource.name@</jndi-name>
+ <connection-url>@database.connection.url@</connection-url>
+ <driver-class>@database.driver@</driver-class>
+ <user-name>@database.login@</user-name>
+ <password>@database.password@</password>
+ </local-tx-datasource>
+</datasources>
\ No newline at end of file
diff --git a/ejb2/src/com/geodetix/geo/client/Client.java b/ejb2/src/com/geodetix/geo/client/Client.java
new file mode 100644
index 0000000..a077c2c
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/client/Client.java
@@ -0,0 +1,246 @@
+/*
+ * Client.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.client;
+
+import com.geodetix.geo.exception.ApplicationGeoLayerException;
+import com.geodetix.geo.interfaces.GeometryFacade;
+import com.geodetix.geo.interfaces.GeometryFacadeHome;
+
+import com.geodetix.geo.util.GeometryFacadeUtil;
+import com.geodetix.geo.value.GeometryValue;
+
+import java.rmi.RemoteException;
+
+import javax.naming.InitialContext;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
+
+import java.util.*;
+import org.postgis.*;
+
+
+/**
+ * A client executing a simple Test Case and illustrating the Geometry Bean Usage.
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
+ */
+public class Client {
+
+
+ private GeometryFacade geometryFacade;
+
+ private Point p1;
+ private Point p2;
+ private LineString fromP1toP2;
+ private Polygon searchPolygon;
+
+
+ /**
+ * Initializer method.
+ *
+ * @param geometryFacade the geometry facade object used to interact
+ * with the EJBs
+ */
+ public Client(GeometryFacade geometryFacade) {
+
+ this.geometryFacade=geometryFacade;
+
+ this.init();
+ }
+
+ private void init(){
+
+ // Create geometry stuff
+
+ // City Stadium
+ this.p1= new Point(16.23034006,39.31054320);
+
+ // City Train Station
+ this.p2= new Point(16.26002601,39.31920668);
+
+ this.fromP1toP2= new LineString(new Point[] {p1,p2});
+
+
+ // Create search polygon
+
+ Point[] points = new Point[]{
+
+ new Point(16.16399297, 39.40109388),
+ new Point(16.32368776, 39.39596998),
+ new Point(16.32397242, 39.25335486),
+ new Point(16.16399297, 39.25534748),
+ new Point(16.16399297, 39.40109388),
+ };
+
+ LinearRing[] linearRings = { new LinearRing(points) };
+
+ // City Area Extension
+ this.searchPolygon = new Polygon(linearRings);
+ }
+
+
+
+ private void executeNonOpenGisTest() throws ApplicationGeoLayerException, RemoteException {
+
+ System.out.println("Execute some Tests on NON-OpenGIS Geometry EJBs");
+
+ geometryFacade.createGeometryTable();
+
+ System.out.println("create some geometry stuff...");
+
+ this.showGeometry(p1);
+ GeometryValue gv1 = geometryFacade.createGeometry(p1,"[ City Stadium ]");
+
+ this.showGeometry(p2);
+ GeometryValue gv2 = geometryFacade.createGeometry(p2,"[ City Train Station ]");
+
+ this.showGeometry(fromP1toP2);
+ GeometryValue gv3 = geometryFacade.createGeometry(fromP1toP2,"Line from "
+ + gv1.getDescription()
+ + " to "
+ + gv2.getDescription());
+
+ System.out.println("Searching created geometries in City Area Perimeter: ");
+ this.showGeometry(searchPolygon);
+
+ Collection<GeometryValue> findResults = (Collection<GeometryValue>) geometryFacade.findByPolygon(searchPolygon);
+
+ System.out.println("Search Results:");
+
+ for (GeometryValue geometry : findResults ) {
+
+ this.showGeometry(geometry);
+ }
+
+ geometryFacade.dropGeometryTable();
+ }
+
+
+
+
+
+ private void executeOpenGisTest() throws ApplicationGeoLayerException, RemoteException {
+
+ System.out.println("Execute some Tests on OpenGIS Geometry EJBs");
+
+ geometryFacade.createGeometryTable("POINT",4326,2);
+
+ System.out.println("Create some Points ....");
+
+ // Setting SRID
+ this.p1.setSrid(4326);
+ this.p2.setSrid(4326);
+ this.searchPolygon.setSrid(4326);
+
+ this.showGeometry(p1);
+ GeometryValue gv1 = geometryFacade.createGeometry(p1,"[ City Stadium ]");
+
+ this.showGeometry(p2);
+ GeometryValue gv2 = geometryFacade.createGeometry(p2,"[ City Train Station ]");
+
+ System.out.println();
+ System.out.println("Searching created Points in City Area Perimeter: ");
+ this.showGeometry(searchPolygon);
+
+ // Note the use of geometricFacade finder method
+ Collection<GeometryValue> findResults = (Collection<GeometryValue>) geometryFacade.findByPolygon(searchPolygon);
+
+ System.out.println("Search Results:");
+
+ for (GeometryValue geometry : findResults ) {
+
+ this.showGeometry(geometry);
+ }
+
+ geometryFacade.dropGeometryTable();
+ }
+
+
+
+ private void showGeometry(Geometry geometry) {
+
+ System.out.println("Geometry: "+geometry.getTypeString()+geometry.getValue() + " SRID: "+geometry.getSrid());
+ }
+
+
+ private void showGeometry(GeometryValue geometryValue) {
+
+ System.out.println("EJB Id: "+geometryValue.getId());
+ System.out.println("Description: "+geometryValue.getDescription());
+
+ this.showGeometry(geometryValue.getGeometry());
+ }
+
+
+ /**
+ * Main client method.
+ *
+ * @param args arguments from the command line
+ */
+ public static void main(String [] args) {
+
+ try {
+
+ GeometryFacadeHome geometryFacadeHome= GeometryFacadeUtil.getHome();
+
+ GeometryFacade geometryFacade= geometryFacadeHome.create();
+
+ Client client = new Client(geometryFacade);
+
+ System.out.println("===============================");
+ System.out.println("== TEST 1 =====================");
+ System.out.println("===============================");
+ client.executeNonOpenGisTest();
+
+ System.out.println("===============================");
+ System.out.println("== TEST 2 =====================");
+ System.out.println("===============================");
+ client.executeOpenGisTest();
+
+ System.out.println("===============================");
+ System.out.println("DONE.");
+
+ } catch (ApplicationGeoLayerException ae) {
+ ae.printStackTrace();
+ } catch (java.rmi.RemoteException re) {
+ re.printStackTrace();
+ } catch (javax.naming.NamingException ne) {
+ ne.printStackTrace();
+ } catch (javax.ejb.CreateException ce) {
+ ce.printStackTrace();
+ }
+
+ }
+
+
+
+ private static Context getInitialContext()
+ throws javax.naming.NamingException {
+
+ return new javax.naming.InitialContext();
+ }
+
+}
diff --git a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
new file mode 100644
index 0000000..5ce836b
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
@@ -0,0 +1,153 @@
+/*
+ * PostGisGeometryDAO.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.dao;
+
+
+/**
+ * This is the DAO (Data Access Object) interface customized for
+ * the PostGIS database which extends the XDoclet's auto-generated
+ * GeometryDao interface and contains all of the SQL query statements.
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
+ *
+ */
+public interface PostGisGeometryDAO extends GeometryDao {
+
+ /* ========== Constants Definition ============ */
+
+ /** DataSource Lookup String */
+ public static final String DATASOURCE_NAME = "java:/postgis-ejb2-ds";
+
+ /* ========== SQL Queries Definition ============ */
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.ejb.GeometryBean#ejbCreate(org.postgis.Geometry, java.lang.String)}
+ * is called.
+ */
+ public static final String EJB_CREATE_STATEMENT =
+ "INSERT INTO geometries (id,geometry,description) VALUES (?,?,?)";
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPrimaryKey(java.lang.Integer)}
+ * is called.
+ */
+ public static final String FIND_BY_PRIMARY_KEY_STATEMENT =
+ "SELECT id FROM geometries WHERE id = ?";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPolygon(org.postgis.Polygon)}
+ * is called.
+ */
+ public static final String FIND_BY_POLYGON_STATEMENT =
+ "SELECT id FROM geometries WHERE contains(?,geometry)";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable()}
+ * is called.
+ */
+ public static final String HOME_CREATE_NON_OPENGIS_TABLE_STATEMENT =
+ "CREATE TABLE geometries (id INT PRIMARY KEY, description TEXT, geometry GEOMETRY)";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
+ * is called for create initial table.
+ */
+ public static final String HOME_CREATE_OPENGIS_TABLE_STATEMENT =
+ "CREATE TABLE geometries (id INT PRIMARY KEY, description TEXT)";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
+ * is called for adding geometry column.
+ */
+ public static final String ADD_OPEN_GIS_GEOMETRY_COLUMN_STATEMENT =
+ "SELECT AddGeometryColumn('','geometries','geometry',?,?,?)";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#dropDbTable()}
+ * is called for adding geometry column.
+ */
+ public static final String DROP_TABLE_STATEMENT =
+ "DROP TABLE geometries";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.ejb.GeometryBMP#ejbLoad()}
+ * is called from the container.
+ */
+ public static final String EJB_LOAD_STATEMENT =
+ "SELECT id,geometry,description FROM geometries WHERE id=?";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.ejb.GeometryBMP#ejbStore()}
+ * is called from the container.
+ */
+ public static final String EJB_STORE_STATEMENT =
+ "UPDATE geometries SET geometry=?, description=? WHERE id=?";
+
+
+ /**
+ * Query executed from
+ * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
+ * on PostGIS when the method
+ * {@link com.geodetix.geo.ejb.GeometryBean#ejbRemove()}
+ * is called from the container.
+ */
+ public static final String EJB_REMOVE_STATEMENT =
+ "DELETE FROM geometries WHERE id = ?";
+
+} // end PostGisGeometryDAO
diff --git a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
new file mode 100644
index 0000000..51d96bb
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
@@ -0,0 +1,579 @@
+/*
+ * PostGisGeometryDAOImpl.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.dao;
+
+import org.apache.commons.logging.*;
+
+import org.postgis.*;
+
+import java.sql.*;
+
+import java.util.*;
+
+import javax.ejb.*;
+
+import javax.naming.*;
+
+import javax.sql.*;
+
+import java.io.*;
+
+/**
+ *
+ * PostGis DAO Implementation for
+ * {@link com.geodetix.geo.ejb.GeometryBean} BMP Persistence.
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">antonio.pace</a>
+ *
+ */
+public class PostGisGeometryDAOImpl implements PostGisGeometryDAO {
+
+
+ private DataSource dataSource;
+ private Context jndiCntx;
+
+ /**
+ * Creates a new instance of PostGisPointDAO.
+ */
+ public PostGisGeometryDAOImpl() {}
+
+
+
+ /** Initializes the bean. */
+ public void init() {
+ try {
+
+ jndiCntx = new InitialContext();
+ dataSource = (DataSource) jndiCntx.lookup(PostGisGeometryDAO.DATASOURCE_NAME);
+
+ } catch (NamingException ne) {
+ throw new EJBException(ne);
+ }
+ }
+
+
+
+
+ /* =========== Create Methods ============ */
+
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.ejb.GeometryBean#ejbCreate(org.postgis.Geometry, java.lang.String)}
+ * method.
+ *
+ * @return the primary key of the persisted bean.
+ * @param ejb the bean to persist.
+ * @throws javax.ejb.CreateException launched if an EJB creation error is encountered.
+ * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
+ */
+ public java.lang.Integer create(com.geodetix.geo.ejb.GeometryBean ejb)
+ throws javax.ejb.CreateException, javax.ejb.EJBException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.EJB_CREATE_STATEMENT);
+
+ pstm.setInt(1, ejb.getId());
+ pstm.setObject(2, new PGgeometry((Geometry)ejb.getGeometry()));
+ pstm.setString(3,ejb.getDescription());
+
+ if (pstm.executeUpdate() != 1) {
+ throw new CreateException(
+ "Failed to add EJB to database");
+ }
+
+ return ejb.getId();
+
+ } catch (SQLException se) {
+ throw new EJBException(se);
+
+ } finally {
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+
+ } catch (Exception e) {}
+ }
+ }
+
+
+
+
+
+
+ /* ============ Finder Methods ============== */
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPrimaryKey(java.lang.Integer)}
+ * method
+ *
+ *
+ * @return the found bean's prymary key.
+ * @param primaryKey primary key of searching bean.
+ * @throws javax.ejb.FinderException launched if an error occours during the search operation.
+ */
+ public java.lang.Integer findByPrimaryKey(java.lang.Integer primaryKey)
+ throws javax.ejb.FinderException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+ ResultSet result = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.FIND_BY_PRIMARY_KEY_STATEMENT);
+
+ pstm.setInt(1, primaryKey.intValue());
+
+ result = pstm.executeQuery();
+
+ if (!result.next()) {
+ throw new ObjectNotFoundException(
+ "Cannot find Geometry Bean with id = " + primaryKey);
+ }
+
+ } catch (SQLException se) {
+ throw new EJBException(se);
+ } finally {
+ try {
+ if (result != null) {
+ result.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+ } catch (Exception e) {}
+ }
+
+ return primaryKey;
+ }
+
+
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPolygon(org.postgis.Polygon)}
+ * method
+ *
+ * @return a collection of bean's primary key beeing found.
+ * @param polygon the {@link org.postgis.Polygon} to search in.
+ * @throws javax.ejb.FinderException launched if an error occours during the search operation.
+ */
+ public java.util.Collection findByPolygon(org.postgis.Polygon polygon)
+ throws javax.ejb.FinderException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+ ResultSet result = null;
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.FIND_BY_POLYGON_STATEMENT);
+
+ pstm.setObject(1, new PGgeometry(polygon));
+
+ result = pstm.executeQuery();
+
+ Vector keys = new Vector();
+
+ while (result.next()) {
+ keys.addElement(result.getObject("id"));
+ }
+
+ return keys;
+
+ } catch (SQLException se) {
+ throw new EJBException(se);
+
+ } finally {
+ try {
+ if (result != null) {
+ result.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+ } catch (Exception e) {}
+ }
+ }
+
+
+
+
+ /* =========== Bean's Life Cycle Methods ============= */
+
+
+
+ /**
+ * PostGIS implementation of the entity bean's life cycle method
+ * <code>ejbLoad()</code>.
+ *
+ * @param pk the primary key of the bean to load.
+ * @param ejb the ejb whose data must be loaded.
+ * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
+ */
+ public void load(java.lang.Integer pk, com.geodetix.geo.ejb.GeometryBean ejb)
+ throws javax.ejb.EJBException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+ ResultSet result = null;
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.EJB_LOAD_STATEMENT);
+
+ pstm.setInt(1, pk.intValue());
+
+ result = pstm.executeQuery();
+
+ if (result.next()) {
+ ejb.setId(pk);
+ ejb.setGeometry(((PGgeometry) result.getObject("geometry")).getGeometry());
+ ejb.setDescription((String) result.getString("description"));
+
+ } else {
+
+ throw new EJBException("ejbLoad unable to load EJB.");
+ }
+
+ } catch (SQLException se) {
+ throw new EJBException(se);
+
+ } finally {
+ try {
+ if (result != null) {
+ result.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+ } catch (Exception e) {}
+ }
+ }
+
+
+ /**
+ * PostGIS implementation of the entity bean's lifecicle method
+ * <code>ejbStore()</code>.
+ *
+ * @param ejb the ejb whose data must be stored.
+ * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
+ */
+ public void store(com.geodetix.geo.ejb.GeometryBean ejb)
+ throws javax.ejb.EJBException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.EJB_STORE_STATEMENT);
+
+ pstm.setObject(1, new PGgeometry(ejb.getGeometry()));
+ pstm.setString(2,ejb.getDescription());
+ pstm.setInt(3, ejb.getId().intValue());
+
+ if (pstm.executeUpdate() != 1) {
+ throw new EJBException("ejbStore unable to update EJB.");
+ }
+
+ } catch (SQLException se) {
+
+ throw new EJBException(se);
+
+ } finally {
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+
+ } catch (Exception e) {}
+ }
+ }
+
+
+ /**
+ * PostGIS implementation of the entity bean's lifecicle method
+ * <code>ejbRemove()</code>.
+ *
+ *
+ * @param pk primary key of the bean that must be removed .
+ * @throws javax.ejb.RemoveException launched if an error during
+ * EJB remove operation is encountered.
+ * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
+ */
+ public void remove(java.lang.Integer pk)
+ throws javax.ejb.RemoveException, javax.ejb.EJBException {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.EJB_REMOVE_STATEMENT);
+
+ pstm.setInt(1, pk.intValue());
+
+ if (pstm.executeUpdate() != 1) {
+ throw new EJBException("ejbRemove unable to remove EJB.");
+ }
+ } catch (SQLException se) {
+
+ throw new EJBException(se);
+
+ } finally {
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+ } catch (Exception e) {}
+ }
+ }
+
+
+
+
+
+ /* =========== Home Interface Utility Methods ============ */
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
+ * method creating a NON-OpenGis compliant table in the PostGIS database.
+ * The table will contain the geometry EJBs.
+ */
+ public void makeDbTable() {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ System.out.println("Creating non-OpenGIG Bean table... ");
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.HOME_CREATE_NON_OPENGIS_TABLE_STATEMENT);
+ pstm.execute();
+
+ System.out.println("...done!");
+
+ } catch (SQLException e) {
+ throw new EJBException(e);
+
+ } finally {
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+
+ } catch (Exception e) {}
+ }
+ }
+
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
+ * method creating an OpenGIS compliant table in the PostGIS database.
+ * The table will contain the geometry EJBs.
+ *
+ * @param gemetryType the string that rapresent a valid PostGIS
+ * geometry type (i.e.: POINT, LINESTRING, POLYGON etc.).
+ * @param srid the SRID of the geometry.
+ * @param geometryDimension the dimension of the geometry.
+ */
+ public void makeDbTable(String gemetryType, int srid, int geometryDimension) {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ System.out.println("Creating OpenGIS Bean table...");
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.HOME_CREATE_OPENGIS_TABLE_STATEMENT);
+ pstm.execute();
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.ADD_OPEN_GIS_GEOMETRY_COLUMN_STATEMENT);
+ pstm.setInt(1,srid);
+ pstm.setString(2,gemetryType);
+ pstm.setInt(3,geometryDimension);
+
+ pstm.execute();
+
+ System.out.println("...done!");
+
+ } catch (SQLException e) {
+ throw new EJBException(e);
+
+ } finally {
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+
+ } catch (Exception e) {}
+ }
+ }
+
+
+ /**
+ * PostGIS implementation of the
+ * {@link com.geodetix.geo.interfaces.GeometryLocalHome#dropDbTable()}
+ * method removing the table related to the EJBs.
+ */
+ public void dropDbTable() {
+
+ PreparedStatement pstm = null;
+ Connection con = null;
+
+
+ try {
+
+ con = this.dataSource.getConnection();
+
+ System.out.println("Dropping Bean Table... ");
+
+ pstm = con.prepareStatement(PostGisGeometryDAO.DROP_TABLE_STATEMENT);
+ pstm.execute();
+
+ System.out.println("...done!");
+
+ } catch (SQLException e) {
+
+ throw new EJBException(e);
+
+ } finally {
+
+ try {
+ if (pstm != null) {
+ pstm.close();
+ }
+ } catch (Exception e) {}
+
+ try {
+ if (con != null) {
+ con.close();
+ }
+
+ } catch (Exception e) {}
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java b/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
new file mode 100644
index 0000000..d602c6a
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
@@ -0,0 +1,298 @@
+/*
+ * GeometryBean.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.ejb;
+
+
+import javax.ejb.*;
+
+import java.util.*;
+
+import org.postgis.*;
+
+import com.geodetix.geo.value.GeometryValue;
+
+/**
+ * This BMP (Bean Managed Persistence) entity bean stores information
+ * about geometrical description of a choosen entity in some application
+ * domain. It stores geometrical infos in the <code>geometry</code> attribute
+ * of type <code>org.postgis.Geometry</code>. Note that such an attribute could
+ * even be implemented as a pure text (i.e. Java <code>String</code>) field
+ * following the WKT format, thus leaving geometric details to the PostGIS
+ * api classes (see <code>README</code> file for further details).
+ *
+ * @ejb.bean
+ * name="Geometry"
+ * jndi-name="geodetix/geo/Geometry"
+ * local-jndi-name="geodetix/geo/GeometryLocal"
+ * type="BMP"
+ * view-type="local"
+ * primkey-field="id"
+ *
+ * @ejb.dao
+ * impl-class="com.geodetix.geo.dao.PostGisGeometryDAOImpl"
+ *
+ *
+ * @ejb.transaction
+ * type="RequiresNew"
+ *
+ *
+ * @ejb.value-object
+ * name="Geometry"
+ * match="value"
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
+ *
+ */
+public abstract class GeometryBean implements javax.ejb.EntityBean {
+
+
+ /* TEMPORARY (NOT FOR REAL WORLD) PRIMARY KEY GENERATOR */
+ private static final int SIMPLE_ID_GENERATOR = (int) System.currentTimeMillis();
+ private static int actualId = SIMPLE_ID_GENERATOR;
+
+
+
+ /* BMP fields */
+ private Integer id;
+ private String description;
+ private Geometry geometry;
+
+
+
+
+ /* CREATE METHODS */
+
+
+ /**
+ * Creates a new Geometry Bean.
+ *
+ * @ejb.create-method
+ *
+ * @param geometry the <code>org.postgis.Geometry</code> that has to be
+ * included in this EJB.
+ * @param description the textual description of this bean.
+ * @throws CreateException lauched if an error occours during the
+ * EJB creation.
+ * @return the EJB's primary key.
+ */
+ public Integer ejbCreate(org.postgis.Geometry geometry,String description)
+ throws CreateException {
+
+ this.id = (new Integer(actualId++));
+ this.geometry = geometry;
+ this.description=description;
+
+ /* For now return null, this will be overrided in the DAO implementation of this method */
+ return null;
+ }
+
+ /**
+ * This method is called by the container after the EJB creation.
+ *
+ * @param geometry the <code>org.postgis.Geometry</code> that has to be
+ * included in this EJB.
+ */
+ public void ejbPostCreate(org.postgis.Geometry geometry) {
+
+ // Do something with Relationship.
+ }
+
+
+
+
+
+ /* ========== Finder Methods =========== */
+
+
+ /**
+ * Find a Geometry Bean from his primary key.
+ *
+ * @param primaryKey the primary key of the bean to found.
+ * @throws FinderException lauched if an error occours during the
+ * EJB search operation.
+ */
+ public abstract Integer ejbFindByPrimaryKey(Integer primaryKey)
+ throws FinderException;
+
+
+
+
+ /**
+ * Find all of the geometry beans contained in a <code>Polygon</code>.
+ *
+ * @param polygon the Polygon to search in.
+ */
+ public abstract Collection ejbFindByPolygon(org.postgis.Polygon polygon)
+ throws FinderException;
+
+
+
+
+
+ /* ============== BMP Fields Accessor Methods ============ */
+
+
+ /**
+ * Returns the EJB's id field.
+ *
+ * @ejb.pk-field
+ * @ejb.interface-method
+ * @ejb.value-object match="value"
+ */
+ public Integer getId() {
+
+ return this.id;
+ }
+
+
+ /**
+ * Modifies the id field.
+ */
+ public void setId(Integer id) {
+
+ this.id = id;
+
+ this.makeDirty();
+ }
+
+
+ /**
+ * Returns the EJB's textual description.
+ *
+ * @ejb.interface-method
+ * @ejb.value-object match="value"
+ * @return the Geometry Bean description.
+ */
+ public String getDescription() {
+
+ return this.description;
+ }
+
+ /**
+ * Modifies the EJB's textual description.
+ *
+ * @ejb.interface-method
+ * @param description the Geometry Bean description.
+ */
+ public void setDescription(String description) {
+
+ this.description = description;
+
+ this.makeDirty();
+ }
+
+
+
+ /**
+ * Returns the EJB's geometrical description.
+ *
+ * @ejb.interface-method
+ * @ejb.value-object match="value"
+ * @return the org.postgis.Geometry included in this bean.
+ */
+ public org.postgis.Geometry getGeometry() {
+
+ return this.geometry;
+ }
+
+ /**
+ * Modifies the EJB's geometrical description.
+ *
+ * @ejb.interface-method
+ * @param geometry the <code>org.postgis.Geometry</code> that has to
+ * be included in this EJB.
+ */
+ public void setGeometry(org.postgis.Geometry geometry) {
+
+ this.geometry = geometry;
+
+ this.makeDirty();
+ }
+
+
+
+
+
+ /* HOME INTERFACE BMP UTILITY METHODS */
+
+
+ /**
+ * Create a non-OpenGIS DataBase table, used to persist the Geometry Beans.
+ *
+ * @ejb.home-method
+ *
+ * @dao.call
+ */
+ public abstract void ejbHomeMakeDbTable();
+
+
+
+ /**
+ * Create OpenGIS DataBase table, used to persist the Geometry Beans.
+ *
+ * @ejb.home-method
+ *
+ * @dao.call
+ */
+ public abstract void ejbHomeMakeDbTable(String gemetryType, int srid, int geometryDimension);
+
+
+
+ /**
+ * Remove Bean's Persistence Teable of the DataBase.
+ *
+ * @ejb.home-method
+ *
+ * @dao.call
+ */
+ public abstract void ejbHomeDropDbTable();
+
+
+
+ /* VALUE OBJECTS */
+
+ /**
+ * This is an abstract method to allow XDoclet to expose
+ * value object functionalities in the local/remote interface.
+ *
+ * @ejb.interface-method
+ *
+ * @return a value object for this GeometryBean.
+ */
+ public abstract GeometryValue getGeometryValue();
+
+
+
+
+
+ /* XDOCLET BMP METHODS RELATED STUFF */
+
+
+ /**
+ * @see com.geodetix.geo.ejb.GeometryBMP source.
+ */
+ protected abstract void makeDirty();
+
+}
diff --git a/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java b/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
new file mode 100644
index 0000000..33ae6b5
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
@@ -0,0 +1,238 @@
+/*
+ * GeometryFacadeBean.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.ejb;
+
+
+import com.geodetix.geo.exception.ApplicationGeoLayerException;
+import com.geodetix.geo.interfaces.GeometryLocalHome;
+import com.geodetix.geo.interfaces.GeometryLocal;
+import com.geodetix.geo.util.GeometryUtil;
+import com.geodetix.geo.value.GeometryValue;
+
+import org.apache.commons.logging.*;
+
+import org.postgis.*;
+
+import java.rmi.*;
+
+import java.util.*;
+
+import javax.ejb.*;
+
+import javax.naming.*;
+
+
+/**
+ * A SessionFacade for managing Geometry beans.
+ *
+ * @ejb.bean
+ * name="GeometryFacade"
+ * jndi-name="geodetix/geo/GeometryFacade"
+ * local-jndi-name="geodetix/geo/GeometryFacadeLocal"
+ * type="Stateless"
+ * view-type="both"
+ * transaction-type="Container"
+ *
+ * @ejb.ejb-ref
+ * ejb-name="Geometry"
+ * view-type="local"
+ * ref-name="ejb/GeometryLocal"
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
+ */
+public abstract class GeometryFacadeBean implements SessionBean {
+ private SessionContext ctx;
+
+
+ /**
+ * EJB Initializer.
+ *
+ * @ejb.create-method
+ */
+ public void ejbCreate() throws CreateException {}
+
+ /**
+ * Called after the EJB creation.
+ */
+ public void ejbPostCreate() throws CreateException {}
+
+ /**
+ * Save the EJB session context.
+ */
+ public void setSessionContext(SessionContext ctx)
+ throws EJBException, RemoteException {
+ this.ctx = ctx;
+ }
+
+
+
+
+ /* ============ Finder Methods ============== */
+
+ /**
+ * Find all of the geometry beans contained in a <code>Polygon</code>.
+ *
+ * @ejb.interface-method
+ *
+ * @param polygon The Polygon to search in.
+ */
+ public Collection findByPolygon(org.postgis.Polygon polygon)
+ throws ApplicationGeoLayerException {
+ try {
+ GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
+ Collection geometries = geometryHome.findByPolygon(polygon);
+
+ List result = new ArrayList();
+
+ for (Iterator iter = geometries.iterator(); iter.hasNext(); ) {
+ GeometryLocal geometry = (GeometryLocal) iter.next();
+
+ result.add(geometry.getGeometryValue());
+ }
+
+ return result;
+
+ } catch (NamingException e) {
+ throw new ApplicationGeoLayerException(e);
+ } catch (FinderException e) {
+ throw new ApplicationGeoLayerException(e);
+ }
+ }
+
+
+
+
+
+ /* =============== Business Iinterfaces Methods ============= */
+
+
+ /**
+ * Creates a new Geometry Bean.
+ *
+ * @ejb.interface-method
+ *
+ * @param geometry the <code>org.postgis.Geometry</code> that has to be
+ * included in this EJB.
+ * @param description the textual description of this bean.
+ * @return a value object representing the created EJB.
+ */
+ public GeometryValue createGeometry(org.postgis.Geometry geometry, String description)
+ throws ApplicationGeoLayerException {
+ try {
+ GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
+ GeometryLocal geometryLocal =
+ geometryHome.create(geometry,description);
+
+ return geometryLocal.getGeometryValue();
+ } catch (NamingException e) {
+ throw new ApplicationGeoLayerException(e);
+ } catch (CreateException e) {
+ throw new ApplicationGeoLayerException(e);
+ }
+ }
+
+
+
+
+
+ /* ================== BMP Utility Methods ================= */
+
+
+
+ /**
+ * Create a non-OpenGIS DataBase table used to persist the Geometry Beans.
+ * <em>Note that in a real-world application this method should be protected
+ * by using a role-based security policy.</em>
+ *
+ * @ejb.interface-method
+ *
+ * @throws ApplicationGeoLayerException thrown if an error occours
+ * during table creation.
+ */
+ public void createGeometryTable() throws ApplicationGeoLayerException {
+ try {
+ GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
+
+ geometryHome.makeDbTable();
+ } catch (NamingException e) {
+ throw new ApplicationGeoLayerException(e);
+ } catch (Exception e) {
+ throw new ApplicationGeoLayerException(e);
+ }
+ }
+
+
+ /**
+ * Create an OpenGIS compliant database table used to persist the
+ * Geometry Beans.
+ * <em>Note that in a real-world application this method should be protected
+ * by using a role-based security policy.</em>
+ *
+ * @ejb.interface-method
+ *
+ * @throws ApplicationGeoLayerException thrown if an error occours
+ * during table creation.
+ */
+ public void createGeometryTable(String gemetryType, int srid, int geometryDimension )
+ throws ApplicationGeoLayerException {
+ try {
+ GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
+
+ geometryHome.makeDbTable(gemetryType, srid, geometryDimension);
+
+ } catch (NamingException e) {
+ throw new ApplicationGeoLayerException(e);
+ } catch (Exception e) {
+ throw new ApplicationGeoLayerException(e);
+ }
+ }
+
+
+
+ /**
+ * Remove the EJB's persistence table from the database.
+ * <em>Note that in a real-world application this method should be protected
+ * by using a role-based security policy.</em>
+ *
+ * @ejb.interface-method
+ *
+ * @throws ApplicationGeoLayerException thrown if an error occours
+ * during table creation.
+ */
+ public void dropGeometryTable() throws ApplicationGeoLayerException {
+ try {
+ GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
+
+ geometryHome.dropDbTable();
+ } catch (NamingException e) {
+ throw new ApplicationGeoLayerException(e);
+ } catch (Exception e) {
+ throw new ApplicationGeoLayerException(e);
+ }
+ }
+
+
+
+}
diff --git a/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java b/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
new file mode 100644
index 0000000..a36678f
--- /dev/null
+++ b/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
@@ -0,0 +1,66 @@
+/*
+ * ApplicationGeoLayerException.java
+ *
+ * Using PostGIS Geometry Types with EJB2 - Proof of Concept
+ *
+ * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
+ * and individual contributors as indicated by the @authors tag.
+ *
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package com.geodetix.geo.exception;
+
+
+/**
+ * Generic Application Exception.
+ *
+ * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
+ *
+ */
+public class ApplicationGeoLayerException extends Exception {
+
+ /**
+ * Creates a new ApplicationGeoLayerException object.
+ */
+ public ApplicationGeoLayerException() {
+ super("unknown");
+
+ } // end ApplicationGeoLayerException()
+
+
+ /**
+ * Creates a new ApplicationGeoLayerException object.
+ *
+ * @param e the wrapped Exception.
+ */
+ public ApplicationGeoLayerException(Exception e) {
+ super(e.getMessage());
+
+ } // end ApplicationGeoLayerException()
+
+
+ /**
+ * Creates a new ApplicationGeoLayerException object.
+ *
+ * @param msg the wrapped Message.
+ */
+ public ApplicationGeoLayerException(String msg) {
+ super(msg);
+
+ } // end ApplicationGeoLayerException()
+
+} // end ApplicationGeoLayerException
diff --git a/ejb3/.classpath b/ejb3/.classpath
new file mode 100644
index 0000000..fda5da1
--- /dev/null
+++ b/ejb3/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.jboss.ide.eclipse.jdt.aop.core.classpath.AOP_15_CONTAINER"/>
+ <classpathentry kind="con" path="org.jboss.ide.eclipse.jdt.ejb3.wizards.core.classpath.EJB3_CONTAINER/JBoss-4.0.4.GA"/>
+ <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/server/default/lib/postgis_1.1.0.jar"/>
+ <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/client/jbossws-client.jar"/>
+ <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/client/jboss-jaxrpc.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/ejb3/.project b/ejb3/.project
new file mode 100644
index 0000000..f495192
--- /dev/null
+++ b/ejb3/.project
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>PostGISTutorial</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.ejb3.wizards.core.EJB3ProjectNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/ejb3/.settings/org.eclipse.jdt.core.prefs b/ejb3/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..65a5762
--- /dev/null
+++ b/ejb3/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Mon Sep 18 15:14:48 BST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/ejb3/EJB3Spatial.odt b/ejb3/EJB3Spatial.odt
new file mode 100644
index 0000000..c13479e
Binary files /dev/null and b/ejb3/EJB3Spatial.odt differ
diff --git a/ejb3/README.txt b/ejb3/README.txt
new file mode 100644
index 0000000..a4e83c1
--- /dev/null
+++ b/ejb3/README.txt
@@ -0,0 +1,27 @@
+(This code was contributed by Norman Barker <norman.barker at gmail.com>)
+
+Spatial EJB3
+
+
+Spatial EJB3 is a quick investigation to see if it is possible to integrate the
+Java 5 annotation approach to mark a property of an object as spatial and to
+delegate to the EJB3 persistence model to store and retrieve this data.
+
+The project utilises JBoss and PostGIS, future iterations will look to remove
+the dependency on JBoss and Hibernate to incorporate other Application
+Services.
+
+Since it is useful to display screenshots in a tutorial this has been written
+as an Openoffice Document. For easy viewing and printing, a PDF version is
+also available.
+
+
+COMPILING:
+
+Run "ant" to compile.
+
+The postgis.jar, pgjdbc.jar and the other needed libs have to
+be put in the lib/ subdirectory.
+
+If your JBOSS is not installed in C:\jboss-4.0.4.GA, fix the
+path in the build.xml.
diff --git a/ejb3/build.xml b/ejb3/build.xml
new file mode 100644
index 0000000..97b3925
--- /dev/null
+++ b/ejb3/build.xml
@@ -0,0 +1,70 @@
+<!--
+ * build file
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Support
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ -->
+<project name="PostGIS EJB3 Tutorial" default="compile" basedir=".">
+ <property name="build.dir" value="bin"/>
+ <property name="lib.dir" value="lib"/>
+ <property name="src.dir" value="src"/>
+ <property name="dist.dir" value="dist"/>
+ <property name="jboss.home" value="C:/jboss-4.0.4.GA"/>
+ <property name="jbossconf" value="jboss"/>
+
+ <path id="class.path">
+ <pathelement location="${build.dir}"/>
+ <fileset dir="${lib.dir}" includes="*.jar"/>
+ <fileset dir="${jboss.home}/client">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/server/default/lib" includes="hibernate3.jar"/>
+ </path>
+
+ <target name="clean" description="Removes all generated files">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <target name="compile">
+ <mkdir dir="${build.dir}"/>
+ <javac destdir="${build.dir}" fork="true" classpathref="class.path" source="1.5" target="1.5">
+ <src path="${src.dir}"/>
+ </javac>
+ <copy todir="${build.dir}">
+ <fileset dir="${src.dir}"
+ includes="**/images/*,**/*.properties" excludes="**/.svn/*"/>
+ </copy>
+ </target>
+
+ <target name="dist" depends="clean, compile">
+ <mkdir dir="${dist.dir}"/>
+ <jar jarfile="${dist.dir}/ingest.jar" basedir="${build.dir}" includes="**/ejb/*, **/mdb/*, **/UserBean/*, **/hibernate/*">
+ <metainf dir="${src.dir}/META-INF" includes="*.xml"/>
+ </jar>
+ </target>
+
+ <target name="deploy" description="deploys the service to JBoss" depends="dist">
+ <copy todir="${jboss.home}/server/default/deploy">
+ <fileset dir="${dist.dir}" includes="ingest.jar, people.war"/>
+ <fileset dir="${jbossconf}" includes="*.xml"/>
+ </copy>
+ </target>
+
+</project>
diff --git a/ejb3/jboss/geodata-ds.xml b/ejb3/jboss/geodata-ds.xml
new file mode 100644
index 0000000..f681e9e
--- /dev/null
+++ b/ejb3/jboss/geodata-ds.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>GeoDataDS</jndi-name>
+ <connection-url>jdbc:postgresql://127.0.0.1:5432/geotest</connection-url>
+ <driver-class>org.postgis.DriverWrapper</driver-class>
+ <user-name>geo</user-name>
+ <password>geo</password>
+ <metadata>
+ <type-mapping>PostgreSQL 8.1</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
diff --git a/ejb3/jboss/ingest-service.xml b/ejb3/jboss/ingest-service.xml
new file mode 100644
index 0000000..2e6789d
--- /dev/null
+++ b/ejb3/jboss/ingest-service.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=ingestQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
\ No newline at end of file
diff --git a/ejb3/src/META-INF/persistence.xml b/ejb3/src/META-INF/persistence.xml
new file mode 100644
index 0000000..bb06da6
--- /dev/null
+++ b/ejb3/src/META-INF/persistence.xml
@@ -0,0 +1,5 @@
+<persistence>
+ <persistence-unit name="People">
+ <jta-data-source>java:/GeoDataDS</jta-data-source>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/ejb3/src/jndi.properties b/ejb3/src/jndi.properties
new file mode 100644
index 0000000..66babf6
--- /dev/null
+++ b/ejb3/src/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=localhost:1099
diff --git a/ejb3/src/org/postgis/ejb/PersonEntity.java b/ejb3/src/org/postgis/ejb/PersonEntity.java
new file mode 100644
index 0000000..5dbc114
--- /dev/null
+++ b/ejb3/src/org/postgis/ejb/PersonEntity.java
@@ -0,0 +1,95 @@
+/*
+ * PersonEntity.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.ejb;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.hibernate.annotations.Type;
+import org.postgis.Geometry;
+
+ at Entity
+ at Table(name="people")
+ at NamedQuery(name="findPerson",
+ query="SELECT DISTINCT OBJECT(p) FROM PersonEntity p WHERE ((p.name = :name) AND (p.surname = :surname)) ORDER BY p.date")
+public class PersonEntity {
+ private long id;
+ private String name;
+ private String surname;
+ private Geometry location;
+ private Date date;
+
+ @Id
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
+ @Column(name="id")
+ public long getId() {
+ return id;
+ }
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ @Type(type = "org.postgis.hibernate.GeometryType")
+ @Column(name="location", columnDefinition="Geometry")
+ public Geometry getLocation() {
+ return location;
+ }
+ public void setLocation(Geometry location) {
+ this.location = location;
+ }
+
+ @Column(name="name")
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(name="surname")
+ public String getSurname() {
+ return surname;
+ }
+ public void setSurname(String surname) {
+ this.surname = surname;
+ }
+
+ @Column(name="ingested")
+ @Temporal(TemporalType.TIMESTAMP)
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+}
diff --git a/ejb3/src/org/postgis/ejb/UserBean.java b/ejb3/src/org/postgis/ejb/UserBean.java
new file mode 100644
index 0000000..2b0722b
--- /dev/null
+++ b/ejb3/src/org/postgis/ejb/UserBean.java
@@ -0,0 +1,123 @@
+/*
+ * UserBean.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.ejb;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.EJBException;
+import javax.ejb.Stateless;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.jboss.annotation.security.SecurityDomain;
+
+ at Stateless
+ at WebService(
+ name = "EndpointInterface",
+ targetNamespace = "http://org.postgis/ejb/UserBean",
+ serviceName = "PeopleFinder")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public class UserBean implements UserBeanRemote{
+ @PersistenceContext(unitName="People") private EntityManager entityManager;
+
+ @Resource(mappedName = "java:/ConnectionFactory")
+ private QueueConnectionFactory connectionFactory;
+
+ @Resource(mappedName = "queue/ingestQueue")
+ private Queue queue;
+
+
+ @WebMethod
+ public void ingest(@WebParam(name = "name") String name, at WebParam(name = "surname") String surname, at WebParam(name = "lat") double lat, @WebParam(name = "lon") double lon){
+ // place message on a queue
+ try {
+ QueueConnection qConn = connectionFactory.createQueueConnection();
+ QueueSession qSession = qConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ QueueSender qSender = qSession.createSender(queue);
+
+ // create a message
+ MapMessage message = qSession.createMapMessage();
+ message.setStringProperty("MessageFormat", "Person");
+ message.setString("NAME", name);
+ message.setString("SURNAME", surname);
+ message.setDouble("LAT", lat);
+ message.setDouble("LON", lon);
+ qSender.send(message);
+ qSession.close();
+ qConn.close();
+ } catch (JMSException e) {
+ throw new EJBException(e.getMessage());
+ }
+
+ }
+
+
+ @WebMethod
+ @WebResult(name="positions")
+ public String[] findPerson(@WebParam(name = "name") String name, @WebParam(name = "surname") String surname)
+ {
+ Query query = entityManager.createNamedQuery("findPerson");
+ query.setParameter("name", name);
+ query.setParameter("surname", surname);
+ List list = query.getResultList();
+
+ if (list != null)
+ {
+ Iterator itr = list.iterator();
+ ArrayList<String> resultList = new ArrayList<String>();
+
+ while (itr.hasNext())
+ {
+ PersonEntity person = (PersonEntity) itr.next();
+ resultList.add(person.getLocation().getValue() + "," + person.getDate() + "\r\n");
+ }
+
+ String[] result = (String[])(resultList.toArray(new String[resultList.size()]));
+ return result;
+ }
+ else
+ {
+ return null;
+ }
+
+ }
+
+}
diff --git a/ejb3/src/org/postgis/ejb/UserBeanRemote.java b/ejb3/src/org/postgis/ejb/UserBeanRemote.java
new file mode 100644
index 0000000..70ed35e
--- /dev/null
+++ b/ejb3/src/org/postgis/ejb/UserBeanRemote.java
@@ -0,0 +1,34 @@
+/*
+ * UserBeanRemote.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.Remote;
+import javax.jws.WebParam;
+
+ at Remote
+public interface UserBeanRemote {
+ public void ingest(String name, String surname, double lat, double lon) throws RemoteException;
+ public String[] findPerson(String name, String surname) throws RemoteException;
+}
diff --git a/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java b/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java
new file mode 100644
index 0000000..a64176e
--- /dev/null
+++ b/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java
@@ -0,0 +1,98 @@
+/*
+ * IngestMDB.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.ejb.mdb;
+
+import java.util.Date;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.postgis.Point;
+import org.postgis.ejb.PersonEntity;
+
+ at MessageDriven(activationConfig={
+ @ActivationConfigProperty(
+ propertyName="destinationType",
+ propertyValue="javax.jms.Queue"),
+ @ActivationConfigProperty(
+ propertyName="destination",
+ propertyValue="queue/ingestQueue"),
+ @ActivationConfigProperty(
+ propertyName="messageSelector",
+ propertyValue="MessageFormat ='Person'"),
+ @ActivationConfigProperty(
+ propertyName="acknowledgeMode",
+ propertyValue="Auto-acknowledge")
+})
+/**
+ * implements a listener interface to ingest people data
+ */
+public class IngestMDB implements MessageListener {
+
+ public static final String NAME = "NAME";
+ public static final String SURNAME = "SURNAME";
+ public static final String LATITUDE = "LAT";
+ public static final String LONGITUDE = "LON";
+
+ @PersistenceContext(unitName="People") private EntityManager entityManager;
+
+
+ /**
+ * Implements a message listener for Person ingest requests
+ * @see javax.jms.MessageListener#onMessage(javax.jms.Message)
+ */
+ public void onMessage(Message msg) {
+ if (msg instanceof MapMessage)
+ {
+ try {
+ MapMessage m = (MapMessage)msg;
+ String name = m.getString(IngestMDB.NAME);
+ String surname = m.getString(IngestMDB.SURNAME);
+ Double lat = m.getDouble(IngestMDB.LATITUDE);
+ Double lon = m.getDouble(IngestMDB.LONGITUDE);
+
+ PersonEntity person = new PersonEntity();
+ person.setName(name);
+ person.setSurname(surname);
+ person.setLocation(new Point(lon, lat));
+ person.setDate(new Date());
+ entityManager.persist(person);
+
+ // for tutorial info
+ System.out.println("INGESTED " + name + " " + surname + " into PostGIS");
+ } catch (JMSException e) {
+ e.printStackTrace();
+ }
+
+
+ }
+
+ }
+
+}
diff --git a/ejb3/src/org/postgis/hibernate/ContainsExpression.java b/ejb3/src/org/postgis/hibernate/ContainsExpression.java
new file mode 100644
index 0000000..8900248
--- /dev/null
+++ b/ejb3/src/org/postgis/hibernate/ContainsExpression.java
@@ -0,0 +1,82 @@
+/*
+ * ContainsExpression.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.hibernate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.CriteriaQuery;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.engine.TypedValue;
+import org.postgis.Geometry;
+
+/**
+ * @author nbarker
+ *
+ */
+public class ContainsExpression implements Criterion{
+ private static final long serialVersionUID = 1L;
+ private String propertyName;
+ private Geometry geom;
+
+ public ContainsExpression(String propertyName, Geometry geom)
+ {
+ this.propertyName = propertyName;
+ this.geom = geom;
+ }
+
+ public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
+ }
+
+ public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ Dialect dialect = criteriaQuery.getFactory().getDialect();
+ String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
+
+ if (columns.length != 1) throw new HibernateException("\"contains\" may only be used with single-column properties");
+ if ( dialect instanceof PostGISDialect) {
+ StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "contains");
+ List args = new ArrayList();
+ args.add(columns[0]);
+ args.add("?");
+
+ return function.render(args, criteriaQuery.getFactory());
+ }
+ else
+ {
+ throw new HibernateException("\"contains\" may only be used with a spatial hibernate dialect");
+ }
+ }
+
+ public String toString()
+ {
+ return propertyName + " contains " + geom;
+ }
+
+}
diff --git a/ejb3/src/org/postgis/hibernate/GeometryType.java b/ejb3/src/org/postgis/hibernate/GeometryType.java
new file mode 100644
index 0000000..fa3afda
--- /dev/null
+++ b/ejb3/src/org/postgis/hibernate/GeometryType.java
@@ -0,0 +1,149 @@
+/*
+ * GeometryType.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.hibernate;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.sql.Blob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.hibernate.HibernateException;
+import org.hibernate.usertype.UserType;
+import java.io.InputStream;
+import org.postgis.Geometry;
+import org.postgis.binary.BinaryParser;
+import org.postgis.binary.BinaryWriter;
+
+/**
+ * @author nbarker $date 16/8/06
+ */
+public class GeometryType implements UserType {
+ private static final int[] SQL_TYPES = { Types.BLOB };
+
+
+ /**
+ * @see org.hibernate.usertype.UserType#deepCopy(java.lang.Object)
+ */
+ public Object deepCopy(Object value) throws HibernateException {
+ return value;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#equals(java.lang.Object, java.lang.Object)
+ */
+ public boolean equals(Object x, Object y) throws HibernateException {
+ if (x == y) {
+ return true;
+ } else if (x == null || y == null) {
+ return false;
+ } else {
+ return x.equals(y);
+ }
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#hashCode(java.lang.Object)
+ */
+ public int hashCode(Object arg0) throws HibernateException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#isMutable()
+ */
+ public boolean isMutable() {
+ return false;
+ }
+
+ /**)
+ * @see org.hibernate.usertype.UserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object)
+ */
+ public Object nullSafeGet(ResultSet resultSet,
+ String[] names, Object owner) throws HibernateException, SQLException {
+ Geometry result = null;
+ String geom = resultSet.getString(names[0]);
+ if(geom != null ) {
+ BinaryParser parser = new BinaryParser();
+ result = parser.parse(geom);
+ }
+ return result;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#nullSafeSet(java.sql.PreparedStatement, java.lang.Object, int)
+ */
+ public void nullSafeSet(PreparedStatement statement,
+ Object value, int index) throws HibernateException, SQLException {
+ if (value == null) {
+ statement.setBytes(index, null);
+ } else {
+ BinaryWriter bw = new BinaryWriter();
+
+ byte[] bytes = bw.writeBinary((Geometry)value);
+ statement.setBytes(index, bytes);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernate.usertype.UserType#replace(java.lang.Object, java.lang.Object, java.lang.Object)
+ */
+ public Object replace(Object original, Object target,
+ Object owner) throws HibernateException {
+ return original;
+ }
+
+ /* (non-Javadoc)
+ * @see org.hibernate.usertype.UserType#returnedClass()
+ */
+ public Class returnedClass() {
+ return Geometry.class;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#sqlTypes()
+ */
+ public int[] sqlTypes() {
+ return GeometryType.SQL_TYPES;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#assemble(java.io.Serializable, java.lang.Object)
+ */
+ public Object assemble(Serializable cached, Object owner) throws HibernateException {
+ return cached;
+ }
+
+ /**
+ * @see org.hibernate.usertype.UserType#disassemble(java.lang.Object)
+ */
+ public Serializable disassemble(Object value) throws HibernateException {
+ return (Serializable)value;
+ }
+
+}
+
diff --git a/ejb3/src/org/postgis/hibernate/IntersectsExpression.java b/ejb3/src/org/postgis/hibernate/IntersectsExpression.java
new file mode 100644
index 0000000..b9e773a
--- /dev/null
+++ b/ejb3/src/org/postgis/hibernate/IntersectsExpression.java
@@ -0,0 +1,82 @@
+/*
+ * IntersectsExpression.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.hibernate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.CriteriaQuery;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.engine.TypedValue;
+import org.postgis.Geometry;
+
+/**
+ * @author nbarker
+ *
+ */
+public class IntersectsExpression implements Criterion{
+ private static final long serialVersionUID = 1L;
+ private String propertyName;
+ private Geometry geom;
+
+ public IntersectsExpression(String propertyName, Geometry geom)
+ {
+ this.propertyName = propertyName;
+ this.geom = geom;
+ }
+
+ public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
+ }
+
+ public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ Dialect dialect = criteriaQuery.getFactory().getDialect();
+ String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
+
+ if (columns.length != 1) throw new HibernateException("\"intersects\" may only be used with single-column properties");
+ if ( dialect instanceof PostGISDialect) {
+ StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "intersects");
+ List args = new ArrayList();
+ args.add(columns[0]);
+ args.add("?");
+
+ return function.render(args, criteriaQuery.getFactory());
+ }
+ else
+ {
+ throw new HibernateException("\"intersects\" may only be used with a spatial hibernate dialect");
+ }
+ }
+
+ public String toString()
+ {
+ return propertyName + " intersects " + geom;
+ }
+
+}
diff --git a/ejb3/src/org/postgis/hibernate/PostGISDialect.java b/ejb3/src/org/postgis/hibernate/PostGISDialect.java
new file mode 100644
index 0000000..5dd8768
--- /dev/null
+++ b/ejb3/src/org/postgis/hibernate/PostGISDialect.java
@@ -0,0 +1,75 @@
+/*
+ * PostGISDialect.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.hibernate;
+
+import java.sql.Types;
+
+import org.hibernate.Hibernate;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.postgis.hibernate.GeometryType;
+
+/**
+ * @author nbarker
+ *
+ */
+public class PostGISDialect extends PostgreSQLDialect{
+ public static String NAMESPACE = "spatial.";
+
+
+ public PostGISDialect()
+ {
+ super();
+ registerColumnType(Types.BLOB, "geometry");
+ registerFunction( PostGISDialect.NAMESPACE + "dimension", new StandardSQLFunction("dimension", Hibernate.INTEGER));
+ registerFunction( PostGISDialect.NAMESPACE + "geometrytype", new StandardSQLFunction("geometrytype", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "srid", new StandardSQLFunction("srid", Hibernate.INTEGER));
+ registerFunction( PostGISDialect.NAMESPACE + "envelope", new StandardSQLFunction("envelope", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "astext", new StandardSQLFunction("astext", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "asbinary", new StandardSQLFunction("asbinary", Hibernate.BINARY));
+ registerFunction( PostGISDialect.NAMESPACE + "isempty", new StandardSQLFunction("isempty", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "issimple", new StandardSQLFunction("issimple", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "boundary", new StandardSQLFunction("boundary", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "equals", new StandardSQLFunction("equals", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "disjoint", new StandardSQLFunction("disjoint", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "intersects", new StandardSQLFunction("intersects", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "touches", new StandardSQLFunction("touches", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "crosses", new StandardSQLFunction("crosses", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "within", new StandardSQLFunction("within", Hibernate.BOOLEAN));
+ registerFunction( PostGISDialect.NAMESPACE + "contains", new StandardSQLFunction("contains", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "overlaps", new StandardSQLFunction("overlaps", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "relate", new StandardSQLFunction("relate", Hibernate.STRING));
+ registerFunction( PostGISDialect.NAMESPACE + "distance", new StandardSQLFunction("distance", Hibernate.DOUBLE));
+ registerFunction( PostGISDialect.NAMESPACE + "buffer", new StandardSQLFunction("buffer", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "convexhull", new StandardSQLFunction("convexhull", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "intersection", new StandardSQLFunction("intersection", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "union", new StandardSQLFunction("geomunion", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "difference", new StandardSQLFunction("difference", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "symdifference", new StandardSQLFunction("symdifference", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "numgeometries", new StandardSQLFunction("numgeometries", Hibernate.custom(GeometryType.class)));
+ registerFunction( PostGISDialect.NAMESPACE + "geometryn", new StandardSQLFunction("geometryn", Hibernate.INTEGER));
+ registerFunction( PostGISDialect.NAMESPACE + "x", new StandardSQLFunction("x", Hibernate.DOUBLE));
+ registerFunction( PostGISDialect.NAMESPACE + "y", new StandardSQLFunction("y", Hibernate.DOUBLE));
+ registerFunction( PostGISDialect.NAMESPACE + "geometryfromewtk", new StandardSQLFunction("geometryfromewtk", Hibernate.custom(GeometryType.class)));
+ }
+}
diff --git a/ejb3/src/org/postgis/hibernate/WithinExpression.java b/ejb3/src/org/postgis/hibernate/WithinExpression.java
new file mode 100644
index 0000000..a4b3c31
--- /dev/null
+++ b/ejb3/src/org/postgis/hibernate/WithinExpression.java
@@ -0,0 +1,82 @@
+/*
+ * WithinExpression.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
+ *
+ * (C) 2006 Norman Barker <norman.barker at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.hibernate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.criterion.CriteriaQuery;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.engine.TypedValue;
+import org.postgis.Geometry;
+
+/**
+ * @author nbarker
+ *
+ */
+public class WithinExpression implements Criterion{
+ private static final long serialVersionUID = 1L;
+ private String propertyName;
+ private Geometry geom;
+
+ public WithinExpression(String propertyName, Geometry geom)
+ {
+ this.propertyName = propertyName;
+ this.geom = geom;
+ }
+
+ public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
+ }
+
+ public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
+ Dialect dialect = criteriaQuery.getFactory().getDialect();
+ String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
+
+ if (columns.length != 1) throw new HibernateException("\"within\" may only be used with single-column properties");
+ if ( dialect instanceof PostGISDialect) {
+ StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "within");
+ List args = new ArrayList();
+ args.add(columns[0]);
+ args.add("?");
+
+ return function.render(args, criteriaQuery.getFactory());
+ }
+ else
+ {
+ throw new HibernateException("\"within\" may only be used with a spatial hibernate dialect");
+ }
+ }
+
+ public String toString()
+ {
+ return propertyName + " within " + geom;
+ }
+
+}
diff --git a/jdbc/COPYING_LGPL b/jdbc/COPYING_LGPL
new file mode 100644
index 0000000..b124cf5
--- /dev/null
+++ b/jdbc/COPYING_LGPL
@@ -0,0 +1,510 @@
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard. To achieve this, non-free programs must
+be allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at least
+ three years, to give the same user the materials specified in
+ Subsection 6a, above, for a charge no more than the cost of
+ performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James
+ Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/jdbc/README b/jdbc/README
new file mode 100644
index 0000000..897cc9d
--- /dev/null
+++ b/jdbc/README
@@ -0,0 +1,236 @@
+
+*** PostGIS JDBC Driver extension README / FAQ ***
+
+(C) 2005 Markus Schaber <markus.schaber at logix-tt.com>
+
+
+* What is it all about? *
+
+JDBC is an database driver specification for Java. Like ODBC in the C
+world, JDBC allows java applications to transparently use different
+JDBC compliant databases without any source code changes. PostgreSQL,
+the database PostGIS is written for, comes with a driver that
+follows this specification. For downloads and more info, see:
+http://jdbc.postgresql.org/download.html
+
+The purpose of the JDBC Driver extension is to give the PostgreSQL
+JDBC driver some understanding of the PostGIS data types (Geometry,
+Box3D, Box2D). Without this, the Application can only get byte arrays
+or strings (binary and text representation, rsp.) and has to parse it
+on its own. When registering this extension, the Application can
+simply call getObject(column) on the result of the query, and get a
+real java object that is modeled after the OpenGIS spec. It also can
+create or modify this objects itsself and then pass them into the
+database via the PreparedStatement.setObject() method.
+
+Currently, the code is tested with PostGIS 0.8.1, 0.9.1. 0.9.2 and
+1.0.0. It supports both the new hex-encoded EWKB canonical text
+representation used by PostGIS 1.0.0 lwgeom code, and the old, less
+efficient WKT like representation used by previous releases when
+reading data from the server. When sending data to the server, it
+currently always uses the latter form, which is compatible to all
+PostGIS versions.
+
+
+* Do I need it? *
+
+If you happen to write GIS applications, you can propably benefit.
+
+In case your applications are PostGIS specific, you can fully exploit
+the functionality, see "How to I use it" below for instructions and
+the src/examples directory for some code examples.
+
+If you rather prefer to stay OpenGIS compliant, then you cannot use
+the full driver embedding, as this is PostGIS specific functionality.
+But you can still use the geometry classes as a lightweight java
+geometry model if you do not want to use a full-blown GIS
+implementation like jts. Simply use the asText() and
+GeometryFromText() OpenGIS SQL functions against whichever OpenGIS
+compliant server you want, and use the WKT parsing constructors or
+PGgeometry.geomFromString() as well as Geometry.toString() to convert
+between WKT strings and geometry objects.
+
+
+* Is it free? *
+
+Yes. The actual Driver extension code is licensed under the GNU LGPL,
+this allows everyone to include the code in his projects. You do not
+have to pay any license fees, and you can keep your own application
+code proprietary, but you have to make the PostGIS source code available
+to any receivers, including any modifications you apply to it. For
+details, please see the license file COPYING_LGPL.
+
+The Build files and examples are licensed under GNU GPL, just like the
+rest of PostGIS is. This is not LGPL as applications usually do not
+link against those.
+
+
+* How do I build it? *
+
+There are older make files with which you can try to build, but maven is recommended,
+as it handles dependencies on a better and cleaner way.
+
+You have to install maven on your computer to build it. To install maven you can try
+to search on your software repositories or read the documentation:
+http://maven.apache.org/download.html
+
+To compile your postgis driver, go to the jdbc folder and execute the console
+command "mvn package". This should create a postgis jar on the target folder
+inside the jdbc folder.
+
+Note that your postgis driver version does not constrain the PostgreSQL
+server version. As the JDBC drivers are downwards compatible against older
+servers, and PostgreSQL servers typically accept older clients, you can
+easily use e. G. a pgjdbc 8.0 against a PostgreSQL 7.3 server. To benefit
+from optimizations and bugfixes, it is generally suggested to use the
+newest stable pgjdbc build that is documented to work against your
+server release.
+
+* It is called jdbc2 - does it work with jdbc3, too? *
+
+To make it short: The naming does not refer to SUN jdbc standard releases
+jdbc-1, jdbc-2 or jdbc-3.
+
+The current naming is somehow unfortunate. The directory simply is named
+jdbc2 because it is the successor of Paul Ramsey's original jdbc directory,
+which used to exist parallel in the CVS repository. As CVS does its best
+to hinder useful version tracking across file renames, the name was kept
+even after removal of the original jdbc subproject.
+
+Please note that the PostgreSQL JDBC driver itsself is released in
+several flavours for different JDBC relases and sun JDK releases, but
+currently, the same postgis.jar should work with all of them. If not,
+you clearly found a bug, and we kindly ask you to report it.
+
+If you run into troubles, make shure that you use the newest pgjdbc build.
+Especially pre releases are known to contain bugs (that's why they are pre
+releases), and e. G. 8.0 build 309 contained some problems that are fixed
+in 8.0 build 313.
+
+
+* How do I use it? *
+
+To use the PostGIS types, you need the postgis.jar and the pgjdbc
+driver in your classpath.
+
+The PostGIS extension must be registered within the JDBC driver.
+There are three ways to do this:
+
+- If you use pgjdbc 8.0, the org/postgresql/driverconfig.properties
+ file contained in the postgis.jar autoregisters the PostGIS
+ extension for the PostGIS data types (geometry, box2d, box3d)
+ within the pgjdbc driver.
+
+- You can use the org.postgis.DriverWrapper as replacement for the
+ jdbc driver. This class wraps the PostGreSQL Driver to
+ transparently add the PostGIS Object Classes. This method currently
+ works both with J2EE DataSources, and with the older DriverManager
+ framework. I's a thin wrapper around org.postgresql.Driver that
+ simply registers the extension on every new connection created.
+
+ To use it, you replace the "jdbc:postgresql:" with a
+ "jdbc:postgresql_postGIS" in the jdbc URL, and make your
+ environment aware of the new Driver class.
+
+ DriverManager users simply register org/postgis/DriverWrapper
+ instead of (or in addition to) org.postgresql.Driver, see
+ examples/TestBoxes.connect() for an working code.
+
+ DataSource users similarly have to configure their datasource to
+ use the different class. The following works for jboss, put it in
+ your-ds.xml: <driver-class>org.postgis.DriverWrapper</driver-class>
+
+- Of course, you can also manually register the Datatypes on your
+ pgjdbc connection. You have to cast your connection to PGConnection
+ and then call:
+
+ pgconn.addDataType("geometry", "org.postgis.PGgeometry");
+ pgconn.addDataType("box3d", "org.postgis.PGbox3d");
+ pgconn.addDataType("box2d", "org.postgis.PGbox2d");
+
+ You may need to dig through some wrappers when running in an
+ appserver. E. G. for JBoss, The datasource actually gives you a
+ instance of org.jboss.resource.adapter.jdbc.WrappedConnection and
+ have to call getUnderlyingConnection() on it to get the
+ PGConnection instance.)
+
+ Also note that the above addDataType() methods known from earlier
+ pgjdbc versions are deprecated in pgjdbc 8.0 (but still work), see
+ the commented code variants in the DriverWrapper.addGisTypes()
+ method for an alternative.
+
+Note: Even using pgjdbc 8.0, you may still want to use the second or
+third approach if you have several pgjdbc extensions that
+autoregister for the same PostGIS types, as the driver cannot guess
+which extension it should actually use on which connection. The
+current pgjdbc implementation simply parses all
+org/postgresql/driverconfig.properties the classloader can find in his
+classpath, using the first definition found for each type.
+
+
+* How to I run the tests? Are they allowed to fail? *
+
+There are two types of tests provided, offline and online. Offline
+tests can run without a PostGIS server, the online tests need a
+PostGIS server to connect to.
+
+- Offline Tests
+
+ The easiest way to run the offline tests is "make offlinetests".
+
+ The offline tests should always complete without any failure. If
+ you happen to get a failure here, it is a bug in the PostGIS code
+ (or, very unlikely, in the JDK/JRE or Hardware you use). Please
+ contact the PostGIS developer list in this case.
+
+- Online tests
+
+ The online tests can be ran with "make onlinetests", but they need
+ a specially prepared database to connect against, and the pgjdbc
+ driver available in your classpath. The Makefile provides defaults
+ for PGHOST, PGPOR, PGDATABASE, PGUSER and PGPASS, you can override
+ them for your needs. For the jtest, the user needs to create and
+ drop table privileges, the two other tests do not use any table.
+ Make shure you have the PostGIS installed in the database.
+
+ None of the online tests should report any failure. However, some of the
+ tests are skipped against PostGix 0.X servers as 0.8.X and 0.9.X, those
+ are the box2d tests (because this datatype simply is missing on those
+ releases), as well as 22 skipped tests for some geometry representations
+ that those old releases do not support. This is a PostGIS server side
+ problem as the server fails to parse some OpenGIS compliant WKT
+ representations, and structurally (but not geometrically or topologically)
+ mangles some other geometries. They are unlikely to be fixed in those
+ releases as users should migrate to PostGIS 1.0.
+
+ The Autoregister Test needs a pgjdbc version 8.0 or newer, and will
+ simply do nothing with older pgjdbc versions.
+
+ If you get any failure messages in the online tests, check whether
+ your really fulfil the prerequisites above. If yes, please contact
+ the PostGIS developer list.
+
+
+* What about the JTS stuff *
+
+There's beta support for the JTS 1.6 geometry implementations instead of the
+native PostGIS classes on the java client side. Simply add jts_1.6.jar to your
+CLASSPATH, "make postgis_jts" and use at your own risk.
+
+
+* How can I contact you? *
+
+Well, the best place are the official PostGIS mailing lists for PostGIS,
+subscription information is linked at:
+
+ http://postgis.net/
+
+If you want to report errors, please try to send us all the details we need
+to reproduce your problem. A small, self-contained test case would be best.
+
+
+* Phew. That's all? *
+
+Yes. For now, at least.
+
+Happy Coding!
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
new file mode 100644
index 0000000..7ec1c09
--- /dev/null
+++ b/jdbc/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-java-aggregator</artifactId>
+ <version>2.1.7.1</version>
+ </parent>
+
+ <artifactId>postgis-jdbc</artifactId>
+ <version>2.1.7.1</version>
+ <packaging>jar</packaging>
+
+ <name>Postgis JDBC Driver</name>
+ <description>PostGIS adds support for geographic objects to the PostgreSQL object-relational database.</description>
+
+ <properties>
+ <testWithDatabase>false</testWithDatabase>
+ <jdbcDriverClassName>org.postgresql.Driver</jdbcDriverClassName>
+ <jdbcUrl>jdbc:postgresql://localhost:5432/postgis1</jdbcUrl>
+ <jdbcUsername>postgis1</jdbcUsername>
+ <jdbcPassword>postgis1</jdbcPassword>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>[9.1-901.jdbc3,)</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <testWithDatabase>${testWithDatabase}</testWithDatabase>
+ <jdbcDriverClassName>${jdbcDriverClassName}</jdbcDriverClassName>
+ <jdbcUrl>${jdbcUrl}</jdbcUrl>
+ <jdbcUsername>${jdbcUsername}</jdbcUsername>
+ <jdbcPassword>${jdbcPassword}</jdbcPassword>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/jdbc/postgis-jdbc.iml b/jdbc/postgis-jdbc.iml
new file mode 100644
index 0000000..2c789c4
--- /dev/null
+++ b/jdbc/postgis-jdbc.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/jdbc/src/main/java/examples/TestAutoregister.java b/jdbc/src/main/java/examples/TestAutoregister.java
new file mode 100644
index 0000000..a1d165e
--- /dev/null
+++ b/jdbc/src/main/java/examples/TestAutoregister.java
@@ -0,0 +1,181 @@
+/*
+ * TestAutoregister.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package examples;
+
+import org.postgis.PGbox2d;
+import org.postgis.PGbox3d;
+import org.postgis.PGgeometry;
+import org.postgresql.Driver;
+import org.postgresql.util.PGobject;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * This test program tests whether the autoregistration of PostGIS data types
+ * within the pgjdbc driver was successful. This is supposed to work with
+ * pgjdbc.jar version 8.0 and newer, and thus refuses to work with older pgjdbc
+ * versions. (But it will work fine against older servers.) It also checks for
+ * postgis version to know whether box2d is available.
+ */
+public class TestAutoregister {
+
+ public static void main(String[] args) {
+ String dburl = null;
+ String dbuser = null;
+ String dbpass = null;
+
+ if (args.length == 3) {
+ System.out.println("Testing proper auto-registration");
+ dburl = args[0];
+ dbuser = args[1];
+ dbpass = args[2];
+ } else {
+ System.err.println("Usage: java examples/TestParser dburl user pass");
+ System.exit(1);
+ // Signal the compiler that code flow ends here.
+ return;
+ }
+
+ System.out.println("Driver version: " + Driver.getVersion());
+ int major;
+ try {
+ major = new Driver().getMajorVersion();
+ } catch (Exception e) {
+ System.err.println("Cannot create Driver instance: " + e.getMessage());
+ System.exit(1);
+ return;
+ }
+
+ if (major < 8) {
+ System.err.println("Your pgdjbc " + major
+ + ".X is too old, it does not support autoregistration!");
+ return;
+ }
+
+ System.out.println("Creating JDBC connection to " + dburl);
+ Connection conn = null;
+ Statement stat = null;
+ try {
+ conn = DriverManager.getConnection(dburl, dbuser, dbpass);
+ stat = conn.createStatement();
+ } catch (SQLException e) {
+ System.err.println("Connection initialization failed, aborting.");
+ e.printStackTrace();
+ System.exit(1);
+ // signal the compiler that code flow ends here:
+ throw new AssertionError();
+ }
+
+ int postgisServerMajor = 0;
+ try {
+ postgisServerMajor = getPostgisMajor(stat);
+ } catch (SQLException e) {
+ System.err.println("Error fetching PostGIS version: " + e.getMessage());
+ System.err.println("Is PostGIS really installed in the database?");
+ System.exit(1);
+ // signal the compiler that code flow ends here:
+ throw new AssertionError();
+ }
+
+ System.out.println("PostGIS Version: " + postgisServerMajor);
+
+ PGobject result = null;
+
+ /* Test geometries */
+ try {
+ ResultSet rs = stat.executeQuery("SELECT 'POINT(1 2)'::geometry");
+ rs.next();
+ result = (PGobject) rs.getObject(1);
+ if (result instanceof PGgeometry) {
+ System.out.println("PGgeometry successful!");
+ } else {
+ System.out.println("PGgeometry failed!");
+ }
+ } catch (SQLException e) {
+ System.err.println("Selecting geometry failed: " + e.getMessage());
+ System.exit(1);
+ // Signal the compiler that code flow ends here.
+ return;
+ }
+
+ /* Test box3d */
+ try {
+ ResultSet rs = stat.executeQuery("SELECT 'BOX3D(1 2 3, 4 5 6)'::box3d");
+ rs.next();
+ result = (PGobject) rs.getObject(1);
+ if (result instanceof PGbox3d) {
+ System.out.println("Box3d successful!");
+ } else {
+ System.out.println("Box3d failed!");
+ }
+ } catch (SQLException e) {
+ System.err.println("Selecting box3d failed: " + e.getMessage());
+ System.exit(1);
+ // Signal the compiler that code flow ends here.
+ return;
+ }
+
+ /* Test box2d if appropriate */
+ if (postgisServerMajor < 1) {
+ System.out.println("PostGIS version is too old, skipping box2ed test");
+ System.err.println("PostGIS version is too old, skipping box2ed test");
+ } else {
+ try {
+ ResultSet rs = stat.executeQuery("SELECT 'BOX(1 2,3 4)'::box2d");
+ rs.next();
+ result = (PGobject) rs.getObject(1);
+ if (result instanceof PGbox2d) {
+ System.out.println("Box2d successful!");
+ } else {
+ System.out.println("Box2d failed! " + result.getClass().getName());
+ }
+ } catch (SQLException e) {
+ System.err.println("Selecting box2d failed: " + e.getMessage());
+ System.exit(1);
+ // Signal the compiler that code flow ends here.
+ return;
+ }
+ }
+
+ System.out.println("Finished.");
+ // If we finished up to here without exitting, we passed all tests.
+ System.err.println("TestAutoregister.java finished without errors.");
+ }
+
+ public static int getPostgisMajor(Statement stat) throws SQLException {
+ ResultSet rs = stat.executeQuery("SELECT postgis_version()");
+ rs.next();
+ String version = rs.getString(1);
+ if (version == null) {
+ throw new SQLException("postgis_version returned NULL!");
+ }
+ version = version.trim();
+ int idx = version.indexOf('.');
+ return Integer.parseInt(version.substring(0, idx));
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/ComposedGeom.java b/jdbc/src/main/java/org/postgis/ComposedGeom.java
new file mode 100644
index 0000000..bac8c62
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/ComposedGeom.java
@@ -0,0 +1,271 @@
+/*
+ * ComposedGeom.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.util.PGtokenizer;
+
+import java.sql.SQLException;
+import java.util.Iterator;
+
+/**
+ * ComposedGeom - Abstract base class for all Geometries that are composed out
+ * of other Geometries.
+ *
+ * In fact, this currently are all Geometry subclasses except Point.
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ *
+ */
+public abstract class ComposedGeom extends Geometry {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public static final Geometry[] EMPTY = new Geometry[0];
+
+ /**
+ * The Array containing the geometries
+ *
+ * This is only to be exposed by concrete subclasses, to retain type safety.
+ */
+ protected Geometry[] subgeoms = EMPTY;
+
+ /**
+ * @param type
+ */
+ public ComposedGeom(int type) {
+ super(type);
+ }
+
+ public Geometry getSubGeometry(int index) {
+ return subgeoms[index];
+ }
+
+ public int numGeoms() {
+ return subgeoms.length;
+ }
+
+ protected ComposedGeom(int type, Geometry[] geoms) {
+ this(type);
+ this.subgeoms = geoms;
+ if (geoms.length > 0) {
+ dimension = geoms[0].dimension;
+ haveMeasure = geoms[0].haveMeasure;
+ } else {
+ dimension = 0;
+ }
+ }
+
+ protected ComposedGeom(int type, String value, boolean haveM) throws SQLException {
+ super(type);
+ value = initSRID(value);
+
+ String typestring = getTypeString();
+ if (value.indexOf(typestring) == 0) {
+ int pfxlen = typestring.length();
+ if (value.charAt(pfxlen) == 'M') {
+ pfxlen += 1;
+ haveM = true;
+ }
+ value = value.substring(pfxlen).trim();
+ } else if (value.charAt(0) != '(') {
+ // we are neigher inner nor outer rep.
+ throw new SQLException("Error parsing a " + typestring + " out of " + value);
+ }
+ if (value.equals("(EMPTY)")) {
+ // Special case for PostGIS 0.X style empty geometry collections
+ // (which are not OpenGIS compliant)
+ return;
+ }
+ PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ',');
+ int subgeomcount = t.getSize();
+ subgeoms = createSubGeomArray(subgeomcount);
+ for (int p = 0; p < subgeomcount; p++) {
+ subgeoms[p] = createSubGeomInstance(t.getToken(p), haveM);
+ }
+ dimension = subgeoms[0].dimension;
+ // fetch haveMeasure from subpoint because haveM does only work with
+ // 2d+M, not with 3d+M geometries
+ haveMeasure = subgeoms[0].haveMeasure;
+ }
+
+ /**
+ * Return the appropriate instance of the subgeometry - this encapsulates
+ * subclass specific constructor calls
+ */
+ protected abstract Geometry createSubGeomInstance(String token, boolean haveM)
+ throws SQLException;
+
+ /**
+ * Return the appropriate instance of the subgeometry array - this
+ * encapsulates subclass specific array instantiation
+ */
+ protected abstract Geometry[] createSubGeomArray(int size);
+
+ protected boolean equalsintern(Geometry other) {
+ // Can be assumed to be the same subclass of Geometry, so it must be a
+ // ComposedGeom, too.
+ ComposedGeom cother = (ComposedGeom) other;
+
+ if (cother.subgeoms == null && subgeoms == null) {
+ return true;
+ } else if (cother.subgeoms == null || subgeoms == null) {
+ return false;
+ } else if (cother.subgeoms.length != subgeoms.length) {
+ return false;
+ } else if (subgeoms.length == 0) {
+ return true;
+ } else {
+ for (int i = 0; i < subgeoms.length; i++) {
+ if (!cother.subgeoms[i].equalsintern(this.subgeoms[i])) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ public int numPoints() {
+ if ((subgeoms == null) || (subgeoms.length == 0)) {
+ return 0;
+ } else {
+ int result = 0;
+ for (int i = 0; i < subgeoms.length; i++) {
+ result += subgeoms[i].numPoints();
+ }
+ return result;
+ }
+ }
+
+ public Point getPoint(int n) {
+ if (n < 0) {
+ throw new ArrayIndexOutOfBoundsException("Negative index not allowed");
+ } else if ((subgeoms == null) || (subgeoms.length == 0)) {
+ throw new ArrayIndexOutOfBoundsException("Empty Geometry has no Points!");
+ } else {
+ for (int i = 0; i < subgeoms.length; i++) {
+
+ Geometry current = subgeoms[i];
+ int np = current.numPoints();
+ if (n < np) {
+ return current.getPoint(n);
+ } else {
+ n -= np;
+ }
+ }
+ throw new ArrayIndexOutOfBoundsException("Index too large!");
+ }
+ }
+
+ /**
+ * Optimized version
+ */
+ public Point getLastPoint() {
+ if ((subgeoms == null) || (subgeoms.length == 0)) {
+ throw new ArrayIndexOutOfBoundsException("Empty Geometry has no Points!");
+ } else {
+ return subgeoms[subgeoms.length - 1].getLastPoint();
+ }
+ }
+
+ /**
+ * Optimized version
+ */
+ public Point getFirstPoint() {
+ if ((subgeoms == null) || (subgeoms.length == 0)) {
+ throw new ArrayIndexOutOfBoundsException("Empty Geometry has no Points!");
+ } else {
+ return subgeoms[0].getFirstPoint();
+ }
+ }
+
+ public Iterator iterator() {
+ return java.util.Arrays.asList(subgeoms).iterator();
+ }
+
+ public boolean isEmpty() {
+ return (subgeoms == null) || (subgeoms.length == 0);
+ }
+
+ protected void mediumWKT(StringBuffer sb) {
+ if ((subgeoms == null) || (subgeoms.length == 0)) {
+ sb.append(" EMPTY");
+ } else {
+ sb.append('(');
+ innerWKT(sb);
+ sb.append(')');
+ }
+ }
+
+ protected void innerWKT(StringBuffer sb) {
+ subgeoms[0].mediumWKT(sb);
+ for (int i = 1; i < subgeoms.length; i++) {
+ sb.append(',');
+ subgeoms[i].mediumWKT(sb);
+ }
+ }
+
+ // Hashing - still buggy!
+ boolean nohash = true;
+ int hashcode = 0;
+
+ public int hashCode() {
+ if (nohash) {
+ hashcode = super.hashCode() ^ subgeoms.hashCode();
+ nohash = false;
+ }
+ return hashcode;
+ }
+
+ public boolean checkConsistency() {
+ if (super.checkConsistency()) {
+ if (isEmpty()) {
+ return true;
+ }
+ // cache to avoid getMember opcode
+ int _dimension = this.dimension;
+ boolean _haveMeasure = this.haveMeasure;
+ int _srid = this.srid;
+ for (int i = 0; i < subgeoms.length; i++) {
+ Geometry sub = subgeoms[i];
+ if (!(sub.checkConsistency() && sub.dimension == _dimension
+ && sub.haveMeasure == _haveMeasure && sub.srid == _srid)) {
+ return false;
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public void setSrid(int srid) {
+ super.setSrid(srid);
+ for (int i = 0; i < subgeoms.length; i++) {
+ subgeoms[i].setSrid(srid);
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapper.java b/jdbc/src/main/java/org/postgis/DriverWrapper.java
new file mode 100644
index 0000000..dcea806
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/DriverWrapper.java
@@ -0,0 +1,325 @@
+/*
+ * DriverWrapper.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Wrapper utility class
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.postgresql.Driver;
+import org.postgresql.PGConnection;
+
+/**
+ * DriverWrapper
+ *
+ * Wraps the PostGreSQL Driver to transparently add the PostGIS Object Classes.
+ * This avoids the need of explicit addDataType() calls from the driver users
+ * side.
+ *
+ * This method currently works with J2EE DataSource implementations, and with
+ * DriverManager framework.
+ *
+ * Simply replace the "jdbc:postgresql:" with a "jdbc:postgresql_postGIS:" in
+ * the jdbc URL.
+ *
+ * When using the drivermanager, you need to initialize DriverWrapper instead of
+ * (or in addition to) org.postgresql.Driver. When using a J2EE DataSource
+ * implementation, set the driver class property in the datasource config, the
+ * following works for jboss:
+ *
+ * <code>
+ * <driver-class>org.postgis.DriverWrapper</driver-class>
+ * </code>
+ * If you don't like or want to use the DriverWrapper, you have two
+ * alternatives, see the README file.
+ *
+ * Also note that the addDataType() methods known from earlier pgjdbc versions
+ * are deprecated in pgjdbc 8.0, see the commented code variants in the
+ * addGisTypes() method.
+ *
+ * This wrapper always uses EWKT as canonical text representation, and thus
+ * works against PostGIS 1.x servers as well as 0.x (tested with 0.8, 0.9 and
+ * 1.0).
+ *
+ * @author {@literal Markus Schaber <markus.schaber at logix-tt.com>}
+ * @see DriverWrapperLW
+ * @see DriverWrapperAutoprobe
+ */
+public class DriverWrapper extends Driver {
+
+ protected static final Logger logger = Logger.getLogger("org.postgis.DriverWrapper");
+
+ public static final String POSTGRES_PROTOCOL = "jdbc:postgresql:";
+ public static final String POSTGIS_PROTOCOL = "jdbc:postgresql_postGIS:";
+ public static final String REVISION = "$Revision$";
+ protected static TypesAdder ta72 = null;
+ protected static TypesAdder ta74 = null;
+ protected static TypesAdder ta80 = null;
+
+ protected TypesAdder typesAdder;
+
+ /**
+ * Default constructor.
+ *
+ * This also loads the appropriate TypesAdder for our SQL Driver instance.
+ *
+ * @throws SQLException
+ */
+ public DriverWrapper() throws SQLException {
+ super();
+ typesAdder = getTypesAdder(this);
+ // The debug method is @since 7.2
+ if (super.getMajorVersion() > 8 || super.getMinorVersion() > 1) {
+ logger.fine(this.getClass().getName() + " loaded TypesAdder: "
+ + typesAdder.getClass().getName());
+ }
+ }
+
+ protected static TypesAdder getTypesAdder(Driver d) throws SQLException {
+ if (d.getMajorVersion() == 7) {
+ if (d.getMinorVersion() >= 3) {
+ if (ta74 == null) {
+ ta74 = loadTypesAdder("74");
+ }
+ return ta74;
+ } else {
+ if (ta72 == null) {
+ ta72 = loadTypesAdder("72");
+ }
+ return ta72;
+ }
+ } else {
+ if (ta80 == null) {
+ ta80 = loadTypesAdder("80");
+ }
+ return ta80;
+ }
+ }
+
+ private static TypesAdder loadTypesAdder(String version) throws SQLException {
+ try {
+ Class klass = Class.forName("org.postgis.DriverWrapper$TypesAdder" + version);
+ return (TypesAdder) klass.newInstance();
+ } catch (Exception e) {
+ throw new SQLException("Cannot create TypesAdder instance! " + e.getMessage());
+ }
+ }
+
+ static {
+ try {
+ // Try to register ourself to the DriverManager
+ java.sql.DriverManager.registerDriver(new DriverWrapper());
+ } catch (SQLException e) {
+ logger.log(Level.WARNING, "Error registering PostGIS Wrapper Driver", e);
+ }
+ }
+
+ /**
+ * Creates a postgresql connection, and then adds the PostGIS data types to
+ * it calling addpgtypes()
+ *
+ * @param url the URL of the database to connect to
+ * @param info a list of arbitrary tag/value pairs as connection arguments
+ * @return a connection to the URL or null if it isnt us
+ * @exception SQLException if a database access error occurs
+ *
+ * @see java.sql.Driver#connect
+ * @see org.postgresql.Driver
+ */
+ public java.sql.Connection connect(String url, Properties info) throws SQLException {
+ url = mangleURL(url);
+ Connection result = super.connect(url, info);
+ typesAdder.addGT(result, useLW(result));
+ return result;
+ }
+
+ /**
+ * Do we have HexWKB as well known text representation - to be overridden by
+ * subclasses.
+ */
+ protected boolean useLW(Connection result) {
+ if (result == null) {
+ throw new IllegalArgumentException("null is no valid parameter");
+ }
+ return false;
+ }
+
+ /**
+ * Check whether the driver thinks he can handle the given URL.
+ *
+ * @see java.sql.Driver#acceptsURL
+ * @param url the URL of the driver
+ * @return true if this driver accepts the given URL
+ * @exception SQLException Passed through from the underlying PostgreSQL
+ * driver, should not happen.
+ */
+ public boolean acceptsURL(String url) throws SQLException {
+ try {
+ url = mangleURL(url);
+ } catch (SQLException e) {
+ return false;
+ }
+ return super.acceptsURL(url);
+ }
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ */
+ public static String getVersion() {
+ return "PostGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
+ }
+
+ /*
+ * Here follows the addGISTypes() stuff. This is a little tricky because the
+ * pgjdbc people had several, partially incompatible API changes during 7.2
+ * and 8.0. We still want to support all those releases, however.
+ *
+ */
+ /**
+ * adds the JTS/PostGIS Data types to a PG 7.3+ Connection. If you use
+ * PostgreSQL jdbc drivers V8.0 or newer, those methods are deprecated due
+ * to some class loader problems (but still work for now), and you may want
+ * to use the method below instead.
+ *
+ * @throws SQLException
+ *
+ */
+ public static void addGISTypes(PGConnection pgconn) throws SQLException {
+ loadTypesAdder("74").addGT((Connection) pgconn, false);
+ }
+
+ /**
+ * adds the JTS/PostGIS Data types to a PG 8.0+ Connection.
+ */
+ public static void addGISTypes80(PGConnection pgconn) throws SQLException {
+ loadTypesAdder("80").addGT((Connection) pgconn, false);
+ }
+
+ /**
+ * adds the JTS/PostGIS Data types to a PG 7.2 Connection.
+ *
+ * @throws SQLException
+ */
+ public static void addGISTypes72(org.postgresql.PGConnection pgconn) throws SQLException {
+ loadTypesAdder("72").addGT((Connection) pgconn, false);
+ }
+
+ /**
+ * Mangles the PostGIS URL to return the original PostGreSQL URL
+ */
+ protected String mangleURL(String url) throws SQLException {
+ String myProgo = getProtoString();
+ if (url.startsWith(myProgo)) {
+ return POSTGRES_PROTOCOL + url.substring(myProgo.length());
+ } else {
+ throw new SQLException("Unknown protocol or subprotocol in url " + url);
+ }
+ }
+
+ protected String getProtoString() {
+ return POSTGIS_PROTOCOL;
+ }
+
+ /** Base class for the three typewrapper implementations */
+ protected abstract static class TypesAdder {
+ public final void addGT(java.sql.Connection conn, boolean lw) throws SQLException {
+ if (lw) {
+ addBinaryGeometries(conn);
+ } else {
+ addGeometries(conn);
+ }
+ addBoxen(conn);
+ }
+
+ public abstract void addGeometries(Connection conn) throws SQLException;
+
+ public abstract void addBoxen(Connection conn) throws SQLException;
+
+ public abstract void addBinaryGeometries(Connection conn) throws SQLException;
+ }
+
+ /** addGISTypes for V7.3 and V7.4 pgjdbc */
+ protected static final class TypesAdder74 extends TypesAdder {
+ public void addGeometries(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+ }
+
+ public void addBoxen(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("box3d", org.postgis.PGbox3d.class);
+ pgconn.addDataType("box2d", org.postgis.PGbox2d.class);
+ }
+
+ public void addBinaryGeometries(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class);
+ }
+ }
+
+ /** addGISTypes for V7.2 pgjdbc */
+ protected static class TypesAdder72 extends TypesAdder {
+ public void addGeometries(Connection conn) throws SQLException {
+ org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+ }
+
+ public void addBoxen(Connection conn) throws SQLException {
+ org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn;
+ pgconn.addDataType("box3d", org.postgis.PGbox3d.class);
+ pgconn.addDataType("box2d", org.postgis.PGbox2d.class);
+ }
+
+ public void addBinaryGeometries(Connection conn) throws SQLException {
+ org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class);
+ }
+ }
+
+ /** addGISTypes for V8.0 (and hopefully newer) pgjdbc */
+ protected static class TypesAdder80 extends TypesAdder {
+ public void addGeometries(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
+ }
+
+ public void addBoxen(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("box3d", org.postgis.PGbox3d.class);
+ pgconn.addDataType("box2d", org.postgis.PGbox2d.class);
+ }
+
+ public void addBinaryGeometries(Connection conn) throws SQLException {
+ PGConnection pgconn = (PGConnection) conn;
+ pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class);
+ }
+ }
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java b/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java
new file mode 100644
index 0000000..6cce3f2
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java
@@ -0,0 +1,109 @@
+/*
+ * DriverWrapperAutoprobe.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Wrapper utility class
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.Driver;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Level;
+
+/**
+ * DriverWrapperAutoprobe
+ *
+ * Wraps the PostGreSQL Driver to transparently add the PostGIS Object Classes.
+ * This avoids the need of explicit addDataType() calls from the driver users
+ * side.
+ *
+ * This DriverWrapper tries to autoprobe the installed PostGIS version to decide
+ * whether to use EWKT or hex encoded EWKB as canonical text representation. It
+ * uses the first PostGIS installation found in your namespace search path (aka
+ * schema search path) on the server side, and this works as long as you do not
+ * access incompatible PostGIS versions that reside in other schemas.
+ *
+ * For usage notes, see DriverWrapper class, but use "jdbc:postgresql_autogis:"
+ * as JDBC url prefix and org.postgis.DriverWrapperAutoprobe as driver class.
+ *
+ * @author {@literal Markus Schaber <markus.schaber at logix-tt.com>}
+ * @see DriverWrapper
+ */
+public class DriverWrapperAutoprobe extends DriverWrapper {
+
+ public static final String POSTGIS_AUTOPROTOCOL = "jdbc:postgresql_autogis:";
+ public static final String REVISIONAUTO = "$Revision$";
+
+ /**
+ * Default constructor.
+ */
+ public DriverWrapperAutoprobe() throws SQLException {
+ super();
+ }
+
+ static {
+ try {
+ // Try to register ourself to the DriverManager
+ java.sql.DriverManager.registerDriver(new DriverWrapperAutoprobe());
+ } catch (SQLException e) {
+ logger.log(Level.WARNING, "Error registering PostGIS LW Wrapper Driver", e);
+ }
+ }
+
+ protected String getProtoString() {
+ return POSTGIS_AUTOPROTOCOL;
+ }
+
+ protected boolean useLW(Connection conn) {
+ try {
+ return supportsEWKB(conn);
+ } catch (SQLException e) {
+ // fail safe default
+ return false;
+ }
+ }
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ */
+ public static String getVersion() {
+ return "PostGisWrapperAutoprobe " + REVISIONAUTO + ", wrapping " + Driver.getVersion();
+ }
+
+ public static boolean supportsEWKB(Connection conn) throws SQLException {
+ Statement stat = conn.createStatement();
+ ResultSet rs = stat.executeQuery("SELECT postgis_version()");
+ rs.next();
+ String version = rs.getString(1);
+ rs.close();
+ stat.close();
+ if (version == null) {
+ throw new SQLException("postgis_version returned NULL!");
+ }
+ version = version.trim();
+ int idx = version.indexOf('.');
+ int majorVersion = Integer.parseInt(version.substring(0, idx));
+ return majorVersion >= 1;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperLW.java b/jdbc/src/main/java/org/postgis/DriverWrapperLW.java
new file mode 100644
index 0000000..c36fa70
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/DriverWrapperLW.java
@@ -0,0 +1,83 @@
+/*
+ * DriverWrapperLW.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Wrapper utility class
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.Driver;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.logging.Level;
+
+/**
+ * DriverWrapperLW
+ *
+ * Wraps the PostGreSQL Driver to transparently add the PostGIS Object Classes.
+ * This avoids the need of explicit addDataType() calls from the driver users
+ * side.
+ *
+ * This DriverWrapper subclass always uses hex encoded EWKB as canonical text
+ * representation, and thus only works against PostGIS 1.x servers and newer.
+ *
+ * For usage notes, see DriverWrapper class, but use "jdbc:postgresql_lwgis:" as
+ * JDBC url prefix and org.postgis.DriverWrapperLW as driver class.
+ *
+ * @author {@literal Markus Schaber <markus.schaber at logix-tt.com>}
+ * @see DriverWrapper
+ */
+public class DriverWrapperLW extends DriverWrapper {
+
+ public static final String POSTGIS_LWPROTOCOL = "jdbc:postgresql_lwgis:";
+ public static final String REVISIONLW = "$Revision$";
+
+ /**
+ * Default constructor.
+ */
+ public DriverWrapperLW() throws SQLException {
+ super();
+ }
+
+ static {
+ try {
+ // Try to register ourself to the DriverManager
+ java.sql.DriverManager.registerDriver(new DriverWrapperLW());
+ } catch (SQLException e) {
+ logger.log(Level.WARNING, "Error registering PostGIS LW Wrapper Driver", e);
+ }
+ }
+
+ protected String getProtoString() {
+ return POSTGIS_LWPROTOCOL;
+ }
+
+ protected boolean useLW(Connection result) {
+ return true;
+ }
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ */
+ public static String getVersion() {
+ return "PostGisWrapperLW " + REVISIONLW + ", wrapping " + Driver.getVersion();
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/Geometry.java b/jdbc/src/main/java/org/postgis/Geometry.java
new file mode 100644
index 0000000..c48b72f
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/Geometry.java
@@ -0,0 +1,335 @@
+/*
+ * Geometry.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.io.Serializable;
+
+/** The base class of all geometries */
+public abstract class Geometry implements Serializable {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ // OpenGIS Geometry types as defined in the OGC WKB Spec
+ // (May we replace this with an ENUM as soon as JDK 1.5
+ // has gained widespread usage?)
+
+ /** Fake type for linear ring */
+ public static final int LINEARRING = 0;
+ /**
+ * The OGIS geometry type number for points.
+ */
+ public static final int POINT = 1;
+
+ /**
+ * The OGIS geometry type number for lines.
+ */
+ public static final int LINESTRING = 2;
+
+ /**
+ * The OGIS geometry type number for polygons.
+ */
+ public static final int POLYGON = 3;
+
+ /**
+ * The OGIS geometry type number for aggregate points.
+ */
+ public static final int MULTIPOINT = 4;
+
+ /**
+ * The OGIS geometry type number for aggregate lines.
+ */
+ public static final int MULTILINESTRING = 5;
+
+ /**
+ * The OGIS geometry type number for aggregate polygons.
+ */
+ public static final int MULTIPOLYGON = 6;
+
+ /**
+ * The OGIS geometry type number for feature collections.
+ */
+ public static final int GEOMETRYCOLLECTION = 7;
+
+ public static final String[] ALLTYPES = new String[] {
+ "", // internally used LinearRing does not have any text in front of
+ // it
+ "POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING",
+ "MULTIPOLYGON", "GEOMETRYCOLLECTION" };
+
+ /**
+ * The Text representations of the geometry types
+ */
+ public static String getTypeString(int type) {
+ if (type >= 0 && type <= 7) {
+ return ALLTYPES[type];
+ } else {
+ throw new IllegalArgumentException("Unknown Geometry type" + type);
+ }
+ }
+
+ // Properties common to all geometries
+ /**
+ * The dimensionality of this feature (2,3)
+ */
+ public int dimension;
+
+ /**
+ * Do we have a measure (4th dimension)
+ */
+ public boolean haveMeasure = false;
+
+ /**
+ * The OGIS geometry type of this feature. this is final as it never
+ * changes, it is bound to the subclass of the instance.
+ */
+ public final int type;
+
+ /**
+ * Official UNKNOWN srid value
+ */
+ public final static int UNKNOWN_SRID = 0;
+
+ /**
+ * The spacial reference system id of this geometry, default is no srid
+ */
+ public int srid = UNKNOWN_SRID;
+
+ /**
+ * Parse a SRID value, anything {@code <= 0} is unknown
+ */
+ public static int parseSRID(int srid) {
+ if (srid < 0) {
+ /* TODO: raise a warning ? */
+ srid = 0;
+ }
+ return srid;
+ }
+
+ /**
+ * Constructor for subclasses
+ *
+ * @param type
+ * has to be given by all subclasses.
+ */
+ protected Geometry(int type) {
+ this.type = type;
+ }
+
+ /**
+ * java.lang.Object hashCode implementation
+ */
+ public int hashCode() {
+ return dimension | (type * 4) | (srid * 32);
+ }
+
+ /**
+ * java.lang.Object equals implementation
+ */
+ public boolean equals(Object other) {
+ return (other != null) && (other instanceof Geometry)
+ && equals((Geometry) other);
+ }
+
+ /**
+ * geometry specific equals implementation - only defined for non-null
+ * values
+ */
+ public boolean equals(Geometry other) {
+ return (other != null) && (this.dimension == other.dimension)
+ && (this.type == other.type) && (this.srid == other.srid)
+ && (this.haveMeasure == other.haveMeasure)
+ && other.getClass().equals(this.getClass())
+ && this.equalsintern(other);
+ }
+
+ /**
+ * Whether test coordinates for geometry - subclass specific code
+ *
+ * Implementors can assume that dimensin, type, srid and haveMeasure are
+ * equal, other != null and other is the same subclass.
+ */
+ protected abstract boolean equalsintern(Geometry other);
+
+ /**
+ * Return the number of Points of the geometry
+ */
+ public abstract int numPoints();
+
+ /**
+ * Get the nth Point of the geometry
+ *
+ * @param n
+ * the index of the point, from 0 to numPoints()-1;
+ * @throws ArrayIndexOutOfBoundsException
+ * in case of an emtpy geometry or bad index.
+ */
+ public abstract Point getPoint(int n);
+
+ /**
+ * Same as getPoint(0);
+ */
+ public abstract Point getFirstPoint();
+
+ /**
+ * Same as getPoint(numPoints()-1);
+ */
+ public abstract Point getLastPoint();
+
+ /**
+ * The OGIS geometry type number of this geometry.
+ */
+ public int getType() {
+ return this.type;
+ }
+
+ /**
+ * Return the Type as String
+ */
+ public String getTypeString() {
+ return getTypeString(this.type);
+ }
+
+ /** Returns whether we have a measure */
+ public boolean isMeasured() {
+ return haveMeasure;
+ }
+
+ /**
+ * Queries the number of geometric dimensions of this geometry. This does
+ * not include measures, as opposed to the server.
+ *
+ * @return The dimensionality (eg, 2D or 3D) of this geometry.
+ */
+ public int getDimension() {
+ return this.dimension;
+ }
+
+ /**
+ * The OGIS geometry type number of this geometry.
+ */
+ public int getSrid() {
+ return this.srid;
+ }
+
+ /**
+ * Recursively sets the srid on this geometry and all contained
+ * subgeometries
+ */
+ public void setSrid(int srid) {
+ this.srid = srid;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer();
+ if (srid != UNKNOWN_SRID) {
+ sb.append("SRID=");
+ sb.append(srid);
+ sb.append(';');
+ }
+ outerWKT(sb, true);
+ return sb.toString();
+ }
+
+ /**
+ * Render the WKT version of this Geometry (without SRID) into the given
+ * StringBuffer.
+ */
+ public void outerWKT(StringBuffer sb, boolean putM) {
+ sb.append(getTypeString());
+ if (putM && haveMeasure && dimension == 2) {
+ sb.append('M');
+ }
+ mediumWKT(sb);
+ }
+
+ public final void outerWKT(StringBuffer sb) {
+ outerWKT(sb, true);
+ }
+
+ /**
+ * Render the WKT without the type name, but including the brackets into the
+ * StringBuffer
+ */
+ protected void mediumWKT(StringBuffer sb) {
+ sb.append('(');
+ innerWKT(sb);
+ sb.append(')');
+ }
+
+ /**
+ * Render the "inner" part of the WKT (inside the brackets) into the
+ * StringBuffer.
+ */
+ protected abstract void innerWKT(StringBuffer SB);
+
+ /**
+ * backwards compatibility method
+ */
+ public String getValue() {
+ StringBuffer sb = new StringBuffer();
+ mediumWKT(sb);
+ return sb.toString();
+ }
+
+ /**
+ * Do some internal consistency checks on the geometry.
+ *
+ * Currently, all Geometries must have a valid dimension (2 or 3) and a
+ * valid type. 2-dimensional Points must have Z=0.0, as well as non-measured
+ * Points must have m=0.0. Composed geometries must have all equal SRID,
+ * dimensionality and measures, as well as that they do not contain NULL or
+ * inconsistent subgeometries.
+ *
+ * BinaryParser and WKTParser should only generate consistent geometries.
+ * BinaryWriter may produce invalid results on inconsistent geometries.
+ *
+ * @return true if all checks are passed.
+ */
+ public boolean checkConsistency() {
+ return (dimension >= 2 && dimension <= 3) && (type >= 0 && type <= 7);
+ }
+
+ /**
+ * Splits the SRID=4711; part of a EWKT rep if present and sets the srid.
+ *
+ * @return value without the SRID=4711; part
+ */
+ protected String initSRID(String value) {
+ value = value.trim();
+ if (value.startsWith("SRID=")) {
+ int index = value.indexOf(';', 5); // sridprefix length is 5
+ if (index == -1) {
+ throw new IllegalArgumentException(
+ "Error parsing Geometry - SRID not delimited with ';' ");
+ } else {
+ this.srid = Integer.parseInt(value.substring(5, index));
+ return value.substring(index + 1).trim();
+ }
+ } else {
+ return value;
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/GeometryCollection.java b/jdbc/src/main/java/org/postgis/GeometryCollection.java
new file mode 100644
index 0000000..7d5a844
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/GeometryCollection.java
@@ -0,0 +1,79 @@
+/*
+ * GeometryCollection.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+/**
+ * Geometry Collection class WARNING: Currently only implements empty
+ * collections
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ */
+
+public class GeometryCollection extends ComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public static final String GeoCollID = "GEOMETRYCOLLECTION";
+
+ public GeometryCollection() {
+ super(GEOMETRYCOLLECTION);
+ }
+
+ public GeometryCollection(Geometry[] geoms) {
+ super(GEOMETRYCOLLECTION, geoms);
+ }
+
+ public GeometryCollection(String value) throws SQLException {
+ this(value, false);
+ }
+
+ public GeometryCollection(String value, boolean haveM) throws SQLException {
+ super(GEOMETRYCOLLECTION, value, haveM);
+ }
+
+ protected Geometry[] createSubGeomArray(int ngeoms) {
+ return new Geometry[ngeoms];
+ }
+
+ protected Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException {
+ return PGgeometry.geomFromString(token, haveM);
+ }
+
+ protected void innerWKT(StringBuffer SB) {
+ subgeoms[0].outerWKT(SB, true);
+ for (int i = 1; i < subgeoms.length; i++) {
+ SB.append(',');
+ subgeoms[i].outerWKT(SB, true);
+ }
+ }
+
+ public Geometry[] getGeometries() {
+ return subgeoms;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/LineString.java b/jdbc/src/main/java/org/postgis/LineString.java
new file mode 100644
index 0000000..4c9cf45
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/LineString.java
@@ -0,0 +1,101 @@
+/*
+ * LineString.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class LineString extends PointComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ double len = -1.;
+
+ public LineString() {
+ super(LINESTRING);
+ }
+
+ public LineString(Point[] points) {
+ super(LINESTRING, points);
+ }
+
+ public LineString(String value) throws SQLException {
+ super(LINESTRING, value);
+ }
+
+ public LineString(String value, boolean haveM) throws SQLException {
+ super(LINESTRING, value, haveM);
+ }
+
+ public LineString reverse() {
+ Point[] points = this.getPoints();
+ int l = points.length;
+ int i, j;
+ Point[] p = new Point[l];
+ for (i = 0, j = l - 1; i < l; i++, j--) {
+ p[i] = points[j];
+ }
+ return new LineString(p);
+ }
+
+ public LineString concat(LineString other) {
+ Point[] points = this.getPoints();
+ Point[] opoints = other.getPoints();
+
+ boolean cutPoint = this.getLastPoint() == null
+ || this.getLastPoint().equals(other.getFirstPoint());
+ int count = points.length + opoints.length - (cutPoint ? 1 : 0);
+ Point[] p = new Point[count];
+
+ // Maybe we should use System.arrayCopy here?
+ int i, j;
+ for (i = 0; i < points.length; i++) {
+ p[i] = points[i];
+ }
+ if (!cutPoint) {
+ p[i++] = other.getFirstPoint();
+ }
+ for (j = 1; j < opoints.length; j++, i++) {
+ p[i] = opoints[j];
+ }
+ return new LineString(p);
+ }
+
+ public double length() {
+ if (len < 0) {
+ Point[] points = this.getPoints();
+ if ((points == null) || (points.length < 2)) {
+ len = 0;
+ } else {
+ double sum = 0;
+ for (int i = 1; i < points.length; i++) {
+ sum += points[i - 1].distance(points[i]);
+ }
+ len = sum;
+ }
+ }
+ return len;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/LinearRing.java b/jdbc/src/main/java/org/postgis/LinearRing.java
new file mode 100644
index 0000000..7520cc8
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/LinearRing.java
@@ -0,0 +1,74 @@
+/*
+ * LinearRing.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.util.PGtokenizer;
+
+import java.sql.SQLException;
+
+/**
+ * This represents the LinearRing GIS datatype. This type is used to construct
+ * the polygon types, but is not stored or retrieved directly from the database.
+ */
+public class LinearRing extends PointComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public LinearRing(Point[] points) {
+ super(LINEARRING, points);
+ }
+
+ /**
+ * This is called to construct a LinearRing from the PostGIS string
+ * representation of a ring.
+ *
+ * @param value Definition of this ring in the PostGIS string format.
+ */
+ public LinearRing(String value) throws SQLException {
+ this(value, false);
+ }
+
+ /**
+ * @param value The text representation of this LinearRing
+ * @param haveM Hint whether we have a measure. This is given to us by other
+ * "parent" Polygon, and is passed further to our parent.
+ */
+
+ protected LinearRing(String value, boolean haveM) throws SQLException {
+ super(LINEARRING);
+ PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value.trim()), ',');
+ int npoints = t.getSize();
+ Point[] points = new Point[npoints];
+ for (int p = 0; p < npoints; p++) {
+ points[p] = new Point(t.getToken(p), haveM);
+ }
+ this.dimension = points[0].dimension;
+ // fetch haveMeasure from subpoint because haveM does only work with
+ // 2d+M, not with 3d+M geometries
+ this.haveMeasure = points[0].haveMeasure;
+ this.subgeoms = points;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/MultiLineString.java b/jdbc/src/main/java/org/postgis/MultiLineString.java
new file mode 100644
index 0000000..4535003
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/MultiLineString.java
@@ -0,0 +1,95 @@
+/*
+ * MultiLineString.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class MultiLineString extends ComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ double len = -1;
+
+ public int hashCode() {
+ return super.hashCode() ^ (int) this.length();
+ }
+
+ public MultiLineString() {
+ super(MULTILINESTRING);
+ }
+
+ public MultiLineString(LineString[] lines) {
+ super(MULTILINESTRING, lines);
+ }
+
+ public MultiLineString(String value) throws SQLException {
+ this(value, false);
+ }
+
+ public MultiLineString(String value, boolean haveM) throws SQLException {
+ super(MULTILINESTRING, value, haveM);
+ }
+
+ protected Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException {
+ return new LineString(token, haveM);
+ }
+
+ protected Geometry[] createSubGeomArray(int nlines) {
+ return new LineString[nlines];
+ }
+
+ public int numLines() {
+ return subgeoms.length;
+ }
+
+ public LineString[] getLines() {
+ return (LineString[]) subgeoms.clone();
+ }
+
+ public LineString getLine(int idx) {
+ if (idx >= 0 & idx < subgeoms.length) {
+ return (LineString) subgeoms[idx];
+ } else {
+ return null;
+ }
+ }
+
+ public double length() {
+ if (len < 0) {
+ LineString[] lines = (LineString[]) subgeoms;
+ if (lines.length < 1) {
+ len = 0;
+ } else {
+ double sum = 0;
+ for (int i = 0; i < lines.length; i++) {
+ sum += lines[i].length();
+ }
+ len = sum;
+ }
+ }
+ return len;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/MultiPoint.java b/jdbc/src/main/java/org/postgis/MultiPoint.java
new file mode 100644
index 0000000..4bfd58a
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/MultiPoint.java
@@ -0,0 +1,49 @@
+/*
+ * MultiPoint.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class MultiPoint extends PointComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public MultiPoint() {
+ super(MULTIPOINT);
+ }
+
+ public MultiPoint(Point[] points) {
+ super(MULTIPOINT, points);
+ }
+
+ public MultiPoint(String value) throws SQLException {
+ this(value, false);
+ }
+
+ protected MultiPoint(String value, boolean haveM) throws SQLException {
+ super(MULTIPOINT, value, haveM);
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/MultiPolygon.java b/jdbc/src/main/java/org/postgis/MultiPolygon.java
new file mode 100644
index 0000000..3c9c46a
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/MultiPolygon.java
@@ -0,0 +1,73 @@
+/*
+ * MultiPolygon.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class MultiPolygon extends ComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public MultiPolygon() {
+ super(MULTIPOLYGON);
+ }
+
+ public MultiPolygon(Polygon[] polygons) {
+ super(MULTIPOLYGON, polygons);
+ }
+
+ public MultiPolygon(String value) throws SQLException {
+ this(value, false);
+ }
+
+ protected MultiPolygon(String value, boolean haveM) throws SQLException {
+ super(MULTIPOLYGON, value, haveM);
+ }
+
+ protected Geometry[] createSubGeomArray(int npolygons) {
+ return new Polygon[npolygons];
+ }
+
+ protected Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException {
+ return new Polygon(token, haveM);
+ }
+
+ public int numPolygons() {
+ return subgeoms.length;
+ }
+
+ public Polygon getPolygon(int idx) {
+ if (idx >= 0 & idx < subgeoms.length) {
+ return (Polygon) subgeoms[idx];
+ } else {
+ return null;
+ }
+ }
+
+ public Polygon[] getPolygons() {
+ return (Polygon[]) subgeoms;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/PGbox2d.java b/jdbc/src/main/java/org/postgis/PGbox2d.java
new file mode 100644
index 0000000..befd021
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PGbox2d.java
@@ -0,0 +1,65 @@
+/*
+ * PGbox2d.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - bounding box model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class PGbox2d extends PGboxbase {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public PGbox2d() {
+ super();
+ }
+
+ public PGbox2d(Point llb, Point urt) {
+ super(llb, urt);
+ }
+
+ public PGbox2d(String value) throws SQLException {
+ super(value);
+ }
+
+ public void setValue(String value) throws SQLException {
+ super.setValue(value);
+
+ if (llb.dimension != 2 || urt.dimension != 2) {
+ throw new SQLException("PGbox2d is only allowed to have 2 dimensions!");
+ }
+ }
+
+ public String getPrefix() {
+ return "BOX";
+ }
+
+ public String getPGtype() {
+ return "box2d";
+ }
+
+ protected PGboxbase newInstance() {
+ return new PGbox2d();
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/PGbox3d.java b/jdbc/src/main/java/org/postgis/PGbox3d.java
new file mode 100644
index 0000000..2cdbb2d
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PGbox3d.java
@@ -0,0 +1,58 @@
+/*
+ * PGbox3d.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - bounding box model
+ *
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class PGbox3d extends PGboxbase {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public PGbox3d() {
+ super();
+ }
+
+ public PGbox3d(Point llb, Point urt) {
+ super(llb, urt);
+ }
+
+ public PGbox3d(String value) throws SQLException {
+ super(value);
+ }
+
+ public String getPrefix() {
+ return ("BOX3D");
+ }
+
+ public String getPGtype() {
+ return ("box3d");
+ }
+
+ protected PGboxbase newInstance() {
+ return new PGbox3d();
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/PGboxbase.java b/jdbc/src/main/java/org/postgis/PGboxbase.java
new file mode 100644
index 0000000..a0abd9f
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PGboxbase.java
@@ -0,0 +1,173 @@
+/*
+ * PGboxbase.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - bounding box model
+ *
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.util.PGobject;
+import org.postgresql.util.PGtokenizer;
+
+import java.sql.SQLException;
+
+/*
+ * Updates Oct 2002 - data members made private - getLLB() and getURT() methods
+ * added
+ */
+
+public abstract class PGboxbase extends PGobject {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ /**
+ * The lower left bottom corner of the box.
+ */
+ protected Point llb;
+
+ /**
+ * The upper right top corner of the box.
+ */
+ protected Point urt;
+
+ /**
+ * The Prefix we have in WKT rep.
+ *
+ * I use an abstract method here so we do not need to replicate the String
+ * object in every instance.
+ *
+ */
+ public abstract String getPrefix();
+
+ /**
+ * The Postgres type we have (same construct as getPrefix())
+ */
+ public abstract String getPGtype();
+
+ public PGboxbase() {
+ this.setType(getPGtype());
+ }
+
+ public PGboxbase(Point llb, Point urt) {
+ this();
+ this.llb = llb;
+ this.urt = urt;
+ }
+
+ public PGboxbase(String value) throws SQLException {
+ this();
+ setValue(value);
+ }
+
+ public void setValue(String value) throws SQLException {
+ int srid = Geometry.UNKNOWN_SRID;
+ value = value.trim();
+ if (value.startsWith("SRID=")) {
+ String[] temp = PGgeometry.splitSRID(value);
+ value = temp[1].trim();
+ srid = Geometry.parseSRID(Integer.parseInt(temp[0].substring(5)));
+ }
+ String myPrefix = getPrefix();
+ if (value.startsWith(myPrefix)) {
+ value = value.substring(myPrefix.length()).trim();
+ }
+ PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ',');
+ llb = new Point(t.getToken(0));
+ urt = new Point(t.getToken(1));
+ if (srid != Geometry.UNKNOWN_SRID) {
+ llb.setSrid(srid);
+ urt.setSrid(srid);
+ }
+ }
+
+ public String getValue() {
+ StringBuffer sb = new StringBuffer();
+ outerWKT(sb);
+ return sb.toString();
+ }
+
+ private void outerWKT(StringBuffer sb) {
+ sb.append(getPrefix());
+ sb.append('(');
+ llb.innerWKT(sb);
+ sb.append(',');
+ urt.innerWKT(sb);
+ sb.append(')');
+ }
+
+ /**
+ * Unlike geometries, toString() does _not_ contain the srid, as server-side
+ * PostGIS cannot parse this.
+ */
+ public String toString() {
+ return getValue();
+ }
+
+ /** Returns the lower left bottom corner of the box as a Point object */
+ public Point getLLB() {
+ return llb;
+ }
+
+ /** Returns the upper right top corner of the box as a Point object */
+ public Point getURT() {
+ return urt;
+ }
+
+ public boolean equals(Object other) {
+ if (other instanceof PGboxbase) {
+ PGboxbase otherbox = (PGboxbase) other;
+ return (compareLazyDim(this.llb, otherbox.llb) && compareLazyDim(this.urt, otherbox.urt));
+ }
+ return false;
+ }
+
+ /**
+ * Compare two coordinates with lazy dimension checking.
+ *
+ * As the Server always returns Box3D with three dimensions, z==0 equals
+ * dimensions==2
+ *
+ */
+ protected static boolean compareLazyDim(Point first, Point second) {
+ return first.x == second.x
+ && first.y == second.y
+ && (((first.dimension == 2 || first.z == 0.0) && (second.dimension == 2 || second.z == 0)) || (first.z == second.z));
+ }
+
+ public Object clone() {
+ PGboxbase obj = newInstance();
+ obj.llb = this.llb;
+ obj.urt = this.urt;
+ obj.setType(type);
+ return obj;
+ }
+
+ /**
+ * We could have used this.getClass().newInstance() here, but this forces us
+ * dealing with InstantiationException and IllegalAccessException. Due to
+ * the PGObject.clone() brokennes that does not allow clone() to throw
+ * CloneNotSupportedException, we cannot even pass this exceptions down to
+ * callers in a sane way.
+ */
+ protected abstract PGboxbase newInstance();
+}
diff --git a/jdbc/src/main/java/org/postgis/PGgeometry.java b/jdbc/src/main/java/org/postgis/PGgeometry.java
new file mode 100644
index 0000000..4b37c6c
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PGgeometry.java
@@ -0,0 +1,168 @@
+/*
+ * PGgeometry.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - PGobject Geometry Wrapper
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgis.binary.BinaryParser;
+import org.postgresql.util.PGobject;
+
+import java.sql.SQLException;
+
+public class PGgeometry extends PGobject {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ Geometry geom;
+ BinaryParser bp = new BinaryParser();
+
+ public PGgeometry() {
+ this.setType("geometry");
+ }
+
+ public PGgeometry(Geometry geom) {
+ this();
+ this.geom = geom;
+ }
+
+ public PGgeometry(String value) throws SQLException {
+ this();
+ setValue(value);
+ }
+
+ public void setValue(String value) throws SQLException {
+ geom = geomFromString(value, bp);
+ }
+
+ public static Geometry geomFromString(String value) throws SQLException {
+ return geomFromString(value, false);
+ }
+
+ public static Geometry geomFromString(String value, boolean haveM) throws SQLException {
+ BinaryParser bp = new BinaryParser();
+
+ return geomFromString(value, bp, haveM);
+ }
+
+ /**
+ * Maybe we could add more error checking here?
+ */
+ public static Geometry geomFromString(String value, BinaryParser bp) throws SQLException {
+ return geomFromString(value, bp, false);
+ }
+
+ public static Geometry geomFromString(String value, BinaryParser bp, boolean haveM)
+ throws SQLException {
+ value = value.trim();
+
+ int srid = Geometry.UNKNOWN_SRID;
+
+ if (value.startsWith(SRIDPREFIX)) {
+ // break up geometry into srid and wkt
+ String[] parts = PGgeometry.splitSRID(value);
+ value = parts[1].trim();
+ srid = Geometry.parseSRID(Integer.parseInt(parts[0].substring(5)));
+ }
+
+ Geometry result;
+ if (value.startsWith("00") || value.startsWith("01")) {
+ result = bp.parse(value);
+ } else if (value.endsWith("EMPTY")) {
+ // We have a standard conforming representation for an empty
+ // geometry which is to be parsed as an empty GeometryCollection.
+ result = new GeometryCollection();
+ } else if (value.startsWith("MULTIPOLYGON")) {
+ result = new MultiPolygon(value, haveM);
+ } else if (value.startsWith("MULTILINESTRING")) {
+ result = new MultiLineString(value, haveM);
+ } else if (value.startsWith("MULTIPOINT")) {
+ result = new MultiPoint(value, haveM);
+ } else if (value.startsWith("POLYGON")) {
+ result = new Polygon(value, haveM);
+ } else if (value.startsWith("LINESTRING")) {
+ result = new LineString(value, haveM);
+ } else if (value.startsWith("POINT")) {
+ result = new Point(value, haveM);
+ } else if (value.startsWith("GEOMETRYCOLLECTION")) {
+ result = new GeometryCollection(value, haveM);
+ } else {
+ throw new SQLException("Unknown type: " + value);
+ }
+
+ if (srid != Geometry.UNKNOWN_SRID) {
+ result.srid = srid;
+ }
+
+ return result;
+ }
+
+ public Geometry getGeometry() {
+ return geom;
+ }
+
+ public void setGeometry(Geometry newgeom) {
+ this.geom = newgeom;
+ }
+
+ public int getGeoType() {
+ return geom.type;
+ }
+
+ public String toString() {
+ return geom.toString();
+ }
+
+ public String getValue() {
+ return geom.toString();
+ }
+
+ public Object clone() {
+ return new PGgeometry(geom);
+ }
+
+ /** The prefix that indicates SRID presence */
+ public static final String SRIDPREFIX = "SRID=";
+
+ /**
+ * Splits a String at the first occurrence of border charachter.
+ *
+ * Poor man's String.split() replacement, as String.split() was invented at
+ * jdk1.4, and the Debian PostGIS Maintainer had problems building the woody
+ * backport of his package using DFSG-free compilers. In all the cases we
+ * used split() in the org.postgis package, we only needed to split at the
+ * first occurence, and thus this code could even be faster.
+ *
+ * @throws SQLException
+ */
+ public static String[] splitSRID(String whole) throws SQLException {
+ int index = whole.indexOf(';', 5); // sridprefix length is 5
+ if (index == -1) {
+ throw new SQLException("Error parsing Geometry - SRID not delimited with ';' ");
+ } else {
+ return new String[]{
+ whole.substring(0, index),
+ whole.substring(index + 1)};
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/PGgeometryLW.java b/jdbc/src/main/java/org/postgis/PGgeometryLW.java
new file mode 100644
index 0000000..1993021
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PGgeometryLW.java
@@ -0,0 +1,65 @@
+/*
+ * PGgeometryLW.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - PGobject LWGeometry Wrapper
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgis.binary.BinaryWriter;
+
+import java.sql.SQLException;
+
+/**
+ * This is a subclas of PGgeometry that uses hex encoded EWKB to communicate
+ * with the backend, which is much more efficient, but only works with Lwgeom
+ * enabled PostGIS (1.0.0 and up).
+ */
+
+public class PGgeometryLW extends PGgeometry {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ BinaryWriter bw = new BinaryWriter();
+
+ public PGgeometryLW() {
+ super();
+ }
+
+ public PGgeometryLW(Geometry geom) {
+ super(geom);
+ }
+
+ public PGgeometryLW(String value) throws SQLException {
+ super(value);
+ }
+
+ public String toString() {
+ return geom.toString();
+ }
+
+ public String getValue() {
+ return bw.writeHexed(geom);
+ }
+
+ public Object clone() {
+ return new PGgeometryLW(geom);
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/Point.java b/jdbc/src/main/java/org/postgis/Point.java
new file mode 100644
index 0000000..5187c00
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/Point.java
@@ -0,0 +1,296 @@
+/*
+ * Point.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import org.postgresql.util.PGtokenizer;
+
+import java.sql.SQLException;
+
+public class Point extends Geometry {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public static final boolean CUTINTS = true;
+
+ public int hashCode() {
+ return super.hashCode() ^ hashCode(x) ^ hashCode(y) ^ hashCode(z) ^ hashCode(m);
+ }
+
+ public static int hashCode(double value) {
+ long v = Double.doubleToLongBits(value);
+ return (int) (v ^ (v >>> 32));
+ }
+
+ protected boolean equalsintern(Geometry otherg) {
+ Point other = (Point) otherg;
+ return equals(other);
+ }
+
+ public static boolean double_equals(double a, double b) {
+ if ( Double.isNaN(a) && Double.isNaN(b) ) {
+ return true;
+ }
+ else {
+ return (a == b);
+ }
+ }
+
+ public final boolean equals(Point other) {
+ boolean xequals = double_equals(x, other.x);
+ boolean yequals = double_equals(y, other.y);
+ boolean zequals = ((dimension == 2) || double_equals(z, other.z));
+ boolean mequals = ((haveMeasure == false) || double_equals(m,other.m));
+ boolean result = xequals && yequals && zequals && mequals;
+ return result;
+ }
+
+ public Point getPoint(int index) {
+ if (index == 0) {
+ return this;
+ } else {
+ throw new ArrayIndexOutOfBoundsException("Point only has a single Point! " + index);
+ }
+ }
+
+ /** Optimized versions for this special case */
+ public Point getFirstPoint() {
+ return this;
+ }
+
+ /** Optimized versions for this special case */
+ public Point getLastPoint() {
+ return this;
+ }
+
+ public int numPoints() {
+ return 1;
+ }
+
+ /**
+ * The X coordinate of the point.
+ * In most long/lat systems, this is the longitude.
+ */
+ public double x;
+
+ /**
+ * The Y coordinate of the point.
+ * In most long/lat systems, this is the latitude.
+ */
+ public double y;
+
+ /**
+ * The Z coordinate of the point.
+ * In most long/lat systems, this is a radius from the
+ * center of the earth, or the height / elevation over
+ * the ground.
+ */
+ public double z;
+
+ /**
+ * The measure of the point.
+ */
+ public double m = 0.0;
+
+ public Point() {
+ super(POINT);
+ }
+
+ /** Constructs a new Point
+ * @param x the longitude / x ordinate
+ * @param y the latitude / y ordinate
+ * @param z the radius / height / elevation / z ordinate
+ */
+ public Point(double x, double y, double z) {
+ this();
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ dimension = 3;
+ }
+
+ /** Constructs a new Point
+ * @param x the longitude / x ordinate
+ * @param y the latitude / y ordinate
+ */
+ public Point(double x, double y) {
+ this();
+ this.x = x;
+ this.y = y;
+ this.z = 0.0;
+ dimension = 2;
+ }
+
+ /**
+ * Construct a Point from EWKT.
+ *
+ * (3D and measures are legal, but SRID is not allowed).
+ */
+ public Point(String value) throws SQLException {
+ this(value, false);
+ }
+
+ /**
+ * Construct a Point
+ *
+ * @param value The text representation of this point
+ * @param haveM Hint whether we have a measure. This is used by other
+ * geometries parsing inner points where we only get "1 2 3 4"
+ * like strings without the "POINT(" and ")" stuff. If there
+ * acutally is a POINTM prefix, this overrides the given value.
+ * However, POINT does not set it to false, as they can be
+ * contained in measured collections, as in
+ * "GEOMETRYCOLLECTIONM(POINT(0 0 0))".
+ */
+ protected Point(String value, boolean haveM) throws SQLException {
+ this();
+ value = initSRID(value);
+
+ if (value.indexOf("POINTM") == 0) {
+ haveM = true;
+ value = value.substring(6).trim();
+ } else if (value.indexOf("POINT") == 0) {
+ value = value.substring(5).trim();
+ }
+ PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ' ');
+ try {
+ x = Double.valueOf(t.getToken(0)).doubleValue();
+ y = Double.valueOf(t.getToken(1)).doubleValue();
+ haveM |= t.getSize() == 4;
+ if ((t.getSize() == 3 && !haveM) || (t.getSize() == 4)) {
+ z = Double.valueOf(t.getToken(2)).doubleValue();
+ dimension = 3;
+ } else {
+ dimension = 2;
+ }
+ if (haveM) {
+ m = Double.valueOf(t.getToken(dimension)).doubleValue();
+ }
+ } catch (NumberFormatException e) {
+ throw new SQLException("Error parsing Point: " + e.toString());
+ }
+ haveMeasure = haveM;
+ }
+
+ public void innerWKT(StringBuffer sb) {
+ sb.append(x);
+ if (CUTINTS)
+ cutint(sb);
+ sb.append(' ');
+ sb.append(y);
+ if (CUTINTS)
+ cutint(sb);
+ if (dimension == 3) {
+ sb.append(' ');
+ sb.append(z);
+ if (CUTINTS)
+ cutint(sb);
+ }
+ if (haveMeasure) {
+ sb.append(' ');
+ sb.append(m);
+ if (CUTINTS)
+ cutint(sb);
+ }
+ }
+
+ private static void cutint(StringBuffer sb) {
+ int l = sb.length() - 2;
+ if ((sb.charAt(l + 1) == '0') && (sb.charAt(l) == '.')) {
+ sb.setLength(l);
+ }
+ }
+
+ public double getX() {
+ return x;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public double getZ() {
+ return z;
+ }
+
+ public double getM() {
+ return m;
+ }
+
+ public void setX(double x) {
+ this.x = x;
+ }
+
+ public void setY(double y) {
+ this.y = y;
+ }
+
+ public void setZ(double z) {
+ this.z = z;
+ }
+
+ public void setM(double m) {
+ haveMeasure = true;
+ this.m = m;
+ }
+
+ public void setX(int x) {
+ this.x = x;
+ }
+
+ public void setY(int y) {
+ this.y = y;
+ }
+
+ public void setZ(int z) {
+ this.z = z;
+ }
+
+ public double distance(Point other) {
+ double tx, ty, tz;
+ if (this.dimension != other.dimension) {
+ throw new IllegalArgumentException("Points have different dimensions!");
+ }
+ tx = this.x - other.x;
+ switch (this.dimension) {
+ case 1 :
+ return Math.sqrt(tx * tx);
+ case 2 :
+ ty = this.y - other.y;
+ return Math.sqrt(tx * tx + ty * ty);
+ case 3 :
+ ty = this.y - other.y;
+ tz = this.z - other.z;
+ return Math.sqrt(tx * tx + ty * ty + tz * tz);
+ default :
+ throw new IllegalArgumentException("Illegal dimension of Point" + this.dimension);
+ }
+ }
+
+ public boolean checkConsistency() {
+ return super.checkConsistency() && (this.dimension == 3 || this.z == 0.0)
+ && (this.haveMeasure || this.m == 0.0);
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/PointComposedGeom.java b/jdbc/src/main/java/org/postgis/PointComposedGeom.java
new file mode 100644
index 0000000..f153a7f
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/PointComposedGeom.java
@@ -0,0 +1,95 @@
+/*
+ * ComposedGeom.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis;
+
+import java.sql.SQLException;
+
+/**
+ * PointComposedGeom - base class for all composed geoms that contain only
+ * points.
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ */
+
+public abstract class PointComposedGeom extends ComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ protected PointComposedGeom(int type) {
+ super(type);
+ }
+
+ protected PointComposedGeom(int type, Point[] points) {
+ super(type, points);
+ }
+
+ public PointComposedGeom(int type, String value) throws SQLException {
+ this(type, value, false);
+ }
+
+ public PointComposedGeom(int type, String value, boolean haveM) throws SQLException {
+ super(type, value, haveM);
+ }
+
+ protected Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException {
+ return new Point(token, haveM);
+ }
+
+ protected Geometry[] createSubGeomArray(int pointcount) {
+ return new Point[pointcount];
+ }
+
+ protected void innerWKT(StringBuffer sb) {
+ subgeoms[0].innerWKT(sb);
+ for (int i = 1; i < subgeoms.length; i++) {
+ sb.append(',');
+ subgeoms[i].innerWKT(sb);
+ }
+ }
+
+ /**
+ * optimized version
+ */
+ public int numPoints() {
+ return subgeoms.length;
+ }
+
+ /**
+ * optimized version
+ */
+ public Point getPoint(int idx) {
+ if (idx >= 0 & idx < subgeoms.length) {
+ return (Point) subgeoms[idx];
+ } else {
+ return null;
+ }
+ }
+
+ /** Get the underlying Point array */
+ public Point[] getPoints() {
+ return (Point[]) subgeoms;
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/Polygon.java b/jdbc/src/main/java/org/postgis/Polygon.java
new file mode 100644
index 0000000..48ae612
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/Polygon.java
@@ -0,0 +1,69 @@
+/*
+ * Polygon.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+import java.sql.SQLException;
+
+public class Polygon extends ComposedGeom {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ public Polygon() {
+ super(POLYGON);
+ }
+
+ public Polygon(LinearRing[] rings) {
+ super(POLYGON, rings);
+ }
+
+ public Polygon(String value) throws SQLException {
+ this(value, false);
+ }
+
+ public Polygon(String value, boolean haveM) throws SQLException {
+ super(POLYGON, value, haveM);
+ }
+
+ protected Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException {
+ return new LinearRing(token, haveM);
+ }
+
+ protected Geometry[] createSubGeomArray(int ringcount) {
+ return new LinearRing[ringcount];
+ }
+
+ public int numRings() {
+ return subgeoms.length;
+ }
+
+ public LinearRing getRing(int idx) {
+ if (idx >= 0 & idx < subgeoms.length) {
+ return (LinearRing) subgeoms[idx];
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/Version.java b/jdbc/src/main/java/org/postgis/Version.java
new file mode 100644
index 0000000..cc7b71b
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/Version.java
@@ -0,0 +1,119 @@
+/*
+ * Version.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - current version identification
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross {@literal <phillip.w.g.ross at gmail.com>}
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import java.io.IOException;
+import java.util.Properties;
+
+
+/** Corresponds to the appropriate PostGIS that carried this source */
+public class Version {
+
+ /** We read our version information from this resource... */
+ private static final String RESOURCE_FILENAME = "org/postgis/version.properties";
+
+ private static final String VERSION_PROPERTY_NAME = "VERSION";
+
+ public static final String VERSION;
+
+ /** The major version */
+ public static final int MAJOR;
+
+ /** The minor version */
+ public static final int MINOR;
+
+ /**
+ * The micro version, usually a number including possibly textual suffixes
+ * like RC3.
+ */
+ public static final String MICRO;
+
+ static {
+ int major = -1;
+ int minor = -1;
+ String micro = null;
+ String version = null;
+ try {
+ ClassLoader loader = Version.class.getClassLoader();
+
+ Properties prop = new Properties();
+ try {
+ prop.load(loader.getResourceAsStream(RESOURCE_FILENAME));
+ } catch (IOException e) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version. Cause: Ressource "
+ + RESOURCE_FILENAME + " cannot be read. " + e.getMessage());
+ } catch (NullPointerException e) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version. Cause: Ressource "
+ + RESOURCE_FILENAME + " not found. " + e.getMessage());
+ }
+
+ version = prop.getProperty(VERSION_PROPERTY_NAME);
+ if (version == null) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version: Missing " + VERSION_PROPERTY_NAME + " property.");
+ } else if (version.equals("")) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version: Empty " + VERSION_PROPERTY_NAME + " property.");
+ } else {
+ String[] versions = version.split("\\.");
+ if (version.length() < 3) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version: FULL_VERSION (" + version + ") does not contain 3 components ");
+ }
+ if (versions.length >= 1) {
+ try {
+ major = Integer.parseInt(versions[0]);
+ } catch (NumberFormatException nfe) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version! Error parsing major version ");
+ }
+ }
+ if (versions.length >= 2) {
+ try {
+ minor = Integer.parseInt(versions[1]);
+ } catch (NumberFormatException nfe) {
+ throw new ExceptionInInitializerError("Error initializing PostGIS JDBC version! Error parsing minor version ");
+ }
+ }
+ if (version.length() >= 3) {
+ micro = versions[2];
+ }
+ }
+
+ } finally {
+ MAJOR = major;
+ MINOR = minor;
+ MICRO = micro;
+ VERSION = version;
+ }
+ }
+
+ /** Full version for human reading - code should use the constants above */
+ public static final String FULL = "PostGIS JDBC V" + MAJOR + "." + MINOR + "." + MICRO;
+
+ public static String getFullVersion() {
+ return FULL;
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/main/java/org/postgis/binary/BinaryParser.java b/jdbc/src/main/java/org/postgis/binary/BinaryParser.java
new file mode 100644
index 0000000..ee6e551
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/BinaryParser.java
@@ -0,0 +1,232 @@
+/*
+ * BinaryParser.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Parser
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.binary;
+
+import org.postgis.Geometry;
+import org.postgis.GeometryCollection;
+import org.postgis.LineString;
+import org.postgis.LinearRing;
+import org.postgis.MultiLineString;
+import org.postgis.MultiPoint;
+import org.postgis.MultiPolygon;
+import org.postgis.Point;
+import org.postgis.Polygon;
+import org.postgis.binary.ByteGetter.BinaryByteGetter;
+import org.postgis.binary.ByteGetter.StringByteGetter;
+
+/**
+ * Parse binary representation of geometries.
+ *
+ * It should be easy to add char[] and CharSequence ByteGetter instances,
+ * although the latter one is not compatible with older jdks.
+ *
+ * I did not implement real unsigned 32-bit integers or emulate them with long,
+ * as both java Arrays and Strings currently can have only 2^31-1 elements
+ * (bytes), so we cannot even get or build Geometries with more than approx.
+ * 2^28 coordinates (8 bytes each).
+ *
+ * @author {@literal Markus Schaber <markus.schaber at logix-tt.com>}
+ *
+ */
+public class BinaryParser {
+
+ /**
+ * Get the appropriate ValueGetter for my endianness
+ *
+ * @param bytes The appropriate Byte Getter
+ *
+ * @return the ValueGetter
+ */
+ public static ValueGetter valueGetterForEndian(ByteGetter bytes) {
+ if (bytes.get(0) == ValueGetter.XDR.NUMBER) { // XDR
+ return new ValueGetter.XDR(bytes);
+ } else if (bytes.get(0) == ValueGetter.NDR.NUMBER) {
+ return new ValueGetter.NDR(bytes);
+ } else {
+ throw new IllegalArgumentException("Unknown Endian type:" + bytes.get(0));
+ }
+ }
+
+ /**
+ * Parse a hex encoded geometry
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.)
+ */
+ public synchronized Geometry parse(String value) {
+ StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes));
+ }
+
+ /**
+ * Parse a binary encoded geometry.
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.)
+ */
+ public synchronized Geometry parse(byte[] value) {
+ BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes));
+ }
+
+ /** Parse a geometry starting at offset. */
+ protected Geometry parseGeometry(ValueGetter data) {
+ byte endian = data.getByte(); // skip and test endian flag
+ if (endian != data.endian) {
+ throw new IllegalArgumentException("Endian inconsistency!");
+ }
+ int typeword = data.getInt();
+
+ int realtype = typeword & 0x1FFFFFFF; // cut off high flag bits
+
+ boolean haveZ = (typeword & 0x80000000) != 0;
+ boolean haveM = (typeword & 0x40000000) != 0;
+ boolean haveS = (typeword & 0x20000000) != 0;
+
+ int srid = Geometry.UNKNOWN_SRID;
+
+ if (haveS) {
+ srid = Geometry.parseSRID(data.getInt());
+ }
+ Geometry result1;
+ switch (realtype) {
+ case Geometry.POINT :
+ result1 = parsePoint(data, haveZ, haveM);
+ break;
+ case Geometry.LINESTRING :
+ result1 = parseLineString(data, haveZ, haveM);
+ break;
+ case Geometry.POLYGON :
+ result1 = parsePolygon(data, haveZ, haveM);
+ break;
+ case Geometry.MULTIPOINT :
+ result1 = parseMultiPoint(data);
+ break;
+ case Geometry.MULTILINESTRING :
+ result1 = parseMultiLineString(data);
+ break;
+ case Geometry.MULTIPOLYGON :
+ result1 = parseMultiPolygon(data);
+ break;
+ case Geometry.GEOMETRYCOLLECTION :
+ result1 = parseCollection(data);
+ break;
+ default :
+ throw new IllegalArgumentException("Unknown Geometry Type: " + realtype);
+ }
+
+ Geometry result = result1;
+
+ if (srid != Geometry.UNKNOWN_SRID) {
+ result.setSrid(srid);
+ }
+ return result;
+ }
+
+ private Point parsePoint(ValueGetter data, boolean haveZ, boolean haveM) {
+ double X = data.getDouble();
+ double Y = data.getDouble();
+ Point result;
+ if (haveZ) {
+ double Z = data.getDouble();
+ result = new Point(X, Y, Z);
+ } else {
+ result = new Point(X, Y);
+ }
+
+ if (haveM) {
+ result.setM(data.getDouble());
+ }
+
+ return result;
+ }
+
+ /** Parse an Array of "full" Geometries */
+ private void parseGeometryArray(ValueGetter data, Geometry[] container) {
+ for (int i = 0; i < container.length; i++) {
+ container[i] = parseGeometry(data);
+ }
+ }
+
+ /**
+ * Parse an Array of "slim" Points (without endianness and type, part of
+ * LinearRing and Linestring, but not MultiPoint!
+ *
+ * @param haveZ
+ * @param haveM
+ */
+ private Point[] parsePointArray(ValueGetter data, boolean haveZ, boolean haveM) {
+ int count = data.getInt();
+ Point[] result = new Point[count];
+ for (int i = 0; i < count; i++) {
+ result[i] = parsePoint(data, haveZ, haveM);
+ }
+ return result;
+ }
+
+ private MultiPoint parseMultiPoint(ValueGetter data) {
+ Point[] points = new Point[data.getInt()];
+ parseGeometryArray(data, points);
+ return new MultiPoint(points);
+ }
+
+ private LineString parseLineString(ValueGetter data, boolean haveZ, boolean haveM) {
+ Point[] points = parsePointArray(data, haveZ, haveM);
+ return new LineString(points);
+ }
+
+ private LinearRing parseLinearRing(ValueGetter data, boolean haveZ, boolean haveM) {
+ Point[] points = parsePointArray(data, haveZ, haveM);
+ return new LinearRing(points);
+ }
+
+ private Polygon parsePolygon(ValueGetter data, boolean haveZ, boolean haveM) {
+ int count = data.getInt();
+ LinearRing[] rings = new LinearRing[count];
+ for (int i = 0; i < count; i++) {
+ rings[i] = parseLinearRing(data, haveZ, haveM);
+ }
+ return new Polygon(rings);
+ }
+
+ private MultiLineString parseMultiLineString(ValueGetter data) {
+ int count = data.getInt();
+ LineString[] strings = new LineString[count];
+ parseGeometryArray(data, strings);
+ return new MultiLineString(strings);
+ }
+
+ private MultiPolygon parseMultiPolygon(ValueGetter data) {
+ int count = data.getInt();
+ Polygon[] polys = new Polygon[count];
+ parseGeometryArray(data, polys);
+ return new MultiPolygon(polys);
+ }
+
+ private GeometryCollection parseCollection(ValueGetter data) {
+ int count = data.getInt();
+ Geometry[] geoms = new Geometry[count];
+ parseGeometryArray(data, geoms);
+ return new GeometryCollection(geoms);
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java b/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java
new file mode 100644
index 0000000..4ec422c
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java
@@ -0,0 +1,357 @@
+/*
+ * BinaryWriter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Writer
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.binary;
+
+import org.postgis.Geometry;
+import org.postgis.GeometryCollection;
+import org.postgis.LineString;
+import org.postgis.LinearRing;
+import org.postgis.MultiLineString;
+import org.postgis.MultiPoint;
+import org.postgis.MultiPolygon;
+import org.postgis.Point;
+import org.postgis.Polygon;
+
+/**
+ * Create binary representation of geometries. Currently, only text rep (hexed)
+ * implementation is tested.
+ *
+ * It should be easy to add char[] and CharSequence ByteGetter instances,
+ * although the latter one is not compatible with older jdks.
+ *
+ * I did not implement real unsigned 32-bit integers or emulate them with long,
+ * as both java Arrays and Strings currently can have only 2^31-1 elements
+ * (bytes), so we cannot even get or build Geometries with more than approx.
+ * 2^28 coordinates (8 bytes each).
+ *
+ * @author markus.schaber at logi-track.com
+ *
+ */
+public class BinaryWriter {
+
+ /**
+ * Get the appropriate ValueGetter for my endianness
+ *
+ * @param bytes The appropriate Byte Getter
+ *
+ * @return the ValueGetter
+ */
+ public static ValueSetter valueSetterForEndian(ByteSetter bytes, byte endian) {
+ if (endian == ValueSetter.XDR.NUMBER) { // XDR
+ return new ValueSetter.XDR(bytes);
+ } else if (endian == ValueSetter.NDR.NUMBER) {
+ return new ValueSetter.NDR(bytes);
+ } else {
+ throw new IllegalArgumentException("Unknown Endian type:" + endian);
+ }
+ }
+
+ /**
+ * Write a hex encoded geometry
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.) This is a
+ * TODO item.
+ *
+ * The geometry you put in must be consistent, geom.checkConsistency() must
+ * return true. If not, the result may be invalid WKB.
+ *
+ * @see Geometry#checkConsistency() the consistency checker
+ */
+ public synchronized String writeHexed(Geometry geom, byte REP) {
+ int length = estimateBytes(geom);
+ ByteSetter.StringByteSetter bytes = new ByteSetter.StringByteSetter(length);
+ writeGeometry(geom, valueSetterForEndian(bytes, REP));
+ return bytes.result();
+ }
+
+ public synchronized String writeHexed(Geometry geom) {
+ return writeHexed(geom, ValueSetter.NDR.NUMBER);
+ }
+
+ /**
+ * Write a binary encoded geometry.
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.) This is a
+ * TODO item.
+ *
+ * The geometry you put in must be consistent, geom.checkConsistency() must
+ * return true. If not, the result may be invalid WKB.
+ *
+ * @see Geometry#checkConsistency()
+ */
+ public synchronized byte[] writeBinary(Geometry geom, byte REP) {
+ int length = estimateBytes(geom);
+ ByteSetter.BinaryByteSetter bytes = new ByteSetter.BinaryByteSetter(length);
+ writeGeometry(geom, valueSetterForEndian(bytes, REP));
+ return bytes.result();
+ }
+
+ public synchronized byte[] writeBinary(Geometry geom) {
+ return writeBinary(geom, ValueSetter.NDR.NUMBER);
+ }
+
+ /** Parse a geometry starting at offset. */
+ protected void writeGeometry(Geometry geom, ValueSetter dest) {
+ // write endian flag
+ dest.setByte(dest.endian);
+
+ // write typeword
+ int typeword = geom.type;
+ if (geom.dimension == 3) {
+ typeword |= 0x80000000;
+ }
+ if (geom.haveMeasure) {
+ typeword |= 0x40000000;
+ }
+ if (geom.srid != Geometry.UNKNOWN_SRID) {
+ typeword |= 0x20000000;
+ }
+
+ dest.setInt(typeword);
+
+ if (geom.srid != Geometry.UNKNOWN_SRID) {
+ dest.setInt(geom.srid);
+ }
+
+ switch (geom.type) {
+ case Geometry.POINT :
+ writePoint((Point) geom, dest);
+ break;
+ case Geometry.LINESTRING :
+ writeLineString((LineString) geom, dest);
+ break;
+ case Geometry.POLYGON :
+ writePolygon((Polygon) geom, dest);
+ break;
+ case Geometry.MULTIPOINT :
+ writeMultiPoint((MultiPoint) geom, dest);
+ break;
+ case Geometry.MULTILINESTRING :
+ writeMultiLineString((MultiLineString) geom, dest);
+ break;
+ case Geometry.MULTIPOLYGON :
+ writeMultiPolygon((MultiPolygon) geom, dest);
+ break;
+ case Geometry.GEOMETRYCOLLECTION :
+ writeCollection((GeometryCollection) geom, dest);
+ break;
+ default :
+ throw new IllegalArgumentException("Unknown Geometry Type: " + geom.type);
+ }
+ }
+
+ /**
+ * Writes a "slim" Point (without endiannes, srid ant type, only the
+ * ordinates and measure. Used by writeGeometry as ell as writePointArray.
+ */
+ private void writePoint(Point geom, ValueSetter dest) {
+ dest.setDouble(geom.x);
+ dest.setDouble(geom.y);
+
+ if (geom.dimension == 3) {
+ dest.setDouble(geom.z);
+ }
+
+ if (geom.haveMeasure) {
+ dest.setDouble(geom.m);
+ }
+ }
+
+ /** Write an Array of "full" Geometries */
+ private void writeGeometryArray(Geometry[] container, ValueSetter dest) {
+ for (int i = 0; i < container.length; i++) {
+ writeGeometry(container[i], dest);
+ }
+ }
+
+ /**
+ * Write an Array of "slim" Points (without endianness, srid and type, part
+ * of LinearRing and Linestring, but not MultiPoint!
+ */
+ private void writePointArray(Point[] geom, ValueSetter dest) {
+ // number of points
+ dest.setInt(geom.length);
+ for (int i = 0; i < geom.length; i++) {
+ writePoint(geom[i], dest);
+ }
+ }
+
+ private void writeMultiPoint(MultiPoint geom, ValueSetter dest) {
+ dest.setInt(geom.numPoints());
+ writeGeometryArray(geom.getPoints(), dest);
+ }
+
+ private void writeLineString(LineString geom, ValueSetter dest) {
+ writePointArray(geom.getPoints(), dest);
+ }
+
+ private void writeLinearRing(LinearRing geom, ValueSetter dest) {
+ writePointArray(geom.getPoints(), dest);
+ }
+
+ private void writePolygon(Polygon geom, ValueSetter dest) {
+ dest.setInt(geom.numRings());
+ for (int i = 0; i < geom.numRings(); i++) {
+ writeLinearRing(geom.getRing(i), dest);
+ }
+ }
+
+ private void writeMultiLineString(MultiLineString geom, ValueSetter dest) {
+ dest.setInt(geom.numLines());
+ writeGeometryArray(geom.getLines(), dest);
+ }
+
+ private void writeMultiPolygon(MultiPolygon geom, ValueSetter dest) {
+ dest.setInt(geom.numPolygons());
+ writeGeometryArray(geom.getPolygons(), dest);
+ }
+
+ private void writeCollection(GeometryCollection geom, ValueSetter dest) {
+ dest.setInt(geom.numGeoms());
+ writeGeometryArray(geom.getGeometries(), dest);
+ }
+
+ /** Estimate how much bytes a geometry will need in WKB. */
+ protected int estimateBytes(Geometry geom) {
+ int result = 0;
+
+ // write endian flag
+ result += 1;
+
+ // write typeword
+ result += 4;
+
+ if (geom.srid != Geometry.UNKNOWN_SRID) {
+ result += 4;
+ }
+
+ switch (geom.type) {
+ case Geometry.POINT :
+ result += estimatePoint((Point) geom);
+ break;
+ case Geometry.LINESTRING :
+ result += estimateLineString((LineString) geom);
+ break;
+ case Geometry.POLYGON :
+ result += estimatePolygon((Polygon) geom);
+ break;
+ case Geometry.MULTIPOINT :
+ result += estimateMultiPoint((MultiPoint) geom);
+ break;
+ case Geometry.MULTILINESTRING :
+ result += estimateMultiLineString((MultiLineString) geom);
+ break;
+ case Geometry.MULTIPOLYGON :
+ result += estimateMultiPolygon((MultiPolygon) geom);
+ break;
+ case Geometry.GEOMETRYCOLLECTION :
+ result += estimateCollection((GeometryCollection) geom);
+ break;
+ default :
+ throw new IllegalArgumentException("Unknown Geometry Type: " + geom.type);
+ }
+ return result;
+ }
+
+ private int estimatePoint(Point geom) {
+ // x, y both have 8 bytes
+ int result = 16;
+ if (geom.dimension == 3) {
+ result += 8;
+ }
+
+ if (geom.haveMeasure) {
+ result += 8;
+ }
+ return result;
+ }
+
+ /** Write an Array of "full" Geometries */
+ private int estimateGeometryArray(Geometry[] container) {
+ int result = 0;
+ for (int i = 0; i < container.length; i++) {
+ result += estimateBytes(container[i]);
+ }
+ return result;
+ }
+
+ /**
+ * Write an Array of "slim" Points (without endianness and type, part of
+ * LinearRing and Linestring, but not MultiPoint!
+ */
+ private int estimatePointArray(Point[] geom) {
+ // number of points
+ int result = 4;
+
+ // And the amount of the points itsself, in consistent geometries
+ // all points have equal size.
+ if (geom.length > 0) {
+ result += geom.length * estimatePoint(geom[0]);
+ }
+ return result;
+ }
+
+ private int estimateMultiPoint(MultiPoint geom) {
+ // int size
+ int result = 4;
+ if (geom.numPoints() > 0) {
+ // We can shortcut here, as all subgeoms have the same fixed size
+ result += geom.numPoints() * estimateBytes(geom.getFirstPoint());
+ }
+ return result;
+ }
+
+ private int estimateLineString(LineString geom) {
+ return estimatePointArray(geom.getPoints());
+ }
+
+ private int estimateLinearRing(LinearRing geom) {
+ return estimatePointArray(geom.getPoints());
+ }
+
+ private int estimatePolygon(Polygon geom) {
+ // int length
+ int result = 4;
+ for (int i = 0; i < geom.numRings(); i++) {
+ result += estimateLinearRing(geom.getRing(i));
+ }
+ return result;
+ }
+
+ private int estimateMultiLineString(MultiLineString geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom.getLines());
+ }
+
+ private int estimateMultiPolygon(MultiPolygon geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom.getPolygons());
+ }
+
+ private int estimateCollection(GeometryCollection geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom.getGeometries());
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/binary/ByteGetter.java b/jdbc/src/main/java/org/postgis/binary/ByteGetter.java
new file mode 100644
index 0000000..1790c26
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/ByteGetter.java
@@ -0,0 +1,73 @@
+/*
+ * ByteGetter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Parser
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.binary;
+
+public abstract class ByteGetter {
+ /**
+ * Get a byte.
+ *
+ * @return The result is returned as Int to eliminate sign problems when
+ * or'ing several values together.
+ */
+ public abstract int get(int index);
+
+ public static class BinaryByteGetter extends ByteGetter {
+ private byte[] array;
+
+ public BinaryByteGetter(byte[] array) {
+ this.array = array;
+ }
+
+ public int get(int index) {
+ return array[index] & 0xFF; // mask out sign-extended bits.
+ }
+ }
+
+ public static class StringByteGetter extends ByteGetter {
+ private String rep;
+
+ public StringByteGetter(String rep) {
+ this.rep = rep;
+ }
+
+ public int get(int index) {
+ index *= 2;
+ int high = unhex(rep.charAt(index));
+ int low = unhex(rep.charAt(index + 1));
+ return (high << 4) + low;
+ }
+
+ public static byte unhex(char c) {
+ if (c >= '0' && c <= '9') {
+ return (byte) (c - '0');
+ } else if (c >= 'A' && c <= 'F') {
+ return (byte) (c - 'A' + 10);
+ } else if (c >= 'a' && c <= 'f') {
+ return (byte) (c - 'a' + 10);
+ } else {
+ throw new IllegalArgumentException("No valid Hex char " + c);
+ }
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/binary/ByteSetter.java b/jdbc/src/main/java/org/postgis/binary/ByteSetter.java
new file mode 100644
index 0000000..5160a03
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/ByteSetter.java
@@ -0,0 +1,84 @@
+/*
+ * ByteGetter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Parser
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.binary;
+
+public abstract class ByteSetter {
+
+ /**
+ * Set a byte.
+ *
+ */
+ public abstract void set(byte b, int index);
+
+ public static class BinaryByteSetter extends ByteSetter {
+ private byte[] array;
+
+ public BinaryByteSetter(int length) {
+ this.array = new byte[length];
+ }
+
+ public void set(byte b, int index) {
+ array[index] = b; // mask out sign-extended bits.
+ }
+
+ public byte[] result() {
+ return array;
+ }
+
+ public String toString() {
+ char[] arr = new char[array.length];
+ for (int i=0; i<array.length; i++) {
+ arr[i] = (char)(array[i]&0xFF);
+ }
+ return new String(arr);
+ }
+ }
+
+ public static class StringByteSetter extends ByteSetter {
+ protected static final char[] hextypes = "0123456789ABCDEF".toCharArray();
+ private char[] rep;
+
+ public StringByteSetter(int length) {
+ this.rep = new char[length * 2];
+ }
+
+ public void set(byte b, int index) {
+ index *= 2;
+ rep[index] = hextypes[(b >>> 4) & 0xF];
+ rep[index + 1] = hextypes[b & 0xF];
+ }
+
+ public char[] resultAsArray() {
+ return rep;
+ }
+
+ public String result() {
+ return new String(rep);
+ }
+
+ public String toString() {
+ return new String(rep);
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/binary/ValueGetter.java b/jdbc/src/main/java/org/postgis/binary/ValueGetter.java
new file mode 100644
index 0000000..b10a749
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/ValueGetter.java
@@ -0,0 +1,111 @@
+/*
+ * ValueGetter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Parser
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.binary;
+
+public abstract class ValueGetter {
+ ByteGetter data;
+ int position;
+ public final byte endian;
+
+ public ValueGetter(ByteGetter data, byte endian) {
+ this.data = data;
+ this.endian = endian;
+ }
+
+ /**
+ * Get a byte, should be equal for all endians
+ */
+ public byte getByte() {
+ return (byte) data.get(position++);
+ }
+
+ public int getInt() {
+ int res = getInt(position);
+ position += 4;
+ return res;
+ }
+
+ public long getLong() {
+ long res = getLong(position);
+ position += 8;
+ return res;
+ }
+
+ /** Get a 32-Bit integer */
+ protected abstract int getInt(int index);
+
+ /**
+ * Get a long value. This is not needed directly, but as a nice side-effect
+ * from GetDouble.
+ */
+ protected abstract long getLong(int index);
+
+ /**
+ * Get a double.
+ */
+ public double getDouble() {
+ long bitrep = getLong();
+ return Double.longBitsToDouble(bitrep);
+ }
+
+ public static class XDR extends ValueGetter {
+ public static final byte NUMBER = 0;
+
+ public XDR(ByteGetter data) {
+ super(data, NUMBER);
+ }
+
+ protected int getInt(int index) {
+ return (data.get(index) << 24) + (data.get(index + 1) << 16)
+ + (data.get(index + 2) << 8) + data.get(index + 3);
+ }
+
+ protected long getLong(int index) {
+ return ((long) data.get(index) << 56) + ((long) data.get(index + 1) << 48)
+ + ((long) data.get(index + 2) << 40) + ((long) data.get(index + 3) << 32)
+ + ((long) data.get(index + 4) << 24) + ((long) data.get(index + 5) << 16)
+ + ((long) data.get(index + 6) << 8) + ((long) data.get(index + 7) << 0);
+ }
+ }
+
+ public static class NDR extends ValueGetter {
+ public static final byte NUMBER = 1;
+
+ public NDR(ByteGetter data) {
+ super(data, NUMBER);
+ }
+
+ protected int getInt(int index) {
+ return (data.get(index + 3) << 24) + (data.get(index + 2) << 16)
+ + (data.get(index + 1) << 8) + data.get(index);
+ }
+
+ protected long getLong(int index) {
+ return ((long) data.get(index + 7) << 56) + ((long) data.get(index + 6) << 48)
+ + ((long) data.get(index + 5) << 40) + ((long) data.get(index + 4) << 32)
+ + ((long) data.get(index + 3) << 24) + ((long) data.get(index + 2) << 16)
+ + ((long) data.get(index + 1) << 8) + ((long) data.get(index) << 0);
+ }
+ }
+}
diff --git a/jdbc/src/main/java/org/postgis/binary/ValueSetter.java b/jdbc/src/main/java/org/postgis/binary/ValueSetter.java
new file mode 100644
index 0000000..0810941
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/binary/ValueSetter.java
@@ -0,0 +1,129 @@
+/*
+ * ValueGetter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Parser
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.binary;
+
+public abstract class ValueSetter {
+ ByteSetter data;
+ int position=0;
+ public final byte endian;
+
+ public ValueSetter(ByteSetter data, byte endian) {
+ this.data = data;
+ this.endian = endian;
+ }
+
+ /**
+ * Get a byte, should be equal for all endians
+ */
+ public void setByte(byte value) {
+ data.set(value, position);
+ position += 1;
+ }
+
+ public void setInt(int value) {
+ setInt(value, position);
+ position += 4;
+ }
+
+ public void setLong(long value) {
+ setLong(value, position);
+ position += 8;
+ }
+
+ /** Get a 32-Bit integer */
+ protected abstract void setInt(int value, int index);
+
+ /**
+ * Get a long value. This is not needed directly, but as a nice side-effect
+ * from GetDouble.
+ */
+ protected abstract void setLong(long data, int index);
+
+ /**
+ * Get a double.
+ */
+ public void setDouble(double data) {
+ long bitrep = Double.doubleToLongBits(data);
+ setLong(bitrep);
+ }
+
+ public String toString() {
+ String name = getClass().getName();
+ int pointpos = name.lastIndexOf('.');
+ String klsName = name.substring(pointpos+1);
+ return klsName+"('"+(data==null?"NULL":data.toString()+"')");
+ }
+
+ public static class XDR extends ValueSetter {
+ public static final byte NUMBER = 0;
+
+ public XDR(ByteSetter data) {
+ super(data, NUMBER);
+ }
+
+ protected void setInt(int value, int index) {
+ data.set((byte) (value >>> 24), index);
+ data.set((byte) (value >>> 16), index + 1);
+ data.set((byte) (value >>> 8), index + 2);
+ data.set((byte) value, index + 3);
+ }
+
+ protected void setLong(long value, int index) {
+ data.set((byte) (value >>> 56), index);
+ data.set((byte) (value >>> 48), index + 1);
+ data.set((byte) (value >>> 40), index + 2);
+ data.set((byte) (value >>> 32), index + 3);
+ data.set((byte) (value >>> 24), index + 4);
+ data.set((byte) (value >>> 16), index + 5);
+ data.set((byte) (value >>> 8), index + 6);
+ data.set((byte) value, index + 7);
+ }
+ }
+
+ public static class NDR extends ValueSetter {
+ public static final byte NUMBER = 1;
+
+ public NDR(ByteSetter data) {
+ super(data, NUMBER);
+ }
+
+ protected void setInt(int value, int index) {
+ data.set((byte) (value >>> 24), index + 3);
+ data.set((byte) (value >>> 16), index + 2);
+ data.set((byte) (value >>> 8), index + 1);
+ data.set((byte) value, index);
+ }
+
+ protected void setLong(long value, int index) {
+ data.set((byte) (value >>> 56), index + 7);
+ data.set((byte) (value >>> 48), index + 6);
+ data.set((byte) (value >>> 40), index + 5);
+ data.set((byte) (value >>> 32), index + 4);
+ data.set((byte) (value >>> 24), index + 3);
+ data.set((byte) (value >>> 16), index + 2);
+ data.set((byte) (value >>> 8), index + 1);
+ data.set((byte) value, index);
+ }
+ }
+}
diff --git a/jdbc/src/main/javadoc/overview.html b/jdbc/src/main/javadoc/overview.html
new file mode 100644
index 0000000..8e46582
--- /dev/null
+++ b/jdbc/src/main/javadoc/overview.html
@@ -0,0 +1,5 @@
+<body>
+ <p>The JDBC extensions provide Java objects corresponding to the internal PostGIS types. These objects can be used
+ to write Java clients which query the PostGIS database and draw or do calculations on the GIS data in PostGIS.
+ </p>
+</body>
\ No newline at end of file
diff --git a/jdbc/src/main/resources/org/postgis/version.properties b/jdbc/src/main/resources/org/postgis/version.properties
new file mode 100644
index 0000000..2c213d3
--- /dev/null
+++ b/jdbc/src/main/resources/org/postgis/version.properties
@@ -0,0 +1 @@
+VERSION=${version}
\ No newline at end of file
diff --git a/jdbc/src/main/resources/org/postgresql/driverconfig.properties b/jdbc/src/main/resources/org/postgresql/driverconfig.properties
new file mode 100644
index 0000000..1e744c1
--- /dev/null
+++ b/jdbc/src/main/resources/org/postgresql/driverconfig.properties
@@ -0,0 +1,8 @@
+#
+# This property file is included in the postgis jar and autoregisters the
+# PostGIS datatypes within the jdbc driver.
+#
+
+datatype.geometry=org.postgis.PGgeometry
+datatype.box3d=org.postgis.PGbox3d
+datatype.box2d=org.postgis.PGbox2d
diff --git a/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java b/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java
new file mode 100644
index 0000000..3d61759
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java
@@ -0,0 +1,131 @@
+/*
+ * TestAutoregister.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.postgresql.Driver;
+import org.postgresql.util.PGobject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+
+
+/**
+ * This test program tests whether the autoregistration of PostGIS data type within the postgresql jdbc driver was
+ * successful. It also checks for PostGIS version to know whether box2d is available.
+ */
+public class AutoRegistrationTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(AutoRegistrationTest.class);
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ @Test
+ public void testAutoRegistration() throws Exception {
+
+ logger.debug("Driver version: {}", Driver.getVersion());
+ int major = new Driver().getMajorVersion();
+ Assert.assertTrue(major >= 8, "postgresql driver " + major + ".X is too old, it does not support auto-registration");
+
+ if (testWithDatabase) {
+ Statement statement = connection.createStatement();
+ int postgisServerMajor = getPostgisMajor(statement);
+ logger.debug("PostGIS Version: " + postgisServerMajor);
+ Assert.assertNotEquals(postgisServerMajor, 0, "Could not get PostGIS version. Is PostGIS really installed in the database?");
+
+ // Test geometries
+ ResultSet resultSet = statement.executeQuery("SELECT 'POINT(1 2)'::geometry");
+ resultSet.next();
+ PGobject result = (PGobject) resultSet.getObject(1);
+ Assert.assertTrue(result instanceof PGgeometry);
+
+ // Test box3d
+ resultSet = statement.executeQuery("SELECT 'BOX3D(1 2 3, 4 5 6)'::box3d");
+ resultSet.next();
+ result = (PGobject) resultSet.getObject(1);
+ Assert.assertTrue(result instanceof PGbox3d);
+
+ // Test box2d if appropriate
+ if (postgisServerMajor < 1) {
+ logger.info("PostGIS version is too old, skipping box2ed test");
+ } else {
+ resultSet = statement.executeQuery("SELECT 'BOX(1 2,3 4)'::box2d");
+ resultSet.next();
+ result = (PGobject) resultSet.getObject(1);
+ Assert.assertTrue(result instanceof PGbox2d);
+ }
+ }
+ }
+
+
+ public static int getPostgisMajor(Statement statement) throws SQLException {
+ ResultSet resultSet = statement.executeQuery("SELECT postgis_version()");
+ resultSet.next();
+ String version = resultSet.getString(1);
+ if (version == null) {
+ throw new SQLException("postgis_version returned NULL!");
+ }
+ version = version.trim();
+ int idx = version.indexOf('.');
+ return Integer.parseInt(version.substring(0, idx));
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/BoxesTest.java b/jdbc/src/test/java/org/postgis/BoxesTest.java
new file mode 100644
index 0000000..e02352b
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/BoxesTest.java
@@ -0,0 +1,145 @@
+/*
+ * Test.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.postgresql.util.PGobject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+
+
+public class BoxesTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(BoxesTest.class);
+
+ /** Our test candidates: */
+ public static final String[] BOXEN3D = new String[]{
+ "BOX3D(1 2 3,4 5 6)", // 3d variant
+ "BOX3D(1 2,4 5)"// 2d variant
+ };
+
+ public static final String[] BOXEN2D = new String[]{"BOX(1 2,3 4)"};
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+
+ @Test
+ public void testBoxes() throws Exception {
+ for (String aBOXEN3D : BOXEN3D) {
+ PGbox3d candidate = new PGbox3d(aBOXEN3D);
+ if (testWithDatabase) {
+ test(aBOXEN3D, candidate, false);
+ }
+ }
+ for (String aBOXEN2D : BOXEN2D) {
+ PGbox2d candidate = new PGbox2d(aBOXEN2D);
+ if (testWithDatabase) {
+ test(aBOXEN2D, candidate, true);
+ }
+ }
+ }
+
+
+ public void test(String orig, PGobject candidate, boolean newPostgisOnly) throws Exception {
+ logger.debug("Original: {}", orig);
+ String redone = candidate.toString();
+ logger.debug("Parsed: {}", redone);
+ Assert.assertEquals(orig, redone, "Recreated Text Rep not equal");
+
+ // Simulate the way postgresql-jdbc uses to create PGobjects
+ PGobject recreated = candidate.getClass().newInstance();
+ recreated.setValue(redone);
+
+ String reparsed = recreated.toString();
+ logger.debug("Re-Parsed: " + reparsed);
+ Assert.assertEquals(recreated, candidate, "Recreated boxen are not equal");
+ Assert.assertEquals(reparsed, orig, "2nd generation text reps are not equal");
+
+ logger.debug("testing on connection: {}", connection.getCatalog());
+ Statement statement = connection.createStatement();
+ if (newPostgisOnly && AutoRegistrationTest.getPostgisMajor(statement) < 1) {
+ logger.debug("PostGIS version is too old, not testing box2d");
+ } else {
+ PGobject sqlGeom = viaSQL(candidate, statement);
+ logger.debug("SQLin : " + sqlGeom.toString());
+ Assert.assertEquals(candidate, sqlGeom, "Geometries after SQL are not equal");
+ PGobject sqlreGeom = viaSQL(recreated, statement);
+ logger.debug("SQLout : " + sqlreGeom.toString());
+ Assert.assertEquals(candidate, sqlreGeom, "reparsed Geometries after SQL are not equal");
+ }
+ statement.close();
+ }
+
+
+ /** Pass a geometry representation through the SQL server */
+ private static PGobject viaSQL(PGobject obj, Statement stat) throws SQLException {
+ ResultSet rs = stat.executeQuery("SELECT '" + obj.toString() + "'::" + obj.getType());
+ rs.next();
+ return (PGobject) rs.getObject(1);
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName("org.postgis.DriverWrapper");
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/DatatypesTest.java b/jdbc/src/test/java/org/postgis/DatatypesTest.java
new file mode 100644
index 0000000..94cce06
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/DatatypesTest.java
@@ -0,0 +1,118 @@
+/*
+ * Test.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.sql.SQLException;
+
+
+public class DatatypesTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(DatatypesTest.class);
+
+ private static final String mlng_str = "MULTILINESTRING ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+
+ private static final String mplg_str = "MULTIPOLYGON (((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))";
+
+ private static final String plg_str = "POLYGON ((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))";
+
+ private static final String lng_str = "LINESTRING (10 10 20,20 20 20, 50 50 50, 34 34 34)";
+
+ private static final String ptg_str = "POINT(10 10 20)";
+
+ private static final String lr_str = "(10 10 20,34 34 34, 23 19 23 , 10 10 11)";
+
+
+ @Test
+ public void testLinearRing() throws SQLException {
+ logger.trace("void testLinearRing()");
+ logger.info(lr_str);
+ LinearRing lr = new LinearRing(lr_str);
+ logger.info(lr.toString());
+ }
+
+
+ @Test
+ public void testPoint() throws SQLException {
+ logger.trace("void testPoint()");
+ logger.info(ptg_str);
+ Point ptg = new Point(ptg_str);
+ logger.info(ptg.toString());
+ }
+
+
+ @Test
+ public void testLineString() throws SQLException {
+ logger.trace("void testLineString()");
+ logger.info(lng_str);
+ LineString lng = new LineString(lng_str);
+ logger.info(lng.toString());
+ }
+
+
+ @Test
+ public void testPolygon() throws SQLException {
+ logger.trace("void testPolygon()");
+ logger.info(plg_str);
+ Polygon plg = new Polygon(plg_str);
+ logger.info(plg.toString());
+ }
+
+
+ @Test
+ public void testMultiPolygon() throws SQLException {
+ logger.trace("void testMultiPolygon()");
+ logger.info(mplg_str);
+ MultiPolygon mplg = new MultiPolygon(mplg_str);
+ logger.info(mplg.toString());
+ }
+
+
+ @Test
+ public void testMultiLineString() throws SQLException {
+ logger.trace("void testMultiLineString()");
+ logger.info(mlng_str);
+ MultiLineString mlng = new MultiLineString(mlng_str);
+ logger.info(mlng.toString());
+ }
+
+
+ @Test
+ public void testPGgeometry() throws SQLException {
+ logger.trace("void testPGgeometry()");
+ logger.info(mlng_str);
+ PGgeometry pgf = new PGgeometry(mlng_str);
+ logger.info(pgf.toString());
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java b/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java
new file mode 100644
index 0000000..6a7729c
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java
@@ -0,0 +1,137 @@
+package org.postgis;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * This class contains tests for handling of empty geometries.
+ *
+ * @author Phillip Ross {@literal <phillip.r.g.ross at gmail.com>}
+ */
+public class EmptyGeometriesTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(EmptyGeometriesTest.class);
+
+ private static final String DRIVER_WRAPPER_CLASS_NAME = "org.postgis.DriverWrapper";
+
+ private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "org.postgis.DriverWrapperAutoprobe";
+
+
+ public static final String[] geometriesToTest = new String[] {
+ "POINT",
+ "LINESTRING",
+ "POLYGON",
+ "MULTIPOINT",
+ "MULTILINESTRING",
+ "MULTIPOLYGON",
+ "GEOMETRYCOLLECTION",
+ };
+
+ public static final String[] castTypes = new String[] {
+ "bytea",
+ "text",
+ "geometry"
+ };
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ private Statement statement = null;
+
+
+ @Test
+ public void testSqlStatements() throws SQLException {
+ if (testWithDatabase) {
+ for (String sqlStatement : generateSqlStatements()) {
+ logger.debug("**********");
+ logger.debug("* Executing sql statemnent => [{}]", sqlStatement);
+ logger.debug("**********");
+ try (PreparedStatement preparedStatement = connection.prepareStatement(sqlStatement);
+ ResultSet resultSet = preparedStatement.executeQuery()
+ ) {
+ resultSet.next();
+ for (int i = 1; i <= 3; i++) {
+ Object resultSetObject = resultSet.getObject(i);
+ logger.debug("returned resultSetObject {} => (class=[{}]) {}", i, resultSetObject.getClass().getName(), resultSetObject);
+ }
+ resultSet.close();
+ }
+ }
+ }
+ }
+
+
+ private List<String> generateSqlStatements() {
+ List<String> sqlStatementList = new ArrayList<>();
+ for (String geometry : geometriesToTest) {
+ StringBuilder stringBuilder = new StringBuilder("select ");
+ for (String castType : castTypes) {
+ stringBuilder.append("geometry_in('")
+ .append(geometry)
+ .append(" EMPTY')::")
+ .append(castType)
+ .append(", ");
+ }
+ String sqlStatement = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
+ logger.debug("generate sql statement: {}", sqlStatement);
+ sqlStatementList.add(sqlStatement);
+ }
+ return sqlStatementList;
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName(DRIVER_WRAPPER_CLASS_NAME);
+ Class.forName(DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME);
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ statement = connection.createStatement();
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+ @AfterClass
+ public void unallocateDatabaseResources() throws Exception {
+ if ((statement != null) && (!statement.isClosed())) {
+ statement.close();
+ }
+ if ((connection != null) && (!connection.isClosed())) {
+ connection.close();
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/ParserTest.java b/jdbc/src/test/java/org/postgis/ParserTest.java
new file mode 100644
index 0000000..21668e8
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/ParserTest.java
@@ -0,0 +1,468 @@
+/*
+ * Test.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.postgis.binary.BinaryParser;
+import org.postgis.binary.BinaryWriter;
+import org.postgis.binary.ValueSetter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+import java.util.Objects;
+
+
+public class ParserTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(ParserTest.class);
+
+ private static final String DRIVER_WRAPPER_CLASS_NAME = "org.postgis.DriverWrapper";
+
+ private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "org.postgis.DriverWrapperAutoprobe";
+
+ /** The srid we use for the srid tests */
+ public static final int SRID = 4326;
+
+ /** The string prefix we get for the srid tests */
+ public static final String SRIDPREFIX = "SRID=" + SRID + ";";
+
+ /**
+ * Our set of geometries to test.
+ */
+ public static final String ALL = "ALL";
+ public static final String ONLY10 = "ONLY10";
+ public static final String EQUAL10 = "EQUAL10";
+ public static final String[][] testset = new String[][]{
+ {
+ ALL, // 2D
+ "POINT(10 10)"},
+ {
+ ALL, // 3D with 3rd coordinate set to 0
+ "POINT(10 10 0)"},
+ {
+ ALL, // 3D
+ "POINT(10 10 20)"},
+ {
+ ALL, // 3D with scientific notation
+ "POINT(1e100 1.2345e-100 -2e-5)"},
+ {
+ ONLY10, // 2D + Measures
+ "POINTM(10 10 20)"},
+ {
+ ONLY10, // 3D + Measures
+ "POINT(10 10 20 30)"},
+ {
+ ALL, // broken format, see http://lists.jump-project.org/pipermail/jts-devel/2006-April/001572.html
+ "MULTIPOINT(11 12, 20 20)"},
+ {
+ ALL,// broken format
+ "MULTIPOINT(11 12 13, 20 20 20)"},
+ {
+ ONLY10,// broken format
+ "MULTIPOINTM(11 12 13, 20 20 20)"},
+ {
+ ONLY10,// broken format
+ "MULTIPOINT(11 12 13 14,20 20 20 20)"},
+ {
+ ALL, // OGC conforming format
+ "MULTIPOINT((11 12), (20 20))"},
+ {
+ ALL,
+ "MULTIPOINT((11 12 13), (20 20 20))"},
+ {
+ ONLY10,
+ "MULTIPOINTM((11 12 13), (20 20 20))"},
+ {
+ ONLY10,
+ "MULTIPOINT((11 12 13 14),(20 20 20 20))"},
+ {
+ ALL,
+ "LINESTRING(10 10,20 20,50 50,34 34)"},
+ {
+ ALL,
+ "LINESTRING(10 10 20,20 20 20,50 50 50,34 34 34)"},
+ {
+ ONLY10,
+ "LINESTRINGM(10 10 20,20 20 20,50 50 50,34 34 34)"},
+ {
+ ONLY10,
+ "LINESTRING(10 10 20 20,20 20 20 20,50 50 50 50,34 34 34 50)"},
+ {
+ ALL,
+ "POLYGON((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5))"},
+ {
+ ALL,
+ "POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))"},
+ {
+ ONLY10,
+ "POLYGONM((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))"},
+ {
+ ONLY10,
+ "POLYGON((10 10 0 7,20 10 0 7,20 20 0 7,20 10 0 7,10 10 0 7),(5 5 0 7,5 6 0 7,6 6 0 7,6 5 0 7,5 5 0 7))"},
+ {
+ ALL,
+ "MULTIPOLYGON(((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)),((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)))"},
+ {
+ ALL,
+ "MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ONLY10,
+ "MULTIPOLYGONM(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ONLY10,
+ "MULTIPOLYGON(((10 10 0 7,20 10 0 7,20 20 0 7,20 10 0 7,10 10 0 7),(5 5 0 7,5 6 0 7,6 6 0 7,6 5 0 7,5 5 0 7)),((10 10 0 7,20 10 0 7,20 20 0 7,20 10 0 7,10 10 0 7),(5 5 0 7,5 6 0 7,6 6 0 7,6 5 0 7,5 5 0 7)))"},
+ {
+ ALL,
+ "MULTILINESTRING((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5))"},
+ {
+ ALL,
+ "MULTILINESTRING((10 10 5,20 10 5,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))"},
+ {
+ ONLY10,
+ "MULTILINESTRINGM((10 10 7,20 10 7,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))"},
+ {
+ ONLY10,
+ "MULTILINESTRING((10 10 0 7,20 10 0 7,20 20 0 7,20 10 0 7,10 10 0 7),(5 5 0 7,5 6 0 7,6 6 0 7,6 5 0 7,5 5 0 7))"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POINT(10 10),POINT(20 20))"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POINT(10 10 20),POINT(20 20 20))"},
+ {
+ ONLY10,
+ "GEOMETRYCOLLECTION(POINT(10 10 20 7),POINT(20 20 20 7))"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34))"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ONLY10, // Cannot be parsed by 0.X servers, broken format
+ "GEOMETRYCOLLECTION(MULTIPOINT(10 10 10, 20 20 20),MULTIPOINT(10 10 10, 20 20 20))"},
+ {
+ ONLY10, // Cannot be parsed by 0.X servers, OGC conformant
+ "GEOMETRYCOLLECTION(MULTIPOINT((10 10 10), (20 20 20)),MULTIPOINT((10 10 10), (20 20 20)))"},
+ {
+ EQUAL10, // PostGIs 0.X "flattens" this geometry, so it is not
+ // equal after reparsing.
+ "GEOMETRYCOLLECTION(MULTILINESTRING((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ EQUAL10,// PostGIs 0.X "flattens" this geometry, so it is not equal
+ // after reparsing.
+ "GEOMETRYCOLLECTION(MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))),MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))))"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POINT(10 10 20),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ONLY10, // Collections that contain both X and MultiX do not work on
+ // PostGIS 0.x, broken format
+ "GEOMETRYCOLLECTION(POINT(10 10 20),MULTIPOINT(10 10 10, 20 20 20),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))),MULTILINESTRING((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ONLY10, // Collections that contain both X and MultiX do not work on
+ // PostGIS 0.x, OGC conformant
+ "GEOMETRYCOLLECTION(POINT(10 10 20),MULTIPOINT((10 10 10), (20 20 20)),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))),MULTILINESTRING((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))"},
+ {
+ ALL,// new (correct) representation
+ "GEOMETRYCOLLECTION EMPTY"},
+ {
+ ALL,
+ "GEOMETRYCOLLECTIONM(POINTM(10 10 20),POINTM(20 20 20))"},
+ // end
+ };
+
+ public static final String[][] testSetNonWorking = new String[][]{
+ {
+ ALL, // Old (bad) PostGIS 0.X Representation
+ "GEOMETRYCOLLECTION(EMPTY)"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "POINT EMPTY"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "LINESTRING EMPTY"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "POLYGON EMPTY"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "MULTIPOINT EMPTY"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "MULTILINESTRING EMPTY"},
+ {
+ ONLY10,// new (correct) representation - does not work on 0.X
+ "MULTIPOLYGON EMPTY"}
+ };
+
+ private static BinaryParser binaryParser = new BinaryParser();
+
+ private static final BinaryWriter binaryWriter = new BinaryWriter();
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ private Statement statement = null;
+
+
+ @Test
+ public void testParser() throws Exception {
+ for (String[] aTestset : testset) {
+ test(aTestset[1], aTestset[0]);
+ test(SRIDPREFIX + aTestset[1], aTestset[0]);
+ }
+ }
+
+
+ public void test(String WKT, String flags) throws SQLException {
+ logger.debug("Original: {} ", WKT);
+ Geometry geom = PGgeometry.geomFromString(WKT);
+ String parsed = geom.toString();
+ logger.debug("Parsed: {}", parsed);
+ Geometry regeom = PGgeometry.geomFromString(parsed);
+ String reparsed = regeom.toString();
+ logger.debug("Re-Parsed: {}", reparsed);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+ Assert.assertEquals(reparsed, parsed, "Text Reps are not equal");
+
+ String hexNWKT = binaryWriter.writeHexed(regeom, ValueSetter.NDR.NUMBER);
+ logger.debug("NDRHex: {}", hexNWKT);
+ regeom = PGgeometry.geomFromString(hexNWKT);
+ logger.debug("ReNDRHex: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ String hexXWKT = binaryWriter.writeHexed(regeom, ValueSetter.XDR.NUMBER);
+ logger.debug("XDRHex: {}", hexXWKT);
+ regeom = PGgeometry.geomFromString(hexXWKT);
+ logger.debug("ReXDRHex: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ byte[] NWKT = binaryWriter.writeBinary(regeom, ValueSetter.NDR.NUMBER);
+ regeom = binaryParser.parse(NWKT);
+ logger.debug("NDR: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ byte[] XWKT = binaryWriter.writeBinary(regeom, ValueSetter.XDR.NUMBER);
+ regeom = binaryParser.parse(XWKT);
+ logger.debug("XDR: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+
+ if (testWithDatabase) {
+ int serverPostgisMajor = AutoRegistrationTest.getPostgisMajor(statement);
+
+ if ((Objects.equals(flags, ONLY10)) && serverPostgisMajor < 1) {
+ logger.info("PostGIS server too old, skipping test on database connection {}", connection.getCatalog());
+ } else {
+ logger.debug("Testing on connection {}", connection.getCatalog());
+
+ Geometry sqlGeom = viaSQL(WKT);
+ logger.debug("SQLin: {}", sqlGeom);
+ if (!geom.equals(sqlGeom)) {
+ logger.warn("Geometries after SQL are not equal");
+ if (Objects.equals(flags, EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ Geometry sqlreGeom = viaSQL(parsed);
+ logger.debug("SQLout: {}", sqlreGeom);
+ if (!geom.equals(sqlreGeom)) {
+ logger.warn("Reparsed Geometries after SQL are not equal!");
+ if (Objects.equals(flags, EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ sqlreGeom = viaPrepSQL(geom, connection);
+ logger.debug("Prepared: {}", sqlreGeom.toString());
+ if (!geom.equals(sqlreGeom)) {
+ logger.warn("Reparsed Geometries after prepared StatementSQL are not equal!");
+ if (Objects.equals(flags, EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ // asEWKT() function is not present on PostGIS 0.X, and the test
+ // is pointless as 0.X uses EWKT as canonical rep so the same
+ // functionality was already tested above.
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = ewktViaSQL(WKT, statement);
+ logger.debug("asEWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+
+ // asEWKB() function is not present on PostGIS 0.X.
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = ewkbViaSQL(WKT, statement);
+ logger.debug("asEWKB: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+
+ // HexEWKB parsing is not present on PostGIS 0.X.
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = viaSQL(hexNWKT);
+ logger.debug("hexNWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = viaSQL(hexXWKT);
+ logger.debug("hexXWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+
+ // Canonical binary input is not present before 1.0
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = binaryViaSQL(NWKT, connection);
+ logger.debug("NWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = binaryViaSQL(XWKT, connection);
+ logger.debug("XWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+ }
+ }
+ }
+
+
+ /** Pass a geometry representation through the SQL server */
+ private Geometry viaSQL(String rep) throws SQLException {
+ logger.trace("Geometry viaSQL(String rep)");
+ logger.trace("[P] rep => {}", rep);
+ ResultSet resultSet = statement.executeQuery("SELECT geometry_in('" + rep + "')");
+ resultSet.next();
+ return ((PGgeometry) resultSet.getObject(1)).getGeometry();
+ }
+
+
+ /**
+ * Pass a geometry representation through the SQL server via prepared
+ * statement
+ */
+ private static Geometry viaPrepSQL(Geometry geom, Connection conn) throws SQLException {
+ PreparedStatement preparedStatement = conn.prepareStatement("SELECT ?::geometry");
+ PGgeometry wrapper = new PGgeometry(geom);
+ preparedStatement.setObject(1, wrapper, Types.OTHER);
+ ResultSet resultSet = preparedStatement.executeQuery();
+ resultSet.next();
+ PGgeometry resultwrapper = (PGgeometry)resultSet.getObject(1);
+ return resultwrapper.getGeometry();
+ }
+
+
+ /** Pass a geometry representation through the SQL server via EWKT */
+ private static Geometry ewktViaSQL(String rep, Statement stat) throws SQLException {
+ ResultSet resultSet = stat.executeQuery("SELECT ST_AsEWKT(geometry_in('" + rep + "'))");
+ resultSet.next();
+ String resrep = resultSet.getString(1);
+ return PGgeometry.geomFromString(resrep);
+ }
+
+
+ /** Pass a geometry representation through the SQL server via EWKB */
+ private static Geometry ewkbViaSQL(String rep, Statement stat) throws SQLException {
+ ResultSet resultSet = stat.executeQuery("SELECT ST_AsEWKB(geometry_in('" + rep + "'))");
+ resultSet.next();
+ byte[] resrep = resultSet.getBytes(1);
+ return binaryParser.parse(resrep);
+ }
+
+
+ /** Pass a EWKB geometry representation through the server */
+ private static Geometry binaryViaSQL(byte[] rep, Connection conn) throws SQLException {
+ PreparedStatement preparedStatement = conn.prepareStatement("SELECT ?::bytea::geometry");
+ preparedStatement.setBytes(1, rep);
+ ResultSet resultSet = preparedStatement.executeQuery();
+ resultSet.next();
+ PGgeometry resultwrapper = ((PGgeometry) resultSet.getObject(1));
+ return resultwrapper.getGeometry();
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName(DRIVER_WRAPPER_CLASS_NAME);
+ Class.forName(DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME);
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ statement = connection.createStatement();
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+ @AfterClass
+ public void unallocateDatabaseResources() throws Exception {
+ if ((statement != null) && (!statement.isClosed())) {
+ statement.close();
+ }
+ if ((connection != null) && (!connection.isClosed())) {
+ connection.close();
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/ServerTest.java b/jdbc/src/test/java/org/postgis/ServerTest.java
new file mode 100644
index 0000000..104ae29
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/ServerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Test.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+import java.util.UUID;
+
+
+public class ServerTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(ServerTest.class);
+
+ private static final String JDBC_DRIVER_CLASS_NAME = "org.postgresql.Driver";
+
+ private static final String DATABASE_TABLE_NAME_PREFIX = "jdbc_test";
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ private Statement statement = null;
+
+
+ @Test
+ public void testServer() throws Exception {
+ String dbtable = DATABASE_TABLE_NAME_PREFIX + "_" + UUID.randomUUID().toString().replaceAll("-", "");
+
+ String dropSQL = "drop table " + dbtable;
+ String createSQL = "create table " + dbtable + " (geom geometry, id int4)";
+ String insertPointSQL = "insert into " + dbtable + " values ('POINT (10 10 10)',1)";
+ String insertPolygonSQL = "insert into " + dbtable + " values ('POLYGON ((0 0 0,0 10 0,10 10 0,10 0 0,0 0 0))',2)";
+
+ if (testWithDatabase) {
+ logger.debug("Adding geometric type entries...");
+ ((org.postgresql.PGConnection)connection).addDataType("geometry", PGgeometry.class);
+ ((org.postgresql.PGConnection)connection).addDataType("box3d", PGbox3d.class);
+
+ logger.debug("Creating table with geometric types...");
+ boolean tableExists = false;
+ DatabaseMetaData databaseMetaData = connection.getMetaData();
+ try (ResultSet resultSet = databaseMetaData.getTables(null, null, dbtable.toLowerCase(), new String[] {"TABLE"})) {
+ while (resultSet.next()) {
+ tableExists = true;
+ }
+ }
+ if (tableExists) {
+ statement.execute(dropSQL);
+ }
+ statement.execute(createSQL);
+
+ logger.debug("Inserting point...");
+ statement.execute(insertPointSQL);
+
+ logger.debug("Inserting polygon...");
+ statement.execute(insertPolygonSQL);
+
+ logger.debug("Querying table...");
+ ResultSet resultSet = statement.executeQuery("select ST_AsText(geom),id from " + dbtable);
+ while (resultSet.next()) {
+ Object obj = resultSet.getObject(1);
+ int id = resultSet.getInt(2);
+ logger.debug("Row {}: {}", id, obj.toString());
+ }
+ }
+
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName(JDBC_DRIVER_CLASS_NAME);
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ statement = connection.createStatement();
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+ @AfterClass
+ public void unallocateDatabaseResources() throws Exception {
+ if ((statement != null) && (!statement.isClosed())) {
+ statement.close();
+ }
+ if ((connection != null) && (!connection.isClosed())) {
+ connection.close();
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/VersionPrinter.java b/jdbc/src/test/java/org/postgis/VersionPrinter.java
new file mode 100644
index 0000000..155b0de
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/VersionPrinter.java
@@ -0,0 +1,195 @@
+/*
+ * VersionPrinter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis;
+
+
+import org.postgresql.Driver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+
+
+/**
+ * Prints out as much version information as available.
+ */
+public class VersionPrinter {
+
+ private static final Logger logger = LoggerFactory.getLogger(VersionPrinter.class);
+
+ public static String[] POSTGIS_FUNCTIONS = {
+ "postgis_version",
+ "postgis_proj_version",
+ "postgis_scripts_installed",
+ "postgis_lib_version",
+ "postgis_scripts_released",
+ "postgis_uses_stats",
+ "postgis_geos_version",
+ "postgis_scripts_build_date",
+ "postgis_lib_build_date",
+ "postgis_full_version",
+ "postgis_gdal_version",
+ "postgis_libjson_version",
+ "postgis_libxml_version",
+ "postgis_raster_lib_version",
+ "postgis_svn_version"
+ };
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ private Statement statement = null;
+
+
+ @Test
+ public void test() throws Exception {
+
+ // Print PostGIS version
+ logger.info("*** PostGIS jdbc client code ***");
+ String fullVersion = Version.getFullVersion();
+ Assert.assertNotNull(fullVersion);
+ logger.info("\t getFullVersion: {}", fullVersion);
+
+ // Print PostgreSQL JDBC Versions
+ logger.info("*** PostgreSQL JDBC Driver ***");
+ String driverVersion = Driver.getVersion();
+ Assert.assertNotNull(driverVersion);
+ logger.info("\t getVersion: {}", driverVersion);
+
+ try {
+ Driver driver = new Driver();
+ int majorVersion = driver.getMajorVersion();
+ Assert.assertNotEquals(majorVersion, 0);
+ logger.info("\t getMajorVersion: {}", majorVersion);
+ int minorVersion = driver.getMinorVersion();
+ Assert.assertNotEquals(minorVersion, 0);
+ logger.info("\t getMinorVersion: {}", majorVersion);
+ } catch (Exception e) {
+ logger.error("Cannot create Driver instance: {}", e.getMessage());
+ }
+
+ // Print PostgreSQL server versions
+ if (testWithDatabase) {
+ Assert.assertNotNull(connection);
+ Statement statement = connection.createStatement();
+ if (statement == null) {
+ logger.info("No online version available.");
+ } else {
+ logger.info("*** PostgreSQL Server ***");
+ String versionString = getVersionString("version");
+ logger.debug("\t version: {}", versionString);
+
+ // Print PostGIS versions
+ logger.info("*** PostGIS Server ***");
+ for (String GISVERSION : POSTGIS_FUNCTIONS) {
+ versionString = getVersionString(GISVERSION);
+ logger.debug("\t {} version: {}", GISVERSION, versionString);
+ }
+ }
+ }
+ }
+
+
+ public String getVersionString(String function) throws SQLException {
+ String result = "-- unavailable -- ";
+ try {
+ ResultSet resultSet = statement.executeQuery("SELECT " + function + "()");
+ if (resultSet.next()) {
+ String version = resultSet.getString(1);
+ if (version != null) {
+ result = version.trim();
+ } else {
+ result = "-- null result --";
+ }
+ } else {
+ result = "-- no result --";
+ }
+ } catch (SQLException sqle) {
+ // If the function does not exist, a SQLException will be thrown, but it should be caught an swallowed if
+ // the "does not exist" string is in the error message. The SQLException might be thrown for some other
+ // problem not related to the missing function, so rethrow it if it doesn't contain the string.
+ if (!sqle.getMessage().contains("does not exist")) {
+ throw sqle;
+ }
+ }
+ return result;
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcDriverClassNameSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcDriverClassNameSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcDriverClassNameSystemProperty: {}", jdbcDriverClassNameSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcDriverClassName = System.getProperty(jdbcDriverClassNameSystemProperty);
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcDriverClassName: {}", jdbcDriverClassName);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName(jdbcDriverClassName);
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ statement = connection.createStatement();
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+
+ }
+
+
+ @AfterClass
+ public void unallocateDatabaseResources() throws Exception {
+ if ((statement != null) && (!statement.isClosed())) {
+ statement.close();
+ }
+ if ((connection != null) && (!connection.isClosed())) {
+ connection.close();
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/resources/logback-test.xml b/jdbc/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..645d525
--- /dev/null
+++ b/jdbc/src/test/resources/logback-test.xml
@@ -0,0 +1,15 @@
+<configuration debug="false">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+ </layout>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <logger name="org.postgis" level="ERROR"/>
+
+</configuration>
\ No newline at end of file
diff --git a/jdbc/src/test/resources/testng.xml b/jdbc/src/test/resources/testng.xml
new file mode 100644
index 0000000..b719b31
--- /dev/null
+++ b/jdbc/src/test/resources/testng.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Postgis JDBC Extensions Test Suite" verbose="1">
+
+ <parameter name="testWithDatabaseSystemProperty" value="testWithDatabase"/>
+ <parameter name="jdbcDriverClassNameSystemProperty" value="jdbcDriverClassName"/>
+ <parameter name="jdbcUrlSystemProperty" value="jdbcUrl"/>
+ <parameter name="jdbcUsernameSystemProperty" value="jdbcUsername"/>
+ <parameter name="jdbcPasswordSystemProperty" value="jdbcPassword"/>
+
+ <test name="Postgis JDBC Tests">
+ <classes>
+ <class name="org.postgis.AutoRegistrationTest"/>
+ <class name="org.postgis.BoxesTest"/>
+ <class name="org.postgis.DatatypesTest"/>
+ <class name="org.postgis.EmptyGeometriesTest"/>
+ <class name="org.postgis.ParserTest"/>
+ <class name="org.postgis.ServerTest"/>
+ <class name="org.postgis.VersionPrinter"/>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file
diff --git a/jdbc/todo.txt b/jdbc/todo.txt
new file mode 100644
index 0000000..0a8817a
--- /dev/null
+++ b/jdbc/todo.txt
@@ -0,0 +1,27 @@
+Todo for PostGIS 1.0 compatible JDBC classes
+
+- even more Testing, especialy against different postgis,
+ pgjdbc and postgresql releases.
+
+- Use JUnit for testing (maven)
+
+- Unify the build of app java projects -> maven
+
+- Handling of length() - esp. with modifying the geometries
+
+- Handling of hashCode() - esp. with modifying the geometries
+
+- Test correctness of toString() and getValue() for compatibility reasons
+
+- See where the code can be cleaned and leaned.
+
+- Finish JTS support
+
+- Creating a sane extension interface for pgjdbc that allows binary
+ transfers and convince upstream to use it, then create support for it.
+
+- Possibly adding server side code to support plJava
+ http://gborg.postgresql.org/project/pljava/projdisplay.php
+
+- Rework the BinaryParser/BinaryWriter to work on SQLInput/SQLOutput
+ instances, as well as reworking ValueGetter/ValueSetter to implment those interfaces.
diff --git a/jdbc_jtsparser/pom.xml b/jdbc_jtsparser/pom.xml
new file mode 100644
index 0000000..7667314
--- /dev/null
+++ b/jdbc_jtsparser/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-java-aggregator</artifactId>
+ <version>2.1.7.1</version>
+ </parent>
+
+ <artifactId>postgis-jdbc-jtsparser</artifactId>
+ <version>2.1.7.1</version>
+ <packaging>jar</packaging>
+
+ <name>Postgis JDBC Driver JTS Parser</name>
+ <description>Parser between JTS and PostGIS geometry formats.</description>
+
+ <properties>
+ <testWithDatabase>false</testWithDatabase>
+ <jdbcDriverClassName>org.postgresql.Driver</jdbcDriverClassName>
+ <jdbcUrl>jdbc:postgres_jts://localhost:5432/postgis1</jdbcUrl>
+ <jdbcUsername>postgis1</jdbcUsername>
+ <jdbcPassword>postgis1</jdbcPassword>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-jdbc</artifactId>
+ <version>2.1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts</artifactId>
+ <version>1.12</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <testWithDatabase>${testWithDatabase}</testWithDatabase>
+ <jdbcDriverClassName>${jdbcDriverClassName}</jdbcDriverClassName>
+ <jdbcUrl>${jdbcUrl}</jdbcUrl>
+ <jdbcUsername>${jdbcUsername}</jdbcUsername>
+ <jdbcPassword>${jdbcPassword}</jdbcPassword>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/jdbc_jtsparser/postgis-jdbc-jtsparser.iml b/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
new file mode 100644
index 0000000..d0da452
--- /dev/null
+++ b/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="postgis-jdbc" />
+ <orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
+ <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.12" level="project" />
+ <orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
new file mode 100644
index 0000000..5f34991
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
@@ -0,0 +1,279 @@
+package org.postgis.jts;
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.LinearRing;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
+
+public class JTSShape implements Shape {
+ static GeometryFactory fac = new GeometryFactory();
+
+ Geometry geom;
+
+ final static LinearRing[] NOSHELLS = {};
+
+ public JTSShape(Geometry _geom) {
+ this.geom = _geom;
+ }
+
+ public JTSShape(JtsGeometry _geom) {
+ this(_geom.getGeometry());
+ }
+
+ public boolean contains(Point2D p) {
+ return contains(p.getX(), p.getY());
+ }
+
+ public boolean contains(double x, double y) {
+ Coordinate c = new Coordinate(x, y);
+ Point p = fac.createPoint(c);
+ return geom.contains(p);
+ }
+
+ public boolean contains(Rectangle2D r) {
+ return contains(r.getMinX(), r.getMinY(), r.getWidth(), r.getHeight());
+ }
+
+ public boolean contains(double x, double y, double w, double h) {
+ Polygon p = createRect(x, y, w, h);
+ return geom.contains(p);
+ }
+
+ protected Polygon createRect(double x, double y, double w, double h) {
+ double[] arr = { x, y, x + w, y, x + w, y + h, x, y + h, x, y };
+ PackedCoordinateSequence shell = new PackedCoordinateSequence.Double(arr, 2);
+ Polygon p = fac.createPolygon(fac.createLinearRing(shell), NOSHELLS);
+ return p;
+ }
+
+ public Rectangle2D getBounds2D() {
+ Envelope env = geom.getEnvelopeInternal();
+ return new Rectangle2D.Double(env.getMinX(), env.getMaxX(), env.getWidth(), env.getHeight());
+ }
+
+ public Rectangle getBounds() {
+ // We deal simple code for efficiency here, the getBounds() rounding
+ // rules are ugly...
+ return getBounds2D().getBounds();
+ }
+
+ public PathIterator getPathIterator(AffineTransform at) {
+ return getPathIterator(geom, at);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at, double flatness) {
+ // we don't have much work here, as we only have linear segments, no
+ // "flattening" necessary.
+ return getPathIterator(at);
+ }
+
+ public boolean intersects(Rectangle2D r) {
+ return intersects(r.getMinX(), r.getMinY(), r.getWidth(), r.getHeight());
+ }
+
+ public boolean intersects(double x, double y, double w, double h) {
+ Polygon p = createRect(x, y, w, h);
+ return geom.intersects(p);
+ }
+
+ public static GeometryPathIterator getPathIterator(Geometry geometry, AffineTransform _at) {
+ if (geometry instanceof Point) {
+ return new PointPathIterator((Point) geometry, _at);
+ } else if (geometry instanceof LineString) {
+ return new LineStringPathIterator((LineString) geometry, _at);
+ } else if (geometry instanceof Polygon) {
+ return new PolygonPathIterator((Polygon) geometry, _at);
+ } else {
+ return new GeometryCollectionPathIterator((GeometryCollection) geometry, _at);
+ }
+ }
+
+ public static abstract class GeometryPathIterator implements PathIterator {
+
+ protected final AffineTransform at;
+ protected int index=0;
+
+ GeometryPathIterator(AffineTransform _at) {
+ this.at = _at;
+ }
+
+ public final int getWindingRule() {
+ return PathIterator.WIND_EVEN_ODD;
+ }
+
+ public void next() {
+ index++;
+ }
+ }
+
+ public static class PointPathIterator extends GeometryPathIterator {
+ final Point p;
+
+ public PointPathIterator(Point _p, AffineTransform _at) {
+ super(_at);
+ p = _p;
+ }
+
+ public int currentSegment(float[] coords) {
+ switch (index) {
+ case 0:
+ coords[0] = (float) p.getX();
+ coords[1] = (float) p.getY();
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_MOVETO;
+ case 1:
+ return PathIterator.SEG_CLOSE;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ public int currentSegment(double[] coords) {
+ switch (index) {
+ case 0:
+ coords[0] = p.getX();
+ coords[1] = p.getY();
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_MOVETO;
+ case 1:
+ return PathIterator.SEG_CLOSE;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ public boolean isDone() {
+ return index > 1;
+ }
+ }
+
+ public static class LineStringPathIterator extends GeometryPathIterator {
+ CoordinateSequence cs;
+
+ final boolean isRing;
+
+ public LineStringPathIterator(LineString ls, AffineTransform _at) {
+ super(_at);
+ cs = ls.getCoordinateSequence();
+ isRing = ls instanceof LinearRing;
+ }
+
+ /** only to be called from PolygonPathIterator subclass */
+ protected void reInit(CoordinateSequence _cs) {
+ cs = _cs;
+ index=0;
+ }
+
+ public int currentSegment(float[] coords) {
+ if (index == 0) {
+ coords[0] = (float) cs.getOrdinate(index, 0);
+ coords[1] = (float) cs.getOrdinate(index, 1);
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_MOVETO;
+ } else if (index < cs.size()) {
+ coords[0] = (float) cs.getOrdinate(index, 0);
+ coords[1] = (float) cs.getOrdinate(index, 1);
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_LINETO;
+ } else if (isRing && index == cs.size()) {
+ return PathIterator.SEG_CLOSE;
+ } else {
+ throw new IllegalStateException();
+ }
+ }
+
+ public int currentSegment(double[] coords) {
+ if (index == 0) {
+ coords[0] = cs.getOrdinate(index, 0);
+ coords[1] = cs.getOrdinate(index, 1);
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_MOVETO;
+ } else if (index < cs.size()) {
+ coords[0] = cs.getOrdinate(index, 0);
+ coords[1] = cs.getOrdinate(index, 1);
+ at.transform(coords, 0, coords, 0, 1);
+ return PathIterator.SEG_LINETO;
+ } else if (isRing && index == cs.size()) {
+ return PathIterator.SEG_CLOSE;
+ } else {
+ throw new IllegalStateException();
+ }
+ }
+
+ public boolean isDone() {
+ return isRing ? index > cs.size() : index >= cs.size();
+ }
+ }
+
+ public static class PolygonPathIterator extends LineStringPathIterator {
+ final Polygon pg;
+ int outerindex=-1;
+
+ public PolygonPathIterator(Polygon _pg, AffineTransform _at) {
+ super(_pg.getExteriorRing() ,_at);
+ pg=_pg;
+ index = -1;
+ }
+
+ public boolean isDone() {
+ return outerindex >= pg.getNumInteriorRing();
+ }
+
+ public void next() {
+ super.next();
+ if (super.isDone()) {
+ outerindex++;
+ if (outerindex < pg.getNumInteriorRing()) {
+ super.reInit(pg.getInteriorRingN(outerindex).getCoordinateSequence());
+ }
+ }
+ }
+ }
+
+ public static class GeometryCollectionPathIterator extends GeometryPathIterator {
+ final GeometryCollection coll;
+ GeometryPathIterator current;
+
+ public GeometryCollectionPathIterator(GeometryCollection _coll, AffineTransform _at) {
+ super(_at);
+ coll = _coll;
+ current = getPathIterator(coll.getGeometryN(index), _at);
+ }
+
+ public boolean isDone() {
+ return index > coll.getNumGeometries();
+ }
+
+ public void next() {
+ current.next();
+ if (current.isDone()) {
+ index++;
+ if (index < coll.getNumGeometries()) {
+ current = getPathIterator(coll.getGeometryN(index), at);
+ }
+ }
+ }
+
+ public int currentSegment(float[] coords) {
+ return current.currentSegment(coords);
+ }
+
+ public int currentSegment(double[] coords) {
+ return current.currentSegment(coords);
+ }
+ }
+}
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
new file mode 100644
index 0000000..1d2a0be
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
@@ -0,0 +1,240 @@
+/*
+ * JtsBinaryParser.java
+ *
+ * Binary Parser for JTS - relies on org.postgis V1.0.0+ package.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.jts;
+
+import org.postgis.binary.ByteGetter;
+import org.postgis.binary.ValueGetter;
+import org.postgis.binary.ByteGetter.BinaryByteGetter;
+import org.postgis.binary.ByteGetter.StringByteGetter;
+
+import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
+
+/**
+ * Parse binary representation of geometries. Currently, only text rep (hexed)
+ * implementation is tested.
+ *
+ * It should be easy to add char[] and CharSequence ByteGetter instances,
+ * although the latter one is not compatible with older jdks.
+ *
+ * I did not implement real unsigned 32-bit integers or emulate them with long,
+ * as both java Arrays and Strings currently can have only 2^31-1 elements
+ * (bytes), so we cannot even get or build Geometries with more than approx.
+ * 2^28 coordinates (8 bytes each).
+ *
+ * @author Markus Schaber, markus.schaber at logix-tt.com
+ *
+ */
+public class JtsBinaryParser {
+
+ /**
+ * Get the appropriate ValueGetter for my endianness
+ *
+ * @param bytes
+ * The appropriate Byte Getter
+ *
+ * @return the ValueGetter
+ */
+ public static ValueGetter valueGetterForEndian(ByteGetter bytes) {
+ if (bytes.get(0) == ValueGetter.XDR.NUMBER) { // XDR
+ return new ValueGetter.XDR(bytes);
+ } else if (bytes.get(0) == ValueGetter.NDR.NUMBER) {
+ return new ValueGetter.NDR(bytes);
+ } else {
+ throw new IllegalArgumentException("Unknown Endian type:" + bytes.get(0));
+ }
+ }
+
+ /**
+ * Parse a hex encoded geometry
+ */
+ public Geometry parse(String value) {
+ StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes));
+ }
+
+ /**
+ * Parse a binary encoded geometry.
+ */
+ public Geometry parse(byte[] value) {
+ BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes));
+ }
+
+ /** Parse a geometry starting at offset. */
+ protected Geometry parseGeometry(ValueGetter data) {
+ return parseGeometry(data, 0, false);
+ }
+
+ /** Parse with a known geometry factory */
+ protected Geometry parseGeometry(ValueGetter data, int srid, boolean inheritSrid) {
+ byte endian = data.getByte(); // skip and test endian flag
+ if (endian != data.endian) {
+ throw new IllegalArgumentException("Endian inconsistency!");
+ }
+ int typeword = data.getInt();
+
+ int realtype = typeword & 0x1FFFFFFF; // cut off high flag bits
+
+ boolean haveZ = (typeword & 0x80000000) != 0;
+ boolean haveM = (typeword & 0x40000000) != 0;
+ boolean haveS = (typeword & 0x20000000) != 0;
+
+ if (haveS) {
+ int newsrid = org.postgis.Geometry.parseSRID(data.getInt());
+ if (inheritSrid && newsrid != srid) {
+ throw new IllegalArgumentException("Inconsistent srids in complex geometry: " + srid + ", " + newsrid);
+ } else {
+ srid = newsrid;
+ }
+ } else if (!inheritSrid) {
+ srid = org.postgis.Geometry.UNKNOWN_SRID;
+ }
+
+ Geometry result;
+ switch (realtype) {
+ case org.postgis.Geometry.POINT:
+ result = parsePoint(data, haveZ, haveM);
+ break;
+ case org.postgis.Geometry.LINESTRING:
+ result = parseLineString(data, haveZ, haveM);
+ break;
+ case org.postgis.Geometry.POLYGON:
+ result = parsePolygon(data, haveZ, haveM, srid);
+ break;
+ case org.postgis.Geometry.MULTIPOINT:
+ result = parseMultiPoint(data, srid);
+ break;
+ case org.postgis.Geometry.MULTILINESTRING:
+ result = parseMultiLineString(data, srid);
+ break;
+ case org.postgis.Geometry.MULTIPOLYGON:
+ result = parseMultiPolygon(data, srid);
+ break;
+ case org.postgis.Geometry.GEOMETRYCOLLECTION:
+ result = parseCollection(data, srid);
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Geometry Type!");
+ }
+
+ result.setSRID(srid);
+
+ return result;
+ }
+
+ private Point parsePoint(ValueGetter data, boolean haveZ, boolean haveM) {
+ double X = data.getDouble();
+ double Y = data.getDouble();
+ Point result;
+ if (haveZ) {
+ double Z = data.getDouble();
+ result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y, Z));
+ } else {
+ result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y));
+ }
+
+ if (haveM) { // skip M value
+ data.getDouble();
+ }
+
+ return result;
+ }
+
+ /** Parse an Array of "full" Geometries */
+ private void parseGeometryArray(ValueGetter data, Geometry[] container, int srid) {
+ for (int i = 0; i < container.length; i++) {
+ container[i] = parseGeometry(data, srid, true);
+ }
+ }
+
+ /**
+ * Parse an Array of "slim" Points (without endianness and type, part of
+ * LinearRing and Linestring, but not MultiPoint!
+ *
+ * @param haveZ
+ * @param haveM
+ */
+ private CoordinateSequence parseCS(ValueGetter data, boolean haveZ, boolean haveM) {
+ int count = data.getInt();
+ int dims = haveZ ? 3 : 2;
+ CoordinateSequence cs = new PackedCoordinateSequence.Double(count, dims);
+
+ for (int i = 0; i < count; i++) {
+ for (int d = 0; d < dims; d++) {
+ cs.setOrdinate(i, d, data.getDouble());
+ }
+ if (haveM) { // skip M value
+ data.getDouble();
+ }
+ }
+ return cs;
+ }
+
+ private MultiPoint parseMultiPoint(ValueGetter data, int srid) {
+ Point[] points = new Point[data.getInt()];
+ parseGeometryArray(data, points, srid);
+ return JtsGeometry.geofac.createMultiPoint(points);
+ }
+
+ private LineString parseLineString(ValueGetter data, boolean haveZ, boolean haveM) {
+ return JtsGeometry.geofac.createLineString(parseCS(data, haveZ, haveM));
+ }
+
+ private LinearRing parseLinearRing(ValueGetter data, boolean haveZ, boolean haveM) {
+ return JtsGeometry.geofac.createLinearRing(parseCS(data, haveZ, haveM));
+ }
+
+ private Polygon parsePolygon(ValueGetter data, boolean haveZ, boolean haveM, int srid) {
+ int holecount = data.getInt() - 1;
+ LinearRing[] rings = new LinearRing[holecount];
+ LinearRing shell = parseLinearRing(data, haveZ, haveM);
+ shell.setSRID(srid);
+ for (int i = 0; i < holecount; i++) {
+ rings[i] = parseLinearRing(data, haveZ, haveM);
+ rings[i].setSRID(srid);
+ }
+ return JtsGeometry.geofac.createPolygon(shell, rings);
+ }
+
+ private MultiLineString parseMultiLineString(ValueGetter data, int srid) {
+ int count = data.getInt();
+ LineString[] strings = new LineString[count];
+ parseGeometryArray(data, strings, srid);
+ return JtsGeometry.geofac.createMultiLineString(strings);
+ }
+
+ private MultiPolygon parseMultiPolygon(ValueGetter data, int srid) {
+ int count = data.getInt();
+ Polygon[] polys = new Polygon[count];
+ parseGeometryArray(data, polys, srid);
+ return JtsGeometry.geofac.createMultiPolygon(polys);
+ }
+
+ private GeometryCollection parseCollection(ValueGetter data, int srid) {
+ int count = data.getInt();
+ Geometry[] geoms = new Geometry[count];
+ parseGeometryArray(data, geoms, srid);
+ return JtsGeometry.geofac.createGeometryCollection(geoms);
+ }
+}
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
new file mode 100644
index 0000000..a7dc43b
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
@@ -0,0 +1,392 @@
+/*
+ * JtsBinaryWriter.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - Binary Writer
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.jts;
+
+import com.vividsolutions.jts.geom.CoordinateSequence;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.MultiLineString;
+import com.vividsolutions.jts.geom.MultiPoint;
+import com.vividsolutions.jts.geom.MultiPolygon;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import org.postgis.binary.ByteSetter;
+import org.postgis.binary.ValueSetter;
+
+/**
+ * Create binary representation of geometries. Currently, only text rep (hexed)
+ * implementation is tested. Supports only 2 dimensional geometries.
+ *
+ * It should be easy to add char[] and CharSequence ByteGetter instances,
+ * although the latter one is not compatible with older jdks.
+ *
+ * I did not implement real unsigned 32-bit integers or emulate them with long,
+ * as both java Arrays and Strings currently can have only 2^31-1 elements
+ * (bytes), so we cannot even get or build Geometries with more than approx.
+ * 2^28 coordinates (8 bytes each).
+ *
+ * @author markus.schaber at logi-track.com
+ *
+ */
+public class JtsBinaryWriter {
+
+ /**
+ * Get the appropriate ValueGetter for my endianness
+ *
+ * @param bytes
+ * The appropriate Byte Getter
+ *
+ * @return the ValueGetter
+ */
+ public static ValueSetter valueSetterForEndian(ByteSetter bytes, byte endian) {
+ if (endian == ValueSetter.XDR.NUMBER) { // XDR
+ return new ValueSetter.XDR(bytes);
+ } else if (endian == ValueSetter.NDR.NUMBER) {
+ return new ValueSetter.NDR(bytes);
+ } else {
+ throw new IllegalArgumentException("Unknown Endian type:" + endian);
+ }
+ }
+
+ /**
+ * Write a hex encoded geometry
+ *
+ * Currently, geometries with more than 2 dimensions and measures are not
+ * cleanly supported, but SRID is honored.
+ */
+ public String writeHexed(Geometry geom, byte REP) {
+ int length = estimateBytes(geom);
+ ByteSetter.StringByteSetter bytes = new ByteSetter.StringByteSetter(length);
+ writeGeometry(geom, valueSetterForEndian(bytes, REP));
+ return bytes.result();
+ }
+
+ public String writeHexed(Geometry geom) {
+ return writeHexed(geom, ValueSetter.NDR.NUMBER);
+ }
+
+ /**
+ * Write a binary encoded geometry.
+ *
+ * Currently, geometries with more than 2 dimensions and measures are not
+ * cleanly supported, but SRID is honored.
+ */
+ public byte[] writeBinary(Geometry geom, byte REP) {
+ int length = estimateBytes(geom);
+ ByteSetter.BinaryByteSetter bytes = new ByteSetter.BinaryByteSetter(length);
+ writeGeometry(geom, valueSetterForEndian(bytes, REP));
+ return bytes.result();
+ }
+
+ public byte[] writeBinary(Geometry geom) {
+ return writeBinary(geom, ValueSetter.NDR.NUMBER);
+ }
+
+ /** Parse a geometry starting at offset. */
+ protected void writeGeometry(Geometry geom, ValueSetter dest) {
+ final int dimension;
+ if (geom == null) {
+ throw new NullPointerException();
+ } else if (geom.isEmpty()) {
+ // don't set any flag bits
+ dimension = 0;
+ } else {
+ dimension = getCoordDim(geom);
+ if (dimension < 2 || dimension > 4) {
+ throw new IllegalArgumentException("Unsupported geometry dimensionality: " + dimension);
+ }
+ }
+ // write endian flag
+ dest.setByte(dest.endian);
+
+ // write typeword
+ final int plaintype = getWKBType(geom);
+ int typeword = plaintype;
+ if (dimension == 3 || dimension == 4) {
+ typeword |= 0x80000000;
+ }
+ if (dimension == 4) {
+ typeword |= 0x40000000;
+ }
+
+ final boolean haveSrid = checkSrid(geom);
+ if (haveSrid) {
+ typeword |= 0x20000000;
+ }
+
+ dest.setInt(typeword);
+
+ if (haveSrid) {
+ dest.setInt(geom.getSRID());
+ }
+
+ switch (plaintype) {
+ case org.postgis.Geometry.POINT:
+ writePoint((Point) geom, dest);
+ break;
+ case org.postgis.Geometry.LINESTRING:
+ writeLineString((LineString) geom, dest);
+ break;
+ case org.postgis.Geometry.POLYGON:
+ writePolygon((Polygon) geom, dest);
+ break;
+ case org.postgis.Geometry.MULTIPOINT:
+ writeMultiPoint((MultiPoint) geom, dest);
+ break;
+ case org.postgis.Geometry.MULTILINESTRING:
+ writeMultiLineString((MultiLineString) geom, dest);
+ break;
+ case org.postgis.Geometry.MULTIPOLYGON:
+ writeMultiPolygon((MultiPolygon) geom, dest);
+ break;
+ case org.postgis.Geometry.GEOMETRYCOLLECTION:
+ writeCollection((GeometryCollection) geom, dest);
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Geometry Type: " + plaintype);
+ }
+ }
+
+ public static int getWKBType(Geometry geom) {
+ // We always write emtpy geometries as emtpy collections - for OpenGIS
+ // conformance
+ if (geom.isEmpty()) {
+ return org.postgis.Geometry.GEOMETRYCOLLECTION;
+ } else if (geom instanceof Point) {
+ return org.postgis.Geometry.POINT;
+ } else if (geom instanceof com.vividsolutions.jts.geom.LineString) {
+ return org.postgis.Geometry.LINESTRING;
+ } else if (geom instanceof com.vividsolutions.jts.geom.Polygon) {
+ return org.postgis.Geometry.POLYGON;
+ } else if (geom instanceof MultiPoint) {
+ return org.postgis.Geometry.MULTIPOINT;
+ } else if (geom instanceof MultiLineString) {
+ return org.postgis.Geometry.MULTILINESTRING;
+ } else if (geom instanceof com.vividsolutions.jts.geom.MultiPolygon) {
+ return org.postgis.Geometry.MULTIPOLYGON;
+ } if (geom instanceof com.vividsolutions.jts.geom.GeometryCollection) {
+ return org.postgis.Geometry.GEOMETRYCOLLECTION;
+ } else {
+ throw new IllegalArgumentException("Unknown Geometry Type: " + geom.getClass().getName());
+ }
+ }
+
+ /**
+ * Writes a "slim" Point (without endiannes, srid ant type, only the
+ * ordinates and measure. Used by writeGeometry.
+ */
+ private void writePoint(Point geom, ValueSetter dest) {
+ writeCoordinates(geom.getCoordinateSequence(), getCoordDim(geom), dest);
+ }
+
+ /**
+ * Write a Coordinatesequence, part of LinearRing and Linestring, but not
+ * MultiPoint!
+ */
+ private void writeCoordinates(CoordinateSequence seq, int dims, ValueSetter dest) {
+ for (int i = 0; i < seq.size(); i++) {
+ for (int d = 0; d < dims; d++) {
+ dest.setDouble(seq.getOrdinate(i, d));
+ }
+ }
+ }
+
+ private void writeMultiPoint(MultiPoint geom, ValueSetter dest) {
+ dest.setInt(geom.getNumPoints());
+ for (int i = 0; i < geom.getNumPoints(); i++) {
+ writeGeometry(geom.getGeometryN(i), dest);
+ }
+ }
+
+ private void writeLineString(LineString geom, ValueSetter dest) {
+ dest.setInt(geom.getNumPoints());
+ writeCoordinates(geom.getCoordinateSequence(), getCoordDim(geom), dest);
+ }
+
+ private void writePolygon(Polygon geom, ValueSetter dest) {
+ dest.setInt(geom.getNumInteriorRing() + 1);
+ writeLineString(geom.getExteriorRing(), dest);
+ for (int i = 0; i < geom.getNumInteriorRing(); i++) {
+ writeLineString(geom.getInteriorRingN(i), dest);
+ }
+ }
+
+ private void writeMultiLineString(MultiLineString geom, ValueSetter dest) {
+ writeGeometryArray(geom, dest);
+ }
+
+ private void writeMultiPolygon(MultiPolygon geom, ValueSetter dest) {
+ writeGeometryArray(geom, dest);
+ }
+
+ private void writeCollection(GeometryCollection geom, ValueSetter dest) {
+ writeGeometryArray(geom, dest);
+ }
+
+ private void writeGeometryArray(Geometry geom, ValueSetter dest) {
+ dest.setInt(geom.getNumGeometries());
+ for (int i = 0; i < geom.getNumGeometries(); i++) {
+ writeGeometry(geom.getGeometryN(i), dest);
+ }
+ }
+
+ /** Estimate how much bytes a geometry will need in WKB. */
+ protected int estimateBytes(Geometry geom) {
+ int result = 0;
+
+ // write endian flag
+ result += 1;
+
+ // write typeword
+ result += 4;
+
+ if (checkSrid(geom)) {
+ result += 4;
+ }
+
+ switch (getWKBType(geom)) {
+ case org.postgis.Geometry.POINT:
+ result += estimatePoint((Point) geom);
+ break;
+ case org.postgis.Geometry.LINESTRING:
+ result += estimateLineString((LineString) geom);
+ break;
+ case org.postgis.Geometry.POLYGON:
+ result += estimatePolygon((Polygon) geom);
+ break;
+ case org.postgis.Geometry.MULTIPOINT:
+ result += estimateMultiPoint((MultiPoint) geom);
+ break;
+ case org.postgis.Geometry.MULTILINESTRING:
+ result += estimateMultiLineString((MultiLineString) geom);
+ break;
+ case org.postgis.Geometry.MULTIPOLYGON:
+ result += estimateMultiPolygon((MultiPolygon) geom);
+ break;
+ case org.postgis.Geometry.GEOMETRYCOLLECTION:
+ result += estimateCollection((GeometryCollection) geom);
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Geometry Type: " + getWKBType(geom));
+ }
+ return result;
+ }
+
+ private boolean checkSrid(Geometry geom) {
+ final int srid = geom.getSRID();
+ return (srid > 0);
+ }
+
+ private int estimatePoint(Point geom) {
+ return 8 * getCoordDim(geom);
+ }
+
+ /** Write an Array of "full" Geometries */
+ private int estimateGeometryArray(Geometry container) {
+ int result = 0;
+ for (int i = 0; i < container.getNumGeometries(); i++) {
+ result += estimateBytes(container.getGeometryN(i));
+ }
+ return result;
+ }
+
+ /** Estimate an array of "fat" Points */
+ private int estimateMultiPoint(MultiPoint geom) {
+ // int size
+ int result = 4;
+ if (geom.getNumGeometries() > 0) {
+ // We can shortcut here, compared to estimateGeometryArray, as all
+ // subgeoms have the same fixed size
+ result += geom.getNumGeometries() * estimateBytes(geom.getGeometryN(0));
+ }
+ return result;
+ }
+
+ private int estimateLineString(LineString geom) {
+ if (geom == null || geom.getNumGeometries() == 0) {
+ return 0;
+ } else {
+ return 4 + 8 * getCoordSequenceDim(geom.getCoordinateSequence()) * geom.getCoordinateSequence().size();
+ }
+ }
+
+ private int estimatePolygon(Polygon geom) {
+ // int length
+ int result = 4;
+ result += estimateLineString(geom.getExteriorRing());
+ for (int i = 0; i < geom.getNumInteriorRing(); i++) {
+ result += estimateLineString(geom.getInteriorRingN(i));
+ }
+ return result;
+ }
+
+ private int estimateMultiLineString(MultiLineString geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom);
+ }
+
+ private int estimateMultiPolygon(MultiPolygon geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom);
+ }
+
+ private int estimateCollection(GeometryCollection geom) {
+ // 4-byte count + subgeometries
+ return 4 + estimateGeometryArray(geom);
+ }
+
+ public static final int getCoordDim(Geometry geom) {
+ if (geom.isEmpty()) {
+ return 0;
+ }
+ if (geom instanceof Point) {
+ return getCoordSequenceDim(((Point) geom).getCoordinateSequence());
+ } else if (geom instanceof LineString) {
+ return getCoordSequenceDim(((LineString) geom).getCoordinateSequence());
+ } else if (geom instanceof Polygon) {
+ return getCoordSequenceDim(((Polygon) geom).getExteriorRing().getCoordinateSequence());
+ } else {
+ return getCoordDim(geom.getGeometryN(0));
+ }
+ }
+
+ public static final int getCoordSequenceDim(CoordinateSequence coords) {
+ if (coords == null || coords.size() == 0)
+ return 0;
+ // JTS has a really strange way to handle dimensions!
+ // Just have a look at PackedCoordinateSequence and
+ // CoordinateArraySequence
+ int dimensions = coords.getDimension();
+ if (dimensions == 3) {
+ // CoordinateArraySequence will always return 3, so we have to
+ // check, if
+ // the third ordinate contains NaN, then the geom is actually
+ // 2-dimensional
+ return Double.isNaN(coords.getOrdinate(0, CoordinateSequence.Z)) ? 2 : 3;
+ } else {
+ return dimensions;
+ }
+ }
+}
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
new file mode 100644
index 0000000..3a4d91e
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
@@ -0,0 +1,158 @@
+/*
+ * JtsGeometry.java
+ *
+ * Wrapper for PostgreSQL JDBC driver to allow transparent reading and writing
+ * of JTS geometries
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.jts;
+
+import java.sql.SQLException;
+
+import org.postgresql.util.PGobject;
+
+import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Polygon;
+import com.vividsolutions.jts.geom.PrecisionModel;
+import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
+import com.vividsolutions.jts.io.WKTReader;
+
+/**
+ * JTS Geometry SQL wrapper. Supports PostGIS 1.x (lwgeom hexwkb) for writing
+ * and both PostGIS 0.x (EWKT) and 1.x (lwgeom hexwkb) for reading.
+ *
+ * @author Markus Schaber
+ */
+
+public class JtsGeometry extends PGobject {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ Geometry geom;
+
+ final static JtsBinaryParser bp = new JtsBinaryParser();
+
+ final static JtsBinaryWriter bw = new JtsBinaryWriter();
+
+ final static PrecisionModel prec = new PrecisionModel();
+
+ final static CoordinateSequenceFactory csfac = PackedCoordinateSequenceFactory.DOUBLE_FACTORY;
+
+ final static GeometryFactory geofac = new GeometryFactory(prec, 0, csfac);
+
+ static final WKTReader reader = new WKTReader(geofac);
+
+ /** Constructor called by JDBC drivers */
+ public JtsGeometry() {
+ setType("geometry");
+ }
+
+ public JtsGeometry(Geometry geom) {
+ this();
+ this.geom = geom;
+ }
+
+ public JtsGeometry(String value) throws SQLException {
+ this();
+ setValue(value);
+ }
+
+ public void setValue(String value) throws SQLException {
+ geom = geomFromString(value);
+ }
+
+ public static Geometry geomFromString(String value) throws SQLException {
+ try {
+ value = value.trim();
+ if (value.startsWith("00") || value.startsWith("01")) {
+ return bp.parse(value);
+ } else {
+ Geometry result;
+ // no srid := 0 in JTS world
+ int srid = 0;
+ // break up geometry into srid and wkt
+ if (value.startsWith("SRID=")) {
+ String[] temp = value.split(";");
+ value = temp[1].trim();
+ srid = Integer.parseInt(temp[0].substring(5));
+ }
+
+ result = reader.read(value);
+ setSridRecurse(result, srid);
+ return result;
+ }
+ } catch (Exception E) {
+ E.printStackTrace();
+ throw new SQLException("Error parsing SQL data:" + E);
+ }
+ }
+
+ /** Recursively set a srid for the geometry and all subgeometries */
+ public static void setSridRecurse(final Geometry geom, final int srid) {
+ geom.setSRID(srid);
+ if (geom instanceof GeometryCollection) {
+ final int subcnt = geom.getNumGeometries();
+ for (int i = 0; i < subcnt; i++) {
+ setSridRecurse(geom.getGeometryN(i), srid);
+ }
+ } else if (geom instanceof Polygon) {
+ Polygon poly = (Polygon) geom;
+ poly.getExteriorRing().setSRID(srid);
+ final int subcnt = poly.getNumInteriorRing();
+ for (int i = 0; i < subcnt; i++) {
+ poly.getInteriorRingN(i).setSRID(srid);
+ }
+ }
+ }
+
+ public Geometry getGeometry() {
+ return geom;
+ }
+
+ public String toString() {
+ return geom.toString();
+ }
+
+ public String getValue() {
+ return bw.writeHexed(getGeometry());
+ }
+
+ public Object clone() {
+ JtsGeometry obj = new JtsGeometry(geom);
+ obj.setType(type);
+ return obj;
+ }
+
+ public boolean equals(Object obj) {
+ if ((obj != null) && (obj instanceof JtsGeometry)) {
+ Geometry other = ((JtsGeometry) obj).geom;
+ if (this.geom == other) { // handles identity as well as both
+ // ==null
+ return true;
+ } else if (this.geom != null && other != null) {
+ return other.equals(this.geom);
+ }
+ }
+ return false;
+ }
+}
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
new file mode 100644
index 0000000..62caa0f
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
@@ -0,0 +1,154 @@
+/*
+ * JtsWrapper.java
+ *
+ * Allows transparent usage of JTS Geometry classes via PostgreSQL JDBC driver
+ * connected to a PostGIS enabled PostgreSQL server.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.jts;
+
+import org.postgresql.Driver;
+import org.postgresql.PGConnection;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+
+/**
+ * JtsGisWrapper
+ *
+ * Wraps the PostGreSQL Driver to add the JTS/PostGIS Object Classes.
+ *
+ * This method currently works with J2EE DataSource implementations, and with
+ * DriverManager framework.
+ *
+ * Simply replace the "jdbc:postgresql:" with a "jdbc:postgresql_JTS" in the
+ * jdbc URL.
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ */
+public class JtsGisWrapper extends Driver {
+
+ private static final String POSTGRES_PROTOCOL = "jdbc:postgresql:";
+ private static final String POSTGIS_PROTOCOL = "jdbc:postgresql_JTS:";
+ public static final String REVISION = "$Revision$";
+
+ public JtsGisWrapper() {
+ super();
+ }
+
+ static {
+ try {
+ // Analogy to org.postgresql.Driver
+ java.sql.DriverManager.registerDriver(new JtsGisWrapper());
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Creates a postgresql connection, and then adds the PostGIS data types to
+ * it calling addpgtypes()
+ *
+ * @param url the URL of the database to connect to
+ * @param info a list of arbitrary tag/value pairs as connection arguments
+ * @return a connection to the URL or null if it isnt us
+ * @exception SQLException if a database access error occurs
+ *
+ * @see java.sql.Driver#connect
+ * @see org.postgresql.Driver
+ */
+ public java.sql.Connection connect(String url, Properties info) throws SQLException {
+ url = mangleURL(url);
+ Connection result = super.connect(url, info);
+ addGISTypes((PGConnection) result);
+ return result;
+ }
+
+ /**
+ * adds the JTS/PostGIS Data types to a PG Connection.
+ *
+ * @throws SQLException
+ */
+ public static void addGISTypes(PGConnection pgconn) throws SQLException {
+ pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class);
+ pgconn.addDataType("box3d", org.postgis.PGbox3d.class);
+ pgconn.addDataType("box2d", org.postgis.PGbox2d.class);
+ }
+
+ /**
+ * Mangles the PostGIS URL to return the original PostGreSQL URL
+ */
+ public static String mangleURL(String url) throws SQLException {
+ if (url.startsWith(POSTGIS_PROTOCOL)) {
+ return POSTGRES_PROTOCOL + url.substring(POSTGIS_PROTOCOL.length());
+ } else {
+ throw new SQLException("Unknown protocol or subprotocol in url " + url);
+ }
+ }
+
+ /**
+ * Returns true if the driver thinks it can open a connection to the given
+ * URL. Typically, drivers will return true if they understand the
+ * subprotocol specified in the URL and false if they don't. Our protocols
+ * start with jdbc:postgresql_postGIS:
+ *
+ * @see java.sql.Driver#acceptsURL
+ * @param url the URL of the driver
+ * @return true if this driver accepts the given URL
+ * @exception SQLException if a database-access error occurs (Dont know why
+ * it would *shrug*)
+ */
+ public boolean acceptsURL(String url) throws SQLException {
+ try {
+ url = mangleURL(url);
+ } catch (SQLException e) {
+ return false;
+ }
+ return super.acceptsURL(url);
+ }
+
+ /**
+ * Gets the underlying drivers major version number
+ *
+ * @return the drivers major version number
+ */
+
+ public int getMajorVersion() {
+ return super.getMajorVersion();
+ }
+
+ /**
+ * Get the underlying drivers minor version number
+ *
+ * @return the drivers minor version number
+ */
+ public int getMinorVersion() {
+ return super.getMinorVersion();
+ }
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ */
+ public static String getVersion() {
+ return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
+ }
+}
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
new file mode 100644
index 0000000..53a70cc
--- /dev/null
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
@@ -0,0 +1,159 @@
+/*
+ * JtsWrapper.java
+ *
+ * Allows transparent usage of JTS Geometry classes via PostgreSQL JDBC driver
+ * connected to a PostGIS enabled PostgreSQL server.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.jts;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.postgresql.Driver;
+import org.postgresql.PGConnection;
+
+/**
+ * DriverWrapper
+ *
+ * Wraps the PostGreSQL Driver to add the JTS/PostGIS Object Classes.
+ *
+ * This method currently works with J2EE DataSource implementations, and with
+ * DriverManager framework.
+ *
+ * Simply replace the "jdbc:postgresql:" with a "jdbc:postgres_jts:" in the jdbc
+ * URL.
+ *
+ * When using the drivermanager, you need to initialize JtsWrapper instead of
+ * (or in addition to) org.postgresql.Driver. When using a J2EE DataSource
+ * implementation, set the driver class property in the datasource config, the
+ * following works for jboss:
+ *
+ * <driver-class>org.postgis.jts.PostGisWrapper</driver-class>
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ */
+public class JtsWrapper extends Driver {
+
+ protected static final Logger logger = Logger.getLogger("org.postgis.DriverWrapper");
+
+ private static final String POSTGRES_PROTOCOL = "jdbc:postgresql:";
+ private static final String POSTGIS_PROTOCOL = "jdbc:postgres_jts:";
+ public static final String REVISION = "$Revision$";
+
+ public JtsWrapper() {
+ super();
+ }
+
+ static {
+ try {
+ // Try to register ourself to the DriverManager
+ java.sql.DriverManager.registerDriver(new JtsWrapper());
+ } catch (SQLException e) {
+ logger.log(Level.WARNING, "Error registering PostgreSQL Jts Wrapper Driver", e);
+ }
+ }
+
+ /**
+ * Creates a postgresql connection, and then adds the JTS GIS data types to
+ * it calling addpgtypes()
+ *
+ * @param url the URL of the database to connect to
+ * @param info a list of arbitrary tag/value pairs as connection arguments
+ * @return a connection to the URL or null if it isnt us
+ * @exception SQLException if a database access error occurs
+ *
+ * @see java.sql.Driver#connect
+ * @see org.postgresql.Driver
+ */
+ public java.sql.Connection connect(String url, Properties info) throws SQLException {
+ url = mangleURL(url);
+ Connection result = super.connect(url, info);
+ addGISTypes((PGConnection) result);
+ return result;
+ }
+
+ /**
+ * adds the JTS/PostGIS Data types to a PG Connection.
+ * @throws SQLException
+ */
+ public static void addGISTypes(PGConnection pgconn) throws SQLException {
+ pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class);
+ }
+
+ /**
+ * Mangles the PostGIS URL to return the original PostGreSQL URL
+ */
+ public static String mangleURL(String url) throws SQLException {
+ if (url.startsWith(POSTGIS_PROTOCOL)) {
+ return POSTGRES_PROTOCOL + url.substring(POSTGIS_PROTOCOL.length());
+ } else {
+ throw new SQLException("Unknown protocol or subprotocol in url " + url);
+ }
+ }
+
+ /**
+ * Check whether the driver thinks he can handle the given URL.
+ *
+ * @see java.sql.Driver#acceptsURL
+ * @param url the URL of the driver
+ * @return true if this driver accepts the given URL
+ * @exception SQLException Passed through from the underlying PostgreSQL
+ * driver, should not happen.
+ */
+ public boolean acceptsURL(String url) throws SQLException {
+ try {
+ url = mangleURL(url);
+ } catch (SQLException e) {
+ return false;
+ }
+ return super.acceptsURL(url);
+ }
+
+ /**
+ * Gets the underlying drivers major version number
+ *
+ * @return the drivers major version number
+ */
+
+ public int getMajorVersion() {
+ return super.getMajorVersion();
+ }
+
+ /**
+ * Get the underlying drivers minor version number
+ *
+ * @return the drivers minor version number
+ */
+ public int getMinorVersion() {
+ return super.getMinorVersion();
+ }
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ */
+ public static String getVersion() {
+ return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
+ }
+}
diff --git a/jdbc_jtsparser/src/main/javadoc/overview.html b/jdbc_jtsparser/src/main/javadoc/overview.html
new file mode 100644
index 0000000..99e6224
--- /dev/null
+++ b/jdbc_jtsparser/src/main/javadoc/overview.html
@@ -0,0 +1 @@
+<body><p>Parser between JTS and PostGIS geometry formats.</p></body>
\ No newline at end of file
diff --git a/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java b/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
new file mode 100644
index 0000000..8840d48
--- /dev/null
+++ b/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
@@ -0,0 +1,442 @@
+package org.postgis.jts;
+
+
+import org.postgis.binary.ValueSetter;
+
+import com.vividsolutions.jts.geom.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.sql.*;
+
+
+/**
+ * JtsParseTest
+ *
+ * This test class was adapted from the {@code JtsTestParsr} example standalone class.
+ * It is meant to be run in standalone mode or run against a PostGIS database, but it will need to be
+ * fixed to run against a PostGIS database as it currently fails in some places with an error:
+ * {@literal function asewkb(geometry) does not exist}
+ */
+public class JtsParserTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(JtsParserTest.class);
+
+ private static final String JTS_WRAPPER_CLASS_NAME = "org.postgis.jts.JtsWrapper";
+
+ /** The srid we use for the srid tests */
+ public static final int SRID = 4326;
+
+ /** The string prefix we get for the srid tests */
+ public static final String SRIDPREFIX = "SRID=" + SRID + ";";
+
+ /**
+ * Our set of geometries to test.
+ */
+ public static final String ALL = "ALL";
+ public static final String ONLY10 = "ONLY10";
+ public static final String EQUAL10 = "EQUAL10";
+ public static final String[][] testset = new String[][] {
+ { ALL, // 2D
+ "POINT(10 10)" },
+ { ALL, // 3D with 3rd coordinate set to 0
+ "POINT(10 10 0)" },
+ { ALL, // 3D
+ "POINT(10 10 20)" },
+ { ALL, "MULTIPOINT(11 12, 20 20)" },
+ { ALL, "MULTIPOINT(11 12 13, 20 20 20)" },
+ { ALL, "LINESTRING(10 10,20 20,50 50,34 34)" },
+ { ALL, "LINESTRING(10 10 20,20 20 20,50 50 50,34 34 34)" },
+ { ALL, "POLYGON((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5))" },
+ { ALL, "POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))" },
+ {
+ ALL,
+ "MULTIPOLYGON(((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)),((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)))" },
+ {
+ ALL,
+ "MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))" },
+ { ALL, "MULTILINESTRING((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5))" },
+ { ALL, "MULTILINESTRING((10 10 5,20 10 5,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))" },
+ { ALL, "GEOMETRYCOLLECTION(POINT(10 10),POINT(20 20))" },
+ { ALL, "GEOMETRYCOLLECTION(POINT(10 10 20),POINT(20 20 20))" },
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34))" },
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))" },
+ { ONLY10, // Cannot be parsed by 0.X servers
+ "GEOMETRYCOLLECTION(MULTIPOINT(10 10 10, 20 20 20),MULTIPOINT(10 10 10, 20 20 20))" },
+ { EQUAL10, // PostGIs 0.X "flattens" this geometry, so it is not
+ // equal after reparsing.
+ "GEOMETRYCOLLECTION(MULTILINESTRING((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))" },
+ { EQUAL10,// PostGIs 0.X "flattens" this geometry, so it is not
+ // equal
+ // after reparsing.
+ "GEOMETRYCOLLECTION(MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))),MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))))" },
+ {
+ ALL,
+ "GEOMETRYCOLLECTION(POINT(10 10 20),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))" },
+ { ONLY10, // Collections that contain both X and MultiX do not
+ // work on
+ // PostGIS 0.x
+ "GEOMETRYCOLLECTION(POINT(10 10 20),MULTIPOINT(10 10 10, 20 20 20),LINESTRING(10 10 20,20 20 20, 50 50 50, 34 34 34),POLYGON((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),MULTIPOLYGON(((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))),MULTILINESTRING((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))" },
+ { ALL,// new (correct) representation
+ "GEOMETRYCOLLECTION EMPTY" },
+ };
+
+ private static JtsBinaryParser jtsBinaryParser = new JtsBinaryParser();
+
+ private static final JtsBinaryWriter jtsBinaryWriter = new JtsBinaryWriter();
+
+ private boolean testWithDatabase = false;
+
+ private Connection connection = null;
+
+ private Statement statement = null;
+
+
+ @Test
+ public void test() throws Exception {
+ for (String[] aTestset : testset) {
+ test(aTestset[1], aTestset[0]);
+ test(SRIDPREFIX + aTestset[1], aTestset[0]);
+ }
+ }
+
+
+ public void test(String WKT, String flags) throws SQLException {
+ logger.debug("Original: {}", WKT);
+ Geometry geom = JtsGeometry.geomFromString(WKT);
+ String parsed = geom.toString();
+ if (WKT.startsWith("SRID=")) {
+ parsed = "SRID=" + geom.getSRID() + ";" + parsed;
+ }
+ logger.debug("Parsed: {}", parsed);
+ Geometry regeom = JtsGeometry.geomFromString(parsed);
+ String reparsed = regeom.toString();
+ if (WKT.startsWith("SRID=")) {
+ reparsed = "SRID=" + geom.getSRID() + ";" + reparsed;
+ }
+ logger.debug("Re-Parsed: {}", reparsed);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+ Assert.assertEquals(geom.getSRID(), regeom.getSRID(), "Geometry SRIDs are not equal");
+ Assert.assertEquals(reparsed, parsed, "Text Reps are not equal");
+
+ String hexNWKT = jtsBinaryWriter.writeHexed(geom, ValueSetter.NDR.NUMBER);
+ logger.debug("NDRHex: {}", hexNWKT);
+ regeom = JtsGeometry.geomFromString(hexNWKT);
+ logger.debug("ReNDRHex: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ String hexXWKT = jtsBinaryWriter.writeHexed(geom, ValueSetter.XDR.NUMBER);
+ logger.debug("XDRHex: {}", hexXWKT);
+ regeom = JtsGeometry.geomFromString(hexXWKT);
+ logger.debug("ReXDRHex: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ byte[] NWKT = jtsBinaryWriter.writeBinary(geom, ValueSetter.NDR.NUMBER);
+ regeom = jtsBinaryParser.parse(NWKT);
+ logger.debug("NDR: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ byte[] XWKT = jtsBinaryWriter.writeBinary(geom, ValueSetter.XDR.NUMBER);
+ regeom = jtsBinaryParser.parse(XWKT);
+ logger.debug("XDR: {}", regeom);
+ Assert.assertEquals(geom, regeom, "Geometries are not equal");
+
+ Geometry coordArrayGeom = rebuildCS(geom);
+ logger.debug("CoordArray: {}", regeom);
+ Assert.assertEquals(geom, coordArrayGeom, "Geometries are not equal");
+
+ String coordArrayWKT = jtsBinaryWriter.writeHexed(coordArrayGeom, ValueSetter.NDR.NUMBER);
+ logger.debug("HexCArray: {}", coordArrayWKT);
+ Assert.assertEquals(coordArrayWKT, hexNWKT, "CoordArray HexWKT is not equal");
+
+ if (testWithDatabase) {
+ int serverPostgisMajor = getPostgisMajor();
+
+ if ((flags.equals(ONLY10)) && serverPostgisMajor < 1) {
+ logger.info("PostGIS server too old, skipping test on connection {}", connection.getCatalog());
+ } else {
+ logger.debug("Testing on connection {}", connection.getCatalog());
+
+ Geometry sqlGeom = viaSQL(WKT, statement);
+ logger.debug("SQLin: {}", sqlGeom.toString());
+ if (!geom.equalsExact(sqlGeom)) {
+ logger.warn("Geometries after SQL are not equal");
+ if (flags.equals(EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ Geometry sqlreGeom = viaSQL(parsed, statement);
+ logger.debug("SQLout: {}", sqlreGeom);
+ if (!geom.equalsExact(sqlreGeom)) {
+ logger.warn("Reparsed Geometries after SQL are not equal");
+ if (flags.equals(EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ sqlreGeom = viaPrepSQL(geom, connection);
+ logger.debug("Prepared: {}", sqlreGeom);
+ if (!geom.equalsExact(sqlreGeom)) {
+ logger.debug("Reparsed Geometries after prepared StatementSQL are not equal");
+ if (flags.equals(EQUAL10) && serverPostgisMajor < 1) {
+ logger.info("This is expected with PostGIS {}.X", serverPostgisMajor);
+ } else {
+ Assert.fail();
+ }
+ }
+
+ // asEWKT() function is not present on PostGIS 0.X, and the test
+ // is pointless as 0.X uses EWKT as canonical rep so the same
+ // functionality was already tested above.
+ if (serverPostgisMajor >= 1) {
+ sqlGeom = ewktViaSQL(WKT, statement);
+ logger.debug("asEWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+
+ sqlGeom = ewkbViaSQL(WKT, statement);
+ logger.debug("asEWKB: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+
+ sqlGeom = viaSQL(hexNWKT, statement);
+ logger.debug("hexNWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+
+ sqlGeom = viaSQL(hexXWKT, statement);
+ logger.debug("hexXWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+
+ sqlGeom = binaryViaSQL(NWKT, connection);
+ logger.debug("NWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+
+ sqlGeom = binaryViaSQL(XWKT, connection);
+ logger.debug("XWKT: {}", sqlGeom);
+ Assert.assertEquals(geom, sqlGeom);
+ }
+ }
+ }
+ }
+
+
+ /** Pass a geometry representation through the SQL server */
+ private static Geometry viaSQL(String rep, Statement stat) throws SQLException {
+ ResultSet rs = stat.executeQuery("SELECT geometry_in('" + rep + "')");
+ rs.next();
+ return ((JtsGeometry) rs.getObject(1)).getGeometry();
+ }
+
+
+ /**
+ * Pass a geometry representation through the SQL server via prepared
+ * statement
+ */
+ private static Geometry viaPrepSQL(Geometry geom, Connection conn) throws SQLException {
+ PreparedStatement prep = conn.prepareStatement("SELECT ?::geometry");
+ JtsGeometry wrapper = new JtsGeometry(geom);
+ prep.setObject(1, wrapper, Types.OTHER);
+ ResultSet rs = prep.executeQuery();
+ rs.next();
+ JtsGeometry resultwrapper = ((JtsGeometry) rs.getObject(1));
+ return resultwrapper.getGeometry();
+ }
+
+
+ /** Pass a geometry representation through the SQL server via EWKT */
+ private static Geometry ewktViaSQL(String rep, Statement stat) throws SQLException {
+ ResultSet rs = stat.executeQuery("SELECT ST_AsEWKT(geometry_in('" + rep + "'))");
+ rs.next();
+ String resrep = rs.getString(1);
+ return JtsGeometry.geomFromString(resrep);
+ }
+
+
+ /** Pass a geometry representation through the SQL server via EWKB */
+ private static Geometry ewkbViaSQL(String rep, Statement stat) throws SQLException {
+ ResultSet rs = stat.executeQuery("SELECT ST_AsEWKB(geometry_in('" + rep + "'))");
+ rs.next();
+ byte[] resrep = rs.getBytes(1);
+ return jtsBinaryParser.parse(resrep);
+ }
+
+
+ /** Pass a EWKB geometry representation through the server */
+ private static Geometry binaryViaSQL(byte[] rep, Connection conn) throws SQLException {
+ PreparedStatement prep = conn.prepareStatement("SELECT ?::bytea::geometry");
+ prep.setBytes(1, rep);
+ ResultSet rs = prep.executeQuery();
+ rs.next();
+ JtsGeometry resultwrapper = ((JtsGeometry) rs.getObject(1));
+ return resultwrapper.getGeometry();
+ }
+
+
+ // Rebuild given Geometry with a CoordinateArraySequence implementation.
+ public static Geometry rebuildCS(Geometry geom) {
+ if (geom instanceof Point) {
+ return rebuildCSPoint((Point)geom);
+ } else if (geom instanceof MultiPoint) {
+ return rebuildCSMP((MultiPoint)geom);
+ } else if (geom instanceof LineString) {
+ return rebuildCSLS((LineString)geom);
+ } else if (geom instanceof MultiLineString) {
+ return rebuildCSMLS((MultiLineString)geom);
+ } else if (geom instanceof Polygon) {
+ return rebuildCSP((Polygon)geom);
+ } else if (geom instanceof MultiPolygon) {
+ return rebuildCSMP((MultiPolygon)geom);
+ } else if (geom instanceof GeometryCollection) {
+ return rebuildCSGC((GeometryCollection)geom);
+ } else {
+ throw new AssertionError();
+ }
+ }
+
+
+ private static Point rebuildCSPoint(Point point) {
+ Point result = point.getFactory().createPoint(point.getCoordinate());
+ result.setSRID(point.getSRID());
+ return result;
+ }
+
+
+ private static MultiPoint rebuildCSMP(MultiPoint mp) {
+ Point[] points = new Point[mp.getNumGeometries()];
+ for (int i=0; i < points.length; i++) {
+ points[i] = rebuildCSPoint((Point) mp.getGeometryN(i));
+ }
+ MultiPoint result = mp.getFactory().createMultiPoint(points);
+ result.setSRID(mp.getSRID());
+ return result;
+ }
+
+
+ private static MultiPolygon rebuildCSMP(MultiPolygon multipoly) {
+ Polygon[] polygons = new Polygon[multipoly.getNumGeometries()];
+ for (int i=0; i < polygons.length; i++) {
+ polygons[i] = rebuildCSP((Polygon)multipoly.getGeometryN(i));
+ }
+ MultiPolygon result = multipoly.getFactory().createMultiPolygon(polygons);
+ result.setSRID(multipoly.getSRID());
+ return result;
+ }
+
+
+ private static LineString rebuildCSLS(LineString line) {
+ LineString result = line.getFactory().createLineString(line.getCoordinates());
+ result.setSRID(line.getSRID());
+ return result;
+ }
+
+
+ private static MultiLineString rebuildCSMLS(MultiLineString multiline) {
+ LineString[] polygons = new LineString[multiline.getNumGeometries()];
+ for (int i=0; i < polygons.length; i++) {
+ polygons[i] = rebuildCSLS((LineString)multiline.getGeometryN(i));
+ }
+ MultiLineString result = multiline.getFactory().createMultiLineString(polygons);
+ result.setSRID(multiline.getSRID());
+ return result;
+
+ }
+
+
+ private static Polygon rebuildCSP(Polygon polygon) {
+ LinearRing outer = rebuildLR(polygon.getExteriorRing());
+ LinearRing[] holes = new LinearRing[polygon.getNumInteriorRing()];
+ for (int i=0; i < holes.length; i++) {
+ holes[i] = rebuildLR(polygon.getInteriorRingN(i));
+ }
+ Polygon result = polygon.getFactory().createPolygon(outer, holes);
+ result.setSRID(polygon.getSRID());
+ return result;
+ }
+
+
+ private static LinearRing rebuildLR(LineString ring) {
+ LinearRing result = ring.getFactory().createLinearRing(ring.getCoordinates());
+ result.setSRID(ring.getSRID());
+ return result;
+ }
+
+
+ private static Geometry rebuildCSGC(GeometryCollection coll) {
+ Geometry[] geoms = new Geometry[coll.getNumGeometries()];
+ for (int i = 0; i < coll.getNumGeometries(); i++) {
+ geoms[i] = rebuildCS(coll.getGeometryN(i));
+ }
+ Geometry result = coll.getFactory().createGeometryCollection(geoms);
+ result.setSRID(coll.getSRID());
+ return result;
+ }
+
+
+ public int getPostgisMajor() throws SQLException {
+ ResultSet resultSet = statement.executeQuery("SELECT postgis_version()");
+ resultSet.next();
+ String version = resultSet.getString(1);
+ if (version == null) {
+ throw new SQLException("postgis_version returned NULL!");
+ }
+ version = version.trim();
+ int idx = version.indexOf('.');
+ return Integer.parseInt(version.substring(0, idx));
+ }
+
+
+ @BeforeClass
+ @Parameters({"testWithDatabaseSystemProperty", "jdbcUrlSystemProperty", "jdbcUsernameSystemProperty", "jdbcPasswordSystemProperty"})
+ public void initJdbcConnection(String testWithDatabaseSystemProperty,
+ String jdbcUrlSystemProperty,
+ String jdbcUsernameSystemProperty,
+ String jdbcPasswordSystemProperty) throws Exception {
+ logger.debug("testWithDatabaseSystemProperty: {}", testWithDatabaseSystemProperty);
+ logger.debug("jdbcUrlSystemProperty: {}", jdbcUrlSystemProperty);
+ logger.debug("jdbcUsernameSystemProperty: {}", jdbcUsernameSystemProperty);
+ logger.debug("jdbcPasswordSystemProperty: {}", jdbcPasswordSystemProperty);
+
+ testWithDatabase = Boolean.parseBoolean(System.getProperty(testWithDatabaseSystemProperty));
+ String jdbcUrl = System.getProperty(jdbcUrlSystemProperty);
+ String jdbcUsername = System.getProperty(jdbcUsernameSystemProperty);
+ String jdbcPassword = System.getProperty(jdbcPasswordSystemProperty);
+
+ logger.debug("testWithDatabase: {}", testWithDatabase);
+ logger.debug("jdbcUrl: {}", jdbcUrl);
+ logger.debug("jdbcUsername: {}", jdbcUsername);
+ logger.debug("jdbcPassword: {}", jdbcPassword);
+
+ if (testWithDatabase) {
+ Class.forName(JTS_WRAPPER_CLASS_NAME);
+ connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword);
+ statement = connection.createStatement();
+ } else {
+ logger.info("testWithDatabase value was false. Database tests will be skipped.");
+ }
+ }
+
+
+ @AfterClass
+ public void unallocateDatabaseResources() throws Exception {
+ if ((statement != null) && (!statement.isClosed())) {
+ statement.close();
+ }
+ if ((connection != null) && (!connection.isClosed())) {
+ connection.close();
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc_jtsparser/src/test/resources/logback-test.xml b/jdbc_jtsparser/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..53dbdf8
--- /dev/null
+++ b/jdbc_jtsparser/src/test/resources/logback-test.xml
@@ -0,0 +1,15 @@
+<configuration debug="false">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+ </layout>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <logger name="org.postgis.jts" level="ERROR"/>
+
+</configuration>
\ No newline at end of file
diff --git a/jdbc_jtsparser/src/test/resources/testng.xml b/jdbc_jtsparser/src/test/resources/testng.xml
new file mode 100644
index 0000000..9cae669
--- /dev/null
+++ b/jdbc_jtsparser/src/test/resources/testng.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="JTS Parser Test Suite" verbose="1">
+
+ <parameter name="testWithDatabaseSystemProperty" value="testWithDatabase"/>
+ <parameter name="jdbcDriverClassNameSystemProperty" value="jdbcDriverClassName"/>
+ <parameter name="jdbcUrlSystemProperty" value="jdbcUrl"/>
+ <parameter name="jdbcUsernameSystemProperty" value="jdbcUsername"/>
+ <parameter name="jdbcPasswordSystemProperty" value="jdbcPassword"/>
+
+ <test name="JTS Parser Tests">
+ <classes>
+ <class name="org.postgis.jts.JtsParserTest"/>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a873578
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-java-aggregator</artifactId>
+ <version>2.1.7.1</version>
+ <packaging>pom</packaging>
+
+ <name>Postgis Java Project</name>
+ <description>Aggregates java projects associated with the Postgis project.</description>
+ <url>http://postgis.net</url>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Postgis Development Team</name>
+ </developer>
+ <developer>
+ <name>María Arias de Reyna</name>
+ <email>delawen en gmail.com</email>
+ </developer>
+ <developer>
+ <name>Baris ERGUN</name>
+ <email>barisergun75 at gmail.com</email>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Hakan Tandogan</name>
+ <email>hakan at gurkensalat.com</email>
+ <url>http://www.gurkensalat.com/</url>
+ <roles>
+ <role>Maven Packager</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>Baris Ergun</name>
+ <email>barisergun75 at gmail.com</email>
+ <url>http://www.barisergun.com/</url>
+ <roles>
+ <role>Maven Packager</role>
+ </roles>
+ </contributor>
+ </contributors>
+
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>postgis-users-subscribe at lists.osgeo.org</subscribe>
+ <unsubscribe>postgis-users-unsubscribe at lists.osgeo.org</unsubscribe>
+ <post>postgis-users at lists.osgeo.org</post>
+ <archive>http://lists.osgeo.org/pipermail/postgis-users/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Developer List</name>
+ <subscribe>postgis-devel-subscribe at lists.osgeo.org</subscribe>
+ <unsubscribe>postgis-devel-unsubscribe at lists.osgeo.org</unsubscribe>
+ <post>postgis-devel at lists.osgeo.org</post>
+ <archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <modules>
+ <module>jdbc</module>
+ <module>jdbc_jtsparser</module>
+ <module>postgis-jdbc-java2d</module>
+ </modules>
+
+ <scm>
+ <url>https://github.com/postgis/postgis-java</url>
+ <connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
+ <developerConnection>scm:git:git at github.com:postgis/postgis-java.git</developerConnection>
+ <tag>v2.1.7.1</tag>
+ </scm>
+ <issueManagement>
+ <system>GitHub Issues</system>
+ <url>https://github.com/postgis/postgis-java/issues</url>
+ </issueManagement>
+ <distributionManagement>
+ <repository>
+ <id>sonatype-postgis-releases</id>
+ <name>Sonatype Postgis Releases Repo</name>
+ <url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.min.version>1.7</java.min.version>
+ <maven.min.version>3.3</maven.min.version>
+ <maven.test.skip>false</maven.test.skip>
+ <surefire.forkCount>1</surefire.forkCount>
+ <surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
+ <!-- Plugin versioning -->
+ <maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
+ <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
+ <maven-ear-plugin.version>2.10</maven-ear-plugin.version>
+ <maven-enforcer-plugin.version>1.4</maven-enforcer-plugin.version>
+ <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+ <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
+ <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+ <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
+ <maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
+ <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
+ <maven-source-plugin.version>2.4</maven-source-plugin.version>
+ <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+ <maven-war-plugin.version>2.6</maven-war-plugin.version>
+ <!-- Dependency versions -->
+ <dependency.logback.version>1.1.3</dependency.logback.version>
+ <dependency.slfj.version>1.7.12</dependency.slfj.version>
+ <dependency.testng.version>6.9.4</dependency.testng.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${dependency.logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${dependency.logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${dependency.slfj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${dependency.testng.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${maven-clean-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <source>${java.min.version}</source>
+ <target>${java.min.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>${maven-ear-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[${maven.min.version},)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${maven-gpg-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${maven-install-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>${maven-jarsigner-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ <configuration>
+ <forkCount>${surefire.forkCount}</forkCount>
+ <skip>${maven.test.skip}</skip>
+ <systemPropertyVariables>
+ <derby.stream.error.file>
+ ${project.build.directory}/derby.log
+ </derby.stream.error.file>
+ </systemPropertyVariables>
+ <useSystemClassLoader>${surefire.useSystemClassLoader}</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${maven-war-plugin.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+
+ <!--
+ The release-sign-artifacts profile only needs activated when cutting a release for maven central.
+ It will generate additional artifacts for javadoc and source as well as GPG signatures for each artifact.
+ This profile also assumes that the properties for the gpg plugin (such as gpg.keyname and gpg.passphrase
+ are either defined in a settings.xml file or similar facility.
+ -->
+ <profile>
+ <id>release-sign-artifacts</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
diff --git a/postgis-java-aggregator.iml b/postgis-java-aggregator.iml
new file mode 100644
index 0000000..f6e9bf2
--- /dev/null
+++ b/postgis-java-aggregator.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/pom.xml b/postgis-jdbc-java2d/pom.xml
new file mode 100644
index 0000000..6d81b5d
--- /dev/null
+++ b/postgis-jdbc-java2d/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-java-aggregator</artifactId>
+ <version>2.1.7.1</version>
+ </parent>
+
+ <artifactId>postgis-jdbc-java2d</artifactId>
+ <version>2.1.7.1</version>
+ <packaging>jar</packaging>
+
+ <name>postgis-jdbc-java2d</name>
+ <description>Transparent readonly support for PostGIS objects as Java2D path objects</description>
+
+ <properties>
+ <testWithDatabase>false</testWithDatabase>
+ <jdbcDriverClassName>org.postgresql.Driver</jdbcDriverClassName>
+ <jdbcUrl>jdbc:postgres_jts://localhost:5432/postgis1</jdbcUrl>
+ <jdbcUsername>postgis1</jdbcUsername>
+ <jdbcPassword>postgis1</jdbcPassword>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-jdbc</artifactId>
+ <version>2.1.7.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <testWithDatabase>${testWithDatabase}</testWithDatabase>
+ <jdbcDriverClassName>${jdbcDriverClassName}</jdbcDriverClassName>
+ <jdbcUrl>${jdbcUrl}</jdbcUrl>
+ <jdbcUsername>${jdbcUsername}</jdbcUsername>
+ <jdbcPassword>${jdbcPassword}</jdbcPassword>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/postgis-jdbc-java2d.iml b/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
new file mode 100644
index 0000000..f32aba9
--- /dev/null
+++ b/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="postgis-jdbc" />
+ <orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java b/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java
new file mode 100644
index 0000000..9bc5183
--- /dev/null
+++ b/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java
@@ -0,0 +1,177 @@
+/*
+ * Test.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2004 Paul Ramsey, pramsey at refractions.net
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package examples;
+
+import java.awt.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import org.postgis.java2d.Java2DWrapper;
+
+public class TestJava2d {
+ private static final boolean DEBUG = true;
+
+ public static final Shape[] SHAPEARRAY = new Shape[0];
+
+ static {
+ new Java2DWrapper(); // make shure our driver is initialized
+ }
+
+ public static void main(String[] args) throws ClassNotFoundException, SQLException {
+
+ if (args.length != 5) {
+ System.err.println("Usage: java examples/TestJava2D dburl user pass tablename column");
+ System.err.println();
+ System.err.println("dburl has the following format:");
+ System.err.println(Java2DWrapper.POSTGIS_PROTOCOL + "//HOST:PORT/DATABASENAME");
+ System.err.println("tablename is 'jdbc_test' by default.");
+ System.exit(1);
+ }
+
+ Shape[] geometries = read(args[0], args[1], args[2], "SELECT " + args[4] + " FROM "
+ + args[3]);
+
+ if (geometries.length == 0) {
+ System.err.println("No geometries were found.");
+ return;
+ }
+
+ System.err.println("Painting...");
+ Frame window = new Frame("PostGIS java2D demo");
+
+ Canvas CV = new GisCanvas(geometries);
+
+ window.add(CV);
+
+ window.setSize(500, 500);
+
+ window.addWindowListener(new EventHandler());
+
+ window.setVisible(true);
+ }
+
+ static Rectangle2D calcbbox(Shape[] geometries) {
+ Rectangle2D bbox = geometries[0].getBounds2D();
+ for (int i = 1; i < geometries.length; i++) {
+ bbox = bbox.createUnion(geometries[i].getBounds2D());
+ }
+ return bbox;
+ }
+
+ private static Shape[] read(String dburl, String dbuser, String dbpass, String query)
+ throws ClassNotFoundException, SQLException {
+ ArrayList geometries = new ArrayList();
+ System.out.println("Creating JDBC connection...");
+ Class.forName("org.postgresql.Driver");
+ Connection conn = DriverManager.getConnection(dburl, dbuser, dbpass);
+
+ System.out.println("fetching geometries");
+ ResultSet r = conn.createStatement().executeQuery(query);
+
+ while (r.next()) {
+ final Shape current = (Shape) r.getObject(1);
+ if (current != null) {
+ geometries.add(current);
+ }
+ }
+ conn.close();
+ return (Shape[]) geometries.toArray(SHAPEARRAY);
+ }
+
+ public static class GisCanvas extends Canvas {
+ /** Keep java 1.5 compiler happy */
+ private static final long serialVersionUID = 1L;
+
+ final Rectangle2D bbox;
+ final Shape[] geometries;
+
+ public GisCanvas(Shape[] geometries) {
+ this.geometries = geometries;
+ this.bbox = calcbbox(geometries);
+ setBackground(Color.GREEN);
+ }
+
+ public void paint(Graphics og) {
+ Graphics2D g = (Graphics2D) og;
+
+ final double scaleX = (super.getWidth() - 10) / bbox.getWidth();
+ final double scaleY = (super.getHeight() - 10) / bbox.getHeight();
+
+ AffineTransform at = new AffineTransform();
+ at.translate(super.getX() + 5, super.getY() + 5);
+ at.scale(scaleX, scaleY);
+ at.translate(-bbox.getX(), -bbox.getY());
+
+ if (DEBUG) {
+ System.err.println();
+ System.err.println("bbox: " + bbox);
+ System.err.println("trans: " + at);
+ System.err.println("new: " + at.createTransformedShape(bbox).getBounds2D());
+ System.err.println("visual:" + super.getBounds());
+ }
+ for (int i = 0; i < geometries.length; i++) {
+ g.setPaint(Color.BLUE);
+ final Shape shape = at.createTransformedShape(geometries[i]);
+ g.fill(shape);
+ g.setPaint(Color.ORANGE);
+ g.draw(shape);
+ }
+ }
+ }
+
+ public static class EventHandler implements WindowListener {
+
+ public void windowActivated(WindowEvent e) {//
+ }
+
+ public void windowClosed(WindowEvent e) {//
+ }
+
+ public void windowClosing(WindowEvent e) {
+ e.getWindow().setVisible(false);
+ System.exit(0);
+ }
+
+ public void windowDeactivated(WindowEvent e) {//
+ }
+
+ public void windowDeiconified(WindowEvent e) {//
+ }
+
+ public void windowIconified(WindowEvent e) {//
+ }
+
+ public void windowOpened(WindowEvent e) {//
+ }
+ }
+}
diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
new file mode 100644
index 0000000..cc30e8b
--- /dev/null
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
@@ -0,0 +1,173 @@
+/*
+ * JtsWrapper.java
+ *
+ * Allows transparent usage of JTS Geometry classes via PostgreSQL JDBC driver
+ * connected to a PostGIS enabled PostgreSQL server.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.java2d;
+
+import org.postgresql.Driver;
+import org.postgresql.PGConnection;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+/**
+ * Java2DWrapper
+ *
+ * Wraps the PostGreSQL Driver to add transparent readonly support for PostGIS
+ * objects into java2d path objects.
+ *
+ * This method currently works with J2EE DataSource implementations, and with
+ * DriverManager framework.
+ *
+ * Simply replace the "jdbc:postgresql:" with a "jdbc:postgis_j2d" in the
+ * jdbc URL.
+ *
+ * @author markus.schaber at logix-tt.com
+ *
+ */
+public class Java2DWrapper extends Driver {
+
+ private static final String POSTGRES_PROTOCOL = "jdbc:postgresql:";
+ public static final String POSTGIS_PROTOCOL = "jdbc:postgis_j2d:";
+ public static final String REVISION = "$Revision$";
+
+ public Java2DWrapper() {
+ super();
+ }
+
+ static {
+ try {
+ // Analogy to org.postgresql.Driver
+ java.sql.DriverManager.registerDriver(new Java2DWrapper());
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Creates a postgresql connection, and then adds the PostGIS data types to
+ * it calling addpgtypes()
+ *
+ * @param url the URL of the database to connect to
+ * @param info a list of arbitrary tag/value pairs as connection arguments
+ * @return a connection to the URL or null if it isnt us
+ * @exception SQLException if a database access error occurs
+ *
+ * @see java.sql.Driver#connect
+ * @see org.postgresql.Driver
+ */
+ public java.sql.Connection connect(String url, Properties info) throws SQLException {
+ url = mangleURL(url);
+ Connection result = super.connect(url, info);
+ addGISTypes((PGConnection) result);
+ return result;
+ }
+
+
+ /**
+ * Adds the JTS/PostGIS Data types to a PG Connection.
+ *
+ * @throws SQLException when a SQLException occurs
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when an SQLException occurs
+ */
+ public static void addGISTypes(PGConnection pgconn) throws SQLException {
+ pgconn.addDataType("geometry", PGShapeGeometry.class);
+ pgconn.addDataType("box3d", org.postgis.PGbox3d.class);
+ pgconn.addDataType("box2d", org.postgis.PGbox2d.class);
+ }
+
+
+ /**
+ * Mangles the PostGIS URL to return the original PostGreSQL URL
+ *
+ * @param url String containing the url to be "mangled"
+ * @return "mangled" string
+ * @throws SQLException when a SQLException occurs
+ */
+ public static String mangleURL(String url) throws SQLException {
+ if (url.startsWith(POSTGIS_PROTOCOL)) {
+ return POSTGRES_PROTOCOL + url.substring(POSTGIS_PROTOCOL.length());
+ } else {
+ throw new SQLException("Unknown protocol or subprotocol in url " + url);
+ }
+ }
+
+ /**
+ * Returns true if the driver thinks it can open a connection to the given
+ * URL. Typically, drivers will return true if they understand the
+ * subprotocol specified in the URL and false if they don't. Our protocols
+ * start with jdbc:postgresql_postGIS:
+ *
+ * @see java.sql.Driver#acceptsURL
+ * @param url the URL of the driver
+ * @return true if this driver accepts the given URL
+ * @exception SQLException if a database-access error occurs (Dont know why
+ * it would *shrug*)
+ */
+ public boolean acceptsURL(String url) throws SQLException {
+ try {
+ url = mangleURL(url);
+ } catch (SQLException e) {
+ return false;
+ }
+ return super.acceptsURL(url);
+ }
+
+ /**
+ * Gets the underlying drivers major version number
+ *
+ * @return the drivers major version number
+ */
+ public int getMajorVersion() {
+ return super.getMajorVersion();
+ }
+
+ /**
+ * Get the underlying drivers minor version number
+ *
+ * @return the drivers minor version number
+ */
+ public int getMinorVersion() {
+ return super.getMinorVersion();
+ }
+
+
+ /**
+ * Returns our own CVS version plus postgres Version
+ *
+ * @return String identifier for the version
+ */
+ public static String getVersion() {
+ return "Java2DWrapper " + REVISION + ", wrapping " + Driver.getVersion();
+ }
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+}
diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java
new file mode 100644
index 0000000..acf6ad6
--- /dev/null
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java
@@ -0,0 +1,183 @@
+/*
+ * PGShapeGeometry.java
+ *
+ * Allows PostGIS data to be read directly into a java2d shape
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+
+package org.postgis.java2d;
+
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.*;
+import java.sql.SQLException;
+
+import org.postgresql.util.PGobject;
+
+/**
+ * PostGIS Java2D geometry implementation (read-only).
+ *
+ * Supports PostGIS 1.x (lwgeom hexwkb).
+ *
+ * As the java.awt.Shape methods currently are implemented by using a
+ * java.awt.geom.GeneralPath object, they have the same semantics.
+ *
+ * BUG/TODO: MultiPoints or Points in a Geometry Collection currently don't work
+ * as expected, as some GeneralPath implementations throw away adjacent MoveTo
+ * commands as an optimization (e. G. sun 1.5 and ibm 1.5). Points thus are
+ * translated into MoveTo() followed by a closePath. This may change when we
+ * implement our own path logics. We have to evaluate whether Graphics2D renders
+ * a single MoveTo command as a single "brush tip", or we need the closePath()
+ * command nevertheless to get any drawing. Maybe we need a LineTo() to the same
+ * coordinages instead.
+ *
+ * (Multi)LineStrings are translated into a sequence of a single MoveTo and
+ * multiple LineTo vertices, and Polygon rings into a sequence of a single
+ * MoveTo, multiple LineTo and a closePath command. To allow correct Polygon
+ * filling, our PathIterators have GeneralPath.WIND_EVEN_ODD as winding rule.
+ *
+ * @see java.awt.geom.GeneralPath
+ * @see java.awt.Shape
+ * @see org.postgresql.util.PGobject
+ *
+ * @author Markus Schaber
+ */
+
+public class PGShapeGeometry extends PGobject implements Shape {
+ /* JDK 1.5 Serialization */
+ private static final long serialVersionUID = 0x100;
+
+ final static ShapeBinaryParser parser = new ShapeBinaryParser();
+
+ private final GeneralPath path;
+
+ private int srid;
+
+ /**
+ * Constructor called by JDBC drivers. call setValue afterwards to fill with
+ * Geometry data.
+ *
+ */
+ public PGShapeGeometry() {
+ setType("geometry");
+ path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
+ }
+
+
+ /**
+ * Construct directly from a General Path and SRID value
+ *
+ * @param path GeneralPath to be used
+ * @param srid SRID value to be used
+ */
+ public PGShapeGeometry(GeneralPath path, int srid) {
+ setType("geometry");
+ this.path = path;
+ this.srid = srid;
+ }
+
+
+ /**
+ * Construct with HexWKB representation
+ *
+ * @param value String representation of the HexWKB data
+ * @throws SQLException when a SQLException occurs
+ */
+ public PGShapeGeometry(String value) throws SQLException {
+ this();
+ setValue(value);
+ }
+
+ /**
+ * Reads the HexWKB representation - to be called by the jdbc drivers. Be
+ * shure to call this only once and if you used the PGShapeGeometry()
+ * constructor without parameters. In all other cases, behaviour is
+ * undefined.
+ */
+ public void setValue(String value) throws SQLException {
+ srid = parser.parse(value, path);
+ }
+
+ public String toString() {
+ return "PGShapeGeometry " + path.toString();
+ }
+
+ /** We currently have read-only support, so this method returns null */
+ public String getValue() {
+ return null;
+ }
+
+ public boolean equals(Object obj) {
+ if (obj instanceof PGShapeGeometry)
+ return ((PGShapeGeometry) obj).path.equals(path);
+ return false;
+ }
+
+
+ /**
+ * Return the SRID or Geometry.UNKNOWN_SRID if none was available
+ * @return the SRID value to be used
+ */
+ public int getSRID() {
+ return srid;
+ }
+
+ // following are the java2d Shape method implementations...
+ public boolean contains(double x, double y) {
+ return path.contains(x, y);
+ }
+
+ public boolean contains(double x, double y, double w, double h) {
+ return path.contains(x, y, w, h);
+ }
+
+ public boolean intersects(double x, double y, double w, double h) {
+ return path.intersects(x, y, w, h);
+ }
+
+ public Rectangle getBounds() {
+ return path.getBounds();
+ }
+
+ public boolean contains(Point2D p) {
+ return path.contains(p);
+ }
+
+ public Rectangle2D getBounds2D() {
+ return path.getBounds2D();
+ }
+
+ public boolean contains(Rectangle2D r) {
+ return path.contains(r);
+ }
+
+ public boolean intersects(Rectangle2D r) {
+ return path.intersects(r);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at) {
+ return path.getPathIterator(at);
+ }
+
+ public PathIterator getPathIterator(AffineTransform at, double flatness) {
+ return path.getPathIterator(at, flatness);
+ }
+}
diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java
new file mode 100644
index 0000000..b1780b5
--- /dev/null
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java
@@ -0,0 +1,237 @@
+/*
+ * JtsBinaryParser.java
+ *
+ * Binary Parser for JTS - relies on org.postgis V1.0.0+ package.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
+ * http://www.gnu.org.
+ *
+ */
+package org.postgis.java2d;
+
+import java.awt.geom.GeneralPath;
+
+import org.postgis.Geometry;
+import org.postgis.binary.ByteGetter;
+import org.postgis.binary.ValueGetter;
+import org.postgis.binary.ByteGetter.BinaryByteGetter;
+import org.postgis.binary.ByteGetter.StringByteGetter;
+
+/**
+ * Parse binary representation of geometries. Currently, only text rep (hexed)
+ * implementation is tested.
+ *
+ * It should be easy to add char[] and CharSequence ByteGetter instances,
+ * although the latter one is not compatible with older jdks.
+ *
+ * I did not implement real unsigned 32-bit integers or emulate them with long,
+ * as both java Arrays and Strings currently can have only 2^31-1 elements
+ * (bytes), so we cannot even get or build Geometries with more than approx.
+ * 2^28 coordinates (8 bytes each).
+ *
+ * @author Markus Schaber, markus.schaber at logix-tt.com
+ *
+ */
+public class ShapeBinaryParser {
+
+ /**
+ * Get the appropriate ValueGetter for my endianness
+ *
+ * @param bytes The appropriate Byte Getter
+ *
+ * @return the ValueGetter
+ */
+ public static ValueGetter valueGetterForEndian(ByteGetter bytes) {
+ if (bytes.get(0) == ValueGetter.XDR.NUMBER) { // XDR
+ return new ValueGetter.XDR(bytes);
+ } else if (bytes.get(0) == ValueGetter.NDR.NUMBER) {
+ return new ValueGetter.NDR(bytes);
+ } else {
+ throw new IllegalArgumentException("Unknown Endian type:" + bytes.get(0));
+ }
+ }
+
+ /**
+ * Parse a hex encoded geometry
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.)
+ *
+ * @param value String representation of the value to be parsed
+ * @param path GeneralPath to provide the parsed value to
+ *
+ * @return a potential SRID or Geometry.UNKNOWN_SRID if not present
+ */
+ public synchronized int parse(String value, GeneralPath path) {
+ StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes), path);
+ }
+
+ /**
+ * Parse a binary encoded geometry.
+ *
+ * Is synchronized to protect offset counter. (Unfortunately, Java does not
+ * have neither call by reference nor multiple return values.)
+ *
+ * @param value byte array representation of the value to be parsed
+ * @param path GeneralPath to provide the parsed value to
+ *
+ * @return a potential SRID or Geometry.UNKNOWN_SRID if not present
+ */
+ public synchronized int parse(byte[] value, GeneralPath path) {
+ BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
+ return parseGeometry(valueGetterForEndian(bytes), path);
+ }
+
+ /**
+ * Parse a geometry starting at offset.
+ *
+ * @param data ValueGetter containing the value to be parsed
+ * @param path GeneralPath to provide the parsed value to
+ *
+ * @return a potential SRID or Geometry.UNKNOWN_SRID if not present
+ */
+ protected int parseGeometry(ValueGetter data, GeneralPath path) {
+ byte endian = data.getByte(); // skip and test endian flag
+ if (endian != data.endian) {
+ throw new IllegalArgumentException("Endian inconsistency!");
+ }
+ int typeword = data.getInt();
+
+ int realtype = typeword & 0x1FFFFFFF; // cut off high flag bits
+
+ boolean haveZ = (typeword & 0x80000000) != 0;
+ boolean haveM = (typeword & 0x40000000) != 0;
+ boolean haveS = (typeword & 0x20000000) != 0;
+
+ int srid = Geometry.UNKNOWN_SRID;
+
+ if (haveS) {
+ srid = Geometry.parseSRID(data.getInt());
+ }
+
+ switch (realtype) {
+ case org.postgis.Geometry.POINT :
+ parsePoint(data, haveZ, haveM, path);
+ break;
+ case org.postgis.Geometry.LINESTRING :
+ parseLineString(data, haveZ, haveM, path);
+ break;
+ case org.postgis.Geometry.POLYGON :
+ parsePolygon(data, haveZ, haveM, path);
+ break;
+ case org.postgis.Geometry.MULTIPOINT :
+ parseMultiPoint(data, path);
+ break;
+ case org.postgis.Geometry.MULTILINESTRING :
+ parseMultiLineString(data, path);
+ break;
+ case org.postgis.Geometry.MULTIPOLYGON :
+ parseMultiPolygon(data, path);
+ break;
+ case org.postgis.Geometry.GEOMETRYCOLLECTION :
+ parseCollection(data, path);
+ break;
+ default :
+ throw new IllegalArgumentException("Unknown Geometry Type!");
+ }
+ return srid;
+ }
+
+ private void parsePoint(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
+ path.moveTo((float) data.getDouble(), (float) data.getDouble());
+ path.closePath();
+ skipZM(data, haveZ, haveM);
+ }
+
+ private void skipZM(ValueGetter data, boolean haveZ, boolean haveM) {
+ if (haveZ) { // skip Z value
+ data.getDouble();
+ }
+ if (haveM) { // skip M value
+ data.getDouble();
+ }
+ }
+
+ /** Parse an Array of "full" Geometries */
+ private void parseGeometryArray(ValueGetter data, int count, GeneralPath path) {
+ for (int i = 0; i < count; i++) {
+ parseGeometry(data, path);
+ }
+ }
+
+ /**
+ * Parse an Array of "slim" Points (without endianness and type, part of
+ * LinearRing and Linestring, but not MultiPoint!
+ *
+ * @param data ValueGetter containing the value to be parsed
+ * @param haveZ flag indicating if Z values exist
+ * @param haveM flag indicating if M values exist
+ * @param path GeneralPath to provide the parsed value to
+ */
+ private void parseCS(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
+ int count = data.getInt();
+ if (count > 0) {
+ path.moveTo((float) data.getDouble(), (float) data.getDouble());
+ skipZM(data, haveZ, haveM);
+ for (int i = 1; i < count; i++) {
+ path.lineTo((float) data.getDouble(), (float) data.getDouble());
+ skipZM(data, haveZ, haveM);
+ }
+ }
+ }
+
+
+ private void parseMultiPoint(ValueGetter data, GeneralPath path) {
+ parseGeometryArray(data, data.getInt(), path);
+ }
+
+ private void parseLineString(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
+ parseCS(data, haveZ, haveM, path);
+ }
+
+ private void parseLinearRing(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
+ parseCS(data, haveZ, haveM, path);
+ path.closePath();
+ }
+
+ private void parsePolygon(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
+ int holecount = data.getInt() - 1;
+ // parse shell
+ parseLinearRing(data, haveZ, haveM, path);
+ // parse inner rings
+ for (int i = 0; i < holecount; i++) {
+ parseLinearRing(data, haveZ, haveM, path);
+ }
+ }
+
+ private void parseMultiLineString(ValueGetter data, GeneralPath path) {
+ int count = data.getInt();
+ parseGeometryArray(data, count, path);
+ }
+
+ private void parseMultiPolygon(ValueGetter data, GeneralPath path) {
+ int count = data.getInt();
+ parseGeometryArray(data, count, path);
+ }
+
+ private void parseCollection(ValueGetter data, GeneralPath path) {
+ int count = data.getInt();
+ parseGeometryArray(data, count, path);
+ }
+}
diff --git a/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java b/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java
new file mode 100644
index 0000000..1ff333a
--- /dev/null
+++ b/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java
@@ -0,0 +1,29 @@
+package org.postgis.java2d;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+
+/**
+ * This class serves as little more than an initial placeholder for establishing test classes within
+ * this module's test suite.
+ *
+ * @author Phillip Ross {@literal <phillip.w.g.ross at gmail.com>}
+ */
+public class SimpleJava2DWrapperTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(SimpleJava2DWrapperTest.class);
+
+ private static final String JAVA2D_WRAPPER_CLASS_NAME = "org.postgis.java2d.Java2DWrapper";
+
+
+ @Test
+ public void testWrapperClassLoad() throws Exception {
+ logger.debug("Loading java2d wrapper class: {}", JAVA2D_WRAPPER_CLASS_NAME);
+ Class.forName(JAVA2D_WRAPPER_CLASS_NAME);
+ }
+
+
+}
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/src/test/resources/logback-test.xml b/postgis-jdbc-java2d/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..71d8c1b
--- /dev/null
+++ b/postgis-jdbc-java2d/src/test/resources/logback-test.xml
@@ -0,0 +1,15 @@
+<configuration debug="false">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+ </layout>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <logger name="org.postgis.java2d" level="ERROR"/>
+
+</configuration>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/src/test/resources/testng.xml b/postgis-jdbc-java2d/src/test/resources/testng.xml
new file mode 100644
index 0000000..41e8fff
--- /dev/null
+++ b/postgis-jdbc-java2d/src/test/resources/testng.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="PostGIS JDBC Extensions Java2D Test Suite" verbose="1">
+
+ <parameter name="testWithDatabaseSystemProperty" value="testWithDatabase"/>
+ <parameter name="jdbcDriverClassNameSystemProperty" value="jdbcDriverClassName"/>
+ <parameter name="jdbcUrlSystemProperty" value="jdbcUrl"/>
+ <parameter name="jdbcUsernameSystemProperty" value="jdbcUsername"/>
+ <parameter name="jdbcPasswordSystemProperty" value="jdbcPassword"/>
+
+ <test name="PostGIS JDBC Java2D Tests">
+ <classes>
+ <class name="org.postgis.java2d.SimpleJava2DWrapperTest"/>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git
More information about the Pkg-grass-devel
mailing list