Tiny optimisation to QgsVectorLayerFeatureIterator::postProcessFeature

qgis · May 9, 2023 · ab1e839 · ab1e839
1 parent 4c4ccb9
commit ab1e839
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/core/vector/qgsvectorlayerfeatureiterator.cpp b/src/core/vector/qgsvectorlayerfeatureiterator.cpp
@@ -137,6 +137,7 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeat
   if ( mRequest.destinationCrs().isValid() && mRequest.destinationCrs() != mSource->mCrs )
   {
     mTransform = QgsCoordinateTransform( mSource->mCrs, mRequest.destinationCrs(), mRequest.transformContext() );
+    mHasValidTransform = mTransform.isValid();
   }
 
   // prepare spatial filter geometries for optimal speed
@@ -938,7 +939,7 @@ void QgsVectorLayerFeatureIterator::createOrderedJoinList()
 bool QgsVectorLayerFeatureIterator::postProcessFeature( QgsFeature &feature )
 {
   bool result = checkGeometryValidity( feature );
-  if ( result )
+  if ( result && mHasValidTransform )
     geometryToDestinationCrs( feature, mTransform );
 
   if ( result && mDistanceWithinEngine && feature.hasGeometry() )

diff --git a/src/core/vector/qgsvectorlayerfeatureiterator.h b/src/core/vector/qgsvectorlayerfeatureiterator.h
@@ -298,6 +298,7 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
 
     // filter bounding box constraint, in SOURCE CRS
     QgsRectangle mFilterRect;
+    bool mHasValidTransform = false;
     QgsCoordinateTransform mTransform;
 
     // distance within constraint reference geometry and distance IN DESTINATION CRS