Merge pull request #31860 from rouault/fix_30518

[OGR provider] Invalid feature count on layer reload (fixes #30518)
qgis · Sep 18, 2019 · 1494246 · 1494246
2 parents 3ff8ca5 + 2a2cb87
commit 1494246
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -4530,6 +4530,7 @@ void QgsOgrProvider::close()
 
 void QgsOgrProvider::reloadData()
 {
+  mFeaturesCounted = QgsVectorDataProvider::Uncounted;
   bool wasValid = mValid;
   forceReload();
   close();

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -586,6 +586,29 @@ def testBoolFieldEvaluation(self):
         self.assertEqual([f[0] for f in vl.getFeatures()], [True, False, NULL])
         self.assertEqual([f[0].__class__.__name__ for f in vl.getFeatures()], ['bool', 'bool', 'QVariant'])
 
+    def testReloadDataAndFeatureCount(self):
+
+        filename = '/vsimem/test.json'
+        gdal.FileFromMemBuffer(filename, """{
+"type": "FeatureCollection",
+"features": [
+{ "type": "Feature", "properties": null, "geometry": { "type": "Point", "coordinates": [2, 49] } },
+{ "type": "Feature", "properties": null, "geometry": { "type": "Point", "coordinates": [3, 50] } }
+]
+}""")
+        vl = QgsVectorLayer(filename, 'test', 'ogr')
+        self.assertTrue(vl.isValid())
+        self.assertEqual(vl.featureCount(), 2)
+        gdal.FileFromMemBuffer(filename, """{
+"type": "FeatureCollection",
+"features": [
+{ "type": "Feature", "properties": null, "geometry": { "type": "Point", "coordinates": [2, 49] } }
+]
+}""")
+        vl.reload()
+        self.assertEqual(vl.featureCount(), 1)
+        gdal.Unlink(filename)
+
 
 if __name__ == '__main__':
     unittest.main()