python/plugins/fTools/tools/doGeoprocessing.py

@@ -1145,24 +1145,22 @@ def union( self ):
               if int_geom.wkbType() == 0:
                 # intersection produced different geometry types
                 temp_list = int_geom.asGeometryCollection()
-                int_geom = []
                 for i in temp_list:
                   if i.type() == geom.type():
-                    int_geom.append( QgsGeometry( i ) )
-                  if len(int_geom) > 1:
-                    for j in int_geom:
-                      try:
-                        outFeat.setGeometry( j )
-                        outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                        writer.addFeature( outFeat )
-                      except Exception, err:
-                        FEATURE_EXCEPT = False
-              try:
-                outFeat.setGeometry( int_geom )
-                outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                writer.addFeature( outFeat )
-              except Exception, err:
-                FEATURE_EXCEPT = False
+                    int_geom = QgsGeometry( i )
+                    try:
+                      outFeat.setGeometry( int_geom )
+                      outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                      writer.addFeature( outFeat )
+                    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
             else:
               # this only happends if the bounding box
               # intersects, but the geometry doesn't