If field types in csv are present, use them to construct the schema

Author: jericks

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

@@ -329,8 +329,8 @@ class CsvReader implements Reader {
                     }
                 }
                 // Try to guess the geometry Field
-                if (!hasGeom && (c.toLowerCase().contains("geom") || c.toLowerCase().contains("shape"))) {
-                    fieldType = "Point"
+                if (!hasGeom && (isGeometry(fieldType) || c.toLowerCase().contains("geom") || c.toLowerCase().contains("shape"))) {
+                    fieldType = fieldType.equalsIgnoreCase("String") ? "Point" : fieldType
                     hasGeom = true
                 }
                 new Field(c, fieldType, proj)
@@ -345,6 +345,19 @@ class CsvReader implements Reader {
         return layer
     }
 
+    /**
+     * Determine whether the field type is a geometry field type or nor
+     * @param fieldType The field type
+     * @return Whether the field type is a geometry field type
+     */
+    private boolean isGeometry(String fieldType) {
+        List geometryNames = [
+                "point","linestring","polygon","linearring","geometry","geometrycollection",
+                "circularstring","circularring","compoundring","compoundcurve"
+        ]
+        geometryNames.any{geomName -> fieldType.toLowerCase().endsWith(geomName)}
+    }
+
     /**
      * Get the column name from a column name string that may or may not have type and projection information
      * @param col The column name string

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

@@ -429,6 +429,33 @@ ak,10501917,?,"Thursday, June 28, 2012 02:30:58 UTC",60.0233,-152.9946,2,2.9,?,"
         assertEquals("csv geom: Point(EPSG:4326), id: Integer, name: String", layer.schema.toString())
     }
 
+    @Test void readNoFeaturesWithLineStringType() {
+        String csv = """"abc:LineString:EPSG:2927","id:int","name:String"
+"""
+        CsvReader reader = new CsvReader()
+        Layer layer = reader.read(csv)
+        assertEquals(0, layer.count)
+        assertEquals("csv abc: LineString(EPSG:2927), id: Integer, name: String", layer.schema.toString())
+    }
+
+    @Test void readNoFeatureWithPolygonType() {
+        String csv = "\"the_geom:MultiPolygon:EPSG:4326\",\"STATE_NAME:String\",\"STATE_FIPS:String\"," +
+                "\"SUB_REGION:String\",\"STATE_ABBR:String\",\"LAND_KM:Double\",\"WATER_KM:Double\"," +
+                "\"PERSONS:Double\",\"FAMILIES:Double\",\"HOUSHOLD:Double\",\"MALE:Double\"," +
+                "\"FEMALE:Double\",\"WORKERS:Double\",\"DRVALONE:Double\",\"CARPOOL:Double\"," +
+                "\"PUBTRANS:Double\",\"EMPLOYED:Double\",\"UNEMPLOY:Double\",\"SERVICE:Double\"," +
+                "\"MANUAL:Double\",\"P_MALE:Double\",\"P_FEMALE:Double\",\"SAMP_POP:Double\""
+        CsvReader reader = new CsvReader()
+        Layer layer = reader.read(csv)
+        assertEquals(0, layer.count)
+        assertEquals("csv the_geom: MultiPolygon(EPSG:4326), STATE_NAME: String, STATE_FIPS: String, " +
+                "SUB_REGION: String, STATE_ABBR: String, LAND_KM: Double, WATER_KM: Double, PERSONS: Double, " +
+                "FAMILIES: Double, HOUSHOLD: Double, MALE: Double, FEMALE: Double, WORKERS: Double, " +
+                "DRVALONE: Double, CARPOOL: Double, PUBTRANS: Double, EMPLOYED: Double, UNEMPLOY: Double, " +
+                "SERVICE: Double, MANUAL: Double, P_MALE: Double, P_FEMALE: Double, SAMP_POP: Double",
+                layer.schema.toString())
+    }
+
     @Test void readFromWktWithNoSpace() {
         String csv = """the_geom,ADMIN_NAME
 POINT(10.1999998092651 59.7000007629395),Buskerud