[Geometry checker] Don't make minimal angle fix produce duplicate nodes

manisandro · manisandro · commit 13da9f52ff10 · 2016-07-14T17:10:55.000+02:00
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsgeometryanglecheck.h"
+#include "qgsgeometryutils.h"
 #include "../utils/qgsfeaturepool.h"
 
 void QgsGeometryAngleCheck::collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &/*messages*/, QAtomicInt* progressCounter , const QgsFeatureIds &ids ) const
@@ -124,9 +125,15 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError* error, int method,
     }
     else
     {
+      changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, vidx ) );
+      if ( QgsGeometryUtils::sqrDistance2D( p1, p3 ) < QgsGeometryCheckPrecision::tolerance() * QgsGeometryCheckPrecision::tolerance()
+           && QgsGeometryCheckerUtils::canDeleteVertex( geometry, vidx.part, vidx.ring ) &&
+           geometry->deleteVertex( error->vidx() ) ) // error->vidx points to p3 after removing p2
+      {
+        changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, QgsVertexId( vidx.part, vidx.ring, ( vidx.vertex + 1 ) % n ) ) );
+      }
       mFeaturePool->updateFeature( feature );
       error->setFixed( method );
-      changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, vidx ) );
     }
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`***************************************************************************/`
`15`	`15`
`16`	`16`	`#include "qgsgeometryanglecheck.h"`
	`17`	`+#include "qgsgeometryutils.h"`
`17`	`18`	`#include "../utils/qgsfeaturepool.h"`
`18`	`19`
`19`	`20`	`void QgsGeometryAngleCheck::collectErrors( QList<QgsGeometryCheckError>& errors, QStringList &/messages/, QAtomicInt progressCounter , const QgsFeatureIds &ids ) const`
`@@ -124,9 +125,15 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError* error, int method,`
`124`	`125`	`}`
`125`	`126`	`else`
`126`	`127`	`{`
	`128`	`+ changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, vidx ) );`
	`129`	`+ if ( QgsGeometryUtils::sqrDistance2D( p1, p3 ) < QgsGeometryCheckPrecision::tolerance() * QgsGeometryCheckPrecision::tolerance()`
	`130`	`+ && QgsGeometryCheckerUtils::canDeleteVertex( geometry, vidx.part, vidx.ring ) &&`
	`131`	`+ geometry->deleteVertex( error->vidx() ) ) // error->vidx points to p3 after removing p2`
	`132`	`+ {`
	`133`	`+ changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, QgsVertexId( vidx.part, vidx.ring, ( vidx.vertex + 1 ) % n ) ) );`
	`134`	`+ }`
`127`	`135`	`mFeaturePool->updateFeature( feature );`
`128`	`136`	`error->setFixed( method );`
`129`		`- changes[error->featureId()].append( Change( ChangeNode, ChangeRemoved, vidx ) );`
`130`	`137`	`}`
`131`	`138`	`}`
`132`	`139`	`else`