[Geometry checker] Fix incorrect logic in QgsGeometryCheckError::handleChanges

manisandro · manisandro · commit cc9a2b336fc3 · 2017-10-23T17:25:08.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
@@ -102,7 +102,7 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes &chan
     }
     else if ( change.what == QgsGeometryCheck::ChangePart )
     {
-      if ( change.type == QgsGeometryCheck::ChangeChanged || mVidx.part == change.vidx.part )
+      if ( mVidx.part == change.vidx.part )
       {
         return false;
       }
@@ -115,7 +115,7 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes &chan
     {
       if ( mVidx.partEqual( change.vidx ) )
       {
-        if ( change.type == QgsGeometryCheck::ChangeChanged || mVidx.ring == change.vidx.ring )
+        if ( mVidx.ring == change.vidx.ring )
         {
           return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes &chan`
`102`	`102`	`}`
`103`	`103`	`else if ( change.what == QgsGeometryCheck::ChangePart )`
`104`	`104`	`{`
`105`		`- if ( change.type == QgsGeometryCheck::ChangeChanged \|\| mVidx.part == change.vidx.part )`
	`105`	`+ if ( mVidx.part == change.vidx.part )`
`106`	`106`	`{`
`107`	`107`	`return false;`
`108`	`108`	`}`
`@@ -115,7 +115,7 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes &chan`
`115`	`115`	`{`
`116`	`116`	`if ( mVidx.partEqual( change.vidx ) )`
`117`	`117`	`{`
`118`		`- if ( change.type == QgsGeometryCheck::ChangeChanged \|\| mVidx.ring == change.vidx.ring )`
	`118`	`+ if ( mVidx.ring == change.vidx.ring )`
`119`	`119`	`{`
`120`	`120`	`return false;`
`121`	`121`	`}`