ogr provider fix: apparently we need to fetch the geometry to make th…

…e spatial filter stick.
qgis · Jul 18, 2011 · 40cabbd · 40cabbd
1 parent 30708cb
commit 40cabbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -518,7 +518,8 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
   OGRFeatureH fet;
   QgsRectangle selectionRect;
 
-  setRelevantFields( mFetchGeom || mUseIntersect, mAttributesToFetch );
+  setRelevantFields( mFetchGeom || mUseIntersect || !mFetchRect.isEmpty(),
+                     mAttributesToFetch );
 
   while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) )
   {
@@ -616,6 +617,7 @@ void QgsOgrProvider::select( QgsAttributeList fetchAttributes, QgsRectangle rect
   mUseIntersect = useIntersect;
   mAttributesToFetch = fetchAttributes;
   mFetchGeom = fetchGeometry;
+  mFetchRect = rect;
 
   // spatial query to select features
   if ( rect.isEmpty() )

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -276,6 +276,9 @@ class QgsOgrProvider : public QgsVectorDataProvider
     //! layer index
     int mLayerIndex;
 
+    //! current spatial filter
+    QgsRectangle mFetchRect;
+
     //! String used to define a subset of the layer
     QString mSubsetString;