Revert "Check validity of input geometries in intersection algorithm"

m-kuhn · m-kuhn · commit 01e570cc06b7 · 2016-10-20T16:42:54.000+02:00
This reverts commit dbbbf61. Has broken some tests, needs more investigation
diff --git a/python/plugins/processing/algs/qgis/Intersection.py b/python/plugins/processing/algs/qgis/Intersection.py
@@ -85,16 +85,12 @@ def processAlgorithm(self, progress):
         for current, inFeatA in enumerate(selectionA):
             progress.setPercentage(int(current * total))
             geom = QgsGeometry(inFeatA.geometry())
-            if not geom.isGeosValid():
-                raise GeoAlgorithmExecutionException(
-                    self.tr('Input layer A contains invalid geometries. Unable to complete intersection algorithm.'))
             atMapA = inFeatA.attributes()
             intersects = index.intersects(geom.boundingBox())
-            for inFeatB in vlayerB.getFeatures(QgsFeatureRequest().setFilterFids(intersects)):
+            for i in intersects:
+                request = QgsFeatureRequest().setFilterFid(i)
+                inFeatB = vlayerB.getFeatures(request).next()
                 tmpGeom = QgsGeometry(inFeatB.geometry())
-                if not tmpGeom.isGeosValid():
-                    raise GeoAlgorithmExecutionException(
-                        self.tr('Input layer B contains invalid geometries. Unable to complete intersection algorithm.'))
                 if geom.intersects(tmpGeom):
                     atMapB = inFeatB.attributes()
                     int_geom = QgsGeometry(geom.intersection(tmpGeom))
