Merge roads that're so short they vanish when calculating geometry no…

…rmally. #136 Immense improvement to many tests
a-b-street · Dec 16, 2022 · d3d74b3 · d3d74b3
1 parent d3fc36c
commit d3d74b3
Show file tree

Hide file tree

Showing 26 changed files with 3,956 additions and 9,542 deletions.
diff --git a/osm2streets/src/transform/intersection_geometry.rs b/osm2streets/src/transform/intersection_geometry.rs
@@ -60,9 +60,10 @@ pub fn generate(streets: &mut StreetNetwork, timer: &mut Timer) {
         {
             road.center_line = pl;
         } else {
-            // TODO Mark for collapsing?
-            error!("{} got trimmed into oblivion", road.id);
+            error!("{} got trimmed into oblivion, collapse it later", road.id);
             road.center_line = untrimmed;
+            // Collapse it later
+            road.internal_junction_road = true;
         }
     }
 

diff --git a/osm2streets/src/transform/mod.rs b/osm2streets/src/transform/mod.rs
@@ -40,6 +40,9 @@ impl Transformation {
             Transformation::CollapseDegenerateIntersections,
             Transformation::ShrinkOverlappingRoads,
             Transformation::GenerateIntersectionGeometry,
+            // The above may discover more roads to collapse
+            Transformation::CollapseShortRoads,
+            Transformation::GenerateIntersectionGeometry,
         ]
     }