a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-29 12:43:38 +03:00
Code Issues Projects Releases Wiki Activity

base RoadWithStopSign enabledness on turn priorities

Browse Source
This commit is contained in:
Dustin Carlino 2019-05-11 14:41:45 -07:00
parent 6b218fb5ab
commit ca23950097
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/edit/stop_signs.rs
View File

@ -106,7 +106,7 @@ impl StopSignEditor {
.input
.contextual_action(Key::Space, &format!("toggle to {:?}", next_priority))
{
sign.turns.insert(t, next_priority);
sign.change(t, next_priority, &ui.primary.map);
let mut new_edits = ui.primary.map.get_edits().clone();
new_edits.stop_sign_overrides.insert(self.id, sign);
apply_map_edits(ui, ctx, new_edits);

26
map_model/src/stop_signs.rs
View File

@ -75,6 +75,7 @@ impl ControlStopSign {
);
}
}
ss.recalculate_stop_signs(map);
ss
}
@ -99,10 +100,6 @@ impl ControlStopSign {
}
}
false
/*self.turns
.iter()
.find(|(turn, pri)| turn.src == lane && **pri <= TurnPriority::Stop)
.is_none()*/
}
// Returns both errors and warnings.
@ -151,6 +148,27 @@ impl ControlStopSign {
Ok(Warn::empty_warnings(warnings))
}
pub fn change(&mut self, t: TurnID, pri: TurnPriority, map: &Map) {
self.turns.insert(t, pri);
self.recalculate_stop_signs(map);
}
fn recalculate_stop_signs(&mut self, map: &Map) {
for ss in self.roads.values_mut() {
ss.enabled = false;
for l in &ss.travel_lanes {
for (turn, _) in map.get_next_turns_and_lanes(*l, self.id) {
match self.turns[&turn.id] {
TurnPriority::Stop | TurnPriority::Banned => {
ss.enabled = true;
}
_ => {}
}
}
}
}
}
}
fn smart_assignment(map: &Map, id: IntersectionID) -> Warn<ControlStopSign> {