Skip to content
Permalink
Browse files

[OGR provider] When editing a GeoJSON file, close and re-open the fil…

…e at end of editing session (fixes #18596)
  • Loading branch information
rouault committed Jun 2, 2018
1 parent bd65fc6 commit 754018a477e4dad12b99946ae69bac519eb9e530
Showing with 29 additions and 0 deletions.
  1. +7 −0 src/providers/ogr/qgsogrprovider.cpp
  2. +22 −0 tests/src/python/test_provider_ogr.py
@@ -4160,6 +4160,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 )
@@ -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()

2 comments on commit 754018a

@nyalldawson

This comment has been minimized.

Copy link
Collaborator

@nyalldawson nyalldawson replied Jun 5, 2018

@rouault I'm seeing a regression in a plugin's test suite since this commit.

Steps to reproduce:

  • geojson layer
  • startEditing on the layer
  • add an attribute to the layer
  • commit changes
  • field is added to the provider without issue by ogr
  • QgsOgrProvider::leaveUpdateMode is called by QgsVectorLayer::commitChanges()
  • reloadData() is called by this commit
  • new field is no longer present
@rouault

This comment has been minimized.

Copy link
Contributor Author

@rouault rouault replied Jun 5, 2018

Should be fixed with e94b1ac

Please sign in to comment.
You can’t perform that action at this time.