Fix rebase

a-b-street · Dec 4, 2022 · 8d20e2d · 8d20e2d
1 parent bfcdf55
commit 8d20e2d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/osm2streets-java/src/lib.rs b/osm2streets-java/src/lib.rs
@@ -15,7 +15,7 @@ impl StreetNetwork {
 
         let clip_pts = None;
         let mut timer = Timer::throwaway();
-        let mut network =
+        let (mut network, _) =
             streets_reader::osm_to_street_network(&osm_xml_input, clip_pts, cfg, &mut timer)
                 .unwrap();
         let transformations = Transformation::standard_for_clipped_areas();

diff --git a/osm2streets/src/operations/collapse_intersection.rs b/osm2streets/src/operations/collapse_intersection.rs
@@ -3,7 +3,6 @@ use std::collections::BTreeSet;
 use geom::{PolyLine, Pt2D};
 
 use crate::{IntersectionID, RoadID, StreetNetwork};
-use crate::lanes::Placement;
 
 impl StreetNetwork {
     /// Delete an intersection with exactly two roads. Turn the two roads into one. It's the

diff --git a/osm2streets/src/render.rs b/osm2streets/src/render.rs
@@ -413,16 +413,12 @@ fn make_sidewalk_corners(streets: &StreetNetwork, intersection: &Intersection) -
     for road in streets.roads_per_intersection(intersection.id) {
         let mut left = Edge {
             road: road.id,
-            pl: road
-                .trimmed_center_line
-                .must_shift_left(road.total_width() / 2.0),
+            pl: road.center_line.must_shift_left(road.total_width() / 2.0),
             lane: road.lane_specs_ltr[0].clone(),
         };
         let mut right = Edge {
             road: road.id,
-            pl: road
-                .trimmed_center_line
-                .must_shift_right(road.total_width() / 2.0),
+            pl: road.center_line.must_shift_right(road.total_width() / 2.0),
             lane: road.lane_specs_ltr.last().unwrap().clone(),
         };
         if road.dst_i == intersection.id {

diff --git a/osm2streets/src/road.rs b/osm2streets/src/road.rs
@@ -6,8 +6,9 @@ use geom::{Angle, Distance, PolyLine};
 
 use crate::lanes::{Placement, RoadPosition};
 use crate::{
-    get_lane_specs_ltr, osm, CommonEndpoint, Direction, InputRoad, IntersectionID, LaneSpec,
-    LaneType, MapConfig, OriginalRoad, RestrictionType, RoadID, RoadWithEndpoints, StreetNetwork,
+    get_lane_specs_ltr, osm, CommonEndpoint, Direction, DrivingSide, InputRoad, IntersectionID,
+    LaneSpec, LaneType, MapConfig, OriginalRoad, RestrictionType, RoadID, RoadWithEndpoints,
+    StreetNetwork,
 };
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]

diff --git a/osm2streets/src/transform/collapse_intersections.rs b/osm2streets/src/transform/collapse_intersections.rs
@@ -4,6 +4,7 @@ use anyhow::Result;
 
 use geom::Distance;
 
+use crate::lanes::Placement;
 use crate::{IntersectionID, IntersectionKind, Road, StreetNetwork};
 
 /// Collapse degenerate intersections: