[Geometry checker] Fix possible data provider errors due to referring to deleted features

manisandro · manisandro · commit 087ec08b9ce5 · 2016-07-14T17:39:06.000+02:00
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp
@@ -200,14 +200,14 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx,
     return false;
   }
 
-  // Remove polygon from source geometry
-  deleteFeatureGeometryPart( feature, partIdx, changes );
+  // Replace polygon in merge geometry
   if ( mergeFeature.id() == feature.id() && mergePartIdx > partIdx )
   {
     --mergePartIdx;
   }
-  // Replace polygon in merge geometry
   replaceFeatureGeometryPart( mergeFeature, mergePartIdx, combinedGeom, changes );
+  // Remove polygon from source geometry
+  deleteFeatureGeometryPart( feature, partIdx, changes );
 
   return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -200,14 +200,14 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx,`
`200`	`200`	`return false;`
`201`	`201`	`}`
`202`	`202`
`203`		`- // Remove polygon from source geometry`
`204`		`- deleteFeatureGeometryPart( feature, partIdx, changes );`
	`203`	`+ // Replace polygon in merge geometry`
`205`	`204`	`if ( mergeFeature.id() == feature.id() && mergePartIdx > partIdx )`
`206`	`205`	`{`
`207`	`206`	`--mergePartIdx;`
`208`	`207`	`}`
`209`		`- // Replace polygon in merge geometry`
`210`	`208`	`replaceFeatureGeometryPart( mergeFeature, mergePartIdx, combinedGeom, changes );`
	`209`	`+ // Remove polygon from source geometry`
	`210`	`+ deleteFeatureGeometryPart( feature, partIdx, changes );`
`211`	`211`
`212`	`212`	`return true;`
`213`	`213`	`}`