a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-26 07:52:05 +03:00
Code Issues Projects Releases Wiki Activity

SharedSidewalkCorners always have Priority; they never conflict with anything

Browse Source
This commit is contained in:
Dustin Carlino 2019-05-12 09:11:22 -07:00
parent b9f80f3e0f
commit 6ab8372b01
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
map_model/src/stop_signs.rs
View File

@ -121,6 +121,10 @@ impl ControlStopSign {
if !self.turns.contains_key(t) {
warnings.push(format!("Stop sign for {} is missing {}", self.id, t));
}
// Are all of the SharedSidewalkCorner prioritized?
if map.get_t(*t).turn_type == TurnType::SharedSidewalkCorner {
assert_eq!(self.turns[t], TurnPriority::Priority);
}
}
// Do any of the priority turns conflict?
@ -247,7 +251,9 @@ fn smart_assignment(map: &Map, id: IntersectionID) -> Warn<ControlStopSign> {
roads: BTreeMap::new(),
};
for t in &map.get_i(id).turns {
if rank_per_incoming_lane[&t.src] == highest_rank {
if map.get_t(*t).turn_type == TurnType::SharedSidewalkCorner {
ss.turns.insert(*t, TurnPriority::Priority);
} else if rank_per_incoming_lane[&t.src] == highest_rank {
// If it's the highest rank road, prioritize all non-left turns (if possible) and make
// other turns yield.
if map.get_t(*t).turn_type != TurnType::Left && ss.could_be_priority_turn(*t, map) {
@ -270,7 +276,11 @@ fn all_way_stop(map: &Map, id: IntersectionID) -> ControlStopSign {
roads: BTreeMap::new(),
};
for t in &map.get_i(id).turns {
ss.turns.insert(*t, TurnPriority::Stop);
if map.get_t(*t).turn_type == TurnType::SharedSidewalkCorner {
ss.turns.insert(*t, TurnPriority::Priority);
} else {
ss.turns.insert(*t, TurnPriority::Stop);
}
}
ss
}

2
map_model/src/traffic_signals.rs
View File

@ -65,7 +65,7 @@ impl ControlTrafficSignal {
assert!(!cycle.yield_turns.contains(&t.id));
}
TurnType::SharedSidewalkCorner => {
//assert!(cycle.priority_turns.contains(&t.id));
assert!(cycle.priority_turns.contains(&t.id));
}
_ => {}
}

5
map_model/src/turn.rs
View File

@ -75,6 +75,11 @@ pub struct Turn {
impl Turn {
pub fn conflicts_with(&self, other: &Turn) -> bool {
if self.turn_type == TurnType::SharedSidewalkCorner
|| other.turn_type == TurnType::SharedSidewalkCorner
{
return false;
}
if self.id == other.id {
return false;
}