Merge pull request #150 from slarosa/master

fix #3549

Author: alexbruy

python/plugins/fTools/tools/doGeoprocessing.py

@@ -970,9 +970,15 @@ def intersect( self ):
                     int_sym = geom.symDifference( tmpGeom )
                     int_geom = QgsGeometry( int_com.difference( int_sym ) )
                   try:
-                    outFeat.setGeometry( int_geom )
-                    outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                    writer.addFeature( outFeat )
+                    # Geometry list: prevents writing error 
+                    # in geometries of different types
+                    # produced by the intersection 
+                    # fix #3549
+                    gList = ftools_utils.getGeomType( geom.wkbType() )
+                    if int_geom.wkbType() in gList:
+                      outFeat.setGeometry( int_geom )
+                      outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                      writer.addFeature( outFeat )
                   except:
                     FEATURE_EXCEPT = False
                     continue
@@ -999,9 +1005,11 @@ def intersect( self ):
                   int_sym = geom.symDifference( tmpGeom )
                   int_geom = QgsGeometry( int_com.difference( int_sym ) )
                 try:
-                  outFeat.setGeometry( int_geom )
-                  outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                  writer.addFeature( outFeat )
+                  gList = ftools_utils.getGeomType( geom.wkbType() )
+                  if int_geom.wkbType() in gList:
+                    outFeat.setGeometry( int_geom )
+                    outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                    writer.addFeature( outFeat )
                 except:
                   EATURE_EXCEPT = False
                   continue
@@ -1037,9 +1045,11 @@ def intersect( self ):
                     int_sym = geom.symDifference( tmpGeom )
                     int_geom = QgsGeometry( int_com.difference( int_sym ) )
                   try:
-                    outFeat.setGeometry( int_geom )
-                    outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                    writer.addFeature( outFeat )
+                    gList = ftools_utils.getGeomType( geom.wkbType() )
+                    if int_geom.wkbType() in gList:
+                      outFeat.setGeometry( int_geom )
+                      outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                      writer.addFeature( outFeat )
                   except:
                     FEATURE_EXCEPT = False
                     continue
@@ -1066,9 +1076,11 @@ def intersect( self ):
                   int_sym = geom.symDifference( tmpGeom )
                   int_geom = QgsGeometry( int_com.difference( int_sym ) )
                 try:
-                  outFeat.setGeometry( int_geom )
-                  outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                  writer.addFeature( outFeat )
+                  gList = ftools_utils.getGeomType( geom.wkbType() )
+                  if int_geom.wkbType() in gList:
+                    outFeat.setGeometry( int_geom )
+                    outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                    writer.addFeature( outFeat )
                 except:
                   FEATURE_EXCEPT = False
                   continue
@@ -1180,12 +1192,18 @@ def union( self ):
                     except Exception, err:
                       FEATURE_EXCEPT = False
               else:
-                try:
-                  outFeat.setGeometry( int_geom )
-                  outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                  writer.addFeature( outFeat )
-                except Exception, err:
-                  FEATURE_EXCEPT = False
+                # Geometry list: prevents writing error 
+                # in geometries of different types
+                # produced by the intersection
+                # fix #3549
+                gList = ftools_utils.getGeomType(  geom.wkbType() )
+                if int_geom.wkbType() in gList:
+                  try:
+                    outFeat.setGeometry( int_geom )
+                    outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                    writer.addFeature( outFeat )
+                  except Exception, err:
+                    FEATURE_EXCEPT = False
             else:
               # this only happends if the bounding box
               # intersects, but the geometry doesn't

python/plugins/fTools/tools/ftools_utils.py

@@ -344,6 +344,14 @@ def getUniqueValuesCount( vlayer, fieldIndex, useSelection ):
                 count += 1
     return count
 
+def getGeomType(gT):
+  if gT == 3 or gT == 6:
+    gTypeListPoly = [ QGis.WKBPolygon, QGis.WKBMultiPolygon ]
+    return gTypeListPoly
+  elif gT == 2 or gT == 5:
+    gTypeListLine = [ QGis.WKBLineString, QGis.WKBMultiLineString ]
+    return gTypeListLine
+
 def getShapesByGeometryType( baseDir, inShapes, geomType ):
   outShapes = QStringList()
   for fileName in inShapes: