Yet another fix to 594fafe

qgis · Nov 24, 2015 · afd436d · afd436d
1 parent a630205
commit afd436d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -1197,7 +1197,7 @@ def union(self):
                         intB = QgsGeometry.unaryUnion(lstIntersectingB)
                         diff_geom = diff_geom.difference(intB)
 
-                    if diff_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                    if diff_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(diff_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                         temp_list = diff_geom.asGeometryCollection()
                         for i in temp_list:
                             if i.type() == geom.type():
@@ -1415,7 +1415,7 @@ def clip(self):
                         try:
                             cur_geom = QgsGeometry(outFeat.geometry())
                             new_geom = QgsGeometry(geom.intersection(cur_geom))
-                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                                 int_com = QgsGeometry(geom.combine(cur_geom))
                                 int_sym = QgsGeometry(geom.symDifference(cur_geom))
                                 new_geom = QgsGeometry(int_com.difference(int_sym))
@@ -1459,7 +1459,7 @@ def clip(self):
                         try:
                             cur_geom = QgsGeometry(outFeat.geometry())
                             new_geom = QgsGeometry(geom.intersection(cur_geom))
-                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                                 int_com = QgsGeometry(geom.combine(cur_geom))
                                 int_sym = QgsGeometry(geom.symDifference(cur_geom))
                                 new_geom = QgsGeometry(int_com.difference(int_sym))
@@ -1511,7 +1511,7 @@ def clip(self):
                         try:
                             cur_geom = QgsGeometry(outFeat.geometry())
                             new_geom = QgsGeometry(geom.intersection(cur_geom))
-                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                            if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                                 int_com = QgsGeometry(geom.combine(cur_geom))
                                 int_sym = QgsGeometry(geom.symDifference(cur_geom))
                                 new_geom = QgsGeometry(int_com.difference(int_sym))
@@ -1557,7 +1557,7 @@ def clip(self):
                             try:
                                 cur_geom = QgsGeometry(outFeat.geometry())
                                 new_geom = QgsGeometry(geom.intersection(cur_geom))
-                                if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                                if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                                     int_com = QgsGeometry(geom.combine(cur_geom))
                                     int_sym = QgsGeometry(geom.symDifference(cur_geom))
                                     new_geom = QgsGeometry(int_com.difference(int_sym))

diff --git a/python/plugins/processing/algs/qgis/Clip.py b/python/plugins/processing/algs/qgis/Clip.py
@@ -103,7 +103,7 @@ def processAlgorithm(self, progress):
                     try:
                         cur_geom = QgsGeometry(outFeat.geometry())
                         new_geom = QgsGeometry(geom.intersection(cur_geom))
-                        if new_geom.wkbType() == 0 or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                        if new_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(new_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                             int_com = QgsGeometry(geom.combine(cur_geom))
                             int_sym = QgsGeometry(geom.symDifference(cur_geom))
                             new_geom = QgsGeometry(int_com.difference(int_sym))

diff --git a/python/plugins/processing/algs/qgis/Union.py b/python/plugins/processing/algs/qgis/Union.py
@@ -99,7 +99,7 @@ def processAlgorithm(self, progress):
                         else:
                             int_geom = QgsGeometry(int_geom)
 
-                        if int_geom.wkbType() == 0 or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
+                        if int_geom.wkbType() == QGis.WKBUnknown or QgsWKBTypes.flatType(int_geom.geometry().wkbType()) == QgsWKBTypes.GeometryCollection:
                             # Intersection produced different geomety types
                             temp_list = int_geom.asGeometryCollection()
                             for i in temp_list: