GeoJSON: parse '{"type": "GeometryCollection", "geometries": []}' as …

…empty geometrycollection
drons · Jul 3, 2018 · 6250a7e · 6250a7e
1 parent 7cd9487
commit 6250a7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
@@ -4148,6 +4148,17 @@ def ogr_geojson_append_flush():
 ###############################################################################
 
 
+def ogr_geojson_empty_geometrycollection():
+
+    g = ogr.CreateGeometryFromJson('{"type": "GeometryCollection", "geometries": []}')
+    if g.ExportToWkt() != 'GEOMETRYCOLLECTION EMPTY':
+        print(g.ExportToWkt())
+        return 'fail'
+    return 'success'
+
+###############################################################################
+
+
 def ogr_geojson_cleanup():
 
     gdal.SetConfigOption('CPL_CURL_ENABLE_VSIMEM', None)
@@ -4256,6 +4267,7 @@ def ogr_geojson_cleanup():
     ogr_geojson_geom_export_failure,
     ogr_geojson_starting_with_crs,
     ogr_geojson_append_flush,
+    ogr_geojson_empty_geometrycollection,
     ogr_geojson_cleanup]
 
 if __name__ == '__main__':

diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -3122,13 +3122,10 @@ OGRGeometryCollection* OGRGeoJSONReadGeometryCollection( json_object* poObj,
 
     if( json_type_array == json_object_get_type( poObjGeoms ) )
     {
-        const int nGeoms = json_object_array_length( poObjGeoms );
-        if( nGeoms > 0 )
-        {
-            poCollection = new OGRGeometryCollection();
-            poCollection->assignSpatialReference(poSRS);
-        }
+        poCollection = new OGRGeometryCollection();
+        poCollection->assignSpatialReference(poSRS);
 
+        const int nGeoms = json_object_array_length( poObjGeoms );
         for( int i = 0; i < nGeoms; ++i )
         {
             json_object* poObjGeom = json_object_array_get_idx( poObjGeoms, i );