Upstream some utility functions

Author: dabreegster

backend/Cargo.lock

@@ -104,7 +104,7 @@ mod tests {
             (vec!["highway=path", "footway=sidewalk"], Kind::Other),
             (vec!["highway=cycleway", "foot=yes"], Kind::Other),
         ] {
-            let actual = Kind::classify(&tags(&input));
+            let actual = Kind::classify(&Tags::new_from_pairs(&input));
             if actual != expected {
                 println!("For {input:?}, expected {expected:?} but got {actual:?}\n");
                 ok = false;
@@ -115,14 +115,4 @@ mod tests {
             panic!("Some cases failed");
         }
     }
-
-    // TODO Upstream as a test utility
-    fn tags(input: &Vec<&'static str>) -> Tags {
-        let mut tags = Tags::empty();
-        for kv in input {
-            let parts = kv.split("=").collect::<Vec<_>>();
-            tags.insert(parts[0], parts[1]);
-        }
-        tags
-    }
 }

backend/src/classify.rs

@@ -79,7 +79,7 @@ impl Speedwalk {
         FeatureCollection {
             features,
             bbox: None,
-            foreign_members: Some(into_object_value(serde_json::json!({
+            foreign_members: Some(utils::into_object_value(serde_json::json!({
                 "component_lengths": component_lengths,
                 "component_bboxes": component_bboxes,
             }))),
@@ -97,8 +97,3 @@ fn nodes_to_ways(graph: &Graph, nodes: Vec<IntersectionID>) -> BTreeSet<WayID> {
     }
     ways
 }
-
-// TODO Upstream
-fn into_object_value(value: serde_json::Value) -> serde_json::Map<String, serde_json::Value> {
-    value.as_object().unwrap().clone()
-}