Followup 2995bdc: Don't iterate changed geometries twice

qgis · Aug 20, 2013 · b460eebde7043c2cf983bc4941f71887a76bff53 · b460eeb
1 parent 2995bdc
commit b460eebde7043c2cf983bc4941f71887a76bff53
Showing with 7 additions and 8 deletions.

+7 −8 src/core/qgsvectorlayerfeatureiterator.cpp
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -95,6 +95,13 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
     return res;
   }
 
+  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  {
+    if ( fetchNextChangedGeomFeature( f ) )
+      return true;
+  }
+  // no more changed geometries
+
   while ( mProviderIterator.nextFeature( f ) )
   {
     if ( mFetchConsidered.contains( f.id() ) )
@@ -118,14 +125,6 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
   }
   // no more provider features
 
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
-  {
-    if ( fetchNextChangedGeomFeature( f ) )
-      return true;
-  }
-  // no more changed geometries
-
-
   if ( fetchNextAddedFeature( f ) )
     return true;
   // no more added features