Upgrade route-snapper

backend/Cargo.toml

@@ -15,7 +15,7 @@ geo = { git = "https://github.com/dabreegster/geo", branch = "boolops_and_linesp
 geojson = { git = "https://github.com/georust/geojson", features = ["geo-types"] }
 log = "0.4.20"
 osm-reader = { git = "https://github.com/a-b-street/osm-reader" }
-route-snapper-graph = { git = "https://github.com/dabreegster/route_snapper", branch = "no_osm2streets" }
+route-snapper-graph = { git = "https://github.com/dabreegster/route_snapper" }
 serde = "1.0.188"
 serde_json = "1.0.105"
 serde-wasm-bindgen = "0.6.0"

backend/src/route_snapper.rs

@@ -18,9 +18,12 @@ impl MapModel {
                 node1: NodeID(r.src_i.0 as u32),
                 node2: NodeID(r.dst_i.0 as u32),
                 geometry: self.mercator.to_wgs84(&r.linestring),
+                name: r.tags.get("name").cloned(),
+
                 // Isn't serialized, doesn't matter
                 length_meters: 0.0,
-                name: r.tags.get("name").cloned(),
+                forward_cost: None,
+                backward_cost: None,
             });
         }
 
@@ -89,9 +92,12 @@ impl MapModel {
                     node1: pt_to_node_id[&hashify_point(split_ls.0[0])],
                     node2: pt_to_node_id[&hashify_point(*split_ls.0.last().unwrap())],
                     geometry: self.mercator.to_wgs84(&split_ls),
+                    name: self.get_r(r).tags.get("name").cloned(),
+
                     // Isn't serialized, doesn't matter
                     length_meters: 0.0,
-                    name: self.get_r(r).tags.get("name").cloned(),
+                    forward_cost: None,
+                    backward_cost: None,
                 });
             }
 
@@ -105,7 +111,12 @@ impl MapModel {
             edges.remove(r.0);
         }
 
-        RouteSnapperMap { nodes, edges }
+        RouteSnapperMap {
+            nodes,
+            edges,
+            override_forward_costs: Vec::new(),
+            override_backward_costs: Vec::new(),
+        }
     }
 }
 

web/package.json

@@ -31,7 +31,7 @@
     "@maptiler/geocoding-control": "^1.2.2",
     "@picocss/pico": "^2.0.3",
     "@turf/nearest-point-on-line": "^6.5.0",
-    "route-snapper": "0.3.0",
+    "route-snapper": "^0.4.0",
     "svelte-maplibre": "^0.8.1"
   }
 }