[afs] Don't request intersecting features from server if all

features are already locally cached
qgis · Feb 20, 2018 · c0d4ce7 · c0d4ce7
1 parent a818953
commit c0d4ce7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/providers/arcgisrest/qgsafsfeatureiterator.cpp b/src/providers/arcgisrest/qgsafsfeatureiterator.cpp
@@ -71,12 +71,15 @@ QgsAfsFeatureIterator::QgsAfsFeatureIterator( QgsAfsFeatureSource *source, bool
     requestIds.insert( mRequest.filterFid() );
   }
 
-  if ( !mFilterRect.isNull() )
+  if ( !mFilterRect.isNull() && !mSource->sharedData()->hasCachedAllFeatures() )
   {
     // defer request to find features in filter rect until first feature is requested
     // this allows time for a interruption checker to be installed on the iterator
     // and avoids performing this expensive check in the main thread when just
     // preparing iterators
+
+    // (but if we've already cached ALL the features, we skip this -- there's no need for
+    // firing off another request to the server)
     mDeferredFeaturesInFilterRectCheck = true;
   }
 
@@ -129,6 +132,10 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
       mFeatureIterator = mRemainingFeatureIds.at( 0 );
 
     mDeferredFeaturesInFilterRectCheck = false;
+
+    // discard the filter rect - we know that the features in mRemainingFeatureIds are gauranteed
+    // to be intersecting the rect, so avoid any extra unnecessary checks
+    mFilterRect = QgsRectangle();
   }
 
   if ( !mFeatureIdList.empty() && mRemainingFeatureIds.empty() )
@@ -171,6 +178,10 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
         {
           ++mFeatureIterator;
         }
+
+        if ( !mFilterRect.isNull() && ( !f.hasGeometry() || !f.geometry().intersects( mFilterRect ) ) )
+          success = false;
+
         if ( !success )
           continue;
         geometryToDestinationCrs( f, mTransform );

diff --git a/src/providers/arcgisrest/qgsafsshareddata.cpp b/src/providers/arcgisrest/qgsafsshareddata.cpp
@@ -161,3 +161,8 @@ QgsFeatureIds QgsAfsSharedData::getFeatureIdsInExtent( const QgsRectangle &exten
   }
   return ids;
 }
+
+bool QgsAfsSharedData::hasCachedAllFeatures() const
+{
+  return mCache.count() == mObjectIds.count();
+}
diff --git a/src/providers/arcgisrest/qgsafsshareddata.h b/src/providers/arcgisrest/qgsafsshareddata.h
@@ -41,6 +41,8 @@ class QgsAfsSharedData : public QObject
     bool getFeature( QgsFeatureId id, QgsFeature &f, const QgsRectangle &filterRect = QgsRectangle(), QgsFeedback *feedback = nullptr );
     QgsFeatureIds getFeatureIdsInExtent( const QgsRectangle &extent, QgsFeedback *feedback );
 
+    bool hasCachedAllFeatures() const;
+
   private:
     friend class QgsAfsProvider;
     QMutex mMutex;