Small optimisation to QgsVectorLayerFeatureIterator::checkGeometryVal…

…idity, avoid checking geometry presence if not filtering for invalid geometries
qgis · May 9, 2023 · 1b4a59f · 1b4a59f
1 parent ab1e839
commit 1b4a59f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/core/vector/qgsvectorlayerfeatureiterator.cpp b/src/core/vector/qgsvectorlayerfeatureiterator.cpp
@@ -952,16 +952,16 @@ bool QgsVectorLayerFeatureIterator::postProcessFeature( QgsFeature &feature )
 
 bool QgsVectorLayerFeatureIterator::checkGeometryValidity( const QgsFeature &feature )
 {
-  if ( !feature.hasGeometry() )
-    return true;
-
   switch ( mRequest.invalidGeometryCheck() )
   {
     case QgsFeatureRequest::GeometryNoCheck:
       return true;
 
     case QgsFeatureRequest::GeometrySkipInvalid:
     {
+      if ( !feature.hasGeometry() )
+        return true;
+
       if ( !feature.geometry().isGeosValid() )
       {
         QgsMessageLog::logMessage( QObject::tr( "Geometry error: One or more input features have invalid geometry." ), QString(), Qgis::MessageLevel::Critical );
@@ -975,6 +975,9 @@ bool QgsVectorLayerFeatureIterator::checkGeometryValidity( const QgsFeature &fea
     }
 
     case QgsFeatureRequest::GeometryAbortOnInvalid:
+      if ( !feature.hasGeometry() )
+        return true;
+
       if ( !feature.geometry().isGeosValid() )
       {
         QgsMessageLog::logMessage( QObject::tr( "Geometry error: One or more input features have invalid geometry." ), QString(), Qgis::MessageLevel::Critical );