Revert last commit

This reverts commit 5cb6dd7c0b686890cffff1c0d4476dfa2dce57f9.
This commit is contained in:
Alexander Bruy 2012-05-22 14:16:10 +03:00
parent 5cb6dd7c0b
commit a76d629f19

View File

@ -1145,18 +1145,14 @@ class geoprocessingThread( QThread ):
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( 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 ) )