One feature pool per layer is enough

qgis · Oct 15, 2018 · 09ee755 · 09ee755
1 parent 6df73d6
commit 09ee755
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/app/qgsgeometryvalidationservice.cpp b/src/app/qgsgeometryvalidationservice.cpp
@@ -259,8 +259,13 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
   QgsFeatureIds affectedFeatureIds = layer->editBuffer()->changedGeometries().keys().toSet();
   affectedFeatureIds.unite( layer->editBuffer()->addedFeatures().keys().toSet() );
 
-  // TODO: ownership of these objects...
-  QgsVectorLayerFeaturePool *featurePool = new QgsVectorLayerFeaturePool( layer );
+  QgsFeaturePool *featurePool = mFeaturePools.value( layer->id() );
+  if ( !featurePool )
+  {
+    featurePool = new QgsVectorLayerFeaturePool( layer );
+    mFeaturePools.insert( layer->id(), featurePool );
+  }
+
   QList<QgsGeometryCheckError *> &allErrors = mLayerChecks[layer].topologyCheckErrors;
   QMap<QString, QgsFeatureIds> layerIds;
 
@@ -279,11 +284,6 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
   layerIds.insert( layer->id(), checkFeatureIds );
   QgsGeometryCheck::LayerFeatureIds layerFeatureIds( layerIds );
 
-  if ( !mFeaturePools.contains( layer->id() ) )
-  {
-    mFeaturePools.insert( layer->id(), featurePool );
-  }
-
   const QList<QgsGeometryCheck *> checks = mLayerChecks[layer].topologyChecks;
 
   QMap<const QgsGeometryCheck *, QgsFeedback *> feedbacks;