fix #13067 : bad geometries in the difference tool

(cherry picked from commit fe1a032)
qgis · Jul 5, 2015 · 2e77e9c · 2e77e9c
1 parent 7b15f7a
commit 2e77e9c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -893,6 +893,10 @@ def difference( self ):
             try:
               if diff_geom.intersects( tmpGeom ):
                 diff_geom = QgsGeometry( diff_geom.difference( tmpGeom ) )
+              if diff_geom.isGeosEmpty():
+                GEOS_EXCEPT = False
+                add = False
+                break
             except:
               GEOS_EXCEPT = False
               add = False

diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py
@@ -92,6 +92,10 @@ def processAlgorithm(self, progress):
                 try:
                     if diff_geom.intersects(tmpGeom):
                         diff_geom = QgsGeometry(diff_geom.difference(tmpGeom))
+                    if diff_geom.isGeosEmpty():
+                        GEOS_EXCEPT = False
+                        add = False
+                        break
                 except:
                     GEOS_EXCEPT = False
                     add = False