[afs] Use faster bounding box checks where possible

qgis · Feb 20, 2018 · 56b1ede · 56b1ede
1 parent 3ffbd84
commit 56b1ede
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/providers/arcgisrest/qgsafsfeatureiterator.cpp b/src/providers/arcgisrest/qgsafsfeatureiterator.cpp
@@ -182,8 +182,26 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
           ++mFeatureIterator;
         }
 
-        if ( !mFilterRect.isNull() && ( !f.hasGeometry() || !f.geometry().intersects( mFilterRect ) ) )
-          success = false;
+        if ( !mFilterRect.isNull() )
+        {
+          if ( !f.hasGeometry() )
+            success = false;
+          else
+          {
+            if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+            {
+              // exact intersection check requested
+              if ( !f.geometry().intersects( mFilterRect ) )
+                success = false;
+            }
+            else
+            {
+              // bounding box intersect check only
+              if ( !f.geometry().boundingBoxIntersects( mFilterRect ) )
+                success = false;
+            }
+          }
+        }
 
         if ( !success )
           continue;