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

4-phase cycle with protected lefts. very easy to express.

Browse Source
This commit is contained in:
Dustin Carlino 2018-12-01 20:39:44 -08:00
parent 987b2a4884
commit 5b71f04c97
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
map_model/src/traffic_signals.rs
View File

@ -210,12 +210,12 @@ const PROTECTED: bool = true;
const YIELD: bool = false;
fn four_way(map: &Map, i: IntersectionID) -> ControlTrafficSignal {
let roads = map.get_i(i).get_roads_sorted_by_incoming_angle(map);
// Just to refer to these easily, label with directions. Imagine an axis-aligned four-way.
let roads = map.get_i(i).get_roads_sorted_by_incoming_angle(map);
let (north, west, south, east) = (roads[0], roads[1], roads[2], roads[3]);
// Two-phase with no protected lefts, right turn on red, peds yielding to cars
let cycles = make_cycles(
/*let cycles = make_cycles(
map,
i,
vec![
@ -232,6 +232,27 @@ fn four_way(map: &Map, i: IntersectionID) -> ControlTrafficSignal {
(vec![north, south], Turns::Crosswalk, YIELD),
],
],
);*/
// Four-phase with protected lefts, right turn on red (except for the protected lefts), peds
// yielding to cars
let cycles = make_cycles(
map,
i,
vec![
vec![
(vec![north, south], Turns::StraightAndRight, PROTECTED),
(vec![east, west], Turns::Right, YIELD),
(vec![east, west], Turns::Crosswalk, YIELD),
],
vec![(vec![north, south], Turns::Left, PROTECTED)],
vec![
(vec![east, west], Turns::StraightAndRight, PROTECTED),
(vec![north, south], Turns::Right, YIELD),
(vec![north, south], Turns::Crosswalk, YIELD),
],
vec![(vec![east, west], Turns::Left, PROTECTED)],
],
);
ControlTrafficSignal { id: i, cycles }