Move osm-reader to its own crate

a-b-street · Dec 8, 2023 · 3b88d29 · 3b88d29
1 parent ec02044
commit 3b88d29
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 273 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -7,20 +7,19 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+anyhow = "1.0.75"
 console_error_panic_hook = "0.1.6"
 console_log = "1.0.0"
+fast_paths = { git = "https://github.com/easbar/fast_paths" }
 geo = "0.27.0"
 geojson = { git = "https://github.com/georust/geojson", features = ["geo-types"] }
 log = "0.4.20"
-roxmltree = { version = "0.19.0", default-features = false }
+osm-reader = { git = "https://github.com/a-b-street/osm-reader" }
+rand = { version = "0.8.5", default-features = false }
+rand_xorshift = "0.3.0"
+rstar = { version = "0.11.0" }
 serde = "1.0.188"
 serde_json = "1.0.105"
 serde-wasm-bindgen = "0.6.0"
 wasm-bindgen = "0.2.87"
 web-sys = { version = "0.3.64", features = ["console"] }
-anyhow = "1.0.75"
-osmpbf = "0.3.2"
-rstar = { version = "0.11.0" }
-fast_paths = { git = "https://github.com/easbar/fast_paths" }
-rand = { version = "0.8.5", default-features = false }
-rand_xorshift = "0.3.0"
diff --git a/backend/src/lib.rs b/backend/src/lib.rs
@@ -13,7 +13,6 @@ use wasm_bindgen::prelude::*;
 
 mod heatmap;
 mod node_map;
-mod osm_reader;
 mod route;
 mod scrape;
 mod tags;

diff --git a/backend/src/osm_reader/mod.rs b/backend/src/osm_reader/mod.rs
diff --git a/backend/src/osm_reader/pbf.rs b/backend/src/osm_reader/pbf.rs
diff --git a/backend/src/osm_reader/xml.rs b/backend/src/osm_reader/xml.rs
diff --git a/backend/src/scrape.rs b/backend/src/scrape.rs
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use anyhow::Result;
 use geo::{Coord, LineString, Point};
+use osm_reader::{Element, NodeID, WayID};
 
-use crate::osm_reader::{Element, NodeID, WayID};
 use crate::tags::Tags;
 use crate::{Intersection, IntersectionID, MapModel, Road, RoadID, RoadKind};
 
@@ -16,7 +16,7 @@ struct Way {
 pub fn scrape_osm(input_bytes: &[u8]) -> Result<MapModel> {
     let mut node_mapping = HashMap::new();
     let mut highways = Vec::new();
-    for elem in crate::osm_reader::parse(input_bytes)? {
+    for elem in osm_reader::parse(input_bytes)? {
         match elem {
             Element::Node { id, lon, lat, .. } => {
                 let pt = Coord { x: lon, y: lat };