[Geometry checker] Ensure overlap check returns on error for each overlap part

manisandro · manisandro · commit 58e39f6a065d · 2017-10-23T17:25:07.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
@@ -54,10 +54,11 @@ void QgsGeometryOverlapCheck::collectErrors( QList<QgsGeometryCheckError *> &err
           QgsGeometryCheckerUtils::filter1DTypes( interGeom );
           for ( int iPart = 0, nParts = interGeom->partCount(); iPart < nParts; ++iPart )
           {
-            double area = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart )->area();
+            QgsAbstractGeometry *interPart = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart );
+            double area = interPart->area();
             if ( area > mContext->reducedTolerance && area < overlapThreshold )
             {
-              errors.append( new QgsGeometryOverlapCheckError( this, layerFeatureA.layer().id(), layerFeatureA.feature().id(), interGeom->clone(), QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart )->centroid(), area, qMakePair( layerFeatureB.layer().id(), layerFeatureB.feature().id() ) ) );
+              errors.append( new QgsGeometryOverlapCheckError( this, layerFeatureA, interPart->clone(), interPart->centroid(), area, layerFeatureB ) );
             }
           }
         }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
@@ -22,14 +22,13 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheckError : public QgsGeometryCheckErro
 {
   public:
     QgsGeometryOverlapCheckError( const QgsGeometryCheck *check,
-                                  const QString &layerId,
-                                  QgsFeatureId featureId,
+                                  const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
                                   QgsAbstractGeometry *geometry,
                                   const QgsPointXY &errorLocation,
                                   const QVariant &value,
-                                  const QPair<QString, QgsFeatureId> &overlappedFeature )
-      : QgsGeometryCheckError( check, layerId, featureId, geometry, errorLocation, QgsVertexId(), value, ValueArea )
-      , mOverlappedFeature( overlappedFeature )
+                                  const QgsGeometryCheckerUtils::LayerFeature &overlappedFeature )
+      : QgsGeometryCheckError( check, layerFeature.layer().id(), layerFeature.feature().id(), geometry, errorLocation, QgsVertexId(), value, ValueArea )
+      , mOverlappedFeature( qMakePair( overlappedFeature.layer().id(), overlappedFeature.feature().id() ) )
     { }
     const QPair<QString, QgsFeatureId> &overlappedFeature() const { return mOverlappedFeature; }
 

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,11 @@ void QgsGeometryOverlapCheck::collectErrors( QList<QgsGeometryCheckError *> &err`
`54`	`54`	`QgsGeometryCheckerUtils::filter1DTypes( interGeom );`
`55`	`55`	`for ( int iPart = 0, nParts = interGeom->partCount(); iPart < nParts; ++iPart )`
`56`	`56`	`{`
`57`		`- double area = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart )->area();`
	`57`	`+ QgsAbstractGeometry *interPart = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart );`
	`58`	`+ double area = interPart->area();`
`58`	`59`	`if ( area > mContext->reducedTolerance && area < overlapThreshold )`
`59`	`60`	`{`
`60`		`- errors.append( new QgsGeometryOverlapCheckError( this, layerFeatureA.layer().id(), layerFeatureA.feature().id(), interGeom->clone(), QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart )->centroid(), area, qMakePair( layerFeatureB.layer().id(), layerFeatureB.feature().id() ) ) );`
	`61`	`+ errors.append( new QgsGeometryOverlapCheckError( this, layerFeatureA, interPart->clone(), interPart->centroid(), area, layerFeatureB ) );`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`