a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2025-01-01 19:04:50 +03:00
Code Issues Projects Releases Wiki Activity

matching parking lots to offside driving lanes if needed. fixes all ~37 cases in krakow!

Browse Source 
not regenerating yet
This commit is contained in:
Dustin Carlino 2020-08-03 16:50:48 -07:00
parent 588a20e8d3
commit e52da86f74
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
map_model/src/make/parking_lots.rs
View File

@ -1,7 +1,7 @@
use crate::make::match_points_to_lanes;
use crate::raw::RawParkingLot;
use crate::{
LaneType, Map, ParkingLot, ParkingLotID, Position, NORMAL_LANE_THICKNESS,
Map, ParkingLot, ParkingLotID, PathConstraints, Position, NORMAL_LANE_THICKNESS,
PARKING_LOT_SPOT_LENGTH,
};
use abstutil::Timer;
@ -55,24 +55,28 @@ pub fn make_all_parking_lots(
// Can this lot have a driveway? If it's not next to a driving lane, then no.
let mut driveway: Option<(PolyLine, Position)> = None;
let sidewalk_lane = sidewalk_pos.lane();
if let Ok(driving_lane) = map
if let Some(driving_pos) = map
.get_parent(sidewalk_lane)
.find_closest_lane(sidewalk_lane, vec![LaneType::Driving])
.find_closest_lane_v2(
sidewalk_lane,
true,
|l| PathConstraints::Car.can_use(l, map),
map,
)
.and_then(|l| {
sidewalk_pos
.equiv_pos(l, map)
.buffer_dist(driveway_buffer, map)
})
{
let driving_pos = sidewalk_pos.equiv_pos(driving_lane, map);
if driving_pos.dist_along() > driveway_buffer
&& map.get_l(driving_lane).length() - driving_pos.dist_along() > driveway_buffer
{
driveway = Some((
PolyLine::must_new(vec![
sidewalk_line.pt1(),
sidewalk_line.pt2(),
driving_pos.pt(map),
]),
driving_pos,
));
}
driveway = Some((
PolyLine::must_new(vec![
sidewalk_line.pt1(),
sidewalk_line.pt2(),
driving_pos.pt(map),
]),
driving_pos,
));
}
if let Some((driveway_line, driving_pos)) = driveway {
let id = ParkingLotID(results.len());
@ -91,8 +95,10 @@ pub fn make_all_parking_lots(
} else {
// TODO Plumb WayID forward
timer.warn(format!(
"Parking lot from https://www.openstreetmap.org/way/{} can't have a driveway.",
orig.osm_id
"Parking lot from https://www.openstreetmap.org/way/{}, near sidewalk {}, \
can't have a driveway.",
orig.osm_id,
sidewalk_pos.lane()
));
}
}

8
map_model/src/traversable.rs
View File

@ -104,6 +104,14 @@ impl Position {
self.dist_along = dist_along;
Some(self)
}
pub fn buffer_dist(mut self, buffer: Distance, map: &Map) -> Option<Position> {
let len = map.get_l(self.lane).length();
if len <= buffer * 2.0 {
return None;
}
self.dist_along = self.dist_along.max(buffer).min(len - buffer);
Some(self)
}
}
// TODO also building paths?