[Processing] Make DeleteHoles algorithm NULL geometry aware

qgis · Feb 4, 2016 · 1205082 · 1205082
1 parent cd10c6c
commit 1205082
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/python/plugins/processing/algs/qgis/DeleteHoles.py b/python/plugins/processing/algs/qgis/DeleteHoles.py
@@ -60,18 +60,21 @@ def processAlgorithm(self, progress):
         for count, f in enumerate(features):
 
             geometry = f.geometry()
-            if geometry.isMultipart():
-                multi_polygon = geometry.asMultiPolygon()
-                for polygon in multi_polygon:
+            if geometry:
+                if geometry.isMultipart():
+                    multi_polygon = geometry.asMultiPolygon()
+                    for polygon in multi_polygon:
+                        for ring in polygon[1:]:
+                            polygon.remove(ring)
+                    geometry = QgsGeometry.fromMultiPolygon(multi_polygon)
+
+                else:
+                    polygon = geometry.asPolygon()
                     for ring in polygon[1:]:
                         polygon.remove(ring)
-                geometry = QgsGeometry.fromMultiPolygon(multi_polygon)
-
+                    geometry = QgsGeometry.fromPolygon(polygon)
             else:
-                polygon = geometry.asPolygon()
-                for ring in polygon[1:]:
-                    polygon.remove(ring)
-                geometry = QgsGeometry.fromPolygon(polygon)
+                geometry = QgsGeometry(None)
 
             feat.setGeometry(geometry)
             feat.setAttributes(f.attributes())