@@ -891,7 +891,6 @@ def intersect( self ):
891
891
crs_match = None
892
892
else :
893
893
crs_match = crsA == crsB
894
-
895
894
fields = ftools_utils .combineVectorFields ( self .vlayerA , self .vlayerB )
896
895
longNames = ftools_utils .checkFieldNameLength ( fields )
897
896
if not longNames .isEmpty ():
@@ -945,7 +944,8 @@ def intersect( self ):
945
944
gList = ftools_utils .getGeomType ( geom .wkbType () )
946
945
if int_geom .wkbType () in gList :
947
946
outFeat .setGeometry ( int_geom )
948
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
947
+ atMapA .extend ( atMapB )
948
+ outFeat .setAttributes ( atMapA )
949
949
writer .addFeature ( outFeat )
950
950
except :
951
951
FEATURE_EXCEPT = False
@@ -976,7 +976,8 @@ def intersect( self ):
976
976
gList = ftools_utils .getGeomType ( geom .wkbType () )
977
977
if int_geom .wkbType () in gList :
978
978
outFeat .setGeometry ( int_geom )
979
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
979
+ atMapA .extend ( atMapB )
980
+ outFeat .setAttributes ( atMapA )
980
981
writer .addFeature ( outFeat )
981
982
except :
982
983
EATURE_EXCEPT = False
@@ -1015,7 +1016,8 @@ def intersect( self ):
1015
1016
gList = ftools_utils .getGeomType ( geom .wkbType () )
1016
1017
if int_geom .wkbType () in gList :
1017
1018
outFeat .setGeometry ( int_geom )
1018
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
1019
+ atMapA .extend ( atMapB )
1020
+ outFeat .setAttributes ( atMapA )
1019
1021
writer .addFeature ( outFeat )
1020
1022
except :
1021
1023
FEATURE_EXCEPT = False
@@ -1025,8 +1027,8 @@ def intersect( self ):
1025
1027
break
1026
1028
# we have no selection in overlay layer
1027
1029
else :
1028
- fitA = vproviderA .getFeatures ()
1029
- while fita .nextFeature ( inFeatA ):
1030
+ fitA = vproviderA .getFeatures ()
1031
+ while fitA .nextFeature ( inFeatA ):
1030
1032
nElement += 1
1031
1033
self .emit ( SIGNAL ( "runStatus(PyQt_PyObject)" ), nElement )
1032
1034
geom = QgsGeometry ( inFeatA .geometry () )
@@ -1043,11 +1045,13 @@ def intersect( self ):
1043
1045
int_com = geom .combine ( tmpGeom )
1044
1046
int_sym = geom .symDifference ( tmpGeom )
1045
1047
int_geom = QgsGeometry ( int_com .difference ( int_sym ) )
1048
+
1046
1049
try :
1047
1050
gList = ftools_utils .getGeomType ( geom .wkbType () )
1048
1051
if int_geom .wkbType () in gList :
1049
1052
outFeat .setGeometry ( int_geom )
1050
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
1053
+ atMapA .extend ( atMapB )
1054
+ outFeat .setAttributes ( atMapA )
1051
1055
writer .addFeature ( outFeat )
1052
1056
except :
1053
1057
FEATURE_EXCEPT = False
@@ -1148,7 +1152,8 @@ def union( self ):
1148
1152
int_geom = QgsGeometry ( i )
1149
1153
try :
1150
1154
outFeat .setGeometry ( int_geom )
1151
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
1155
+ atMapA .extend ( atMapB )
1156
+ outFeat .setAttributes ( atMapA )
1152
1157
writer .addFeature ( outFeat )
1153
1158
except Exception , err :
1154
1159
FEATURE_EXCEPT = False
@@ -1161,7 +1166,8 @@ def union( self ):
1161
1166
if int_geom .wkbType () in gList :
1162
1167
try :
1163
1168
outFeat .setGeometry ( int_geom )
1164
- outFeat .setAttributes ( atMapA .extend ( atMapB ) )
1169
+ atMapA .extend ( atMapB )
1170
+ outFeat .setAttributes ( atMapA )
1165
1171
writer .addFeature ( outFeat )
1166
1172
except Exception , err :
1167
1173
FEATURE_EXCEPT = False
0 commit comments