The CsvReader was not finding geometry fields where the WKT did not have a space after the geometry type: POINT( instead of POINT (

Author: jericks

src/main/groovy/geoscript/layer/io/CsvReader.groovy

@@ -322,7 +322,11 @@ class CsvReader implements Reader {
      * @return The geometry type (point, linestring, polygon, ect...)
      */
     private String getGeometryTypeFromWKT(String wkt) {
-        wkt.substring(0, wkt.indexOf(" (")).toLowerCase()
+        int i = wkt.indexOf(" (")
+        if (i == -1) {
+            i = wkt.indexOf("(")
+        }
+        wkt.substring(0, i).toLowerCase()
     }
 
     /**
@@ -331,9 +335,14 @@ class CsvReader implements Reader {
      * @return Whether the input value looks like WKT
      */
     private boolean isWKT(String str) {
-        if (str.startsWith("POINT (") || str.startsWith("LINESTRING (") || str.startsWith("POLYGON") ||
-                str.startsWith("MULTIPOINT (") || str.startsWith("MULTILINESTRING (") || str.startsWith("MULTIPOLYGON") ||
-                str.startsWith("GEOMETRYCOLLECTION (") || str.startsWith("LINEARRING (")
+        if (str.startsWith("POINT (") || str.startsWith("POINT(") ||
+            str.startsWith("LINESTRING (") || str.startsWith("LINESTRING(") ||
+            str.startsWith("POLYGON") || str.startsWith("POLYGON(") ||
+            str.startsWith("MULTIPOINT (") || str.startsWith("MULTIPOINT(") ||
+            str.startsWith("MULTILINESTRING (") || str.startsWith("MULTILINESTRING(") ||
+            str.startsWith("MULTIPOLYGON") || str.startsWith("MULTIPOLYGON(") ||
+            str.startsWith("GEOMETRYCOLLECTION (") || str.startsWith("GEOMETRYCOLLECTION(") ||
+            str.startsWith("LINEARRING (") || str.startsWith("LINEARRING(")
         ) {
             return true
         }

src/test/groovy/geoscript/layer/io/CsvReaderTestCase.groovy

@@ -428,4 +428,19 @@ ak,10501917,?,"Thursday, June 28, 2012 02:30:58 UTC",60.0233,-152.9946,2,2.9,?,"
         assertEquals(0, layer.count)
         assertEquals("csv geom: Point(EPSG:4326), id: Integer, name: String", layer.schema.toString())
     }
+
+    @Test void readFromWktWithNoSpace() {
+        String csv = """the_geom,ADMIN_NAME
+POINT(10.1999998092651 59.7000007629395),Buskerud
+POINT(-2.96670007705688 56.4667015075684),Scotland
+POINT(-4.85678577423096 55.736743927002),Scotland
+POINT(14.7166996002197 55.11669921875),Bornholm
+POINT(69.2166976928711 54.88330078125),North Kazakhstan
+POINT(-1.16670000553131 54.5999984741211),England
+"""
+        CsvReader reader = new CsvReader()
+        Layer layer = reader.read(csv)
+        assertEquals(6, layer.count)
+        assertEquals("csv the_geom: Point, ADMIN_NAME: String", layer.schema.toString())
+    }
 }