[Geometry checker] Only add to feature pool spatial indices features which are to be processed

manisandro · manisandro · commit e089b3ba6a94 · 2017-10-23T17:25:08.000+02:00
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -48,7 +48,7 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, c
   QgsFeatureIterator it = layer->getFeatures( req );
   while ( it.nextFeature( feature ) )
   {
-    if ( feature.geometry() )
+    if ( mFeatureIds.contains( feature.id() ) && feature.geometry() )
     {
       mIndex.insertFeature( feature );
     }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -166,11 +166,6 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
     QgsFeaturePool *featurePool = mContext->featurePools[layerId];
     QgsCoordinateTransform t = QgsCoordinateTransformCache::instance()->transform( mContext->mapCrs, featurePool->getLayer()->crs().authid() );
     recheckAreaFeatures[layerId] = featurePool->getIntersects( t.transform( recheckArea ) );
-    // If only selected features were checked, confine the recheck areas to the selected features
-    if ( featurePool->getSelectedOnly() )
-    {
-      recheckAreaFeatures[layerId] = recheckAreaFeatures[layerId].intersect( featurePool->getLayer()->selectedFeatureIds() );
-    }
   }
 
   // Recheck feature / changed area to detect new errors

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, c`
`48`	`48`	`QgsFeatureIterator it = layer->getFeatures( req );`
`49`	`49`	`while ( it.nextFeature( feature ) )`
`50`	`50`	`{`
`51`		`- if ( feature.geometry() )`
	`51`	`+ if ( mFeatureIds.contains( feature.id() ) && feature.geometry() )`
`52`	`52`	`{`
`53`	`53`	`mIndex.insertFeature( feature );`
`54`	`54`	`}`