Merge pull request #7145 from rouault/fix_18596

rouault · web-flow · commit f68f288dead1 · 2018-06-02T17:32:12.000+02:00
[OGR provider] When editing a GeoJSON file, close and re-open the file at end of editing session (fixes #18596)
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4232,6 +4232,13 @@ bool QgsOgrProvider::leaveUpdateMode()
   }
   if ( !mDynamicWriteAccess )
   {
+    // The GeoJSON driver only properly flushes stuff in all situations by
+    // closing and re-opening. Starting with GDAL 2.3.1, it should be safe to
+    // use GDALDatasetFlush().
+    if ( mGDALDriverName == QLatin1String( "GeoJSON" ) )
+    {
+      reloadData();
+    }
     return true;
   }
   if ( mUpdateModeStackDepth == 0 )
diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -318,6 +318,28 @@ def testSetupProxy(self):
         self.assertEqual(gdal.GetConfigOption("GDAL_HTTP_PROXY"), "myproxyhostname.com")
         self.assertEqual(gdal.GetConfigOption("GDAL_HTTP_PROXYUSERPWD"), "username")
 
+    def testEditGeoJson(self):
+        """ Test bugfix of https://issues.qgis.org/issues/18596 """
+
+        datasource = os.path.join(self.basetestpath, 'testEditGeoJson.json')
+        with open(datasource, 'wt') as f:
+            f.write("""{
+"type": "FeatureCollection",
+"features": [
+{ "type": "Feature", "properties": { "x": 1, "y": 2, "z": 3, "w": 4 }, "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } } ] }""")
+
+        vl = QgsVectorLayer(datasource, 'test', 'ogr')
+        self.assertTrue(vl.isValid())
+        self.assertTrue(vl.startEditing())
+        self.assertTrue(vl.deleteAttribute(1))
+        self.assertTrue(vl.commitChanges())
+
+        f = QgsFeature()
+        self.assertTrue(vl.getFeatures(QgsFeatureRequest()).nextFeature(f))
+        self.assertEqual(f['x'], 1)
+        self.assertEqual(f['z'], 3)
+        self.assertEqual(f['w'], 4)
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -4232,6 +4232,13 @@ bool QgsOgrProvider::leaveUpdateMode()`
`4232`	`4232`	`}`
`4233`	`4233`	`if ( !mDynamicWriteAccess )`
`4234`	`4234`	`{`
	`4235`	`+ // The GeoJSON driver only properly flushes stuff in all situations by`
	`4236`	`+ // closing and re-opening. Starting with GDAL 2.3.1, it should be safe to`
	`4237`	`+ // use GDALDatasetFlush().`
	`4238`	`+ if ( mGDALDriverName == QLatin1String( "GeoJSON" ) )`
	`4239`	`+ {`
	`4240`	`+ reloadData();`
	`4241`	`+ }`
`4235`	`4242`	`return true;`
`4236`	`4243`	`}`
`4237`	`4244`	`if ( mUpdateModeStackDepth == 0 )`