Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions features/guidance/advanced-lanes.feature
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Feature: Turn Lane Guidance
| restriction | bc | cd | c | no_right_turn |

When I route I should get
| waypoints | route | turns | lanes |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false, |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true, |
| a,f | in,cross,cross | depart,continue right,arrive | ,;right:true, |
| waypoints | route | turns | lanes | locations |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false, | a,?,e |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true, | a,i,g |
| a,f | in,cross,cross | depart,continue right,arrive | ,;right:true, | a,?,f |

@sliproads
Scenario: Separate Turn Lanes
Expand Down Expand Up @@ -68,10 +68,10 @@ Feature: Turn Lane Guidance
| restriction | bc | cd | c | no_right_turn |

When I route I should get
| waypoints | route | turns | lanes |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, |
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, |
| waypoints | route | turns | lanes | locations |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | a,?,e |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | a,i,g |
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | a,?,f |


@sliproads
Expand Down Expand Up @@ -109,12 +109,12 @@ Feature: Turn Lane Guidance
| restriction | bc | cd | c | no_right_turn |

When I route I should get
| waypoints | route | turns | lanes |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, |
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, |
| a,j | in,turn,other,other | depart,turn right,turn left,arrive | ,,left:true right:false, |
| a,i | in,turn,other,other | depart,turn right,turn right,arrive | ,,left:false right:true, |
| waypoints | route | turns | lanes | locations |
| a,e | in,cross,cross | depart,turn left,arrive | ;,left:true straight:false right:false, | a,?,e |
| a,g | in,straight,straight | depart,new name straight,arrive | ;,left:false straight:true right:false, | a,i,g |
| a,f | in,cross,cross | depart,turn right,arrive | ,left:false straight:false right:true;left:false straight:false right:true, | a,?,f |
| a,j | in,turn,other,other | depart,turn right,turn left,arrive | ,,left:true right:false, | a,n,t,j |
| a,i | in,turn,other,other | depart,turn right,turn right,arrive | ,,left:false right:true, | a,n,t,i |


@todo @2654 @none
Expand Down Expand Up @@ -143,9 +143,9 @@ Feature: Turn Lane Guidance
| hbi | ksd | secondary | yes | |

When I route I should get
| waypoints | route | turns | lanes |
| a,f | ,ksd,ksd | depart,turn left,arrive | ,left:true none:true right:false, |
| a,i | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, |
| waypoints | route | turns | lanes | locations |
| a,f | ,ksd,ksd | depart,turn left,arrive | ,left:true none:true right:false, | a,?,f |
| a,i | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, | a,?,i |

@todo @2650 @sliproads
#market and haight in SF, restricted turn
Expand Down Expand Up @@ -189,11 +189,11 @@ Feature: Turn Lane Guidance
| relation | bd | dc | d | no_right_turn |

When I route I should get
| waypoints | route | turns | lanes |
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, |
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, |
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, |
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, |
| waypoints | route | turns | lanes | locations |
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | a,h,l |
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | a,?,h |
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | a,?,j |
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | a,g,f |

@todo @2650 @sliproads
#market and haight in SF, unrestricted
Expand Down Expand Up @@ -233,11 +233,11 @@ Feature: Turn Lane Guidance
| bl | haight | residential | yes | left\|none |

When I route I should get
| waypoints | route | turns | lanes |
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, |
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, |
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, |
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, |
| waypoints | route | turns | lanes | locations |
| a,l | ghough,haight,haight | depart,turn right,arrive | ,none:false straight:false straight:false straight:true, | a,h,l |
| a,h | ghough,market,market | depart,turn slight right,arrive | ,none:false straight:false straight:true straight:true, | a,?,h |
| a,j | ghough,market,market | depart,turn left,arrive | ,none:true straight:false straight:false straight:false, | a,?,j |
| a,f | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false, | a,g,f |


Scenario: Check sliproad handler loop's exit condition, Issue #2896
Expand All @@ -253,5 +253,5 @@ Feature: Turn Lane Guidance
| cbac | |

When I route I should get
| from | to | route | turns |
| a | c | , | depart,arrive |
| from | to | route | turns | locations |
| a | c | , | depart,arrive | a,c |
4 changes: 2 additions & 2 deletions features/guidance/bicycle-sliproads.feature
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Feature: Bike - Mode flag
| geh | secondary | street | | |

When I route I should get
| waypoints | route | turns |
| a,f | street,,road,road | depart,turn right,turn right,arrive |
| waypoints | route | turns | locations |
| a,f | street,,road,road | depart,turn right,turn right,arrive | a,?,?,f |
36 changes: 18 additions & 18 deletions features/guidance/bike-staggered-intersections.feature
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr | yes |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,pushing bike,cycling,cycling |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,pushing bike,cycling,cycling | a,a,a,g |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |

Scenario: Staggered Intersection - pushing at start
Given the node map
Expand All @@ -46,9 +46,9 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr | |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,cycling,cycling |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,cycling,cycling | a,a,a,g |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |

Scenario: Staggered Intersection - pushing at end
Given the node map
Expand All @@ -68,9 +68,9 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr | |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,cycling,pushing bike,pushing bike |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | cycling,cycling,pushing bike,pushing bike | a,a,a,g |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |

Scenario: Staggered Intersection - pushing at start and end
Given the node map
Expand All @@ -90,9 +90,9 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr | |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | a,a,a,g |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |

Scenario: Staggered Intersection - pushing at start and end
Given the node map
Expand All @@ -112,9 +112,9 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
| g,a | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | a,a,a,g |
| g,a | Oak St,Cedar Dr,Oak St,Oak St | depart,turn right,turn left,arrive | pushing bike,cycling,pushing bike,pushing bike | g,a,a,a |

Scenario: Staggered Intersection - control, all cycling on staggered intersection
Given the node map
Expand All @@ -134,6 +134,6 @@ Feature: Staggered Intersections
| ihedcj | residential | Cedar Dr |

When I route I should get
| waypoints | route | turns | modes |
| a,g | Oak St,Oak St | depart,arrive | cycling,cycling |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling |
| waypoints | route | turns | modes | locations |
| a,g | Oak St,Oak St | depart,arrive | cycling,cycling | a,g |
| g,a | Oak St,Oak St | depart,arrive | cycling,cycling | g,a |
Loading
Loading