More workarounds for clipping, found while upgrading A/B Street. #127

- traffic signals should never wind up on map edges - multipolygons and OSM document-level clipping are still strange
a-b-street · Dec 23, 2022 · ca1f718 · ca1f718
1 parent ac5623a
commit ca1f718
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/osm2streets/src/intersection.rs b/osm2streets/src/intersection.rs
@@ -196,10 +196,7 @@ impl StreetNetwork {
         intersection.kind = kind;
     }
 
-    pub fn calculate_movements_and_kind(
-        &self,
-        i: IntersectionID,
-    ) -> (Vec<Movement>, IntersectionKind) {
+    fn calculate_movements_and_kind(&self, i: IntersectionID) -> (Vec<Movement>, IntersectionKind) {
         let roads: Vec<_> = self
             .roads_per_intersection(i)
             .into_iter()

diff --git a/streets_reader/src/osm_reader/multipolygon.rs b/streets_reader/src/osm_reader/multipolygon.rs
@@ -17,7 +17,10 @@ impl Document {
         for (role, member) in &rel.members {
             if let OsmID::Way(w) = member {
                 if role == "outer" {
-                    pts_per_way.push((*w, self.ways[w].pts.clone()));
+                    // TODO Hack. Clipping doesn't handle relations / members yet
+                    if let Some(way) = self.ways.get(w) {
+                        pts_per_way.push((*w, way.pts.clone()));
+                    }
                 } else {
                     println!("{} has unhandled member role {}, ignoring it", id, role);
                 }

diff --git a/streets_reader/src/split_ways.rs b/streets_reader/src/split_ways.rs
@@ -210,8 +210,10 @@ pub fn split_up_roads(
                     } else {
                         road.src_i
                     };
-                    streets.intersections.get_mut(&i).unwrap().control =
-                        IntersectionControl::Signalled;
+                    let i = streets.intersections.get_mut(&i).unwrap();
+                    if !i.is_map_edge() {
+                        i.control = IntersectionControl::Signalled;
+                    }
                 }
             }
         }

diff --git a/tests/src/leeds_cycleway/geometry.json b/tests/src/leeds_cycleway/geometry.json
@@ -18245,7 +18245,7 @@
         "type": "Polygon"
       },
       "properties": {
-        "control": "Signalled",
+        "control": "Uncontrolled",
         "id": 1,
         "intersection_kind": "MapEdge",
         "movements": [],