[processing] stop algorithm execution if geometry/feature error occured

alexbruy · alexbruy · commit c620c7c306e9 · 2017-05-13T09:45:37.000+03:00
(fix #11986)
diff --git a/python/plugins/processing/algs/qgis/Intersection.py b/python/plugins/processing/algs/qgis/Intersection.py
@@ -36,6 +36,7 @@
                        QgsMessageLog,
                        QgsProcessingUtils)
 
+from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.parameters import ParameterVector
 from processing.core.outputs import OutputVector
@@ -114,9 +115,10 @@ def processAlgorithm(self, context, feedback):
                             int_sym = geom.symDifference(tmpGeom)
                             int_geom = QgsGeometry(int_com.difference(int_sym))
                     if int_geom.isEmpty() or not int_geom.isGeosValid():
-                        QgsMessageLog.logMessage(self.tr('GEOS geoprocessing error: One or '
-                                                         'more input features have invalid '
-                                                         'geometry.'), self.tr('Processing'), QgsMessageLog.CRITICAL)
+                        raise GeoAlgorithmExecutionException(
+                            self.tr('GEOS geoprocessing error: One or '
+                                    'more input features have invalid '
+                                    'geometry.'))
                     try:
                         if int_geom.wkbType() in wkbTypeGroups[wkbTypeGroups[int_geom.wkbType()]]:
                             outFeat.setGeometry(int_geom)
@@ -126,7 +128,9 @@ def processAlgorithm(self, context, feedback):
                             outFeat.setAttributes(attrs)
                             writer.addFeature(outFeat)
                     except:
-                        QgsMessageLog.logMessage(self.tr('Feature geometry error: One or more output features ignored due to invalid geometry.'), self.tr('Processing'), QgsMessageLog.INFO)
-                        continue
+                        raise GeoAlgorithmExecutionException(
+                            self.tr('Feature geometry error: One or more '
+                                    'output features ignored due to invalid '
+                                    'geometry.'))
 
         del writer
