[QGIS Commit] r11341 - trunk/qgis/python/plugins/fTools/tools

[svn_qgis at osgeo.org]

Author: cfarmer
Date: 2009-08-10 18:36:47 -0400 (Mon, 10 Aug 2009)
New Revision: 11341

Modified:
   trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
Log:
Updates to union geoprocessing tool: Fixes ##1865; Note: Misformed geometries still an issue with some complex geometries

Modified: trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py
===================================================================
--- trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2009-08-10 22:22:40 UTC (rev 11340)
+++ trunk/qgis/python/plugins/fTools/tools/doGeoprocessing.py	2009-08-10 22:36:47 UTC (rev 11341)
@@ -1023,9 +1023,8 @@
           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 @@
       if len(intersects) <= 0:
         try:
           outFeat.setGeometry( diff_geom )
-          outFeat.setAttributeMap( atMapA )
+          outFeat.setAttributeMap( atMap )
           writer.addFeature( outFeat )
         except:
           FEATURE_EXCEPT = False