Merge pull request #1008 from otbutz/ewkb_parser

Load geometries as EWKB

Author: lonvia

build.gradle

@@ -73,7 +73,6 @@ dependencies {
     implementation 'io.javalin:javalin:6.7.0'
     implementation 'io.javalin:javalin-micrometer:6.7.0'
     implementation 'io.micrometer:micrometer-registry-prometheus:1.16.2'
-    implementation 'net.postgis:postgis-jdbc:2025.1.1'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.21.0'
 
     testImplementation 'com.h2database:h2:2.4.240'

src/main/java/de/komoot/photon/nominatim/PostgisDataAdapter.java

@@ -1,24 +1,27 @@
 package de.komoot.photon.nominatim;
 
-import net.postgis.jdbc.PGgeometry;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
 import org.locationtech.jts.io.ParseException;
-import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.io.WKBReader;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.HexFormat;
 import java.util.Map;
 
 /**
  * Utility functions to parse data from and create SQL for PostgreSQL/PostGIS.
  */
 @NullMarked
 public class PostgisDataAdapter implements DBDataAdapter {
+    private static final GeometryFactory GEOMETRY_FACTORY = new GeometryFactory(new PrecisionModel(), 4326);
     private static final Logger LOGGER = LogManager.getLogger();
 
     @Override
@@ -34,22 +37,18 @@ public Map<String, String> getMap(ResultSet rs, String columnName) throws SQLExc
     @Override
     @Nullable
     public Geometry extractGeometry(ResultSet rs, String columnName) throws SQLException {
-        PGgeometry wkt = (PGgeometry) rs.getObject(columnName);
-        if (wkt != null) {
-            try {
-                StringBuffer sb = new StringBuffer();
-                wkt.getGeometry().outerWKT(sb);
-
-                Geometry geometry = new WKTReader().read(sb.toString());
-                geometry.setSRID(4326);
-                return geometry;
-            } catch (ParseException e) {
-                // ignore
-                LOGGER.error("Cannot parse database geometry", e);
-            }
+        var ewkbHex = rs.getString(columnName);
+        if  (ewkbHex == null) {
+            return null;
         }
 
-        return null;
+        try {
+            var ewkb = HexFormat.of().parseHex(ewkbHex);
+            return new WKBReader(GEOMETRY_FACTORY).read(ewkb);
+        } catch (IllegalArgumentException | ParseException e) {
+            LOGGER.error("Cannot parse database geometry: {}", ewkbHex, e);
+            return null;
+        }
     }
 
     @Override