[processing] Fix simplify alg handling of null goemetry, add tests

qgis · Aug 31, 2016 · 5d97d03 · 5d97d03
1 parent f9e508c
commit 5d97d03
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 10 deletions.
diff --git a/python/plugins/processing/algs/qgis/SimplifyGeometries.py b/python/plugins/processing/algs/qgis/SimplifyGeometries.py
@@ -74,16 +74,15 @@ def processAlgorithm(self, progress):
 
         features = vector.features(layer)
         total = 100.0 / len(features)
-        for current, f in enumerate(features):
-            featGeometry = f.geometry()
-            attrs = f.attributes()
-            pointsBefore += featGeometry.geometry().nCoordinates()
-            newGeometry = featGeometry.simplify(tolerance)
-            pointsAfter += newGeometry.geometry().nCoordinates()
-            feature = QgsFeature()
-            feature.setGeometry(newGeometry)
-            feature.setAttributes(attrs)
-            writer.addFeature(feature)
+        for current, input_feature in enumerate(features):
+            out_feature = input_feature
+            if input_feature.geometry():
+                input_geometry = input_feature.geometry()
+                pointsBefore += input_geometry.geometry().nCoordinates()
+                output_geometry = input_geometry.simplify(tolerance)
+                pointsAfter += output_geometry.geometry().nCoordinates()
+                out_feature.setGeometry(output_geometry)
+            writer.addFeature(out_feature)
             progress.setPercentage(int(current * total))
 
         del writer

diff --git a/python/plugins/processing/tests/testdata/expected/simplify_lines.gfs b/python/plugins/processing/tests/testdata/expected/simplify_lines.gfs
@@ -0,0 +1,15 @@
+<GMLFeatureClassList>
+  <GMLFeatureClass>
+    <Name>simplify_lines</Name>
+    <ElementPath>simplify_lines</ElementPath>
+    <GeometryType>2</GeometryType>
+    <SRSName>EPSG:4326</SRSName>
+    <DatasetSpecificInfo>
+      <FeatureCount>7</FeatureCount>
+      <ExtentXMin>-1.00000</ExtentXMin>
+      <ExtentXMax>11.00000</ExtentXMax>
+      <ExtentYMin>-3.00000</ExtentYMin>
+      <ExtentYMax>5.00000</ExtentYMax>
+    </DatasetSpecificInfo>
+  </GMLFeatureClass>
+</GMLFeatureClassList>
diff --git a/python/plugins/processing/tests/testdata/expected/simplify_lines.gml b/python/plugins/processing/tests/testdata/expected/simplify_lines.gml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation=""
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
+      <gml:coord><gml:X>11</gml:X><gml:Y>5</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.0">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>6,2 9,2 11,5</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.1">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>-1,-1 1,-1</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.2">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>2,0 3,3</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.3">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>3,1 5,1</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.4">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>7,-3 10,-3</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.5">
+      <ogr:geometryProperty><gml:LineString srsName="EPSG:4326"><gml:coordinates>6,-3 10,1</gml:coordinates></gml:LineString></ogr:geometryProperty>
+    </ogr:simplify_lines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_lines fid="lines.6">
+    </ogr:simplify_lines>
+  </gml:featureMember>
+</ogr:FeatureCollection>
diff --git a/python/plugins/processing/tests/testdata/expected/simplify_multilines.gfs b/python/plugins/processing/tests/testdata/expected/simplify_multilines.gfs
@@ -0,0 +1,15 @@
+<GMLFeatureClassList>
+  <GMLFeatureClass>
+    <Name>simplify_multilines</Name>
+    <ElementPath>simplify_multilines</ElementPath>
+    <GeometryType>5</GeometryType>
+    <SRSName>EPSG:4326</SRSName>
+    <DatasetSpecificInfo>
+      <FeatureCount>4</FeatureCount>
+      <ExtentXMin>-1.00000</ExtentXMin>
+      <ExtentXMax>5.58042</ExtentXMax>
+      <ExtentYMin>-1.00000</ExtentYMin>
+      <ExtentYMax>4.11977</ExtentYMax>
+    </DatasetSpecificInfo>
+  </GMLFeatureClass>
+</GMLFeatureClassList>
diff --git a/python/plugins/processing/tests/testdata/expected/simplify_multilines.gml b/python/plugins/processing/tests/testdata/expected/simplify_multilines.gml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation=""
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-1</gml:Y></gml:coord>
+      <gml:coord><gml:X>5.58042226487524</gml:X><gml:Y>4.119769673704415</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+
+  <gml:featureMember>
+    <ogr:simplify_multilines fid="lines.1">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>-1,-1 1,-1</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:simplify_multilines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_multilines fid="lines.2">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>3,1 5,1</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>5.024184261036468,2.414779270633399 5,1</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:simplify_multilines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_multilines fid="lines.3">
+    </ogr:simplify_multilines>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:simplify_multilines fid="lines.4">
+      <ogr:geometryProperty><gml:MultiLineString srsName="EPSG:4326"><gml:lineStringMember><gml:LineString><gml:coordinates>2,0 3,3</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>2.944337811900192,4.04721689059501 5.459500959692898,4.119769673704415</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>3,3 5.58042226487524,2.946833013435702</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString></ogr:geometryProperty>
+    </ogr:simplify_multilines>
+  </gml:featureMember>
+</ogr:FeatureCollection>
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -916,3 +916,26 @@ tests:
         name: expected/extract_nodes_lines.gml
         type: vector
 
+  - algorithm: qgis:simplifygeometries
+    name: Simplify (lines)
+    params:
+      INPUT:
+        name: lines.gml
+        type: vector
+      TOLERANCE: 1.0
+    results:
+      OUTPUT:
+        name: expected/simplify_lines.gml
+        type: vector
+
+  - algorithm: qgis:simplifygeometries
+    name: Simplify (multilines)
+    params:
+      INPUT:
+        name: multilines.gml
+        type: vector
+      TOLERANCE: 1.0
+    results:
+      OUTPUT:
+        name: expected/simplify_multilines.gml
+        type: vector