Fix backport of "force multitype output on processing overlay ops"

m-kuhn · m-kuhn · commit 1f5fb8097a71 · 2016-10-20T08:19:37.000+02:00
diff --git a/python/plugins/processing/algs/qgis/Clip.py b/python/plugins/processing/algs/qgis/Clip.py
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             source_layer.fields(),
-            QgsWKBTypes.multiType(source_layer.wkbType()),
+            QgsWKBTypes.multiType(QGis.fromOldWkbType(source_layer.wkbType())),
             source_layer.crs())
 
         # first build up a list of clip geometries
diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py
@@ -68,7 +68,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(Difference.OVERLAY))
         ignoreInvalid = self.getParameterValue(Difference.IGNORE_INVALID)
 
-        geomType = QgsWKBTypes.multiType(layerA.wkbType())
+        geomType = QgsWKBTypes.multiType(QGis.fromOldWkbType(layerA.wkbType()))
         writer = self.getOutputFromName(
             Difference.OUTPUT).getVectorWriter(layerA.pendingFields(),
                                                geomType,
diff --git a/python/plugins/processing/algs/qgis/Intersection.py b/python/plugins/processing/algs/qgis/Intersection.py
@@ -74,7 +74,7 @@ def processAlgorithm(self, progress):
         vlayerB = dataobjects.getObjectFromUri(
             self.getParameterValue(self.INPUT2))
 
-        geomType = QgsWKBTypes.multiType(vlayerA.wkbType())
+        geomType = QgsWKBTypes.multiType(QGis.fromOldWkbType(vlayerA.wkbType()))
         fields = vector.combineVectorFields(vlayerA, vlayerB)
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      geomType, vlayerA.crs())
diff --git a/python/plugins/processing/algs/qgis/SymmetricalDifference.py b/python/plugins/processing/algs/qgis/SymmetricalDifference.py
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
         layerB = dataobjects.getObjectFromUri(
             self.getParameterValue(self.OVERLAY))
 
-        geomType = QgsWKBTypes.multiType(layerA.wkbType())
+        geomType = QgsWKBTypes.multiType(QGis.fromOldWkbType(layerA.wkbType()))
         fields = vector.combineVectorFields(layerA, layerB)
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             fields, geomType, layerA.crs())
