Use osm-reader callbacks

a-b-street · Dec 12, 2023 · 3c0844d · 3c0844d
1 parent 7d34bc1
commit 3c0844d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/src/scrape.rs b/backend/src/scrape.rs
@@ -17,24 +17,22 @@ 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 osm_reader::parse(input_bytes)? {
-        match elem {
-            Element::Node { id, lon, lat, .. } => {
-                let pt = Coord { x: lon, y: lat };
-                node_mapping.insert(id, pt);
-            }
-            Element::Way { id, node_ids, tags } => {
-                if tags.contains_key("highway") {
-                    highways.push(Way {
-                        id,
-                        node_ids,
-                        tags: tags.into(),
-                    });
-                }
+    osm_reader::parse(input_bytes, |elem| match elem {
+        Element::Node { id, lon, lat, .. } => {
+            let pt = Coord { x: lon, y: lat };
+            node_mapping.insert(id, pt);
+        }
+        Element::Way { id, node_ids, tags } => {
+            if tags.contains_key("highway") {
+                highways.push(Way {
+                    id,
+                    node_ids,
+                    tags: tags.into(),
+                });
             }
-            Element::Relation { .. } => {}
         }
-    }
+        Element::Relation { .. } => {}
+    })?;
 
     let (mut roads, mut intersections) = split_edges(&node_mapping, highways);