Initially cutover to osm2lanes

a-b-street · Apr 27, 2022 · 8a9893f · 8a9893f
1 parent bd5d93b
commit 8a9893f
Show file tree

Hide file tree

Showing 6 changed files with 300 additions and 600 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/abstutil/src/collections.rs b/abstutil/src/collections.rs
@@ -283,6 +283,9 @@ impl Tags {
     pub fn contains_key(&self, k: &str) -> bool {
         self.0.contains_key(k)
     }
+    pub fn has_any(&self, keys: Vec<&str>) -> bool {
+        keys.into_iter().any(|key| self.contains_key(key))
+    }
 
     pub fn is(&self, k: &str, v: &str) -> bool {
         self.0.get(k) == Some(&v.to_string())

diff --git a/convert_osm/src/extract.rs b/convert_osm/src/extract.rs
@@ -7,7 +7,7 @@ use abstutil::{Tags, Timer};
 use geom::{Distance, FindClosest, HashablePt2D, Polygon, Pt2D, Ring};
 use kml::{ExtraShape, ExtraShapes};
 use raw_map::{
-    osm, Amenity, AreaType, Direction, DrivingSide, NamePerLanguage, RawArea, RawBuilding, RawMap,
+    osm, Amenity, AreaType, Direction, NamePerLanguage, RawArea, RawBuilding, RawMap,
     RawParkingLot, RawRoad, RestrictionType,
 };
 
@@ -445,6 +445,7 @@ fn is_road(tags: &mut Tags, opts: &Options, name: &MapName) -> bool {
     }
 
     // It's a road! Now fill in some possibly missing data.
+    // TODO Stop doing this entirely?
 
     // If there's no parking data in OSM already, then assume no parking and mark that it's
     // inferred.
@@ -457,51 +458,9 @@ fn is_road(tags: &mut Tags, opts: &Options, name: &MapName) -> bool {
         tags.insert(osm::PARKING_BOTH, "no_parking");
         tags.insert(osm::INFERRED_PARKING, "true");
     }
-
-    // If there's no sidewalk data in OSM already, then make an assumption and mark that
-    // it's inferred.
-    if !tags.contains_key(osm::SIDEWALK) && opts.map_config.inferred_sidewalks {
-        tags.insert(osm::INFERRED_SIDEWALKS, "true");
-
-        if tags.contains_key("sidewalk:left") || tags.contains_key("sidewalk:right") {
-            // Attempt to mangle
-            // https://wiki.openstreetmap.org/wiki/Key:sidewalk#Separately_mapped_sidewalks_on_only_one_side
-            // into left/right/both. We have to make assumptions for missing values.
-            let right = !tags.is("sidewalk:right", "no");
-            let left = !tags.is("sidewalk:left", "no");
-            let value = match (right, left) {
-                (true, true) => "both",
-                (true, false) => "right",
-                (false, true) => "left",
-                (false, false) => "none",
-            };
-            tags.insert(osm::SIDEWALK, value);
-        } else if tags.is_any(osm::HIGHWAY, vec!["motorway", "motorway_link"])
-            || tags.is_any("junction", vec!["intersection", "roundabout"])
-            || tags.is("foot", "no")
-            || tags.is(osm::HIGHWAY, "service")
-            // TODO For now, not attempting shared walking/biking paths.
-            || tags.is_any(osm::HIGHWAY, vec!["cycleway", "pedestrian", "track"])
-        {
-            tags.insert(osm::SIDEWALK, "none");
-        } else if tags.is("oneway", "yes") {
-            if opts.map_config.driving_side == DrivingSide::Right {
-                tags.insert(osm::SIDEWALK, "right");
-            } else {
-                tags.insert(osm::SIDEWALK, "left");
-            }
-            if tags.is_any(osm::HIGHWAY, vec!["residential", "living_street"])
-                && !tags.is("dual_carriageway", "yes")
-            {
-                tags.insert(osm::SIDEWALK, "both");
-            }
-            // Hack for Geneva, which maps sidewalks as separate ways
-            if name.city == CityName::new("ch", "geneva") {
-                tags.insert(osm::SIDEWALK, "both");
-            }
-        } else {
-            tags.insert(osm::SIDEWALK, "both");
-        }
+    // Hack for Geneva, which maps sidewalks as separate ways
+    if !tags.contains_key(osm::SIDEWALK) && name.city == CityName::new("ch", "geneva") {
+        tags.insert(osm::SIDEWALK, "both");
     }
 
     true

diff --git a/raw_map/Cargo.toml b/raw_map/Cargo.toml
@@ -13,6 +13,7 @@ geojson = { version = "0.22.0", features = ["geo-types"] }
 geom = { path = "../geom" }
 kml = { path = "../kml" }
 log = "0.4.14"
+osm2lanes = { git = "https://github.com/a-b-street/osm2lanes" }
 petgraph = { version = "0.6.0" }
 serde = "1.0.123"
 serde_json = "1.0.61"