Add a fix command for vector layers with invalid geometry

Author: jericks

src/main/docs/layer.adoc

@@ -480,6 +480,32 @@ include::output/layer_validity_1_result.txt[]
 include::output/layer_validity_2_command.txt[]
 include::output/layer_validity_2_result.txt[]
 
+==== Fix
+
+include::commands/layer_fix_description.txt[]
+
+include::output/layer_fix_4_command.txt[]
+
+include::commands/layer_fix.txt[]
+
+include::output/layer_fix_0_command.txt[]
+include::output/layer_fix_0_result.txt[]
+
+include::output/layer_fix_1_command.txt[]
+include::output/layer_fix_1_result.txt[]
+
+include::output/layer_fix_2_command.txt[]
+include::output/layer_fix_2_result.txt[]
+
+include::output/layer_fix_3_command.txt[]
+include::output/layer_fix_3_result.txt[]
+
+include::output/layer_fix_4_command.txt[]
+include::output/layer_fix_4_result.txt[]
+
+include::output/layer_fix_5_command.txt[]
+include::output/layer_fix_5_result.txt[]
+
 === Geoprocessing
 
 ==== Clip

src/main/groovy/org/geoshell/vector/LayerCommands.groovy

@@ -1218,6 +1218,41 @@ class LayerCommands implements CommandMarker {
         }
     }
 
+    @CliCommand(value = "layer fix", help = "Fix the geometries of the features of the input Layer and save them to the output Layer")
+    String fix(
+            @CliOption(key = "input-name", mandatory = true, help = "The Layer name") LayerName inputLayerName,
+            @CliOption(key = "output-workspace", mandatory = true, help = "The output Layer Workspace") WorkspaceName workspaceName,
+            @CliOption(key = "output-name", mandatory = true, help = "The output Layer name") String outputLayerName
+    ) throws Exception {
+        Layer inputLayer = catalog.layers[inputLayerName]
+        if (inputLayer) {
+            Workspace outputWorkspace = catalog.workspaces[workspaceName]
+            if (outputWorkspace) {
+                Schema schema = new Schema(outputLayerName, inputLayer.schema.fields)
+                Layer outputLayer = outputWorkspace.create(schema)
+                outputLayer.withWriter { geoscript.layer.Writer w ->
+                    inputLayer.eachFeature { Feature f ->
+                        Map values = [:]
+                        f.attributes.each { k, v ->
+                            if (v instanceof geoscript.geom.Geometry) {
+                                values[k] = f.geom.fix()
+                            } else {
+                                values[k] = v
+                            }
+                        }
+                        w.add(outputLayer.schema.feature(values, f.id))
+                    }
+                }
+                catalog.layers[new LayerName(outputLayerName)] = outputWorkspace.get(outputLayerName)
+                "Done!"
+            } else {
+                "Unable to find Workspace ${workspaceName}"
+            }
+        } else {
+            "Unable to find Layer ${inputLayerName}"
+        }
+    }
+
     @CliCommand(value = "layer delete", help = "Delete features from the Layer")
     String delete(
             @CliOption(key = "name", mandatory = true, help = "The Layer name") LayerName layerName,

src/test/groovy/org/geoshell/docs/LayerDocTest.groovy

@@ -1140,6 +1140,17 @@ class LayerDocTest extends AbstractDocTest {
         copyFile(new File("examples/layer_union.png"), new File("src/main/docs/images"))
     }
 
+    @Test
+    void fix() {
+        run("layer_fix", [
+                'workspace open --name mem --params memory',
+                'layer create --workspace mem --name lines --fields "the_geom=LineString EPSG:4326|fid=Int|name=String"',
+                'layer add --name lines --values "the_geom=LINESTRING (0 0, 0 0, 0 0, 1 1)|fid=1|name=Location 1"',
+                'layer add --name lines --values "the_geom=LINESTRING (1 1, 2 2, 2 2, 2 2, 3 3)|fid=2|name=Location 2"',
+                'layer fix --input-name lines --output-workspace mem --output-name lines_fixed',
+                'layer features --name lines_fixed'
+        ])
+    }
 
 
 }

src/test/groovy/org/geoshell/vector/LayerCommandsTest.groovy

@@ -838,6 +838,23 @@ class LayerCommandsTest {
         }
     }
 
+    @Test void fix() {
+        Layer layer = new Property(new File(getClass().getClassLoader().getResource("fixable.properties").toURI()))
+        Catalog catalog = new Catalog()
+        catalog.workspaces[new WorkspaceName("mem")] = new Memory()
+        catalog.layers[new LayerName("lines")] = layer
+        LayerCommands cmds = new LayerCommands(catalog: catalog)
+        String result = cmds.fix(new LayerName("lines"), new WorkspaceName("mem"), "fixed_lines")
+        assertEquals "Done!", result
+        assertNotNull catalog.layers[new LayerName("fixed_lines")]
+        Layer outLayer = catalog.layers[new LayerName("fixed_lines")]
+        assertEquals layer.count, outLayer.count
+        assertEquals "LineString", outLayer.schema.geom.typ
+        (0..<layer.count).each { int i ->
+            assertTrue outLayer.features[i].geom.numPoints < layer.features[i].geom.numPoints
+        }
+    }
+
     @Test void delete() {
         Catalog catalog = new Catalog()
         catalog.workspaces[new WorkspaceName("mem")] = new Memory()

src/test/resources/fixable.properties

@@ -0,0 +1,3 @@
+_=id:String,name:String,geom:LineString
+road.1360815594529=1|Road 1|LINESTRING (0 0, 0 0, 0 0, 1 1))
+road.1360815594538=2|Road 2|LINESTRING (1 1, 0 0, 0 0, 0 0, 2 2)