[ogr] Fix ExactIntersection flag should be ignored if filter rect

nyalldawson · nyalldawson · commit 13a888d2f8b7 · 2017-12-19T11:29:53.000+11:00
is not set

And add provider test case to ensure no other providers have this
issue
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -363,7 +363,7 @@ bool QgsOgrFeatureIterator::readFeature( gdal::ogr_feature_unique_ptr fet, QgsFe
   feature.initAttributes( mSource->mFields.count() );
   feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
-  bool useIntersect = mRequest.flags() & QgsFeatureRequest::ExactIntersect;
+  bool useIntersect = !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect;
   bool geometryTypeFilter = mSource->mOgrGeometryTypeFilter != wkbUnknown;
   if ( mFetchGeometry || useIntersect || geometryTypeFilter )
   {
diff --git a/tests/src/python/featuresourcetestbase.py b/tests/src/python/featuresourcetestbase.py
@@ -485,6 +485,14 @@ def testGetFeaturesFilterRectTests(self):
         assert set(features) == set([1, 2, 3, 4, 5]), 'Got {} instead'.format(features)
         self.assertTrue(all_valid)
 
+        # ExactIntersection flag set, but no filter rect set. Should be ignored.
+        request = QgsFeatureRequest()
+        request.setFlags(QgsFeatureRequest.ExactIntersect)
+        features = [f['pk'] for f in self.source.getFeatures(request)]
+        all_valid = (all(f.isValid() for f in self.source.getFeatures(request)))
+        assert set(features) == set([1, 2, 3, 4, 5]), 'Got {} instead'.format(features)
+        self.assertTrue(all_valid)
+
     def testRectAndExpression(self):
         extent = QgsRectangle(-70, 67, -60, 80)
         request = QgsFeatureRequest().setFilterExpression('"cnt">200').setFilterRect(extent)

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ bool QgsOgrFeatureIterator::readFeature( gdal::ogr_feature_unique_ptr fet, QgsFe`
`363`	`363`	`feature.initAttributes( mSource->mFields.count() );`
`364`	`364`	`feature.setFields( mSource->mFields ); // allow name-based attribute lookups`
`365`	`365`
`366`		`- bool useIntersect = mRequest.flags() & QgsFeatureRequest::ExactIntersect;`
	`366`	`+ bool useIntersect = !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect;`
`367`	`367`	`bool geometryTypeFilter = mSource->mOgrGeometryTypeFilter != wkbUnknown;`
`368`	`368`	`if ( mFetchGeometry \|\| useIntersect \|\| geometryTypeFilter )`
`369`	`369`	`{`