[processing] Remove special handling for invalid geometries

Instead rely on QgsFeatureRequest method. There's a temporary loss of the feedback on encountering an invalid geometry when abort on invalid is set, but that will be resurrected when all of vector.features is moved to c++
qgis · Apr 25, 2017 · ee77744 · ee77744
1 parent 5d377be
commit ee77744
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -99,34 +99,20 @@ class Features(object):
         def __init__(self, layer, request):
             self.layer = layer
             self.selection = False
+
+            invalidFeaturesMethod = ProcessingConfig.getSetting(ProcessingConfig.FILTER_INVALID_GEOMETRIES)
+            if invalidFeaturesMethod == self.IGNORE:
+                request.setInvalidGeometryCheck(QgsFeatureRequest.GeometrySkipInvalid)
+            elif invalidFeaturesMethod == self.RAISE_EXCEPTION:
+                request.setInvalidGeometryCheck(QgsFeatureRequest.GeometryAbortOnInvalid)
+
             if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED)\
                     and layer.selectedFeatureCount() > 0:
                 self.iter = layer.selectedFeaturesIterator(request)
                 self.selection = True
             else:
                 self.iter = layer.getFeatures(request)
 
-            invalidFeaturesMethod = ProcessingConfig.getSetting(ProcessingConfig.FILTER_INVALID_GEOMETRIES)
-
-            def filterFeature(f, ignoreInvalid):
-                geom = f.geometry()
-                if geom is None:
-                    ProcessingLog.addToLog(ProcessingLog.LOG_INFO,
-                                           self.tr('Feature with NULL geometry found.'))
-                elif not geom.isGeosValid():
-                    ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
-                                           self.tr('GEOS geoprocessing error: One or more input features have invalid geometry.'))
-                    if ignoreInvalid:
-                        return False
-                    else:
-                        raise GeoAlgorithmExecutionException(self.tr('Features with invalid geometries found. Please fix these geometries or specify the "Ignore invalid input features" flag'))
-                return True
-
-            if invalidFeaturesMethod == self.IGNORE:
-                self.iter = filter(lambda x: filterFeature(x, True), self.iter)
-            elif invalidFeaturesMethod == self.RAISE_EXCEPTION:
-                self.iter = filter(lambda x: filterFeature(x, False), self.iter)
-
         def __iter__(self):
             return self.iter