fix N+1 problem for Scale Tool

qgis · May 6, 2021 · 84232a2 · 84232a2
1 parent bb5871c
commit 84232a2
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/app/qgsmaptoolscalefeature.cpp b/src/app/qgsmaptoolscalefeature.cpp
@@ -364,12 +364,20 @@ void QgsMapToolScaleFeature::applyScaling( double scale )
   t.scale( mScaling, mScaling );
   t.translate( -layerCoords.x(), -layerCoords.y() );
 
-  for ( QgsFeatureId id : std::as_const( mScaledFeatures ) )
+  QgsFeatureRequest request;
+  request.setFilterFids( mScaledFeatures ).setNoAttributes();
+  QgsFeatureIterator fi = vlayer->getFeatures( request );
+  QgsFeature feat;
+  while ( fi.nextFeature( feat ) )
   {
-    QgsFeature feat;
-    vlayer->getFeatures( QgsFeatureRequest().setFilterFid( id ) ).nextFeature( feat );
+    if ( !feat.hasGeometry() )
+      continue;
+
     QgsGeometry geom = feat.geometry();
-    geom.transform( t );
+    if ( !( geom.transform( t ) == QgsGeometry::Success ) )
+      continue;
+
+    QgsFeatureId id = feat.id();
     vlayer->changeGeometry( id, geom );
   }