Update osm2graph and handle new API

a-b-street · Jan 12, 2025 · 1b33bfd · 1b33bfd
1 parent 40bb502
commit 1b33bfd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -18,4 +18,3 @@ serde = "1.0.209"
 serde_json = "1.0.127"
 simple_logger = "5.0.0"
 tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }
-utils = { git = "https://github.com/a-b-street/utils" }
diff --git a/graph/src/create.rs b/graph/src/create.rs
@@ -49,12 +49,13 @@ impl Graph {
             osm_reader,
         )?;
         post_process_graph(&mut graph)?;
+        graph.compact_ids();
 
         timer.step("calculate road attributes");
         // Copy all the fields
         let intersections: Vec<Intersection> = graph
             .intersections
-            .into_iter()
+            .into_values()
             .map(|i| Intersection {
                 id: IntersectionID(i.id.0),
                 point: i.point,
@@ -66,7 +67,7 @@ impl Graph {
         // Add in a bit
         let mut roads: Vec<Road> = graph
             .edges
-            .into_iter()
+            .into_values()
             .map(|e| Road {
                 id: RoadID(e.id.0),
                 src_i: IntersectionID(e.src.0),