Fix attributes in geojson export

joto · joto · commit 4b787e0ff03d · 2025-02-28T15:01:21.000+01:00
diff --git a/src/export/export_format_json.cpp b/src/export/export_format_json.cpp
@@ -96,7 +96,6 @@ void ExportFormatJSON::start_feature(const std::string& prefix, osmium::object_i
 
 void ExportFormatJSON::add_option(const std::string& name) {
     const nlohmann::json j = name;
-    m_buffer += ',';
     m_buffer += j.dump();
     m_buffer += ':';
 }
@@ -105,38 +104,47 @@ void ExportFormatJSON::add_attributes(const osmium::OSMObject& object) {
 
     if (!options().type.empty()) {
         add_option(options().type);
+        m_buffer += '"';
         m_buffer += object_type_as_string(object);
+        m_buffer += '"';
+        m_buffer += ',';
     }
 
     if (!options().id.empty()) {
         add_option(options().id);
         m_buffer += std::to_string(object.type() == osmium::item_type::area ? osmium::area_id_to_object_id(object.id()) : object.id());
+        m_buffer += ',';
     }
 
     if (!options().version.empty()) {
         add_option(options().version);
         m_buffer += std::to_string(object.version());
+        m_buffer += ',';
     }
 
     if (!options().changeset.empty()) {
         add_option(options().changeset);
         m_buffer += std::to_string(object.changeset());
+        m_buffer += ',';
     }
 
     if (!options().uid.empty()) {
         add_option(options().uid);
         m_buffer += std::to_string(object.uid());
+        m_buffer += ',';
     }
 
     if (!options().user.empty()) {
         add_option(options().user);
         const nlohmann::json j = object.user();
-        m_buffer += j.template get<std::string>();
+        m_buffer += j.dump();
+        m_buffer += ',';
     }
 
     if (!options().timestamp.empty()) {
         add_option(options().timestamp);
         m_buffer += std::to_string(object.timestamp().seconds_since_epoch());
+        m_buffer += ',';
     }
 
     if (!options().way_nodes.empty() && object.type() == osmium::item_type::way) {
@@ -152,6 +160,7 @@ void ExportFormatJSON::add_attributes(const osmium::OSMObject& object) {
         } else {
             m_buffer += ']';
         }
+        m_buffer += ',';
     }
 }
 
diff --git a/test/export/CMakeLists.txt b/test/export/CMakeLists.txt
@@ -14,6 +14,9 @@ check_export(geojson    "-f geojson"       input.osm output.geojson)
 check_export(geojsonseq "-f geojsonseq -x print_record_separator=false" input.osm output.geojsonseq)
 check_export(geojsonuid "-f geojsonseq -u type_id" input.osm output-uid.geojsonseq)
 check_export(geojsoncnt "-f geojsonseq -u counter" input.osm output-cnt.geojsonseq)
+check_export(geojsonattr "-f geojson -n -a type,id,version,changeset,timestamp,uid,user,way_nodes" input.osm output-attr.geojson)
+check_export(geojsonchar "-f geojson -n -a type,id,version,changeset,timestamp,uid,user,way_nodes" input-chars.osm output-chars.geojson)
+
 check_export(pg         "-f pg"            input.osm output.pg)
 
 check_export(missing-node "-f geojson" input-missing-node.osm output-missing-node.geojson)
diff --git a/test/export/input-chars.osm b/test/export/input-chars.osm
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version="0.6" upload="false" generator="testdata">
+  <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="te'st" changeset="1" lat="3" lon="1"/>
+  <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user='te"st' changeset="1" lat="1" lon="1"/>
+  <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1">
+    <tag k="ame'nity" v='post"_box'/>
+  </node>
+</osm>
diff --git a/test/export/output-attr.geojson b/test/export/output-attr.geojson
@@ -0,0 +1,11 @@
+{"type":"FeatureCollection","features":[
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,1.0]},"properties":{"@type":"node","@id":10,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,2.0]},"properties":{"@type":"node","@id":11,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,3.0]},"properties":{"@type":"node","@id":12,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,4.0]},"properties":{"@type":"node","@id":13,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[2.0,1.5]},"properties":{"@type":"node","@id":14,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"amenity":"post_box"}},
+{"type":"Feature","geometry":{"type":"LineString","coordinates":[[1.0,1.0],[1.0,2.0],[1.0,3.0]]},"properties":{"@type":"way","@id":20,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"@way_nodes":[10,11,12],"highway":"track"}},
+{"type":"Feature","geometry":{"type":"LineString","coordinates":[[1.0,1.0],[1.0,2.0],[2.0,1.5]]},"properties":{"@type":"way","@id":21,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"@way_nodes":[10,11,14],"barrier":"fence"}},
+{"type":"Feature","geometry":{"type":"LineString","coordinates":[[2.0,1.5],[1.0,1.0]]},"properties":{"@type":"way","@id":22,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"@way_nodes":[14,10]}},
+{"type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[[[[1.0,1.0],[2.0,1.5],[1.0,2.0],[1.0,1.0]]]]},"properties":{"@type":"relation","@id":30,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"landuse":"forest"}}
+]}
diff --git a/test/export/output-chars.geojson b/test/export/output-chars.geojson
@@ -0,0 +1,5 @@
+{"type":"FeatureCollection","features":[
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,3.0]},"properties":{"@type":"node","@id":10,"@version":1,"@changeset":1,"@uid":1,"@user":"te'st","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,1.0]},"properties":{"@type":"node","@id":11,"@version":1,"@changeset":1,"@uid":1,"@user":"te\"st","@timestamp":1420074000}},
+{"type":"Feature","geometry":{"type":"Point","coordinates":[1.0,2.0]},"properties":{"@type":"node","@id":12,"@version":1,"@changeset":1,"@uid":1,"@user":"test","@timestamp":1420074000,"ame'nity":"post\"_box"}}
+]}

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ void ExportFormatJSON::start_feature(const std::string& prefix, osmium::object_i`
`96`	`96`
`97`	`97`	`void ExportFormatJSON::add_option(const std::string& name) {`
`98`	`98`	`const nlohmann::json j = name;`
`99`		`- m_buffer += ',';`
`100`	`99`	`m_buffer += j.dump();`
`101`	`100`	`m_buffer += ':';`
`102`	`101`	`}`
`@@ -105,38 +104,47 @@ void ExportFormatJSON::add_attributes(const osmium::OSMObject& object) {`
`105`	`104`
`106`	`105`	`if (!options().type.empty()) {`
`107`	`106`	`add_option(options().type);`
	`107`	`+ m_buffer += '"';`
`108`	`108`	`m_buffer += object_type_as_string(object);`
	`109`	`+ m_buffer += '"';`
	`110`	`+ m_buffer += ',';`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`if (!options().id.empty()) {`
`112`	`114`	`add_option(options().id);`
`113`	`115`	`m_buffer += std::to_string(object.type() == osmium::item_type::area ? osmium::area_id_to_object_id(object.id()) : object.id());`
	`116`	`+ m_buffer += ',';`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`if (!options().version.empty()) {`
`117`	`120`	`add_option(options().version);`
`118`	`121`	`m_buffer += std::to_string(object.version());`
	`122`	`+ m_buffer += ',';`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`if (!options().changeset.empty()) {`
`122`	`126`	`add_option(options().changeset);`
`123`	`127`	`m_buffer += std::to_string(object.changeset());`
	`128`	`+ m_buffer += ',';`
`124`	`129`	`}`
`125`	`130`
`126`	`131`	`if (!options().uid.empty()) {`
`127`	`132`	`add_option(options().uid);`
`128`	`133`	`m_buffer += std::to_string(object.uid());`
	`134`	`+ m_buffer += ',';`
`129`	`135`	`}`
`130`	`136`
`131`	`137`	`if (!options().user.empty()) {`
`132`	`138`	`add_option(options().user);`
`133`	`139`	`const nlohmann::json j = object.user();`
`134`		`- m_buffer += j.template get<std::string>();`
	`140`	`+ m_buffer += j.dump();`
	`141`	`+ m_buffer += ',';`
`135`	`142`	`}`
`136`	`143`
`137`	`144`	`if (!options().timestamp.empty()) {`
`138`	`145`	`add_option(options().timestamp);`
`139`	`146`	`m_buffer += std::to_string(object.timestamp().seconds_since_epoch());`
	`147`	`+ m_buffer += ',';`
`140`	`148`	`}`
`141`	`149`
`142`	`150`	`if (!options().way_nodes.empty() && object.type() == osmium::item_type::way) {`
`@@ -152,6 +160,7 @@ void ExportFormatJSON::add_attributes(const osmium::OSMObject& object) {`
`152`	`160`	`} else {`
`153`	`161`	`m_buffer += ']';`
`154`	`162`	`}`
	`163`	`+ m_buffer += ',';`
`155`	`164`	`}`
`156`	`165`	`}`
`157`	`166`