Store lane_specs_ltr on RawRoad, instead of constantly recalculating. a…

…-b-street/osm2streets#2
a-b-street · May 1, 2022 · f72dd62 · f72dd62
1 parent 2c3157e
commit f72dd62
Show file tree

Hide file tree

Showing 15 changed files with 1,257 additions and 1,256 deletions.
diff --git a/apps/map_editor/src/edit.rs b/apps/map_editor/src/edit.rs
@@ -28,7 +28,7 @@ impl EditRoad {
         for (k, v) in road.osm_tags.inner() {
             txt.add_line(Line(format!("{} = {}", k, v)).secondary());
         }
-        if let Ok((pl, _)) = app.model.map.untrimmed_road_geometry(r) {
+        if let Ok((pl, _)) = road.untrimmed_road_geometry() {
             txt.add_line(Line(format!("Length before trimming: {}", pl.length())));
         }
         if let Ok(pl) = app.model.map.trimmed_road_geometry(r) {

diff --git a/apps/map_editor/src/model.rs b/apps/map_editor/src/model.rs
@@ -262,9 +262,9 @@ impl Model {
 // Roads
 impl Model {
     pub fn road_added(&mut self, ctx: &EventCtx, id: OriginalRoad) {
-        let (center, total_width) = self.map.untrimmed_road_geometry(id).unwrap();
-        let hitbox = center.make_polygons(total_width);
         let road = &self.map.roads[&id];
+        let (center, total_width) = road.untrimmed_road_geometry().unwrap();
+        let hitbox = center.make_polygons(total_width);
         let mut draw = GeomBatch::new();
         draw.push(
             if road.osm_tags.is("junction", "intersection") {
@@ -338,6 +338,7 @@ impl Model {
                     self.map.intersections[&i2].point,
                 ],
                 osm_tags,
+                &self.map.config,
             ),
         );
         self.road_added(ctx, id);

diff --git a/convert_osm/src/extract.rs b/convert_osm/src/extract.rs
@@ -109,8 +109,10 @@ pub fn extract_osm(
                 way.tags.insert(osm::SIDEWALK, "right");
             }
 
-            out.roads
-                .push((id, RawRoad::new(way.pts.clone(), way.tags.clone())));
+            out.roads.push((
+                id,
+                RawRoad::new(way.pts.clone(), way.tags.clone(), &opts.map_config),
+            ));
             continue;
         } else if way.tags.is(osm::HIGHWAY, "service") {
             // If we got here, is_road didn't interpret it as a normal road

diff --git a/convert_osm/src/parking.rs b/convert_osm/src/parking.rs
@@ -31,6 +31,8 @@ pub fn apply_parking(map: &mut RawMap, opts: &Options, timer: &mut Timer) {
                     } else {
                         r.osm_tags.insert(osm::PARKING_BOTH, "parallel");
                     }
+
+                    r.lane_specs_ltr = raw_map::get_lane_specs_ltr(&r.osm_tags, &opts.map_config);
                 }
             }
         }
@@ -138,6 +140,9 @@ fn use_parking_hints(map: &mut RawMap, path: String, timer: &mut Timer) {
                 tags.remove(osm::PARKING_RIGHT).unwrap();
                 tags.insert(osm::PARKING_BOTH, value);
             }
+
+            let lane_specs_ltr = raw_map::get_lane_specs_ltr(tags, &map.config);
+            map.roads.get_mut(&r).unwrap().lane_specs_ltr = lane_specs_ltr;
         }
     }
     timer.stop("apply parking hints");