Merge pull request #1086 from ebocher/postgis_prj

Fix POSTGIS issues with drivers
orbisgis · Jun 9, 2020 · ea1295a · ea1295a
2 parents dfa687b + 7f54324
commit ea1295a
Show file tree

Hide file tree

Showing 13 changed files with 391 additions and 218 deletions.
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/io/shp/SHPDriverFunction.java b/h2gis-functions/src/main/java/org/h2gis/functions/io/shp/SHPDriverFunction.java
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_LineFromWKB.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_LineFromWKB.java
@@ -2,24 +2,25 @@
  * H2GIS is a library that brings spatial support to the H2 Database Engine
  * <http://www.h2database.com>. H2GIS is developed by CNRS
  * <http://www.cnrs.fr/>.
- *
- * This code is part of the H2GIS project. H2GIS is free software; 
+ * <p>
+ * This code is part of the H2GIS project. H2GIS 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;
  * version 3.0 of the License.
- *
+ * <p>
  * H2GIS 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 <http://www.gnu.org/licenses/>.
- *
- *
+ * <p>
+ * <p>
  * For more information, please consult: <http://www.h2gis.org/>
  * or contact directly: info_at_h2gis.org
  */
 
 package org.h2gis.functions.spatial.convert;
 
+import org.h2.value.ValueGeometry;
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryTypeCodes;
 import org.h2gis.utilities.GeometryMetaData;
@@ -47,7 +48,7 @@ public ST_LineFromWKB() {
     public String getJavaStaticMethod() {
         return "toLineString";
     }
-    
+
     /**
      * Convert WKT into a LinearRing
      * @param bytes Byte array
@@ -58,7 +59,7 @@ public String getJavaStaticMethod() {
     public static Geometry toLineString(byte[] bytes) throws SQLException, IOException {
         return toLineString(bytes, 0);
     }
-    
+
 
     /**
      * Convert WKT into a LinearRing
@@ -69,19 +70,15 @@ public static Geometry toLineString(byte[] bytes) throws SQLException, IOExcepti
      * @throws java.io.IOException
      */
     public static Geometry toLineString(byte[] bytes, int srid) throws SQLException, IOException {
-        if(bytes==null) {
+        if (bytes == null) {
             return null;
         }
-        WKBReader wkbReader = new WKBReader();
-        try {
-            if(GeometryMetaData.getMetaData(bytes).geometryTypeCode != GeometryTypeCodes.LINESTRING) {
-                throw new SQLException("Provided WKB is not a LINESTRING.");
-            }
-            Geometry geometry = wkbReader.read(bytes);
-            geometry.setSRID(srid);
-            return geometry;
-        } catch (ParseException ex) {
-            throw new SQLException("ParseException while evaluating ST_LineFromWKB",ex);
+        ValueGeometry valueGeometry = ValueGeometry.get(bytes);
+        if (valueGeometry.getTypeAndDimensionSystem() != GeometryTypeCodes.LINESTRING) {
+            throw new SQLException("Provided WKB is not a POINT.");
         }
+        Geometry geometry = valueGeometry.getGeometry();
+        geometry.setSRID(srid);
+        return geometry;
     }
 }
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_PointFromWKB.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_PointFromWKB.java
@@ -2,24 +2,25 @@
  * H2GIS is a library that brings spatial support to the H2 Database Engine
  * <http://www.h2database.com>. H2GIS is developed by CNRS
  * <http://www.cnrs.fr/>.
- *
- * This code is part of the H2GIS project. H2GIS is free software; 
+ * <p>
+ * This code is part of the H2GIS project. H2GIS 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;
  * version 3.0 of the License.
- *
+ * <p>
  * H2GIS 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 <http://www.gnu.org/licenses/>.
- *
- *
+ * <p>
+ * <p>
  * For more information, please consult: <http://www.h2gis.org/>
  * or contact directly: info_at_h2gis.org
  */
 
 package org.h2gis.functions.spatial.convert;
 
+import org.h2.value.ValueGeometry;
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryTypeCodes;
 import org.h2gis.utilities.GeometryMetaData;
@@ -32,21 +33,19 @@
 
 /**
  * Convert Well Known Binary into a POINT.
+ *
  * @author Erwan Bocher
  */
-public class ST_PointFromWKB extends DeterministicScalarFunction{
+public class ST_PointFromWKB extends DeterministicScalarFunction {
+
 
-
-    public ST_PointFromWKB(){
+    public ST_PointFromWKB() {
         addProperty(PROP_REMARKS, "Convert Well Known Binary into a POINT.\n If an SRID is not specified, it defaults to 0.");
     }
-    @Override
-    public String getJavaStaticMethod() {
-        return "toPoint";        
-    }
-
-     /**
+
+    /**
      * Convert WKT into a Point
+     *
      * @param bytes Byte array
      * @return Point instance of null if bytes null
      * @throws SQLException WKB Parse error
@@ -57,26 +56,28 @@ public static Geometry toPoint(byte[] bytes) throws SQLException, IOException {
 
     /**
      * Convert WKT into a Point
+     *
      * @param bytes Byte array
-     * @param srid SRID
+     * @param srid  SRID
      * @return Point instance of null if bytes null
      * @throws SQLException WKB Parse error
      */
     public static Geometry toPoint(byte[] bytes, int srid) throws SQLException, IOException {
-        if(bytes==null) {
+        if (bytes == null) {
             return null;
         }
-        WKBReader wkbReader = new WKBReader();
-        try {
-            if(GeometryMetaData.getMetaData(bytes).geometryTypeCode != GeometryTypeCodes.POINT) {
-                throw new SQLException("Provided WKB is not a POINT.");
-            }
-            Geometry geometry = wkbReader.read(bytes);
-            geometry.setSRID(srid);
-            return geometry;
-        } catch (ParseException ex) {
-            throw new SQLException("ParseException while evaluating ST_PointFromWKB",ex);
+        ValueGeometry valueGeometry = ValueGeometry.get(bytes);
+        if (valueGeometry.getTypeAndDimensionSystem() != GeometryTypeCodes.POINT) {
+            throw new SQLException("Provided WKB is not a POINT.");
         }
+        Geometry geometry = valueGeometry.getGeometry();
+        geometry.setSRID(srid);
+        return geometry;
+    }
+
+    @Override
+    public String getJavaStaticMethod() {
+        return "toPoint";
     }
-    
+
 }
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_PolyFromWKB.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/convert/ST_PolyFromWKB.java
@@ -20,6 +20,7 @@
 
 package org.h2gis.functions.spatial.convert;
 
+import org.h2.value.ValueGeometry;
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryTypeCodes;
 import org.h2gis.utilities.GeometryMetaData;
@@ -68,16 +69,15 @@ public static Geometry toPolygon(byte[] bytes, int srid) throws SQLException, IO
         if(bytes==null) {
             return null;
         }
-        WKBReader wkbReader = new WKBReader();
-        try {
-            if(GeometryMetaData.getMetaData(bytes).geometryTypeCode != GeometryTypeCodes.POLYGON) {
-                throw new SQLException("Provided WKB is not a Polygon.");
-            }
-            Geometry geometry = wkbReader.read(bytes);
-            geometry.setSRID(srid);
-            return geometry;
-        } catch (ParseException ex) {
-            throw new SQLException("ParseException while evaluating ST_PolyFromWKB",ex);
+        if (bytes == null) {
+            return null;
+        }
+        ValueGeometry valueGeometry = ValueGeometry.get(bytes);
+        if (valueGeometry.getTypeAndDimensionSystem() != GeometryTypeCodes.POLYGON) {
+            throw new SQLException("Provided WKB is not a POINT.");
         }
+        Geometry geometry = valueGeometry.getGeometry();
+        geometry.setSRID(srid);
+        return geometry;
     }
 }
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_CoordDim.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_CoordDim.java
@@ -22,6 +22,7 @@
 
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryMetaData;
+import org.locationtech.jts.geom.Geometry;
 
 import java.io.IOException;
 
@@ -49,7 +50,7 @@ public String getJavaStaticMethod() {
      * @return The dimension of the coordinates of the given geometry
      * @throws IOException
      */
-    public static Integer getCoordinateDimension(byte[] geom) throws IOException {
+    public static Integer getCoordinateDimension(Geometry geom) throws IOException {
         if (geom == null) {
             return null;
         }

diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_GeometryType.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_GeometryType.java
@@ -22,6 +22,7 @@
 
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryMetaData;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Return the type of geometry : ST_POINT, ST_LINESTRING, ST_POLYGON...
@@ -47,7 +48,7 @@ public String getJavaStaticMethod() {
      * @param geometry Geometry instance
      * @return Geometry type for a user-defined type defined in SQL/MM specification. SQL-MM 3: 5.1.4
      */
-    public static String getGeometryType(byte[] geometry) {
+    public static String getGeometryType(Geometry geometry) {
         if(geometry==null) {
             return null;
         }

diff --git a/...s-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_GeometryTypeCode.java b/...s-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_GeometryTypeCode.java
@@ -22,6 +22,7 @@
 
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryMetaData;
+import org.locationtech.jts.geom.Geometry;
 
 import java.io.IOException;
 
@@ -46,7 +47,7 @@ public String getJavaStaticMethod() {
      * @return Returns the OGC SFS {@link org.h2gis.utilities.GeometryTypeCodes} of a Geometry. This function does not take account of Z nor M.
      * @throws IOException WKB is not valid.
      */
-    public static Integer getTypeCode(byte[] geometry) throws IOException {
+    public static Integer getTypeCode(Geometry geometry) throws IOException {
         if(geometry == null) {
             return null;
         }

diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_Is3D.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_Is3D.java
@@ -22,6 +22,7 @@
 
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryMetaData;
+import org.locationtech.jts.geom.Geometry;
 
 import java.io.IOException;
 
@@ -50,7 +51,7 @@ public String getJavaStaticMethod() {
      * @return
      * @throws IOException 
      */
-    public static int is3D(byte[] geom) throws IOException {
+    public static int is3D(Geometry geom) throws IOException {
          if (geom == null) {
             return 0;
         }

diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_SRID.java b/h2gis-functions/src/main/java/org/h2gis/functions/spatial/properties/ST_SRID.java
@@ -22,6 +22,7 @@
 
 import org.h2gis.api.DeterministicScalarFunction;
 import org.h2gis.utilities.GeometryMetaData;
+import org.locationtech.jts.geom.Geometry;
 
 import java.io.IOException;
 
@@ -48,7 +49,7 @@ public String getJavaStaticMethod() {
      * @return SRID value or 0 if input geometry does not have one.
      * @throws IOException
      */
-    public static Integer getSRID(byte[] geometry) throws IOException {
+    public static Integer getSRID(Geometry geometry) throws IOException {
         if(geometry==null) {
             return 0;
         }

diff --git a/h2gis-functions/src/test/java/org/h2gis/functions/io/shp/SHPImportExportTest.java b/h2gis-functions/src/test/java/org/h2gis/functions/io/shp/SHPImportExportTest.java
@@ -42,6 +42,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -773,12 +774,32 @@ public void testSelectWriteRead() throws Exception {
             stat.execute("CALL SHPRead('target/lines.shp', 'TABLE_LINESTRINGS_READ');");
             ResultSet res = stat.executeQuery("SELECT * FROM TABLE_LINESTRINGS_READ;");
             res.next();
-            GeometryAsserts.assertGeometryEquals("SRID=4326;MULTILINESTRING ((1 10, 20 15))",res.getObject("THE_GEOM"));
+            Geometry geom = (Geometry) res.getObject("THE_GEOM");
+            assertEquals(4326, geom.getSRID());
+            GeometryAsserts.assertGeometryEquals("SRID=4326;MULTILINESTRING ((1 10, 20 15))",geom);
             res.close();
             stat.execute("DROP TABLE IF EXISTS TABLE_LINESTRINGS_READ");
         }
     }
 
+    @Test
+    public void testSelectWriteRead2() throws Exception {
+        try (Statement stat = connection.createStatement()) {
+            stat.execute(" DROP TABLE IF EXISTS orbisgis;"+
+                "CREATE TABLE orbisgis (id int, the_geom geometry(point, 4326));"+
+                "INSERT INTO orbisgis VALUES (1, 'SRID=4326;POINT(10 10)'::GEOMETRY), (2, 'SRID=4326;POINT(1 1)'::GEOMETRY); ");
+            stat.execute("CALL SHPWrite('target/points.shp', '(SELECT st_buffer(the_geom, 10) as the_geom from orbisgis)', true);");
+            stat.execute("CALL SHPRead('target/points.shp', 'TABLE_POINTS_READ', true);");
+            ResultSet res = stat.executeQuery("SELECT * FROM TABLE_POINTS_READ;");
+            res.next();
+            Geometry geom = (Geometry) res.getObject("THE_GEOM");
+            assertEquals(4326, geom.getSRID());
+            GeometryAsserts.assertGeometryEquals("SRID=4326;MULTIPOLYGON (((0 10.000000000000007, 0.19214719596769747 11.950903220161292, 0.7612046748871375 13.826834323650909, 1.6853038769745545 15.555702330196034, 2.928932188134537 17.071067811865486, 4.444297669803992 18.314696123025463, 6.173165676349122 19.238795325112875, 8.04909677983874 19.807852804032308, 10.000000000000025 20, 11.950903220161308 19.8078528040323, 13.826834323650925 19.238795325112857, 15.555702330196048 18.314696123025435, 17.071067811865497 17.07106781186545, 18.31469612302547 15.555702330195993, 19.238795325112882 13.826834323650862, 19.80785280403231 11.950903220161244, 20 10, 19.807852804032304 8.049096779838717, 19.238795325112868 6.173165676349102, 18.314696123025453 4.444297669803978, 17.071067811865476 2.9289321881345254, 15.555702330196024 1.6853038769745474, 13.826834323650898 0.7612046748871322, 11.950903220161283 0.1921471959676957, 10 0, 8.049096779838719 0.1921471959676957, 6.173165676349103 0.7612046748871322, 4.44429766980398 1.6853038769745474, 2.9289321881345254 2.9289321881345245, 1.6853038769745474 4.444297669803978, 0.7612046748871322 6.173165676349106, 0.19214719596769392 8.049096779838722, 0 10.000000000000007)))",geom);
+            res.close();
+            stat.execute("DROP TABLE IF EXISTS TABLE_POINTS_READ");
+        }
+    }
+
     @Disabled
     @Test
     public void exportImportPointPostGIS() throws SQLException, IOException {
@@ -792,9 +813,10 @@ public void exportImportPointPostGIS() throws SQLException, IOException {
         Connection con = ds.getConnection();
         Statement stat = con.createStatement();
         File shpFile = new File("target/punctual_export_postgis.shp");
+        Files.deleteIfExists(shpFile.toPath());
         stat.execute("DROP TABLE IF EXISTS PUNCTUAL");
-        stat.execute("create table punctual(idarea int primary key, the_geom GEOMETRY(POINTZ))");
-        stat.execute("insert into punctual values(1, 'POINT(-10 109 5)')");
+        stat.execute("create table punctual(idarea int primary key, the_geom GEOMETRY(POINTZ, 4326))");
+        stat.execute("insert into punctual values(1, ST_GEOMFROMTEXT('POINT(-10 109 5)',4326))");
         // Create a shape file using table area
         SHPDriverFunction driver = new SHPDriverFunction();
         driver.exportTable(con,"punctual", shpFile,new EmptyProgressVisitor());
@@ -805,10 +827,39 @@ public void exportImportPointPostGIS() throws SQLException, IOException {
         ResultSet res = stat.executeQuery("SELECT THE_GEOM FROM IMPORT_PUNCTUAL;");
         res.next();
         Geometry geom = (Geometry) res.getObject(1);
+        assertEquals(4326, geom.getSRID());
         Coordinate coord = geom.getCoordinate();
         assertEquals(coord.z, 5, 10E-1);
         stat.execute("DROP TABLE IF EXISTS IMPORT_PUNCTUAL;");
         res.close();
     }
+
+    @Disabled
+    @Test
+    public void testSelectWriteReadPostGIS() throws Exception {
+        String url = "jdbc:postgresql://?/?";
+        Properties props = new Properties();
+        props.setProperty("user", "");
+        props.setProperty("password","" );
+        props.setProperty("url", url);
+        DataSourceFactory dataSourceFactory = new DataSourceFactoryImpl();
+        DataSource ds = dataSourceFactory.createDataSource(props);
+        Connection con = ds.getConnection();
+        try (Statement stat = con.createStatement()) {
+            stat.execute(" DROP TABLE IF EXISTS orbisgis;"+
+                    "CREATE TABLE orbisgis (id int, the_geom geometry(point, 4326));"+
+                    "INSERT INTO orbisgis VALUES (1, ST_GEOMFROMTEXT('POINT(10 10)',4326)), (2, ST_GEOMFROMTEXT('POINT(1 1)',4326)); ");
+            SHPDriverFunction shpDriverFunction = new SHPDriverFunction();
+            shpDriverFunction.exportTable(con,"(SELECT st_buffer(the_geom, 10) as the_geom from orbisgis)", new File("target/points.shp"), null, true , new EmptyProgressVisitor());
+            shpDriverFunction.importFile(con,"TABLE_POINTS_READ", new File("target/points.shp"), null, true , new EmptyProgressVisitor());
+            ResultSet res = stat.executeQuery("SELECT * FROM TABLE_POINTS_READ;");
+            res.next();
+            Geometry geom = (Geometry) res.getObject("THE_GEOM");
+            assertEquals(4326, geom.getSRID());
+            GeometryAsserts.assertGeometryEquals("SRID=4326;MULTIPOLYGON (((0 9.999999999999968, 0.1921471959676886 11.950903220161248, 0.761204674887118 13.826834323650864, 1.685303876974526 15.55570233019599, 2.928932188134495 17.071067811865447, 4.444297669803942 18.314696123025428, 6.173165676349064 19.238795325112854, 8.049096779838678 19.807852804032297, 9.999999999999963 20, 11.950903220161248 19.80785280403231, 13.826834323650868 19.238795325112882, 15.555702330195995 18.31469612302547, 17.071067811865454 17.071067811865497, 18.31469612302544 15.555702330196045, 19.23879532511286 13.826834323650921, 19.8078528040323 11.950903220161305, 20 10, 19.807852804032308 8.049096779838719, 19.238795325112868 6.173165676349106, 18.314696123025456 4.444297669803983, 17.071067811865483 2.9289321881345307, 15.55570233019603 1.6853038769745528, 13.826834323650909 0.7612046748871375, 11.950903220161296 0.19214719596769747, 10.000000000000016 0, 8.049096779838735 0.19214719596769214, 6.173165676349122 0.7612046748871251, 4.444297669803995 1.6853038769745368, 2.9289321881345405 2.9289321881345085, 1.6853038769745616 4.444297669803957, 0.7612046748871428 6.173165676349077, 0.19214719596770102 8.049096779838688, 0 9.999999999999968)))",geom);
+            res.close();
+            stat.execute("DROP TABLE IF EXISTS TABLE_POINTS_READ");
+        }
+    }
 
 }