Produce valid .osc files in the lane editor, by including version

a-b-street · Mar 24, 2024 · 53b83f1 · 53b83f1
1 parent 5486508
commit 53b83f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/osm2streets-js/src/lib.rs b/osm2streets-js/src/lib.rs
@@ -234,10 +234,9 @@ impl JsStreetNetwork {
     pub fn way_to_xml(&self, id: i64) -> String {
         let way = &self.ways[&osm::WayID(id)];
         let mut out = format!(r#"<way id="{id}""#);
-        // TODO Add this to osm-reader
-        /*if let Some(version) = way.version {
+        if let Some(version) = way.version {
             out.push_str(&format!(r#" version="{version}""#));
-        }*/
+        }
         out.push_str(">\n");
         for node in &way.nodes {
             out.push_str(&format!(r#"  <nd ref="{}"/>"#, node.0));

diff --git a/streets_reader/src/osm_reader/mod.rs b/streets_reader/src/osm_reader/mod.rs
@@ -24,6 +24,7 @@ pub struct Document {
 pub struct Node {
     pub pt: Pt2D,
     pub tags: Tags,
+    pub version: Option<i32>,
 }
 
 #[derive(Clone)]
@@ -32,10 +33,12 @@ pub struct Way {
     pub nodes: Vec<NodeID>,
     pub pts: Vec<Pt2D>,
     pub tags: Tags,
+    pub version: Option<i32>,
 }
 
 pub struct Relation {
     pub tags: Tags,
     /// Role, member
     pub members: Vec<(String, OsmID)>,
+    pub version: Option<i32>,
 }
diff --git a/streets_reader/src/osm_reader/reader.rs b/streets_reader/src/osm_reader/reader.rs
@@ -49,7 +49,13 @@ impl Document {
                     ]));
                 }
             }
-            Element::Node { id, lon, lat, tags } => {
+            Element::Node {
+                id,
+                lon,
+                lat,
+                tags,
+                version,
+            } => {
                 if doc.gps_bounds.is_none() {
                     warn!(
                         "No clipping polygon provided and the .osm is missing a <bounds> element, \
@@ -68,10 +74,16 @@ impl Document {
                     Node {
                         pt,
                         tags: make_tags(tags),
+                        version,
                     },
                 );
             }
-            Element::Way { id, node_ids, tags } => {
+            Element::Way {
+                id,
+                node_ids,
+                tags,
+                version,
+            } => {
                 if doc.ways.contains_key(&id) {
                     panic!("Duplicate {id}, your .osm is corrupt");
                 }
@@ -92,6 +104,7 @@ impl Document {
                             nodes,
                             pts,
                             tags: make_tags(tags),
+                            version,
                         },
                     );
                 }
@@ -100,6 +113,7 @@ impl Document {
                 id,
                 tags,
                 mut members,
+                version,
             } => {
                 if doc.relations.contains_key(&id) {
                     panic!("Duplicate {id}, your .osm is corrupt");
@@ -116,6 +130,7 @@ impl Document {
                     Relation {
                         tags: make_tags(tags),
                         members,
+                        version,
                     },
                 );
             }