[Geometry checker] Don't recheck any features if fixed error resulted in no changes

manisandro · manisandro · commit 8cefc6561aac · 2017-10-23T17:25:08.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -113,7 +113,8 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
     return false;
   }
 
-  if ( error->resolutionMessage() == tr( "No action" ) )
+  // If nothing was changed, stop here
+  if ( changes.isEmpty() )
   {
     return true;
   }
@@ -188,20 +189,6 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
     }
   }
 
-  // Remove just-fixed error from newly-found errors if no changes occurred (needed in case error was fixed with "no change")
-  if ( changes.isEmpty() )
-  {
-    for ( QgsGeometryCheckError *recheckErr : recheckErrors )
-    {
-      if ( recheckErr->isEqual( error ) )
-      {
-        recheckErrors.removeAll( recheckErr );
-        delete recheckErr;
-        break;
-      }
-    }
-  }
-
   // Go through error list, update other errors of the checked feature
   for ( QgsGeometryCheckError *err : mCheckErrors )
   {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`113`	`113`	`return false;`
`114`	`114`	`}`
`115`	`115`
`116`		`- if ( error->resolutionMessage() == tr( "No action" ) )`
	`116`	`+ // If nothing was changed, stop here`
	`117`	`+ if ( changes.isEmpty() )`
`117`	`118`	`{`
`118`	`119`	`return true;`
`119`	`120`	`}`
`@@ -188,20 +189,6 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`
`191`		`- // Remove just-fixed error from newly-found errors if no changes occurred (needed in case error was fixed with "no change")`
`192`		`- if ( changes.isEmpty() )`
`193`		`- {`
`194`		`- for ( QgsGeometryCheckError *recheckErr : recheckErrors )`
`195`		`- {`
`196`		`- if ( recheckErr->isEqual( error ) )`
`197`		`- {`
`198`		`- recheckErrors.removeAll( recheckErr );`
`199`		`- delete recheckErr;`
`200`		`- break;`
`201`		`- }`
`202`		`- }`
`203`		`- }`
`204`		`-`
`205`	`192`	`// Go through error list, update other errors of the checked feature`
`206`	`193`	`for ( QgsGeometryCheckError *err : mCheckErrors )`
`207`	`194`	`{`