[Geometry checker] Initial multilayer support for contained check

qgis · Oct 23, 2017 · 821eb40 · 821eb40
1 parent 55cf125
commit 821eb40
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 43 deletions.
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.cpp
@@ -13,85 +13,110 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgscrscache.h"
 #include "qgsgeometryengine.h"
 #include "qgsgeometrycontainedcheck.h"
 #include "../utils/qgsfeaturepool.h"
 
 void QgsGeometryContainedCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
 {
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds() : ids;
-  for ( const QString &layerId : featureIds.keys() )
+  for ( const QString &layerIdA : featureIds.keys() )
   {
-    QgsFeaturePool *featurePool = mContext->featurePools[ layerId ];
-    if ( !getCompatibility( featurePool->getLayer()->geometryType() ) )
+    QgsFeaturePool *featurePoolA = mContext->featurePools[ layerIdA ];
+    if ( !getCompatibility( featurePoolA->getLayer()->geometryType() ) )
     {
       continue;
     }
-    for ( QgsFeatureId featureid : featureIds[layerId] )
+    QgsCoordinateTransform crstA = QgsCoordinateTransformCache::instance()->transform( featurePoolA->getLayer()->crs().authid(), mContext->mapCrs );
+
+    for ( QgsFeatureId featureIdA : featureIds[layerIdA] )
     {
       if ( progressCounter ) progressCounter->fetchAndAddRelaxed( 1 );
-      QgsFeature feature;
-      if ( !featurePool->get( featureid, feature ) )
+      QgsFeature featureA;
+      if ( !featurePoolA->get( featureIdA, featureA ) )
       {
         continue;
       }
 
-      QgsGeometry featureGeom = feature.geometry();
-      QgsGeometryEngine *geomEngine = QgsGeometryCheckerUtils::createGeomEngine( featureGeom.geometry(), mContext->tolerance );
+      QgsAbstractGeometry *featureGeomA = featureA.geometry().geometry()->clone();
+      featureGeomA->transform( crstA );
+      QgsGeometryEngine *geomEngineA = QgsGeometryCheckerUtils::createGeomEngine( featureGeomA, mContext->tolerance );
+      QgsRectangle bboxA = crstA.transform( featureGeomA->boundingBox() );
 
-      QgsFeatureIds ids = featurePool->getIntersects( featureGeom.geometry()->boundingBox() );
-      for ( QgsFeatureId otherid : ids )
+      for ( const QString &layerIdB : featureIds.keys() )
       {
-        if ( otherid == featureid )
-        {
-          continue;
-        }
-        QgsFeature otherFeature;
-        if ( !featurePool->get( otherid, otherFeature ) )
+        QgsFeaturePool *featurePoolB = mContext->featurePools[ layerIdB ];
+        if ( !getCompatibility( featurePoolB->getLayer()->geometryType() ) )
         {
           continue;
         }
+        QgsCoordinateTransform crstB = QgsCoordinateTransformCache::instance()->transform( featurePoolB->getLayer()->crs().authid(), mContext->mapCrs );
 
-        QString errMsg;
-        if ( geomEngine->within( *otherFeature.geometry().geometry(), &errMsg ) )
+        QgsFeatureIds idsB = featurePoolB->getIntersects( crstB.transform( bboxA, QgsCoordinateTransform::ReverseTransform ) );
+        for ( QgsFeatureId featureIdB : idsB )
         {
-          errors.append( new QgsGeometryContainedCheckError( this, layerId, featureid, feature.geometry().geometry()->centroid(), otherid ) );
-        }
-        else if ( !errMsg.isEmpty() )
-        {
-          messages.append( tr( "Feature %1 within feature %2: %3" ).arg( feature.id() ).arg( otherFeature.id() ).arg( errMsg ) );
+          QgsFeature featureB;
+          if ( !featurePoolB->get( featureIdB, featureB ) )
+          {
+            continue;
+          }
+          QgsAbstractGeometry *featureGeomB = featureB.geometry().geometry()->clone();
+          featureGeomB->transform( crstB );
+
+          QString errMsg;
+          if ( geomEngineA->within( *featureGeomB, &errMsg ) )
+          {
+            errors.append( new QgsGeometryContainedCheckError( this, layerIdA, featureIdA, featureGeomA->centroid(), qMakePair( layerIdB, featureIdB ) ) );
+          }
+          else if ( !errMsg.isEmpty() )
+          {
+            messages.append( tr( "Feature %1:%2 within feature %3:%4: %5" ).arg( layerIdA ).arg( featureIdA ).arg( layerIdB ).arg( featureIdB ).arg( errMsg ) );
+          }
+          delete featureGeomB;
         }
       }
-      delete geomEngine;
+      delete geomEngineA;
+      delete featureGeomA;
     }
   }
 }
 
 void QgsGeometryContainedCheck::fixError( QgsGeometryCheckError *error, int method, const QMap<QString, int> & /*mergeAttributeIndices*/, Changes &changes ) const
 {
-  QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsGeometryContainedCheckError *containerError = static_cast<QgsGeometryContainedCheckError *>( error );
+  QgsFeaturePool *featurePoolA = mContext->featurePools[ error->layerId() ];
+  QgsFeaturePool *featurePoolB = mContext->featurePools[ containerError->containingFeature().first ];
 
-  QgsFeature feature;
-  QgsFeature otherFeature;
-  if ( !featurePool->get( error->featureId(), feature ) ||
-       !featurePool->get( containerError->otherId(), otherFeature ) )
+  QgsFeature featureA;
+  QgsFeature featureB;
+  if ( !featurePoolA->get( error->featureId(), featureA ) ||
+       !featurePoolB->get( containerError->containingFeature().second, featureB ) )
   {
     error->setObsolete();
     return;
   }
+  QgsCoordinateTransform crstA = QgsCoordinateTransformCache::instance()->transform( featurePoolA->getLayer()->crs().authid(), mContext->mapCrs );
+  QgsCoordinateTransform crstB = QgsCoordinateTransformCache::instance()->transform( featurePoolB->getLayer()->crs().authid(), mContext->mapCrs );
 
   // Check if error still applies
-  QgsGeometry featureGeom = feature.geometry();
-  QgsGeometryEngine *geomEngine = QgsGeometryCheckerUtils::createGeomEngine( featureGeom.geometry(), mContext->tolerance );
+  QgsAbstractGeometry *featureGeomA = featureA.geometry().geometry()->clone();
+  featureGeomA->transform( crstA );
+  QgsGeometryEngine *geomEngineA = QgsGeometryCheckerUtils::createGeomEngine( featureGeomA, mContext->tolerance );
+
+  QgsAbstractGeometry *featureGeomB = featureB.geometry().geometry()->clone();
+  featureGeomB->transform( crstB );
+
+  bool within = geomEngineA->within( *featureGeomB );
+  delete geomEngineA;
+  delete featureGeomA;
+  delete featureGeomB;
 
-  if ( !geomEngine->within( otherFeature.geometry().geometry() ) )
+  if ( !within )
   {
-    delete geomEngine;
     error->setObsolete();
     return;
   }
-  delete geomEngine;
 
   // Fix error
   if ( method == NoChange )
@@ -100,8 +125,8 @@ void QgsGeometryContainedCheck::fixError( QgsGeometryCheckError *error, int meth
   }
   else if ( method == Delete )
   {
-    changes[error->layerId()][feature.id()].append( Change( ChangeFeature, ChangeRemoved ) );
-    featurePool->deleteFeature( feature );
+    changes[error->layerId()][featureA.id()].append( Change( ChangeFeature, ChangeRemoved ) );
+    featurePoolA->deleteFeature( featureA );
     error->setFixed( method );
   }
   else

diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h b/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
@@ -25,24 +25,24 @@ class QgsGeometryContainedCheckError : public QgsGeometryCheckError
                                     const QString &layerId,
                                     QgsFeatureId featureId,
                                     const QgsPoint &errorLocation,
-                                    QgsFeatureId otherId
+                                    const QPair<QString, QgsFeatureId> &containingFeature
                                   )
-      : QgsGeometryCheckError( check, layerId, featureId, errorLocation, QgsVertexId(), otherId, ValueOther )
-      , mOtherId( otherId )
+      : QgsGeometryCheckError( check, layerId, featureId, errorLocation, QgsVertexId(), QString( "%1:%2" ).arg( containingFeature.first ).arg( containingFeature.second ), ValueOther )
+      , mContainingFeature( containingFeature )
     { }
-    QgsFeatureId otherId() const { return mOtherId; }
+    const QPair<QString, QgsFeatureId> &containingFeature() const { return mContainingFeature; }
 
     bool isEqual( QgsGeometryCheckError *other ) const override
     {
       return other->check() == check() &&
              other->featureId() == featureId() &&
-             static_cast<QgsGeometryContainedCheckError *>( other )->otherId() == otherId();
+             static_cast<QgsGeometryContainedCheckError *>( other )->containingFeature() == containingFeature();
     }
 
-    virtual QString description() const override { return QApplication::translate( "QgsGeometryContainedCheckError", "Within %1" ).arg( otherId() ); }
+    virtual QString description() const override { return QApplication::translate( "QgsGeometryContainedCheckError", "Within %1:%2" ).arg( mContainingFeature.first ).arg( mContainingFeature.second ); }
 
   private:
-    QgsFeatureId mOtherId;
+    QPair<QString, QgsFeatureId> mContainingFeature;
 };
 
 class QgsGeometryContainedCheck : public QgsGeometryCheck