Merge pull request #42 from rust-transit/no_merge_different_tag

No merge different tag

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "osm4routing"
 edition = "2021"
-version = "0.6.2"
+version = "0.6.3"
 authors = ["Tristram Gräbener <[email protected]>"]
 description = "Convert OpenStreetMap data into routing friendly CSV"
 homepage = "https://github.com/Tristramg/osm4routing2"

src/osm4routing/reader.rs

@@ -70,7 +70,7 @@ impl Reader {
                 let node = self
                     .nodes
                     .get_mut(node_id)
-                    .expect("Missing node, id: {node_id}");
+                    .unwrap_or_else(|| panic!("Missing node, id: {}", node_id.0));
                 // Count double extremities nodes to be sure to include dead-ends
                 if i == 0 || i == way.nodes.len() - 1 {
                     node.uses += 2;
@@ -140,10 +140,12 @@ impl Reader {
         for (node, edges) in neighbors.drain() {
             // We merge two edges at the node if there are only two edges
             // The edges must have the same accessibility properties
+            // If the consummer asked to store the tags, the tags must be the same for both edges
             // The edges must be from different ways (no surface)
             // The edges must not have been merged this iteration (they might be re-merged through a recurive call)
             if edges.len() == 2
                 && edges[0].properties == edges[1].properties
+                && edges[0].tags == edges[1].tags
                 && edges[0].id != edges[1].id
                 && !already_merged.contains(&edges[0].id)
                 && !already_merged.contains(&edges[1].id)