Updates to union geoprocessing tool: Fixes ##1865; Note: Misformed geometries still an issue with some complex geometries

git-svn-id: http://svn.osgeo.org/qgis/trunk@11341 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: cfarmer

python/plugins/fTools/tools/doGeoprocessing.py

@@ -1023,9 +1023,8 @@ def union( self ):
           try:
             if geom.intersects( tmpGeom ):
               found = True
-              diff_geom = QgsGeometry( geom.difference( tmpGeom ) )#
+              diff_geom = QgsGeometry( geom.difference( tmpGeom ) )
               int_geom = QgsGeometry( geom.intersection( tmpGeom ) )
-              print "found"
               if int_geom.wkbType() == 7:
                 int_com = geom.combine( tmpGeom )
                 int_sym = geom.symDifference( tmpGeom )
@@ -1061,7 +1060,7 @@ def union( self ):
       if len(intersects) <= 0:
         try:
           outFeat.setGeometry( diff_geom )
-          outFeat.setAttributeMap( atMapA )
+          outFeat.setAttributeMap( atMap )
           writer.addFeature( outFeat )
         except:
           FEATURE_EXCEPT = False