diff --git a/features/guidance/advanced-lanes.feature b/features/guidance/advanced-lanes.feature index b920dfdce2e..dc15a3a311f 100644 --- a/features/guidance/advanced-lanes.feature +++ b/features/guidance/advanced-lanes.feature @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 | diff --git a/features/guidance/bicycle-sliproads.feature b/features/guidance/bicycle-sliproads.feature index 347476b453a..622207338b2 100644 --- a/features/guidance/bicycle-sliproads.feature +++ b/features/guidance/bicycle-sliproads.feature @@ -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 | diff --git a/features/guidance/bike-staggered-intersections.feature b/features/guidance/bike-staggered-intersections.feature index c4953bb82d6..6fe8774ab00 100644 --- a/features/guidance/bike-staggered-intersections.feature +++ b/features/guidance/bike-staggered-intersections.feature @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 | diff --git a/features/guidance/bridges_and_tunnels.feature b/features/guidance/bridges_and_tunnels.feature index f95876982ff..e7dba6a0dd4 100644 --- a/features/guidance/bridges_and_tunnels.feature +++ b/features/guidance/bridges_and_tunnels.feature @@ -17,8 +17,8 @@ Feature: Car - Guidance - Bridges and Tunnels | cd | primary | | Hauptstraße | When I route I should get - | from | to | route | turns | - | a | d | Hauptstraße,Hauptstraße | depart,arrive | + | from | to | route | turns | locations | + | a | d | Hauptstraße,Hauptstraße | depart,arrive | a,d | Scenario: Bridge with Immediate Turn Given the node map @@ -35,11 +35,11 @@ Feature: Car - Guidance - Bridges and Tunnels | dce | primary | | Nebenstraße | When I route I should get - | from | to | route | turns | - | a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,arrive | - | a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,arrive | - | e | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive | - | d | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive | + | from | to | route | turns | locations | + | a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,arrive | a,e,d | + | a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,arrive | a,e,e | + | e | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive | e,e,a | + | d | a | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive | d,e,a | Scenario: Bridge with Immediate Turn Front and Back Given the node map @@ -57,15 +57,15 @@ Feature: Car - Guidance - Bridges and Tunnels | gaf | primary | | Anderestraße | When I route I should get - | from | to | route | turns | - | f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | - | f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | - | g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | - | g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | - | e | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | - | e | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | - | d | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | - | d | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | + | from | to | route | turns | locations | + | f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | f,e,e,d | + | f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | f,e,e,e | + | g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | g,e,e,d | + | g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | g,e,e,e | + | e | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | e,e,e,f | + | e | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | e,e,e,g | + | d | f | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | d,e,e,f | + | d | g | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | d,e,e,g | Scenario: Simple Tunnel Given the node map @@ -80,8 +80,8 @@ Feature: Car - Guidance - Bridges and Tunnels | cd | primary | | Hauptstraße | When I route I should get - | from | to | route | turns | - | a | d | Hauptstraße,Hauptstraße | depart,arrive | + | from | to | route | turns | locations | + | a | d | Hauptstraße,Hauptstraße | depart,arrive | a,d | Scenario: Tunnel with Immediate Turn Given the node map @@ -98,11 +98,11 @@ Feature: Car - Guidance - Bridges and Tunnels | dce | primary | | Nebenstraße | When I route I should get - | from | to | route | turns | - | a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road left,arrive | - | a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road right,arrive | - | e | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive | - | d | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive | + | from | to | route | turns | locations | + | a | d | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road left,arrive | a,e,d | + | a | e | Hauptstraße,Nebenstraße,Nebenstraße | depart,end of road right,arrive | a,e,e | + | e | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive | e,e,a | + | d | a | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive | d,e,a | Scenario: Tunnel with Immediate Turn Front and Back Given the node map @@ -120,12 +120,12 @@ Feature: Car - Guidance - Bridges and Tunnels | gaf | primary | | Anderestraße | When I route I should get - | from | to | route | turns | - | f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | - | f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | - | g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | - | g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | - | e | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | - | e | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | - | d | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | - | d | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | + | from | to | route | turns | locations | + | f | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn left,arrive | f,e,e,d | + | f | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn left,turn right,arrive | f,e,e,e | + | g | d | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn left,arrive | g,e,e,d | + | g | e | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße | depart,turn right,turn right,arrive | g,e,e,e | + | e | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn right,arrive | e,e,a,f | + | e | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn left,arrive | e,e,a,g | + | d | f | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn right,arrive | d,e,a,f | + | d | g | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn left,arrive | d,e,a,g | diff --git a/features/guidance/bugs.feature b/features/guidance/bugs.feature index 6861295f2f5..e1228dff354 100644 --- a/features/guidance/bugs.feature +++ b/features/guidance/bugs.feature @@ -33,8 +33,8 @@ Feature: Features related to bugs | e | traffic_signals | When I route I should get - | waypoints | route | turns | - | 1,2 | top,right | depart,arrive | + | waypoints | route | turns | locations | + | 1,2 | top,right | depart,arrive | 1,2 | @3156 Scenario: Incorrect lanes tag @@ -65,8 +65,8 @@ Feature: Features related to bugs | bc | Merritt to Apricot | residential | When I route I should get - | waypoints | route | intersections | - | a,c | Pear to Merrit,Merritt to Apricot,Merritt to Apricot | true:0;true:0 false:180;true:180 | + | waypoints | route | intersections | locations | + | a,c | Pear to Merrit,Merritt to Apricot,Merritt to Apricot | true:0;true:0 false:180;true:180 | | # https://github.com/Project-OSRM/osrm-backend/issues/6373 diff --git a/features/guidance/circular.feature b/features/guidance/circular.feature index 94e0b80232b..026cc5a7aa7 100644 --- a/features/guidance/circular.feature +++ b/features/guidance/circular.feature @@ -27,16 +27,16 @@ Feature: Circular | bgecb | circular | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive | - | a,f | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive | - | a,h | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive | - | d,f | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive | - | d,h | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive | - | d,a | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive | - | f,h | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive | - | f,a | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive | - | f,d | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive | - | h,a | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive | - | h,d | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive | - | h,f | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive | a,?,c,d | + | a,f | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive | a,?,e,f | + | a,h | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive | a,?,g,h | + | d,f | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive | d,?,e,f | + | d,h | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive | d,?,g,h | + | d,a | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive | d,?,a,a | + | f,h | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive | f,?,g,h | + | f,a | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive | f,?,a,a | + | f,d | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive | f,?,c,d | + | h,a | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive | h,?,a,a | + | h,d | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive | h,?,c,d | + | h,f | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive | h,?,e,f | diff --git a/features/guidance/continue.feature b/features/guidance/continue.feature index 86ac2c3fe1d..47a04882f1a 100644 --- a/features/guidance/continue.feature +++ b/features/guidance/continue.feature @@ -18,9 +18,9 @@ Feature: Continue Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,continue left,arrive | - | a,d | abc,bd,bd | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,continue left,arrive | a,a,c | + | a,d | abc,bd,bd | depart,turn straight,arrive | a,b,d | Scenario: Road turning left, Suffix changes Given the node map @@ -36,8 +36,8 @@ Feature: Continue Instructions | bd | primary | some random street | When I route I should get - | waypoints | route | turns | - | a,c | North Capitol Northeast,North Capitol Northwest,North Capitol Northwest | depart,continue left,arrive | + | waypoints | route | turns | locations | + | a,c | North Capitol Northeast,North Capitol Northwest,North Capitol Northwest | depart,continue left,arrive | a,N,c | Scenario: Road turning left, Suffix changes, no-spaces Given the node map @@ -53,8 +53,8 @@ Feature: Continue Instructions | bd | primary | some random street | When I route I should get - | waypoints | route | turns | - | a,c | North CapitolNortheast,North CapitolNorthwest,North CapitolNorthwest | depart,continue left,arrive | + | waypoints | route | turns | locations | + | a,c | North CapitolNortheast,North CapitolNorthwest,North CapitolNorthwest | depart,continue left,arrive | a,N,c | Scenario: Road turning left and straight Given the node map @@ -69,9 +69,9 @@ Feature: Continue Instructions | bd | primary | road | When I route I should get - | waypoints | route | turns | - | a,c | road,road,road | depart,continue left,arrive | - | a,d | road,road | depart,arrive | + | waypoints | route | turns | locations | + | a,c | road,road,road | depart,continue left,arrive | a,r,c | + | a,d | road,road | depart,arrive | a,d | Scenario: Road turning left and straight Given the node map @@ -88,10 +88,10 @@ Feature: Continue Instructions | be | primary | road | When I route I should get - | waypoints | route | turns | - | a,c | road,road,road | depart,continue left,arrive | - | a,d | road,road | depart,arrive | - | a,e | road,road,road | depart,continue right,arrive | + | waypoints | route | turns | locations | + | a,c | road,road,road | depart,continue left,arrive | a,r,c | + | a,d | road,road | depart,arrive | a,d | + | a,e | road,road,road | depart,continue right,arrive | a,r,e | Scenario: Road turning right Given the node map @@ -106,9 +106,9 @@ Feature: Continue Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,continue right,arrive | - | a,d | abc,bd,bd | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,continue right,arrive | a,a,c | + | a,d | abc,bd,bd | depart,turn straight,arrive | a,b,d | Scenario: Road turning slight left Given the node map @@ -125,9 +125,9 @@ Feature: Continue Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,continue left,arrive | - | a,d | abc,bd,bd | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,continue left,arrive | a,a,c | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | Scenario: Road turning slight right Given the node map @@ -144,9 +144,9 @@ Feature: Continue Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,continue right,arrive | - | a,d | abc,bd,bd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,continue right,arrive | a,a,c | + | a,d | abc,bd,bd | depart,turn left,arrive | a,b,d | Scenario: Road Loop Given the node map @@ -164,12 +164,12 @@ Feature: Continue Instructions | bg | primary | When I route I should get - | waypoints | route | turns | - | a,c | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | - | a,f | abcdefb,abcdefb,abcdefb | depart,continue left,arrive | - | a,d | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | + | waypoints | route | turns | locations | + | a,c | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | a,a,c | + | a,f | abcdefb,abcdefb,abcdefb | depart,continue left,arrive | a,a,f | + | a,d | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | a,a,d | # continuing right here, since the turn to the left is more expensive - | a,e | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | + | a,e | abcdefb,abcdefb,abcdefb | depart,continue right,arrive | a,a,e | Scenario: End-Of-Road Continue Given the node map @@ -189,5 +189,5 @@ Feature: Continue Instructions When I route I should get - | waypoints | route | turns | - | e,a | turn,road,road,road | depart,turn right,continue left,arrive | + | waypoints | route | turns | locations | + | e,a | turn,road,road,road | depart,turn right,continue left,arrive | e,r,r,a | diff --git a/features/guidance/destination-signs.feature b/features/guidance/destination-signs.feature index dc29a5baded..4ef6fa1a6b9 100644 --- a/features/guidance/destination-signs.feature +++ b/features/guidance/destination-signs.feature @@ -35,15 +35,15 @@ Feature: Destination Signs | uv | UV | | Berlin | | St Street | yes | | When I route I should get - | from | to | route | destinations | ref | # | - | a | b | AB,AB | , | E1,E1 | | - | c | d | CD,CD | Berlin,Berlin | , | | - | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | - | g | h | , | A1: Berlin,A1: Berlin | , | | - | i | j | , | Berlin,Berlin | , | | - | k | l | KL,KL | A1: Berlin,A1: Berlin | E1,E1 | | - | m | n | MN,MN | A1, A2: Berlin, Hamburg,A1, A2: Berlin, Hamburg | , | | - | o | p | OP,OP | , | , | guard against mis-tagging | - | q | r | QR,QR | A1, A2,A1, A2 | , | | - | s | t | ST,ST | St Street,St Street | , | | - | u | v | UV,UV | Berlin,Berlin | , | city preferred over street | + | from | to | route | destinations | ref | # | locations | + | a | b | AB,AB | , | E1,E1 | | a,b | + | c | d | CD,CD | Berlin,Berlin | , | | c,d | + | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | e,f | + | g | h | , | A1: Berlin,A1: Berlin | , | | g,h | + | i | j | , | Berlin,Berlin | , | | i,j | + | k | l | KL,KL | A1: Berlin,A1: Berlin | E1,E1 | | k,l | + | m | n | MN,MN | A1, A2: Berlin, Hamburg,A1, A2: Berlin, Hamburg | , | | m,n | + | o | p | OP,OP | , | , | guard against mis-tagging | o,p | + | q | r | QR,QR | A1, A2,A1, A2 | , | | q,r | + | s | t | ST,ST | St Street,St Street | , | | s,t | + | u | v | UV,UV | Berlin,Berlin | , | city preferred over street | u,v | diff --git a/features/guidance/directional-destination-signs.feature b/features/guidance/directional-destination-signs.feature index 8376dfae1e3..2d66c6e054a 100644 --- a/features/guidance/directional-destination-signs.feature +++ b/features/guidance/directional-destination-signs.feature @@ -31,13 +31,13 @@ Feature: Destination Signs | qr | QR | | | | | Hamburg | -1 | | When I route I should get - | from | to | route | destinations | ref | # | - | a | b | AB,AB | Berlin,Berlin | , | | - | c | d | CD,CD | Berlin,Berlin | , | | - | f | e | EF,EF | Hamburg,Hamburg | , | | - | g | h | GH,GH | A1,A1 | , | | - | i | j | IJ,IJ | , | , | guard against mis-tagging | - | k | l | KL,KL | A1: Berlin,A1: Berlin | , | | - | m | n | MN,MN | A1: Berlin,A1: Berlin | , | | - | p | o | OP,OP | Hamburg,Hamburg | , | | - | r | q | QR,QR | Hamburg,Hamburg | , | | + | from | to | route | destinations | ref | # | locations | + | a | b | AB,AB | Berlin,Berlin | , | | a,b | + | c | d | CD,CD | Berlin,Berlin | , | | c,d | + | f | e | EF,EF | Hamburg,Hamburg | , | | f,e | + | g | h | GH,GH | A1,A1 | , | | g,h | + | i | j | IJ,IJ | , | , | guard against mis-tagging | i,j | + | k | l | KL,KL | A1: Berlin,A1: Berlin | , | | k,l | + | m | n | MN,MN | A1: Berlin,A1: Berlin | , | | m,n | + | p | o | OP,OP | Hamburg,Hamburg | , | | p,o | + | r | q | QR,QR | Hamburg,Hamburg | , | | r,q | diff --git a/features/guidance/directional-ref-destination-signs.feature b/features/guidance/directional-ref-destination-signs.feature index abda1efc64c..a6d80a7b972 100644 --- a/features/guidance/directional-ref-destination-signs.feature +++ b/features/guidance/directional-ref-destination-signs.feature @@ -29,11 +29,11 @@ Feature: Destination Signs | mn | MN | Berlin | A1 | A1 | | Berlin | Hamburg | no | mis-tagged destination: not a oneway | When I route I should get - | from | to | route | destinations | ref | # | - | a | b | AB,AB | A1: Berlin,A1: Berlin | , | | - | d | c | CD,CD | A2: Hamburg,A2: Hamburg | , | | - | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | - | h | g | GH,GH | A2: Hamburg,A2: Hamburg | , | | - | i | j | IJ,IJ | A1: Berlin,A1: Berlin | , | | - | l | k | KL,KL | A2: Hamburg,A2: Hamburg | , | | - | m | n | MN,MN | , | , | guard against mis-tagging | + | from | to | route | destinations | ref | # | locations | + | a | b | AB,AB | A1: Berlin,A1: Berlin | , | | a,b | + | d | c | CD,CD | A2: Hamburg,A2: Hamburg | , | | d,c | + | e | f | EF,EF | A1: Berlin,A1: Berlin | , | | e,f | + | h | g | GH,GH | A2: Hamburg,A2: Hamburg | , | | h,g | + | i | j | IJ,IJ | A1: Berlin,A1: Berlin | , | | i,j | + | l | k | KL,KL | A2: Hamburg,A2: Hamburg | , | | l,k | + | m | n | MN,MN | , | , | guard against mis-tagging | m,n | diff --git a/features/guidance/divided-highways.feature b/features/guidance/divided-highways.feature index 2824293bcd5..6ada01028f2 100644 --- a/features/guidance/divided-highways.feature +++ b/features/guidance/divided-highways.feature @@ -28,8 +28,8 @@ Feature: Divided road entry | igj | maple st | residential | | When I route I should get - | waypoints | route | turns | - | h,a | side st,main st,main st| depart,end of road left,arrive | + | waypoints | route | turns | locations | + | h,a | side st,main st,main st | depart,end of road left,arrive | h,t,a | # Similar to previous one, but the joining way is tagged with the side-street name @@ -55,8 +55,8 @@ Feature: Divided road entry | igj | maple st | residential | | When I route I should get - | waypoints | route | turns | - | h,a | side st,main st,main st| depart,end of road left,arrive | + | waypoints | route | turns | locations | + | h,a | side st,main st,main st | depart,end of road left,arrive | h,t,a | # Center join named after crossroad @@ -80,8 +80,8 @@ Feature: Divided road entry | hbeg | side st | residential | | When I route I should get - | waypoints | route | turns | - | g,a | side st,main st,main st| depart,turn left,arrive | + | waypoints | route | turns | locations | + | g,a | side st,main st,main st | depart,turn left,arrive | g,t,a | # Join named after divided road Scenario: Crossing a divided road, named after main street @@ -106,8 +106,8 @@ Feature: Divided road entry | eg | side st | residential | | When I route I should get - | waypoints | route | turns | - | g,a | side st,main st,main st| depart,turn left,arrive | + | waypoints | route | turns | locations | + | g,a | side st,main st,main st | depart,turn left,arrive | g,t,a | # Verify end of road left turn across divided roads Scenario: Join on a divided road, named after the side street @@ -133,7 +133,7 @@ Feature: Divided road entry | mjgn | maple st| residential | no | When I route I should get - | waypoints | route | turns | - | l,a | side st,main st,main st| depart,end of road left,arrive | + | waypoints | route | turns | locations | + | l,a | side st,main st,main st | depart,end of road left,arrive | l,t,a | diff --git a/features/guidance/end-of-road.feature b/features/guidance/end-of-road.feature index 34dc1717275..85eec1db2dd 100644 --- a/features/guidance/end-of-road.feature +++ b/features/guidance/end-of-road.feature @@ -20,9 +20,9 @@ Feature: End Of Road Instructions | ef | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cbd,cbd | depart,end of road left,arrive | - | a,d | aeb,cbd,cbd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cbd,cbd | depart,end of road left,arrive | a,b,c | + | a,d | aeb,cbd,cbd | depart,end of road right,arrive | a,b,d | # http://map.project-osrm.org/?z=18¢er=38.906632%2C-77.008265&loc=38.906463%2C-77.007621&loc=38.906822%2C-77.008860&hl=en&alt=0 Scenario: End of Road, unnamed oneway @@ -40,8 +40,8 @@ Feature: End Of Road Instructions | ef | primary | turn | yes | When I route I should get - | waypoints | route | turns | - | a,d | road,, | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,d | road,, | depart,end of road right,arrive | a,?,d | @3605 Scenario: End of Road with oneway through street @@ -59,8 +59,8 @@ Feature: End Of Road Instructions | ef | primary | no | When I route I should get - | waypoints | route | turns | - | a,d | aeb,cbd,cbd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,d | aeb,cbd,cbd | depart,end of road right,arrive | a,b,d | @3605 Scenario: End of Road fromnameless onto through street @@ -78,8 +78,8 @@ Feature: End Of Road Instructions | ef | primary | no | ef | When I route I should get - | waypoints | route | turns | - | a,d | ,cbd,cbd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,d | ,cbd,cbd | depart,end of road right,arrive | a,?,d | Scenario: End of Road with three streets Given the node map @@ -97,9 +97,9 @@ Feature: End Of Road Instructions | ef | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cb,cb | depart,end of road left,arrive | - | a,d | aeb,bd,bd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cb,cb | depart,end of road left,arrive | a,b,c | + | a,d | aeb,bd,bd | depart,end of road right,arrive | a,b,d | Scenario: End of Road with three streets, slightly angled Given the node map @@ -117,9 +117,9 @@ Feature: End Of Road Instructions | ef | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cb,cb | depart,end of road left,arrive | - | a,d | aeb,bd,bd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cb,cb | depart,end of road left,arrive | a,b,c | + | a,d | aeb,bd,bd | depart,end of road right,arrive | a,b,d | Scenario: End of Road with three streets, slightly angled Given the node map @@ -137,9 +137,9 @@ Feature: End Of Road Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cb,cb | depart,end of road left,arrive | - | a,d | aeb,bd,bd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cb,cb | depart,end of road left,arrive | a,b,c | + | a,d | aeb,bd,bd | depart,end of road right,arrive | a,b,d | Scenario: End of Road with through street, slightly angled Given the node map @@ -156,9 +156,9 @@ Feature: End Of Road Instructions | cbd | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cbd,cbd | depart,end of road left,arrive | - | a,d | aeb,cbd,cbd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cbd,cbd | depart,end of road left,arrive | a,b,c | + | a,d | aeb,cbd,cbd | depart,end of road right,arrive | a,b,d | Scenario: End of Road with through street, slightly angled Given the node map @@ -175,9 +175,9 @@ Feature: End Of Road Instructions | cbd | primary | When I route I should get - | waypoints | route | turns | - | a,c | aeb,cbd,cbd | depart,end of road left,arrive | - | a,d | aeb,cbd,cbd | depart,end of road right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,cbd,cbd | depart,end of road left,arrive | a,b,c | + | a,d | aeb,cbd,cbd | depart,end of road right,arrive | a,b,d | Scenario: End of Road with two ramps - prefer ramp over end of road Given the node map @@ -195,9 +195,9 @@ Feature: End Of Road Instructions | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,c | aeb,bc,bc | depart,on ramp left,arrive | - | a,d | aeb,bd,bd | depart,on ramp right,arrive | + | waypoints | route | turns | locations | + | a,c | aeb,bc,bc | depart,on ramp left,arrive | a,b,c | + | a,d | aeb,bd,bd | depart,on ramp right,arrive | a,b,d | # http://www.openstreetmap.org/#map=19/52.49907/13.41836 @end-of-road @negative @@ -232,5 +232,5 @@ Feature: End Of Road Instructions | pg | secondary | kstr | yes | When I route I should get - | waypoints | route | turns | # | - | k,l | skal,kotti,skal,skal | depart,turn right,turn right,arrive | # could be a case to find better turn instructions for | + | waypoints | route | turns | # | locations | + | k,l | skal,kotti,skal,skal | depart,turn right,turn right,arrive | # could be a case to find better turn instructions for | k,k,k,l | diff --git a/features/guidance/exit-numbers-names.feature b/features/guidance/exit-numbers-names.feature index bb8483f56f7..2185e3cf342 100644 --- a/features/guidance/exit-numbers-names.feature +++ b/features/guidance/exit-numbers-names.feature @@ -23,8 +23,8 @@ Feature: Exit Numbers and Names | ef | motorway_link | ExitRamp | | When I route I should get - | waypoints | route | turns | exits | - | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,3, | + | waypoints | route | turns | exits | locations | + | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,3, | a,a,f | Scenario: Exit number on the way, motorway junction node tag missing, multiple numbers @@ -41,8 +41,8 @@ Feature: Exit Numbers and Names | ef | motorway_link | ExitRamp | | When I route I should get - | waypoints | route | turns | exits | - | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,10; 12, | + | waypoints | route | turns | exits | locations | + | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,10; 12, | a,a,f | Scenario: Exit number on the ways after the motorway junction, multiple exits @@ -66,9 +66,9 @@ Feature: Exit Numbers and Names | gh | motorway_link | ExitRamp | | When I route I should get - | waypoints | route | turns | exits | - | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,3, | - | a,h | MainRoad,ExitRamp,ExitRamp | depart,off ramp right,arrive | ,3, | + | waypoints | route | turns | exits | locations | + | a,f | MainRoad,ExitRamp,ExitRamp | depart,off ramp slight right,arrive | ,3, | a,a,f | + | a,h | MainRoad,ExitRamp,ExitRamp | depart,off ramp right,arrive | ,3, | a,a,h | @@ -93,6 +93,6 @@ Feature: Exit Numbers and Names | cf | motorway_link | | 393 | yes | Great America Parkway;Bowers Avenue | When I route I should get - | waypoints | route | turns | exits | destinations | - | a,e | Bayshore Freeway,Bayshore Freeway | depart,arrive | , | , | - | a,f | Bayshore Freeway,, | depart,off ramp slight right,arrive | ,393,393 | ,Great America Parkway, Bowers Avenue,Great America Parkway, Bowers Avenue | + | waypoints | route | turns | exits | destinations | locations | + | a,e | Bayshore Freeway,Bayshore Freeway | depart,arrive | , | , | a,e | + | a,f | Bayshore Freeway,, | depart,off ramp slight right,arrive | ,393,393 | ,Great America Parkway, Bowers Avenue,Great America Parkway, Bowers Avenue | a,?,f | diff --git a/features/guidance/fork.feature b/features/guidance/fork.feature index 8fd4683198d..566938e85d0 100644 --- a/features/guidance/fork.feature +++ b/features/guidance/fork.feature @@ -20,9 +20,9 @@ Feature: Fork Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Don't Fork On Single Road Given the node map @@ -39,8 +39,8 @@ Feature: Fork Instructions | bd | primary | yes | When I route I should get - | waypoints | route | turns | - | a,d | ab,bd | depart,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bd | depart,arrive | a,d | Scenario: Don't Fork On Single Road Given the node map @@ -56,8 +56,8 @@ Feature: Fork Instructions | bd | primary | yes | turn | When I route I should get - | waypoints | route | turns | - | a,d | road,turn | depart,arrive | + | waypoints | route | turns | locations | + | a,d | road,turn | depart,arrive | a,d | Scenario: Do not fork on link type Given the node map @@ -74,9 +74,9 @@ Feature: Fork Instructions When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,bd,bd | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | Scenario: Fork in presence of other roads Given the node map @@ -94,9 +94,9 @@ Feature: Fork Instructions | eb | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Fork Turning Slight Left Given the node map @@ -114,9 +114,9 @@ Feature: Fork Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Fork Turning Slight Right Given the node map @@ -134,9 +134,9 @@ Feature: Fork Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Do not fork on service Given the node map @@ -152,9 +152,9 @@ Feature: Fork Instructions | bd | service | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,bd,bd | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | Scenario: Fork Both Turning Slight Right Given the node map @@ -171,9 +171,9 @@ Feature: Fork Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Fork Both Turning Slight Left Given the node map @@ -190,9 +190,9 @@ Feature: Fork Instructions | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork slight right,arrive | a,b,d | Scenario: Fork Both Turning Slight Right - Unnamed Given the node map @@ -209,9 +209,9 @@ Feature: Fork Instructions | bd | primary | | When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,fork slight left,arrive | - | a,d | ,, | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,fork slight left,arrive | a,?,c | + | a,d | ,, | depart,fork slight right,arrive | a,?,d | Scenario: Fork Both Turning Slight Left - Unnamed Given the node map @@ -228,9 +228,9 @@ Feature: Fork Instructions | bd | primary | | When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,fork slight left,arrive | - | a,d | ,, | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,fork slight left,arrive | a,?,c | + | a,d | ,, | depart,fork slight right,arrive | a,?,d | Scenario: Fork Both Turning Very Slightly Right - Unnamed Given the node map @@ -247,9 +247,9 @@ Feature: Fork Instructions | bd | primary | | When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,fork slight left,arrive | - | a,d | ,, | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,fork slight left,arrive | a,?,c | + | a,d | ,, | depart,fork slight right,arrive | a,?,d | Scenario: Fork Both Turning Very Slightly Right - Unnamed Ramps Given the node map @@ -266,9 +266,9 @@ Feature: Fork Instructions | bd | motorway_link | | When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,fork slight left,arrive | - | a,d | ,, | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,fork slight left,arrive | a,?,c | + | a,d | ,, | depart,fork slight right,arrive | a,?,d | Scenario: Non-Fork on complex intersection - left Given the node map @@ -285,9 +285,9 @@ Feature: Fork Instructions | eb | tertiary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,bd,bd | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | Scenario: Non-Fork on complex intersection - right Given the node map @@ -304,9 +304,9 @@ Feature: Fork Instructions | eb | tertiary | When I route I should get - | waypoints | route | turns | - | a,c | abd,bc,bc | depart,turn slight left,arrive | - | a,d | abd,abd | depart,arrive | + | waypoints | route | turns | locations | + | a,c | abd,bc,bc | depart,turn slight left,arrive | a,b,c | + | a,d | abd,abd | depart,arrive | a,d | Scenario: Tripple fork Given the node map @@ -324,10 +324,10 @@ Feature: Fork Instructions | be | secondary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,fork slight left,arrive | - | a,d | ab,bd,bd | depart,fork straight,arrive | - | a,e | ab,be,be | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,fork slight left,arrive | a,b,c | + | a,d | ab,bd,bd | depart,fork straight,arrive | a,b,d | + | a,e | ab,be,be | depart,fork slight right,arrive | a,b,e | Scenario: Tripple fork -- middle obvious Given the node map @@ -344,10 +344,10 @@ Feature: Fork Instructions | be | secondary | When I route I should get - | waypoints | route | turns | - | a,c | abd,bc,bc | depart,turn slight left,arrive | - | a,d | abd,abd | depart,arrive | - | a,e | abd,be,be | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,c | abd,bc,bc | depart,turn slight left,arrive | a,b,c | + | a,d | abd,abd | depart,arrive | a,d | + | a,e | abd,be,be | depart,turn slight right,arrive | a,b,e | Scenario: Don't Fork when leaving Road Given the node map @@ -362,9 +362,9 @@ Feature: Fork Instructions | bd | secondary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,bd,bd | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | Scenario: Fork on motorway links - don't fork on through Given the node map @@ -382,6 +382,6 @@ Feature: Fork Instructions | ab | on | motorway_link | When I route I should get - | waypoints | route | turns | - | a,j | on,xbcj | depart,arrive | - | a,i | on,off,off | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,j | on,xbcj | depart,arrive | a,j | + | a,i | on,off,off | depart,turn right,arrive | a,o,i | diff --git a/features/guidance/internal-intersections.feature b/features/guidance/internal-intersections.feature index 887e11c50bf..e8eb3d6e27b 100644 --- a/features/guidance/internal-intersections.feature +++ b/features/guidance/internal-intersections.feature @@ -27,20 +27,20 @@ Feature: Internal Intersection Model | hij | yes | Snowden River Parkway | When I route I should get - | waypoints | route | turns | # | - | a,k | Broken Land Parkway,Broken Land Parkway | depart,arrive || - | l,b | Broken Land Parkway,Broken Land Parkway | depart,arrive || -# | g,j | Patuxent Woods Drive,Snowden River Parkway,Snowden River Parkway | depart,continue,arrive | did not work as expected - might be another issue to handle in post process? | -# | f,c | Snowden River Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,continue,arrive | did not work as expected - might be another issue to handle in post process? | - | a,c | Broken Land Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,turn right,arrive || - | g,k | Patuxent Woods Drive,Broken Land Parkway,Broken Land Parkway | depart,turn right,arrive || - | l,j | Broken Land Parkway,Snowden River Parkway,Snowden River Parkway | depart,turn right,arrive || - | f,b | Snowden River Parkway,Broken Land Parkway,Broken Land Parkway | depart,turn right,arrive || - | a,j | Broken Land Parkway,Snowden River Parkway,Snowden River Parkway | depart,turn left,arrive || - | g,b | Patuxent Woods Drive,Broken Land Parkway,Broken Land Parkway | depart,turn left,arrive || - | l,c | Broken Land Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,turn left,arrive || - | f,k | Snowden River Parkway,Broken Land Parkway,Broken Land Parkway | depart,turn left,arrive || - | a,b | Broken Land Parkway,Broken Land Parkway,Broken Land Parkway | depart,continue uturn,arrive || - | g,c | Patuxent Woods Drive,Patuxent Woods Drive,Patuxent Woods Drive | depart,continue uturn,arrive || - | l,k | Broken Land Parkway,Broken Land Parkway,Broken Land Parkway | depart,continue uturn,arrive || - | f,j | Snowden River Parkway,Snowden River Parkway,Snowden River Parkway | depart,continue uturn,arrive || + | waypoints | route | turns | # | locations | + | a,k | Broken Land Parkway,Broken Land Parkway | depart,arrive | | a,k | + | l,b | Broken Land Parkway,Broken Land Parkway | depart,arrive | | l,b | +# | g,j | Patuxent Woods Drive,Snowden River Parkway,Snowden River Parkway | depart,continue,arrive | did not work as expected - might be another issue to handle in post process? | | +# | f,c | Snowden River Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,continue,arrive | did not work as expected - might be another issue to handle in post process? | | + | a,c | Broken Land Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,turn right,arrive | | a,?,c | + | g,k | Patuxent Woods Drive,Broken Land Parkway,Broken Land Parkway | depart,turn right,arrive | | g,?,k | + | l,j | Broken Land Parkway,Snowden River Parkway,Snowden River Parkway | depart,turn right,arrive | | l,?,j | + | f,b | Snowden River Parkway,Broken Land Parkway,Broken Land Parkway | depart,turn right,arrive | | f,?,b | + | a,j | Broken Land Parkway,Snowden River Parkway,Snowden River Parkway | depart,turn left,arrive | | a,?,j | + | g,b | Patuxent Woods Drive,Broken Land Parkway,Broken Land Parkway | depart,turn left,arrive | | g,?,b | + | l,c | Broken Land Parkway,Patuxent Woods Drive,Patuxent Woods Drive | depart,turn left,arrive | | l,?,c | + | f,k | Snowden River Parkway,Broken Land Parkway,Broken Land Parkway | depart,turn left,arrive | | f,?,k | + | a,b | Broken Land Parkway,Broken Land Parkway,Broken Land Parkway | depart,continue uturn,arrive | | a,?,b | + | g,c | Patuxent Woods Drive,Patuxent Woods Drive,Patuxent Woods Drive | depart,continue uturn,arrive | | g,?,c | + | l,k | Broken Land Parkway,Broken Land Parkway,Broken Land Parkway | depart,continue uturn,arrive | | l,?,k | + | f,j | Snowden River Parkway,Snowden River Parkway,Snowden River Parkway | depart,continue uturn,arrive | | f,?,j | diff --git a/features/guidance/intersections.feature b/features/guidance/intersections.feature index bc66cd7ab6d..0286fae433c 100644 --- a/features/guidance/intersections.feature +++ b/features/guidance/intersections.feature @@ -19,8 +19,8 @@ Feature: Intersections Data | bd | corner | When I route I should get - | waypoints | route | intersections | - | a,c | through,through | true:90,true:90 true:180 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,c | through,through | true:90,true:90 true:180 false:270;true:270 | | Scenario: Passing Three Way North Given the node map @@ -36,8 +36,8 @@ Feature: Intersections Data | bd | corner | When I route I should get - | waypoints | route | intersections | - | a,c | through,through | true:90,true:0 true:90 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,c | through,through | true:90,true:0 true:90 false:270;true:270 | | Scenario: Passing Oneway Street In Given the node map @@ -53,8 +53,8 @@ Feature: Intersections Data | db | corner | yes | When I route I should get - | waypoints | route | intersections | - | a,c | through,through | true:90,false:0 true:90 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,c | through,through | true:90,false:0 true:90 false:270;true:270 | | Scenario: Passing Oneway Street Out Given the node map @@ -70,8 +70,8 @@ Feature: Intersections Data | bd | corner | yes | When I route I should get - | waypoints | route | intersections | - | a,c | through,through | true:90,true:0 true:90 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,c | through,through | true:90,true:0 true:90 false:270;true:270 | | Scenario: Passing Two Intersections Given the node map @@ -90,8 +90,8 @@ Feature: Intersections Data | cf | corner | When I route I should get - | waypoints | route | intersections | - | a,d | through,through | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,d | through,through | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 | | Scenario: Passing Two Intersections, Collapsing Given the node map @@ -110,9 +110,9 @@ Feature: Intersections Data | cf | corner | When I route I should get - | waypoints | route | intersections | - | a,d | through,through | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 | - | f,a | corner,throughbridge,through | true:0;true:90 false:180 true:270,true:0 false:90 true:270;true:90 | + | waypoints | route | intersections | locations | + | a,d | through,through | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 | | + | f,a | corner,throughbridge,through | true:0;true:90 false:180 true:270,true:0 false:90 true:270;true:90 | | Scenario: Roundabouts Given the node map @@ -139,10 +139,10 @@ Feature: Intersections Data | hd | | When I route I should get - | waypoints | route | intersections | - | e,f | ea,fb,fb,fb | true:180;false:0 false:150 true:210;false:30 true:150 true:270;true:90 | - | e,g | ea,gc,gc,gc | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:30 true:180 false:330;true:0 | - | e,h | ea,hd,hd,hd | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:90 false:210 true:330;true:270 | - | e,2 | ea,abcda,abcda | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:327 +-1 | - | 1,g | abcda,gc,gc | true:214,false:30 true:150 true:270;true:30 true:180 false:330;true:0 | - | 1,3 | abcda,abcda | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214 | + | waypoints | route | intersections | locations | + | e,f | ea,fb,fb,fb | true:180;false:0 false:150 true:210;false:30 true:150 true:270;true:90 | | + | e,g | ea,gc,gc,gc | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:30 true:180 false:330;true:0 | | + | e,h | ea,hd,hd,hd | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:90 false:210 true:330;true:270 | | + | e,2 | ea,abcda,abcda | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:327 +-1 | | + | 1,g | abcda,gc,gc | true:214,false:30 true:150 true:270;true:30 true:180 false:330;true:0 | | + | 1,3 | abcda,abcda | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214 | | diff --git a/features/guidance/low-priority.feature b/features/guidance/low-priority.feature index a71007e73a0..533f6448632 100644 --- a/features/guidance/low-priority.feature +++ b/features/guidance/low-priority.feature @@ -22,9 +22,9 @@ Feature: Exceptions for routing onto low-priority roads | bc | service | service | When I route I should get - | waypoints | route | turns | - | c,e | service,service | depart,arrive | - | e,c | service,service | depart,arrive | + | waypoints | route | turns | locations | + | c,e | service,service | depart,arrive | c,e | + | e,c | service,service | depart,arrive | e,c | Scenario: Straight onto low-priority: onto and from unnamed Given the node map @@ -43,9 +43,9 @@ Feature: Exceptions for routing onto low-priority roads | bc | service | | When I route I should get - | waypoints | route | turns | - | e,c | , | depart,arrive | - | c,e | , | depart,arrive | + | waypoints | route | turns | locations | + | e,c | , | depart,arrive | e,c | + | c,e | , | depart,arrive | c,e | Scenario: Straight onto low-priority: unnamed Given the node map @@ -64,9 +64,9 @@ Feature: Exceptions for routing onto low-priority roads | bc | service | | When I route I should get - | waypoints | route | turns | - | e,c | service, | depart,arrive | - | c,e | ,service | depart,arrive | + | waypoints | route | turns | locations | + | e,c | service, | depart,arrive | e,c | + | c,e | ,service | depart,arrive | c,e | Scenario: Straight onto low-priority Given the node map @@ -80,8 +80,8 @@ Feature: Exceptions for routing onto low-priority roads | bc | service | service | When I route I should get - | waypoints | route | turns | - | a,c | road,service | depart,arrive | + | waypoints | route | turns | locations | + | a,c | road,service | depart,arrive | a,c | Scenario: Straight onto low-priority, with driveway Given the node map @@ -97,8 +97,8 @@ Feature: Exceptions for routing onto low-priority roads | bf | driveway | | When I route I should get - | waypoints | route | turns | - | a,c | road,road | depart,arrive | + | waypoints | route | turns | locations | + | a,c | road,road | depart,arrive | a,c | Scenario: Straight onto low-priority, with driveway Given the node map @@ -114,6 +114,6 @@ Feature: Exceptions for routing onto low-priority roads | bf | driveway | | When I route I should get - | waypoints | route | turns | - | a,c | road, | depart,arrive | - | c,a | ,road | depart,arrive | + | waypoints | route | turns | locations | + | a,c | road, | depart,arrive | a,c | + | c,a | ,road | depart,arrive | c,a | diff --git a/features/guidance/maneuver-tag.feature b/features/guidance/maneuver-tag.feature index 243090579fa..9020429d2df 100644 --- a/features/guidance/maneuver-tag.feature +++ b/features/guidance/maneuver-tag.feature @@ -35,15 +35,15 @@ Feature: Maneuver tag support | maneuver | cgi | c | cde | fork | turn | slight_right | When I route I should get - | waypoints | route | turns | + | waypoints | route | turns | locations | # Testing directly connected from/to - | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,turn left,arrive | - | b,g | A Street,C Street,C Street | depart,turn sharp right,arrive | + | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,turn left,arrive | a,?,?,j | + | b,g | A Street,C Street,C Street | depart,turn sharp right,arrive | b,?,g | # Testing re-awakening suppressed turns - | a,e | A Street,B Street,B Street | depart,turn slight left,arrive | - | e,i | B Street,C Street,C Street | depart,turn straight,arrive | - | i,e | C Street,B Street,B Street | depart,fork slight right,arrive | - | i,a | C Street,A Street,A Street | depart,turn right,arrive | + | a,e | A Street,B Street,B Street | depart,turn slight left,arrive | a,?,e | + | e,i | B Street,C Street,C Street | depart,turn straight,arrive | e,?,i | + | i,e | C Street,B Street,B Street | depart,fork slight right,arrive | i,?,e | + | i,a | C Street,A Street,A Street | depart,turn right,arrive | i,?,a | Scenario: single via-way Given the node map @@ -68,8 +68,8 @@ Feature: Maneuver tag support | maneuver | abc | cgi | ij | c | turn | sharp_right | When I route I should get - | waypoints | route | turns | - | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,turn left,arrive | + | waypoints | route | turns | locations | + | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,turn left,arrive | a,t,t,j | Scenario: multiple via-way @@ -97,8 +97,8 @@ Feature: Maneuver tag support | maneuver | abc | cg | gi | ij | c | turn | sharp_right | When I route I should get - | waypoints | route | turns | - | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,end of road left,arrive | + | waypoints | route | turns | locations | + | a,j | A Street,C Street,J Street,J Street | depart,turn sharp right,end of road left,arrive | a,t,t,j | Scenario: Use maneuver tag to announce a particular turn type @@ -139,8 +139,8 @@ Feature: Maneuver tag support | maneuver | mh | m | mt | turn | left | When I route I should get - | waypoints | route | turns | - | h,t | CA-120,Priest Rd,Priest Rd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | h,t | CA-120,Priest Rd,Priest Rd | depart,turn left,arrive | h,?,t | #original | h,t | CA-120,Priest Rd,Priest Rd | depart,turn straight,arrive | Scenario: Use maneuver tag to announce lane guidance @@ -177,8 +177,8 @@ Feature: Maneuver tag support | maneuver | ab | b | bc | cd | suppress | When I route I should get - | waypoints | route | turns | - | a,d | Marsh Rd,Marsh Rd,Marsh Rd | depart,turn uturn,arrive | + | waypoints | route | turns | locations | + | a,d | Marsh Rd,Marsh Rd,Marsh Rd | depart,turn uturn,arrive | a,M,d | #original | a,d | Marsh Rd,service,Marsh Rd,Marsh Rd | depart,turn left,turn left,arrive | Scenario: Use maneuver tag to suppress a turn @@ -227,9 +227,9 @@ Feature: Maneuver tag support | maneuver | zy | y, p | yp | pb | suppress | invalid relation: multiple node:via | When I route I should get - | waypoints | route | turns | - | z,t | NY Ave,395,395 | depart,on ramp left,arrive | - | z,b | NY Ave,,4th St,4th St | depart,on ramp left,fork slight right,arrive | + | waypoints | route | turns | locations | + | z,t | NY Ave,395,395 | depart,on ramp left,arrive | z,?,t | + | z,b | NY Ave,,4th St,4th St | depart,on ramp left,fork slight right,arrive | z,?,?,b | Scenario: Gracefully handles maneuvers that are redundant for the profile Given the node map @@ -250,8 +250,8 @@ Feature: Maneuver tag support | maneuver | abc | c | cdf | turn | slight_left | When I route I should get - | waypoints | route | turns | - | a,f | A Street,A Street | depart,arrive | + | waypoints | route | turns | locations | + | a,f | A Street,A Street | depart,arrive | a,f | Scenario: Handles uncompressed nodes in maneuver path Given the node map @@ -279,8 +279,8 @@ Feature: Maneuver tag support | maneuver | abc | e | cde | ei | turn | sharp_right | When I route I should get - | waypoints | route | turns | - | a,i | A Street,C Street,F Street,F Street | depart,turn right,turn sharp right,arrive | + | waypoints | route | turns | locations | + | a,i | A Street,C Street,F Street,F Street | depart,turn right,turn sharp right,arrive | a,t,t,i | Scenario: Can be used with turn restrictions @@ -322,8 +322,8 @@ Feature: Maneuver tag support | restriction | bc | bde,eg | gi | no_left_turn | When I route I should get - | waypoints | route | turns | - | a,e | A Street,C Street,C Street | depart,turn sharp right,arrive | - | b,f | C Street,D Street,D Street | depart,turn sharp left,arrive | - | c,h | B Street,E Street,F Street,F Street | depart,turn left,turn slight right,arrive | - | c,i | B Street,A Street,E Street,G Street,G Street | depart,turn uturn,turn right,end of road left,arrive | + | waypoints | route | turns | locations | + | a,e | A Street,C Street,C Street | depart,turn sharp right,arrive | a,t,e | + | b,f | C Street,D Street,D Street | depart,turn sharp left,arrive | b,t,f | + | c,h | B Street,E Street,F Street,F Street | depart,turn left,turn slight right,arrive | c,t,t,h | + | c,i | B Street,A Street,E Street,G Street,G Street | depart,turn uturn,turn right,end of road left,arrive | c,t,t,t,i | diff --git a/features/guidance/merge-segregated-roads.feature b/features/guidance/merge-segregated-roads.feature index bb85673f7e8..b4b29670538 100644 --- a/features/guidance/merge-segregated-roads.feature +++ b/features/guidance/merge-segregated-roads.feature @@ -22,9 +22,9 @@ Feature: Merge Segregated Roads | be | road | yes | When I route I should get - | waypoints | route | intersections | - | a,c | road,road | true:90,true:75 true:90 false:270;true:270 | - | d,f | road,road | true:270,false:90 false:255 true:270;true:90 | + | waypoints | route | intersections | locations | + | a,c | road,road | true:90,true:75 true:90 false:270;true:270 | | + | d,f | road,road | true:270,false:90 false:255 true:270;true:90 | | #http://www.openstreetmap.org/#map=18/52.48337/13.36184 @negative @@ -63,8 +63,8 @@ Feature: Merge Segregated Roads | jd | bot | no | When I route I should get - | waypoints | route | intersections | - | a,f | road,road,road | true:90,false:45 true:135 false:270;true:45 true:180 false:315,true:90 false:225 true:315;true:270 | + | waypoints | route | intersections | locations | + | a,f | road,road,road | true:90,false:45 true:135 false:270;true:45 true:180 false:315,true:90 false:225 true:315;true:270 | | #https://www.openstreetmap.org/#map=19/52.50003/13.33915 @negative @@ -98,8 +98,8 @@ Feature: Merge Segregated Roads | bfc | aug | yes | When I route I should get - | waypoints | route | intersections | - | a,e | pass,pass | true:90,false:60 true:90 true:165 false:270,true:90 false:195 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,e | pass,pass | true:90,false:60 true:90 true:165 false:270,true:90 false:195 false:270;true:270 | | @negative Scenario: Tripple Merge should not be possible @@ -120,8 +120,8 @@ Feature: Merge Segregated Roads | dcb | merge | yes | When I route I should get - | waypoints | route | intersections | - | a,e | in,merge,merge | true:90;false:60 true:90 false:120 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,e | in,merge,merge | true:90;false:60 true:90 false:120 false:270;true:270 | | Scenario: Tripple Merge should not be possible Given the node map @@ -141,8 +141,8 @@ Feature: Merge Segregated Roads | bcd | merge | yes | When I route I should get - | waypoints | route | intersections | - | a,d | in,merge,merge | true:90;false:60 false:90 true:120 false:270;true:270 | + | waypoints | route | intersections | locations | + | a,d | in,merge,merge | true:90;false:60 false:90 true:120 false:270;true:270 | | @negative Scenario: Don't accept turn-restrictions @@ -167,8 +167,8 @@ Feature: Merge Segregated Roads | restriction | ab | bcdg | b | no_left_turn | When I route I should get - | waypoints | route | intersections | - | a,h | road,road | true:90,false:60 true:120 false:270,true:90 false:240 false:300;true:270 | + | waypoints | route | intersections | locations | + | a,h | road,road | true:90,false:60 true:120 false:270,true:90 false:240 false:300;true:270 | | @negative Scenario: Actual Turn into segregated ways @@ -192,8 +192,8 @@ Feature: Merge Segregated Roads | fg | road | no | When I route I should get - | waypoints | route | intersections | - | a,g | road,road | true:90,false:90 true:165 false:270,true:90 false:270 true:345;true:270 | + | waypoints | route | intersections | locations | + | a,g | road,road | true:90,false:90 true:165 false:270,true:90 false:270 true:345;true:270 | | Scenario: Merging parallel roads with intermediate bridges # https://www.mapillary.com/app/?lat=52.466483333333336&lng=13.431908333333332&z=17&focus=photo&pKey=LWXnKqoGqUNLnG0lofiO0Q @@ -249,11 +249,11 @@ Feature: Merge Segregated Roads #the intermediate intersections of degree two indicate short segments of new names. At some point, we probably want to get rid of these When I route I should get - | waypoints | turns | route | intersections | - | a,f | depart,arrive | Hermannstr,Hermannstr | true:0,true:0 false:180,true:0 false:180;true:180 | - | f,a | depart,arrive | Hermannstr,Hermannstr | true:180,false:0 true:180,false:0 true:180;true:0 | - | y,f | depart,arrive | Hermannstr,Hermannstr | true:0,true:0 true:90 false:180 true:270,true:0 false:180,true:0 false:180;true:180 | - | f,y | depart,arrive | Hermannstr,Hermannstr | true:180,false:0 true:180,false:0 true:180,false:0 true:90 true:180 true:270;true:0 | + | waypoints | turns | route | intersections | locations | + | a,f | depart,arrive | Hermannstr,Hermannstr | true:0,true:0 false:180,true:0 false:180;true:180 | a,f | + | f,a | depart,arrive | Hermannstr,Hermannstr | true:180,false:0 true:180,false:0 true:180;true:0 | f,a | + | y,f | depart,arrive | Hermannstr,Hermannstr | true:0,true:0 true:90 false:180 true:270,true:0 false:180,true:0 false:180;true:180 | y,f | + | f,y | depart,arrive | Hermannstr,Hermannstr | true:180,false:0 true:180,false:0 true:180,false:0 true:90 true:180 true:270;true:0 | f,y | Scenario: Four Way Intersection Double Through Street Segregated Given the node map @@ -307,23 +307,23 @@ Feature: Merge Segregated Roads | mfagl | primary | yes | second | 4 | When I route I should get - | waypoints | route | turns | - | f,e | second,first,first | depart,turn right,arrive | - | f,c | second,second | depart,arrive | - | f,i | second,first,first | depart,turn left,arrive | - | f,g | second,second,second | depart,continue uturn,arrive | - | d,c | first,second,second | depart,turn right,arrive | - | d,i | first,first | depart,arrive | - | d,g | first,second,second | depart,turn left,arrive | - | d,e | first,first,first | depart,continue uturn,arrive | - | b,i | second,first,first | depart,turn right,arrive | - | b,g | second,second | depart,arrive | - | b,e | second,first,first | depart,turn left,arrive | - | b,c | second,second,second | depart,continue uturn,arrive | - | h,g | first,second,second | depart,turn right,arrive | - | h,e | first,first | depart,arrive | - | h,c | first,second,second | depart,turn left,arrive | - | h,i | first,first,first | depart,continue uturn,arrive | + | waypoints | route | turns | locations | + | f,e | second,first,first | depart,turn right,arrive | f,s,e | + | f,c | second,second | depart,arrive | f,c | + | f,i | second,first,first | depart,turn left,arrive | f,s,i | + | f,g | second,second,second | depart,continue uturn,arrive | f,s,g | + | d,c | first,second,second | depart,turn right,arrive | d,s,c | + | d,i | first,first | depart,arrive | d,i | + | d,g | first,second,second | depart,turn left,arrive | d,s,g | + | d,e | first,first,first | depart,continue uturn,arrive | d,f,e | + | b,i | second,first,first | depart,turn right,arrive | b,s,i | + | b,g | second,second | depart,arrive | b,g | + | b,e | second,first,first | depart,turn left,arrive | b,s,e | + | b,c | second,second,second | depart,continue uturn,arrive | b,s,c | + | h,g | first,second,second | depart,turn right,arrive | h,s,g | + | h,e | first,first | depart,arrive | h,e | + | h,c | first,second,second | depart,turn left,arrive | h,s,c | + | h,i | first,first,first | depart,continue uturn,arrive | h,f,i | Scenario: Middle Island Over Bridge Given the node map @@ -355,13 +355,13 @@ Feature: Merge Segregated Roads | hb | road | yes | When I route I should get - | waypoints | turns | route | intersections | - | a,f | depart,arrive | road,road | true:180,false:0 true:180,false:0 true:180;true:0 | - | 1,f | depart,arrive | bridge,road | true:180,false:0 true:180;true:0 | - | 2,f | depart,arrive | bridge,road | true:180,false:0 true:180;true:0 | - | f,a | depart,arrive | road,road | true:0,true:0 false:180,true:0 false:180;true:180 | - | 3,a | depart,arrive | bridge,road | true:0,true:0 false:180;true:180 | - | 4,a | depart,arrive | bridge,road | true:0,true:0 false:180;true:180 | + | waypoints | turns | route | intersections | locations | + | a,f | depart,arrive | road,road | true:180,false:0 true:180,false:0 true:180;true:0 | a,f | + | 1,f | depart,arrive | bridge,road | true:180,false:0 true:180;true:0 | 1,f | + | 2,f | depart,arrive | bridge,road | true:180,false:0 true:180;true:0 | 2,f | + | f,a | depart,arrive | road,road | true:0,true:0 false:180,true:0 false:180;true:180 | f,a | + | 3,a | depart,arrive | bridge,road | true:0,true:0 false:180;true:180 | 3,a | + | 4,a | depart,arrive | bridge,road | true:0,true:0 false:180;true:180 | 4,a | @negative Scenario: Traffic Circle @@ -385,9 +385,9 @@ Feature: Merge Segregated Roads | cd | right | no | When I route I should get - | waypoints | route | intersections | - | a,d | left,circle,right,right | true:90,false:90 true:120 false:270;true:60 true:180 false:300;true:90 false:240 true:270;true:270 | - | g,d | bottom,circle,right,right | true:0;true:60 false:180 false:300;true:90 false:240 true:270;true:270 | + | waypoints | route | intersections | locations | + | a,d | left,circle,right,right | true:90,false:90 true:120 false:270;true:60 true:180 false:300;true:90 false:240 true:270;true:270 | | + | g,d | bottom,circle,right,right | true:0;true:60 false:180 false:300;true:90 false:240 true:270;true:270 | | Scenario: Middle Island Given the node map @@ -426,12 +426,12 @@ Feature: Merge Segregated Roads | restriction | bz | bcde | b | no_left_turn | When I route I should get - | waypoints | turns | route | - | a,f | depart,arrive | road,road | - | c,f | depart,arrive | road,road | - | f,a | depart,arrive | road,road | - | g,a | depart,arrive | road,road | - | z,a | depart,turn right,arrive | cross,road,road | + | waypoints | turns | route | locations | + | a,f | depart,arrive | road,road | a,f | + | c,f | depart,arrive | road,road | c,f | + | f,a | depart,arrive | road,road | f,a | + | g,a | depart,arrive | road,road | g,a | + | z,a | depart,turn right,arrive | cross,road,road | z,r,a | Scenario: Traffic Island Given the node map @@ -448,8 +448,8 @@ Feature: Merge Segregated Roads | bcdfb | road | yes | When I route I should get - | waypoints | route | intersections | - | a,e | road,road | true:90;true:270 | + | waypoints | route | intersections | locations | + | a,e | road,road | true:90;true:270 | | @negative Scenario: Turning Road, Don't remove sliproads @@ -478,10 +478,10 @@ Feature: Merge Segregated Roads | restriction | fb | bcd | b | no_left_turn | When I route I should get - | waypoints | route | turns | intersections | - | a,d | road,road | depart,arrive | true:90,false:60 true:90 true:180 false:270;true:270 | - | e,h | road,road | depart,arrive | true:270,false:90 true:240 true:270;true:90 | - | e,i | road,turn,turn | depart,turn left,arrive | true:270;false:90 true:240 true:270,false:60 false:90 true:180 false:270;true:0 | + | waypoints | route | turns | intersections | locations | + | a,d | road,road | depart,arrive | true:90,false:60 true:90 true:180 false:270;true:270 | a,d | + | e,h | road,road | depart,arrive | true:270,false:90 true:240 true:270;true:90 | e,h | + | e,i | road,turn,turn | depart,turn left,arrive | true:270;false:90 true:240 true:270,false:60 false:90 true:180 false:270;true:0 | e,r,i | @negative Scenario: Meeting Turn Roads Given the node map @@ -532,11 +532,11 @@ Feature: Merge Segregated Roads # the goal here should be not to mention the intersection in the middle at all and also suppress the segregated parts When I route I should get - | waypoints | route | intersections | - | a,l | horiz,vert,vert | true:90;false:0 true:60 true:90 true:180 false:270,true:60 false:120 false:240 false:300,true:0 false:90 false:180 false:240 true:270;true:180 | - | a,d | horiz,horiz | true:90,false:0 true:60 true:90 true:180 false:270,false:0 true:90 false:180 false:270 true:300;true:270 | - | j,h | vert,horiz,horiz | true:0;true:0 true:90 false:180 false:270 true:300,false:60 false:120 false:240 true:300,false:0 false:90 false:120 true:180 true:270;true:90 | - | j,l | vert,vert | true:0,true:0 true:90 false:180 false:270 true:300,true:0 false:90 false:180 true:240 false:270;true:180 | + | waypoints | route | intersections | locations | + | a,l | horiz,vert,vert | true:90;false:0 true:60 true:90 true:180 false:270,true:60 false:120 false:240 false:300,true:0 false:90 false:180 false:240 true:270;true:180 | | + | a,d | horiz,horiz | true:90,false:0 true:60 true:90 true:180 false:270,false:0 true:90 false:180 false:270 true:300;true:270 | | + | j,h | vert,horiz,horiz | true:0;true:0 true:90 false:180 false:270 true:300,false:60 false:120 false:240 true:300,false:0 false:90 false:120 true:180 true:270;true:90 | | + | j,l | vert,vert | true:0,true:0 true:90 false:180 false:270 true:300,true:0 false:90 false:180 true:240 false:270;true:180 | | Scenario: Square Area - Don't merge almost circular roads @@ -571,8 +571,8 @@ Feature: Merge Segregated Roads | jd | Hubertusallee | yes | When I route I should get - | waypoints | route | turns | - | i,h | Kurfürstendamm,Rathenauplatz,Hubertusallee,Hubertusallee | depart,turn right,turn right,arrive | + | waypoints | route | turns | locations | + | i,h | Kurfürstendamm,Rathenauplatz,Hubertusallee,Hubertusallee | depart,turn right,turn right,arrive | i,u,a,h | # https://www.openstreetmap.org/#map=19/52.46339/13.40272 Scenario: Do not merge links between segregated roads @@ -601,11 +601,11 @@ Feature: Merge Segregated Roads | gb | germ | no | When I route I should get - | waypoints | route | turns | - | a,c | germ,ober | depart,arrive | - | a,g | germ,germ,germ | depart,continue right,arrive | - | a,1 | germ,germ,germ | depart,continue left,arrive | - | d,g | ober,germ,germ | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | germ,ober | depart,arrive | a,c | + | a,g | germ,germ,germ | depart,continue right,arrive | a,g,g | + | a,1 | germ,germ,germ | depart,continue left,arrive | a,g,1 | + | d,g | ober,germ,germ | depart,turn left,arrive | d,r,g | # https://www.openstreetmap.org/#map=19/51.32888/6.57059 Scenario: Places in presence of oneways @@ -637,16 +637,16 @@ Feature: Merge Segregated Roads | cf | albrecht | yes | When I route I should get - | waypoints | route | turns | - | a,l | schwert,albrecht,marianne,marianne | depart,new name straight,turn left,arrive | - | a,j | schwert,luise,luise | depart,turn right,arrive | - | a,1 | schwert,albrecht,albrecht,albrecht | depart,new name straight,continue uturn,arrive | - | k,l | marianne,marianne | depart,arrive | - | k,j | marianne,albrecht,luise,luise | depart,turn left,turn left,arrive | - | k,d | marianne,schwert,schwert | depart,turn right,arrive | - | i,j | luise,luise | depart,arrive | - | i,d | luise,albrecht,schwert | depart,turn left,arrive | - | i,l | luise,albrecht,marianne,marianne | depart,turn left,turn left,arrive | + | waypoints | route | turns | locations | + | a,l | schwert,albrecht,marianne,marianne | depart,new name straight,turn left,arrive | a,t,a,l | + | a,j | schwert,luise,luise | depart,turn right,arrive | a,s,j | + | a,1 | schwert,albrecht,albrecht,albrecht | depart,new name straight,continue uturn,arrive | a,t,a,1 | + | k,l | marianne,marianne | depart,arrive | k,l | + | k,j | marianne,albrecht,luise,luise | depart,turn left,turn left,arrive | k,a,l,j | + | k,d | marianne,schwert,schwert | depart,turn right,arrive | k,e,d | + | i,j | luise,luise | depart,arrive | i,j | + | i,d | luise,albrecht,schwert | depart,turn left,arrive | i,e,d | + | i,l | luise,albrecht,marianne,marianne | depart,turn left,turn left,arrive | i,e,a,l | # https://www.openstreetmap.org/#map=19/52.46339/13.40272 Scenario: Do not merge links between segregated roads @@ -670,13 +670,13 @@ Feature: Merge Segregated Roads | eb | otto | no | When I route I should get - | waypoints | route | turns | # | - | a,c | otto,otto | depart,arrive | | - | a,f | otto,otto,otto | depart,continue uturn,arrive | | - | a,1 | otto,otto,otto | depart,continue left,arrive | | - | a,d | otto,neu,neu | depart,turn left,arrive | | - | c,1 | otto,otto | depart,arrive | | - | c,f | otto,otto,otto | depart,continue left,arrive | Ideally, this would be depart,arrive, but the obvious discovery making the turn onto `1` from `c` obvious interferes here | + | waypoints | route | turns | # | locations | + | a,c | otto,otto | depart,arrive | | a,c | + | a,f | otto,otto,otto | depart,continue uturn,arrive | | a,?,f | + | a,1 | otto,otto,otto | depart,continue left,arrive | | a,?,1 | + | a,d | otto,neu,neu | depart,turn left,arrive | | a,?,d | + | c,1 | otto,otto | depart,arrive | | c,1 | + | c,f | otto,otto,otto | depart,continue left,arrive | Ideally, this would be depart,arrive, but the obvious discovery making the turn onto `1` from `c` obvious interferes here | c,o,f | # https://www.openstreetmap.org/#map=18/50.94608/7.02030 Scenario: Do not merge oneway places @@ -709,6 +709,6 @@ Feature: Merge Segregated Roads | ej | wei | no | When I route I should get - | waypoints | route | turns | - | j,h | wei,wei | depart,arrive | - | a,d | kobe,kobe,kobe | depart,continue left,arrive | + | waypoints | route | turns | locations | + | j,h | wei,wei | depart,arrive | j,h | + | a,d | kobe,kobe,kobe | depart,continue left,arrive | a,k,d | diff --git a/features/guidance/merge.feature b/features/guidance/merge.feature index 1533810cbe8..16a9e824d65 100644 --- a/features/guidance/merge.feature +++ b/features/guidance/merge.feature @@ -21,9 +21,9 @@ Feature: Merging | eb | primary | When I route I should get - | waypoints | route | turns | - | d,c | db,abc,abc | depart,turn straight,arrive | - | e,c | eb,abc,abc | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | d,c | db,abc,abc | depart,turn straight,arrive | d,b,c | + | e,c | eb,abc,abc | depart,turn straight,arrive | e,b,c | @merge Scenario: Merge on Three Way Intersection Right @@ -39,8 +39,8 @@ Feature: Merging | db | primary | When I route I should get - | waypoints | route | turns | - | d,c | db,abc,abc | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | d,c | db,abc,abc | depart,turn straight,arrive | d,b,c | @merge @negative Scenario: Don't Merge on Short-Three Way Intersection Right @@ -56,8 +56,8 @@ Feature: Merging | db | primary | When I route I should get - | waypoints | route | turns | - | d,c | db,abc,abc | depart,turn slight left,arrive | + | waypoints | route | turns | locations | + | d,c | db,abc,abc | depart,turn slight left,arrive | d,b,c | @merge @@ -74,8 +74,8 @@ Feature: Merging | db | primary | When I route I should get - | waypoints | route | turns | - | d,c | db,abc,abc | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | d,c | db,abc,abc | depart,turn straight,arrive | d,b,c | @merge Scenario: Merge onto a turning road @@ -106,9 +106,9 @@ Feature: Merging | fd | residential | in | When I route I should get - | waypoints | turns | route | - | f,e | depart,turn straight,arrive | in,road,road | - | f,a | depart,turn sharp left,arrive | in,road,road | + | waypoints | turns | route | locations | + | f,e | depart,turn straight,arrive | in,road,road | f,?,e | + | f,a | depart,turn sharp left,arrive | in,road,road | f,?,a | @merge Scenario: Merge onto a motorway @@ -124,8 +124,8 @@ Feature: Merging | db | | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | d,c | ,A100,A100 | depart,merge slight right,arrive | + | waypoints | route | turns | locations | + | d,c | ,A100,A100 | depart,merge slight right,arrive | d,?,c | # https://www.openstreetmap.org/way/254299122 @@ -145,5 +145,5 @@ Feature: Merging | cf | | 1B | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | e,d | ,A100,A100 | depart,merge slight left,arrive | + | waypoints | route | turns | locations | + | e,d | ,A100,A100 | depart,merge slight left,arrive | e,?,d | diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature index dc657f50a01..9fc34029641 100644 --- a/features/guidance/motorway.feature +++ b/features/guidance/motorway.feature @@ -18,9 +18,9 @@ Feature: Motorway Guidance | bfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,bfg,bfg | depart,off ramp slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,bfg,bfg | depart,off ramp slight right,arrive | a,b,g | Scenario: Ramp Exit Right Curved Right Given the node map @@ -36,9 +36,9 @@ Feature: Motorway Guidance | bfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,bfg,bfg | depart,off ramp right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,bfg,bfg | depart,off ramp right,arrive | a,b,g | Scenario: Ramp Exit Right Curved Left Given the node map @@ -54,9 +54,9 @@ Feature: Motorway Guidance | cfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,cfg,cfg | depart,off ramp slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,cfg,cfg | depart,off ramp slight right,arrive | a,c,g | Scenario: Ramp Exit Left @@ -72,9 +72,9 @@ Feature: Motorway Guidance | bfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,bfg,bfg | depart,off ramp slight left,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,bfg,bfg | depart,off ramp slight left,arrive | a,b,g | Scenario: Ramp Exit Left Curved Left Given the node map @@ -90,9 +90,9 @@ Feature: Motorway Guidance | bfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,bfg,bfg | depart,off ramp left,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,bfg,bfg | depart,off ramp left,arrive | a,b,g | Scenario: Ramp Exit Left Curved Right Given the node map @@ -108,9 +108,9 @@ Feature: Motorway Guidance | cfg | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,cfg,cfg | depart,off ramp slight left,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,cfg,cfg | depart,off ramp slight left,arrive | a,c,g | Scenario: On Ramp Right Given the node map @@ -125,9 +125,9 @@ Feature: Motorway Guidance | fgd | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | f,e | fgd,abcde,abcde | depart,merge slight left,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | f,e | fgd,abcde,abcde | depart,merge slight left,arrive | f,d,e | Scenario: On Ramp Left Given the node map @@ -142,9 +142,9 @@ Feature: Motorway Guidance | fgd | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | f,e | fgd,abcde,abcde | depart,merge slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | f,e | fgd,abcde,abcde | depart,merge slight right,arrive | f,d,e | Scenario: Highway Fork Given the node map @@ -160,9 +160,9 @@ Feature: Motorway Guidance | cfg | motorway | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde,abcde | depart,fork slight left,arrive | - | a,g | abcde,cfg,cfg | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde,abcde | depart,fork slight left,arrive | a,a,e | + | a,g | abcde,cfg,cfg | depart,fork slight right,arrive | a,c,g | Scenario: Fork After Ramp Given the node map @@ -179,9 +179,9 @@ Feature: Motorway Guidance | cfg | motorway | | When I route I should get - | waypoints | route | turns | - | a,e | abc,cde,cde | depart,fork slight left,arrive | - | a,g | abc,cfg,cfg | depart,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abc,cde,cde | depart,fork slight left,arrive | a,c,e | + | a,g | abc,cfg,cfg | depart,fork slight right,arrive | a,c,g | Scenario: On And Off Ramp Right Given the node map @@ -197,11 +197,11 @@ Feature: Motorway Guidance | chi | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | f,e | fgc,abcde,abcde | depart,merge slight left,arrive | - | a,i | abcde,chi,chi | depart,off ramp slight right,arrive | - | f,i | fgc,chi,chi | depart,off ramp slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | f,e | fgc,abcde,abcde | depart,merge slight left,arrive | f,c,e | + | a,i | abcde,chi,chi | depart,off ramp slight right,arrive | a,c,i | + | f,i | fgc,chi,chi | depart,off ramp slight right,arrive | f,c,i | Scenario: On And Off Ramp Left Given the node map @@ -217,11 +217,11 @@ Feature: Motorway Guidance | chi | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | f,e | fgc,abcde,abcde | depart,merge slight right,arrive | - | a,i | abcde,chi,chi | depart,off ramp slight left,arrive | - | f,i | fgc,chi,chi | depart,off ramp slight left,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | f,e | fgc,abcde,abcde | depart,merge slight right,arrive | f,c,e | + | a,i | abcde,chi,chi | depart,off ramp slight left,arrive | a,c,i | + | f,i | fgc,chi,chi | depart,off ramp slight left,arrive | f,c,i | Scenario: Merging Motorways Given the node map @@ -238,9 +238,9 @@ Feature: Motorway Guidance | eb | motorway | When I route I should get - | waypoints | route | turns | - | d,c | db,abc,abc | depart,merge slight left,arrive | - | e,c | eb,abc,abc | depart,merge slight right,arrive | + | waypoints | route | turns | locations | + | d,c | db,abc,abc | depart,merge slight left,arrive | d,b,c | + | e,c | eb,abc,abc | depart,merge slight right,arrive | e,b,c | Scenario: Handle 90 degree off ramps correctly Given the node map @@ -259,8 +259,8 @@ Feature: Motorway Guidance | cy | Hwy | motorway | | When I route I should get - | waypoints | route | turns | - | a,d | On,Hwy,Off,Off | depart,merge slight right,off ramp right,arrive | + | waypoints | route | turns | locations | + | a,d | On,Hwy,Off,Off | depart,merge slight right,off ramp right,arrive | a,?,?,d | #http://0.0.0.0:9966/?z=18¢er=38.893323%2C-77.055117&loc=38.893551%2C-77.054833&loc=38.893112%2C-77.055536&hl=en&alt=0 Scenario: Merging with same name @@ -278,9 +278,9 @@ Feature: Motorway Guidance | cd | | US 50; I 66 | motorway | yes | When I route I should get - | waypoints | route | turns | - | a,d | , | depart,arrive | - | b,d | , | depart,arrive | + | waypoints | route | turns | locations | + | a,d | , | depart,arrive | a,d | + | b,d | , | depart,arrive | b,d | Scenario: Ramp Exit with Lower Priority @@ -296,9 +296,9 @@ Feature: Motorway Guidance | bfg | primary_link | yes | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | - | a,g | abcde,bfg,bfg | depart,off ramp slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | + | a,g | abcde,bfg,bfg | depart,off ramp slight right,arrive | a,b,g | # https://www.openstreetmap.org/node/67366428#map=18/33.64613/-84.44425 @@ -319,10 +319,10 @@ Feature: Motorway Guidance When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,fork slight left,arrive | - | a,e | ,,, | depart,fork slight right,fork slight left,arrive | - | a,f | ,,, | depart,fork slight right,fork slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,fork slight left,arrive | a,?,c | + | a,e | ,,, | depart,fork slight right,fork slight left,arrive | a,?,?,e | + | a,f | ,,, | depart,fork slight right,fork slight right,arrive | a,?,?,f | # https://www.openstreetmap.org/#map=19/53.46186/-2.24509 @@ -341,7 +341,7 @@ Feature: Motorway Guidance | cd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abce,cd,cd | depart,off ramp slight left,arrive | - | a,e | abce,abce | depart,arrive | - | a,f | abce,cf,cf | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abce,cd,cd | depart,off ramp slight left,arrive | a,c,d | + | a,e | abce,abce | depart,arrive | a,e | + | a,f | abce,cf,cf | depart,turn slight right,arrive | a,c,f | diff --git a/features/guidance/new-name.feature b/features/guidance/new-name.feature index e5307fa0c52..702b7ad2b03 100644 --- a/features/guidance/new-name.feature +++ b/features/guidance/new-name.feature @@ -17,8 +17,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name straight,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name straight,arrive | a,b,c | Scenario: Undisturbed Name Change with unannounced Turn Right @@ -34,8 +34,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name slight right,arrive | a,b,c | Scenario: Undisturbed Name Change with unannounced Turn Left Given the node map @@ -50,8 +50,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name slight left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name slight left,arrive | a,b,c | Scenario: Disturbed Name Change with Turn Given the node map @@ -67,8 +67,8 @@ Feature: New-Name Instructions | db | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name slight right,arrive | a,b,c | Scenario: Undisturbed Name Change with announced Turn Left Given the node map @@ -83,8 +83,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name left,arrive | a,b,c | Scenario: Undisturbed Name Change with announced Turn Sharp Left Given the node map @@ -99,8 +99,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name sharp left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name sharp left,arrive | a,b,c | Scenario: Undisturbed Name Change with announced Turn Right Given the node map @@ -115,8 +115,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name right,arrive | a,b,c | Scenario: Undisturbed Name Change with announced Turn Sharp Right Given the node map @@ -131,8 +131,8 @@ Feature: New-Name Instructions | bc | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name sharp right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name sharp right,arrive | a,b,c | Scenario: Disturbed Name Change with minor road class @@ -149,8 +149,8 @@ Feature: New-Name Instructions | bd | service | yes | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,new name slight right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,new name slight right,arrive | a,b,c | Scenario: Empty road names - Announce Change From, suppress Change To Given the node map @@ -165,9 +165,9 @@ Feature: New-Name Instructions | cd | cd | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,new name straight,arrive | - | a,1 | ab, | depart,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,new name straight,arrive | a,?,d | + | a,1 | ab, | depart,arrive | a,1 | Scenario: Empty road names - Loose name shortly Given the node map @@ -183,9 +183,9 @@ Feature: New-Name Instructions | de | with-name | When I route I should get - | waypoints | route | turns | - | a,e | name,with-name,with-name | depart,new name straight,arrive | - | b,e | with-name,with-name | depart,arrive | + | waypoints | route | turns | locations | + | a,e | name,with-name,with-name | depart,new name straight,arrive | a,e,e | + | b,e | with-name,with-name | depart,arrive | b,e | Scenario: Both Name and Ref Empty Given the node map @@ -199,8 +199,8 @@ Feature: New-Name Instructions | bc | | | When I route I should get - | waypoints | route | turns | - | a,c | , | depart,arrive | + | waypoints | route | turns | locations | + | a,c | , | depart,arrive | a,c | Scenario: Same Name, Ref Extended Given the node map @@ -214,8 +214,8 @@ Feature: New-Name Instructions | bc | C | B1;B2 | When I route I should get - | waypoints | route | turns | - | a,c | A,C,C | depart,new name straight,arrive | + | waypoints | route | turns | locations | + | a,c | A,C,C | depart,new name straight,arrive | a,?,c | Scenario: Same Name, Ref Removed Given the node map @@ -229,8 +229,8 @@ Feature: New-Name Instructions | bc | C | B1 | When I route I should get - | waypoints | route | turns | - | a,c | A,C,C | depart,new name straight,arrive | + | waypoints | route | turns | locations | + | a,c | A,C,C | depart,new name straight,arrive | a,?,c | Scenario: Name Removed, Ref Extended Given the node map @@ -244,8 +244,8 @@ Feature: New-Name Instructions | bc | | B1;B2 | When I route I should get - | waypoints | route | turns | - | a,c | A, | depart,arrive | + | waypoints | route | turns | locations | + | a,c | A, | depart,arrive | a,c | Scenario: Name Added, Ref Removed Given the node map @@ -259,8 +259,8 @@ Feature: New-Name Instructions | bc | A | | When I route I should get - | waypoints | route | turns | - | a,c | ,A,A | depart,new name straight,arrive | + | waypoints | route | turns | locations | + | a,c | ,A,A | depart,new name straight,arrive | a,?,c | Scenario: Prefix Change Given the node map @@ -274,8 +274,8 @@ Feature: New-Name Instructions | bc | Central Expressway | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | North Central Expressway,Central Expressway | depart,arrive | + | waypoints | route | turns | locations | + | a,c | North Central Expressway,Central Expressway | depart,arrive | a,c | Scenario: Prefix Change Given the node map @@ -289,8 +289,8 @@ Feature: New-Name Instructions | cb | Central Expressway | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | c,a | Central Expressway,North Central Expressway | depart,arrive | + | waypoints | route | turns | locations | + | c,a | Central Expressway,North Central Expressway | depart,arrive | c,a | Scenario: No Name, Same Reference Given the node map @@ -304,8 +304,8 @@ Feature: New-Name Instructions | bc | | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | Central Expressway, | depart,arrive | + | waypoints | route | turns | locations | + | a,c | Central Expressway, | depart,arrive | a,c | Scenario: No Name, Same Reference Given the node map @@ -319,8 +319,8 @@ Feature: New-Name Instructions | bc | Central Expressway | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | ,Central Expressway | depart,arrive | + | waypoints | route | turns | locations | + | a,c | ,Central Expressway | depart,arrive | a,c | Scenario: No Name, Same Reference Given the node map @@ -334,8 +334,8 @@ Feature: New-Name Instructions | bc | | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | , | depart,arrive | + | waypoints | route | turns | locations | + | a,c | , | depart,arrive | a,c | Scenario: No Name, Same Reference Given the node map @@ -349,8 +349,8 @@ Feature: New-Name Instructions | bc | | US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | , | depart,arrive | + | waypoints | route | turns | locations | + | a,c | , | depart,arrive | a,c | Scenario: No Name, Same Reference Given the node map @@ -364,8 +364,8 @@ Feature: New-Name Instructions | bc | | US 75;US 69 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | , | depart,arrive | + | waypoints | route | turns | locations | + | a,c | , | depart,arrive | a,c | Scenario: No Name, Same Reference Given the node map @@ -379,8 +379,8 @@ Feature: New-Name Instructions | bc | | US 69;US 75 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | , | depart,arrive | + | waypoints | route | turns | locations | + | a,c | , | depart,arrive | a,c | Scenario: No Name, Reference changed Given the node map @@ -394,8 +394,8 @@ Feature: New-Name Instructions | bc | | US 422 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | ,, | depart,new name straight,arrive | + | waypoints | route | turns | locations | + | a,c | ,, | depart,new name straight,arrive | a,?,c | Scenario: Spaces in refs for containment check, #3086 Given the node map @@ -409,8 +409,8 @@ Feature: New-Name Instructions | bc | Keystone | US 64; US 412 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | Keystone,Keystone | depart,arrive | + | waypoints | route | turns | locations | + | a,c | Keystone,Keystone | depart,arrive | a,c | Scenario: More spaces in refs for containment check, #3086 Given the node map @@ -424,5 +424,5 @@ Feature: New-Name Instructions | bc | Keystone | US 64 ; US 412 | motorway | When I route I should get - | waypoints | route | turns | - | a,c | Keystone,Keystone | depart,arrive | + | waypoints | route | turns | locations | + | a,c | Keystone,Keystone | depart,arrive | a,c | diff --git a/features/guidance/notification.feature b/features/guidance/notification.feature index b9a4e01624f..da9a3aa2fee 100644 --- a/features/guidance/notification.feature +++ b/features/guidance/notification.feature @@ -20,8 +20,8 @@ Feature: Notification on turn onto mode change | de | primary | | | When I route I should get - | waypoints | route | turns | modes | - | a,e | ,ferry,, | depart,turn right,notification right,arrive | driving,ferry,driving,driving | + | waypoints | route | turns | modes | locations | + | a,e | ,ferry,, | depart,turn right,notification right,arrive | driving,ferry,driving,driving | a,?,?,e | Scenario: Turn onto a Ferry Given the node map @@ -39,9 +39,9 @@ Feature: Notification on turn onto mode change | gef | primary | | | When I route I should get - | waypoints | route | turns | modes | - | g,h | ,ferry,,, | depart,turn right,notification straight,turn right,arrive | driving,ferry,driving,driving,driving | - | b,g | ,,ferry,, | depart,turn right,notification straight,turn left,arrive | driving,driving,ferry,driving,driving | + | waypoints | route | turns | modes | locations | + | g,h | ,ferry,,, | depart,turn right,notification straight,turn right,arrive | driving,ferry,driving,driving,driving | g,?,?,?,h | + | b,g | ,,ferry,, | depart,turn right,notification straight,turn left,arrive | driving,driving,ferry,driving,driving | b,?,?,?,g | Scenario: Straight onto a Ferry Given the node map @@ -59,5 +59,5 @@ Feature: Notification on turn onto mode change | df | primary | | | When I route I should get - | waypoints | route | turns | modes | - | a,f | ,ferry,, | depart,notification right,notification right,arrive | driving,ferry,driving,driving | + | waypoints | route | turns | modes | locations | + | a,f | ,ferry,, | depart,notification right,notification right,arrive | driving,ferry,driving,driving | a,?,?,f | diff --git a/features/guidance/perception.feature b/features/guidance/perception.feature index 30a7393165e..d9dee6e0b4d 100644 --- a/features/guidance/perception.feature +++ b/features/guidance/perception.feature @@ -32,9 +32,9 @@ Feature: Simple Turns | ed | turn | primary | yes | When I route I should get - | waypoints | turns | route | intersections | - | f,a | depart,arrive | road,road | true:0,true:0 false:150 false:180;true:180 | - | e,a | depart,turn slight right,arrive | turn,road,road | true:333;true:0 false:150 false:180;true:180 | + | waypoints | turns | route | intersections | locations | + | f,a | depart,arrive | road,road | true:0,true:0 false:150 false:180;true:180 | f,a | + | e,a | depart,turn slight right,arrive | turn,road,road | true:333;true:0 false:150 false:180;true:180 | e,r,a | Scenario: Turning into splitting road - no improvement Given the node map @@ -62,9 +62,9 @@ Feature: Simple Turns | ed | turn | primary | yes | When I route I should get - | waypoints | turns | route | intersections | - | f,a | depart,arrive | road,road | true:0,true:0 false:90 false:180;true:180 | - | e,a | depart,turn right,arrive | turn,road,road | true:270;true:0 false:90 false:180;true:180 | + | waypoints | turns | route | intersections | locations | + | f,a | depart,arrive | road,road | true:0,true:0 false:90 false:180;true:180 | f,a | + | e,a | depart,turn right,arrive | turn,road,road | true:270;true:0 false:90 false:180;true:180 | e,r,a | Scenario: Turning into splitting road Given the node map @@ -95,12 +95,12 @@ Feature: Simple Turns | bg | left | primary | yes | When I route I should get - | waypoints | turns | route | - | f,a | depart,arrive | road,road | - | e,a | depart,turn slight right,arrive | turn,road,road | - | e,g | depart,turn slight right,turn left,arrive | turn,road,left,left | - | f,g | depart,turn left,arrive | road,left,left | - | f,c | depart,continue uturn,arrive | road,road,road | + | waypoints | turns | route | locations | + | f,a | depart,arrive | road,road | f,a | + | e,a | depart,turn slight right,arrive | turn,road,road | e,r,a | + | e,g | depart,turn slight right,turn left,arrive | turn,road,left,left | e,r,?,g | + | f,g | depart,turn left,arrive | road,left,left | f,?,g | + | f,c | depart,continue uturn,arrive | road,road,road | f,r,c | @bug @not-sorted @3179 Scenario: Adjusting road angles to not be sorted @@ -127,7 +127,7 @@ Feature: Simple Turns | ei | left | yes | When I route I should get - | waypoints | route | turns | - | g,a | in,road,road | depart,fork slight right,arrive | - | g,h | in,right,right | depart,fork straight,arrive | - | g,i | in,left,left | depart,fork slight left,arrive | + | waypoints | route | turns | locations | + | g,a | in,road,road | depart,fork slight right,arrive | g,?,a | + | g,h | in,right,right | depart,fork straight,arrive | g,i,h | + | g,i | in,left,left | depart,fork slight left,arrive | g,?,i | diff --git a/features/guidance/ramp.feature b/features/guidance/ramp.feature index 560952d0b94..141a7f49b1a 100644 --- a/features/guidance/ramp.feature +++ b/features/guidance/ramp.feature @@ -18,8 +18,8 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp right,arrive | a,b,d | Scenario: Ramp On Through Street Left Given the node map @@ -34,8 +34,8 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp left,arrive | a,b,d | Scenario: Ramp On Through Street Left and Right Given the node map @@ -52,9 +52,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp right,arrive | - | a,e | abc,be,be | depart,on ramp left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp right,arrive | a,b,d | + | a,e | abc,be,be | depart,on ramp left,arrive | a,b,e | Scenario: Ramp On Three Way Intersection Right Given the node map @@ -70,8 +70,8 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | ab,bd,bd | depart,on ramp right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bd,bd | depart,on ramp right,arrive | a,b,d | Scenario: Ramp On Three Way Intersection Right Given the node map @@ -88,8 +88,8 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | ab,bd,bd | depart,on ramp right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bd,bd | depart,on ramp right,arrive | a,b,d | Scenario: Ramp Off Though Street Given the node map @@ -105,9 +105,9 @@ Feature: Ramp Guidance | bd | motorway_link | yes | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp right,arrive | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp right,arrive | a,b,d | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Straight Ramp Off Turning Though Street Given the node map @@ -122,9 +122,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp straight,arrive | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp straight,arrive | a,b,d | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Fork Ramp Off Turning Though Street Given the node map @@ -140,9 +140,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp right,arrive | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp right,arrive | a,b,d | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Fork Ramp Given the node map @@ -159,9 +159,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | ab,bd,bd | depart,on ramp right,arrive | - | a,c | ab,bc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bd,bd | depart,on ramp right,arrive | a,b,d | + | a,c | ab,bc | depart,arrive | a,c | Scenario: Fork Slight Ramp Given the node map @@ -178,9 +178,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | ab,bd,bd | depart,on ramp slight right,arrive | - | a,c | ab,bc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bd,bd | depart,on ramp slight right,arrive | a,b,d | + | a,c | ab,bc | depart,arrive | a,c | Scenario: Fork Slight Ramp on Through Street Given the node map @@ -196,9 +196,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp slight right,arrive | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp slight right,arrive | a,b,d | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Fork Slight Ramp on Obvious Through Street Given the node map @@ -214,9 +214,9 @@ Feature: Ramp Guidance | bd | motorway_link | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,on ramp slight right,arrive | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,on ramp slight right,arrive | a,b,d | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Two Ramps Joining into common Motorway Given the node map @@ -233,9 +233,9 @@ Feature: Ramp Guidance | cd | motorway | When I route I should get - | waypoints | route | turns | - | a,d | ac,cd | depart,arrive | - | b,d | bc,cd | depart,arrive | + | waypoints | route | turns | locations | + | a,d | ac,cd | depart,arrive | a,d | + | b,d | bc,cd | depart,arrive | b,d | Scenario: Two Ramps Joining into common Motorway Unnamed Given the node map @@ -252,9 +252,9 @@ Feature: Ramp Guidance | cd | motorway | | When I route I should get - | waypoints | route | turns | - | a,d | , | depart,arrive | - | b,d | , | depart,arrive | + | waypoints | route | turns | locations | + | a,d | , | depart,arrive | a,d | + | b,d | , | depart,arrive | b,d | Scenario: Ferry Onto A Ramp Given the node map @@ -274,5 +274,5 @@ Feature: Ramp Guidance | de | motorway_link | | | | When I route I should get - | waypoints | route | - | a,e | boarding,boaty mc boatface,, | + | waypoints | route | locations | + | a,e | boarding,boaty mc boatface,, | | diff --git a/features/guidance/rotary.feature b/features/guidance/rotary.feature index 64e78b3ef3c..ceddb16719f 100644 --- a/features/guidance/rotary.feature +++ b/features/guidance/rotary.feature @@ -24,19 +24,19 @@ Feature: Rotary | bgecb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive | - | a,f | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive | - | a,h | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive | - | d,f | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive | - | d,h | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive | - | d,a | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive | - | f,h | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive | - | f,a | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive | - | f,d | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive | - | h,a | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive | - | h,d | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive | - | h,f | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive | a,?,c,d | + | a,f | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive | a,?,e,f | + | a,h | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive | a,?,g,h | + | d,f | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive | d,?,e,f | + | d,h | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive | d,?,g,h | + | d,a | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive | d,?,a,a | + | f,h | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive | f,?,g,h | + | f,a | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive | f,?,a,a | + | f,d | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive | f,?,c,d | + | h,a | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive | h,?,a,a | + | h,d | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive | h,?,c,d | + | h,f | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive | h,?,e,f | Scenario: Only Enter Given the node map @@ -57,19 +57,19 @@ Feature: Rotary | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | a,c | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | a,e | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | a,g | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | d,e | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | d,g | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | d,b | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | f,g | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | f,b | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | f,c | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | h,b | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | h,c | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | - | h,e | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | a,b,c | + | a,e | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | a,b,e | + | a,g | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | a,b,g | + | d,e | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | d,c,e | + | d,g | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | d,c,g | + | d,b | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | d,c,b | + | f,g | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | f,e,g | + | f,b | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | f,e,b | + | f,c | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | f,e,c | + | h,b | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | h,g,b | + | h,c | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | h,g,c | + | h,e | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive | h,g,e | Scenario: Only Exit Given the node map @@ -90,19 +90,19 @@ Feature: Rotary | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | b,d | bcegb,cd,cd | depart,exit rotary right,arrive | - | b,f | bcegb,ef,ef | depart,exit rotary right,arrive | - | b,h | bcegb,gh,gh | depart,exit rotary right,arrive | - | c,f | bcegb,ef,ef | depart,exit rotary right,arrive | - | c,h | bcegb,gh,gh | depart,exit rotary right,arrive | - | c,a | bcegb,ab,ab | depart,exit rotary right,arrive | - | e,h | bcegb,gh,gh | depart,exit rotary right,arrive | - | e,a | bcegb,ab,ab | depart,exit rotary right,arrive | - | e,d | bcegb,cd,cd | depart,exit rotary right,arrive | - | g,a | bcegb,ab,ab | depart,exit rotary right,arrive | - | g,d | bcegb,cd,cd | depart,exit rotary right,arrive | - | g,f | bcegb,ef,ef | depart,exit rotary right,arrive | + | waypoints | route | turns | locations | + | b,d | bcegb,cd,cd | depart,exit rotary right,arrive | b,c,d | + | b,f | bcegb,ef,ef | depart,exit rotary right,arrive | b,e,f | + | b,h | bcegb,gh,gh | depart,exit rotary right,arrive | b,g,h | + | c,f | bcegb,ef,ef | depart,exit rotary right,arrive | c,e,f | + | c,h | bcegb,gh,gh | depart,exit rotary right,arrive | c,g,h | + | c,a | bcegb,ab,ab | depart,exit rotary right,arrive | c,b,a | + | e,h | bcegb,gh,gh | depart,exit rotary right,arrive | e,g,h | + | e,a | bcegb,ab,ab | depart,exit rotary right,arrive | e,b,a | + | e,d | bcegb,cd,cd | depart,exit rotary right,arrive | e,c,d | + | g,a | bcegb,ab,ab | depart,exit rotary right,arrive | g,b,a | + | g,d | bcegb,cd,cd | depart,exit rotary right,arrive | g,c,d | + | g,f | bcegb,ef,ef | depart,exit rotary right,arrive | g,e,f | #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits Scenario: Drive Around @@ -124,19 +124,19 @@ Feature: Rotary | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | b,c | bcegb,bcegb | depart,arrive | - | b,e | bcegb,bcegb | depart,arrive | - | b,g | bcegb,bcegb | depart,arrive | - | c,e | bcegb,bcegb | depart,arrive | - | c,g | bcegb,bcegb | depart,arrive | - | c,b | bcegb,bcegb | depart,arrive | - | e,g | bcegb,bcegb | depart,arrive | - | e,b | bcegb,bcegb | depart,arrive | - | e,c | bcegb,bcegb | depart,arrive | - | g,b | bcegb,bcegb | depart,arrive | - | g,c | bcegb,bcegb | depart,arrive | - | g,e | bcegb,bcegb | depart,arrive | + | waypoints | route | turns | locations | + | b,c | bcegb,bcegb | depart,arrive | b,c | + | b,e | bcegb,bcegb | depart,arrive | b,e | + | b,g | bcegb,bcegb | depart,arrive | b,g | + | c,e | bcegb,bcegb | depart,arrive | c,e | + | c,g | bcegb,bcegb | depart,arrive | c,g | + | c,b | bcegb,bcegb | depart,arrive | c,b | + | e,g | bcegb,bcegb | depart,arrive | e,g | + | e,b | bcegb,bcegb | depart,arrive | e,b | + | e,c | bcegb,bcegb | depart,arrive | e,c | + | g,b | bcegb,bcegb | depart,arrive | g,b | + | g,c | bcegb,bcegb | depart,arrive | g,c | + | g,e | bcegb,bcegb | depart,arrive | g,e | #needs to be adjusted when name-discovery works for entrys Scenario: Mixed Entry and Exit @@ -158,23 +158,23 @@ Feature: Rotary | bkheb | roundabout | yes | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,exit rotary right,arrive | - | a,l | abc,jkl,jkl,jkl | depart,bkheb-exit-2,exit rotary straight,arrive | - | a,i | abc,ghi,ghi,ghi | depart,bkheb-exit-3,exit rotary straight,arrive | - | a,f | abc,def,def,def | depart,bkheb-exit-4,exit rotary straight,arrive | - | d,f | def,def,def | depart,exit rotary right,arrive | - | d,c | def,abc,abc,abc | depart,bkheb-exit-2,exit rotary straight,arrive | - | d,l | def,jkl,jkl,jkl | depart,bkheb-exit-3,exit rotary straight,arrive | - | d,i | def,ghi,ghi,ghi | depart,bkheb-exit-4,exit rotary straight,arrive | - | g,i | ghi,ghi,ghi | depart,exit rotary right,arrive | - | g,f | ghi,def,def,def | depart,bkheb-exit-2,exit rotary straight,arrive | - | g,c | ghi,abc,abc,abc | depart,bkheb-exit-3,exit rotary straight,arrive | - | g,l | ghi,jkl,jkl,jkl | depart,bkheb-exit-4,exit rotary straight,arrive | - | j,l | jkl,jkl,jkl | depart,exit rotary right,arrive | - | j,i | jkl,ghi,ghi,ghi | depart,bkheb-exit-2,exit rotary straight,arrive | - | j,f | jkl,def,def,def | depart,bkheb-exit-3,exit rotary straight,arrive | - | j,c | jkl,abc,abc,abc | depart,bkheb-exit-4,exit rotary straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,exit rotary right,arrive | a,a,c | + | a,l | abc,jkl,jkl,jkl | depart,bkheb-exit-2,exit rotary straight,arrive | a,?,j,l | + | a,i | abc,ghi,ghi,ghi | depart,bkheb-exit-3,exit rotary straight,arrive | a,?,g,i | + | a,f | abc,def,def,def | depart,bkheb-exit-4,exit rotary straight,arrive | a,?,d,f | + | d,f | def,def,def | depart,exit rotary right,arrive | d,d,f | + | d,c | def,abc,abc,abc | depart,bkheb-exit-2,exit rotary straight,arrive | d,?,a,c | + | d,l | def,jkl,jkl,jkl | depart,bkheb-exit-3,exit rotary straight,arrive | d,?,j,l | + | d,i | def,ghi,ghi,ghi | depart,bkheb-exit-4,exit rotary straight,arrive | d,?,g,i | + | g,i | ghi,ghi,ghi | depart,exit rotary right,arrive | g,g,i | + | g,f | ghi,def,def,def | depart,bkheb-exit-2,exit rotary straight,arrive | g,?,d,f | + | g,c | ghi,abc,abc,abc | depart,bkheb-exit-3,exit rotary straight,arrive | g,?,a,c | + | g,l | ghi,jkl,jkl,jkl | depart,bkheb-exit-4,exit rotary straight,arrive | g,?,j,l | + | j,l | jkl,jkl,jkl | depart,exit rotary right,arrive | j,j,l | + | j,i | jkl,ghi,ghi,ghi | depart,bkheb-exit-2,exit rotary straight,arrive | j,?,g,i | + | j,f | jkl,def,def,def | depart,bkheb-exit-3,exit rotary straight,arrive | j,?,d,f | + | j,c | jkl,abc,abc,abc | depart,bkheb-exit-4,exit rotary straight,arrive | j,?,a,c | Scenario: Collinear in X,Y Given the node map @@ -193,9 +193,9 @@ Feature: Rotary | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary straight,arrive | - | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary straight,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary straight,arrive | a,?,c,e | + | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary straight,arrive | a,?,d,f | Scenario: Collinear in X,Y Given the node map @@ -214,9 +214,9 @@ Feature: Rotary | cf | | When I route I should get - | waypoints | route | turns | - | a,e | ad,be,be,be | depart,bcdb-exit-1,exit rotary straight,arrive | - | a,f | ad,cf,cf,cf | depart,bcdb-exit-2,exit rotary straight,arrive | + | waypoints | route | turns | locations | + | a,e | ad,be,be,be | depart,bcdb-exit-1,exit rotary straight,arrive | a,?,b,e | + | a,f | ad,cf,cf,cf | depart,bcdb-exit-2,exit rotary straight,arrive | a,?,c,f | Scenario: Collinear in X,Y Given the node map @@ -235,9 +235,9 @@ Feature: Rotary | bf | | When I route I should get - | waypoints | route | turns | - | a,e | ac,de,de,de | depart,bcdb-exit-1,exit rotary straight,arrive | - | a,f | ac,bf,bf,bf | depart,bcdb-exit-2,exit rotary straight,arrive | + | waypoints | route | turns | locations | + | a,e | ac,de,de,de | depart,bcdb-exit-1,exit rotary straight,arrive | a,?,d,e | + | a,f | ac,bf,bf,bf | depart,bcdb-exit-2,exit rotary straight,arrive | a,?,b,f | Scenario: Collinear in X,Y Given the node map @@ -256,9 +256,9 @@ Feature: Rotary | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive | - | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive | a,?,c,e | + | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive | a,?,d,f | Scenario: Collinear in X,Y Given the node map @@ -277,6 +277,6 @@ Feature: Rotary | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive | - | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive | a,?,c,e | + | a,f | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive | a,?,d,f | diff --git a/features/guidance/roundabout-bike.feature b/features/guidance/roundabout-bike.feature index 2f7bc823e9b..43ac773023c 100644 --- a/features/guidance/roundabout-bike.feature +++ b/features/guidance/roundabout-bike.feature @@ -24,19 +24,19 @@ Feature: Basic Roundabout | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | b,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | b,f | bcegb,ef,ef | depart,exit roundabout right,arrive | - | b,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | c,f | bcegb,ef,ef | depart,exit roundabout right,arrive | - | c,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | c,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | e,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | e,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | e,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | g,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | g,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | g,f | bcegb,ef,ef | depart,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | b,d | bcegb,cd,cd | depart,exit roundabout right,arrive | b,c,d | + | b,f | bcegb,ef,ef | depart,exit roundabout right,arrive | b,e,f | + | b,h | bcegb,gh,gh | depart,exit roundabout right,arrive | b,g,h | + | c,f | bcegb,ef,ef | depart,exit roundabout right,arrive | c,e,f | + | c,h | bcegb,gh,gh | depart,exit roundabout right,arrive | c,g,h | + | c,a | bcegb,ab,ab | depart,exit roundabout right,arrive | c,b,a | + | e,h | bcegb,gh,gh | depart,exit roundabout right,arrive | e,g,h | + | e,a | bcegb,ab,ab | depart,exit roundabout right,arrive | e,b,a | + | e,d | bcegb,cd,cd | depart,exit roundabout right,arrive | e,c,d | + | g,a | bcegb,ab,ab | depart,exit roundabout right,arrive | g,b,a | + | g,d | bcegb,cd,cd | depart,exit roundabout right,arrive | g,c,d | + | g,f | bcegb,ef,ef | depart,exit roundabout right,arrive | g,e,f | #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits Scenario: Mixed Entry and Exit @@ -58,20 +58,20 @@ Feature: Basic Roundabout | bkheb | roundabout | yes | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,exit roundabout right,arrive | - | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive | - | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive | - | a,f | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive | - | d,f | def,def,def | depart,exit roundabout right,arrive | - | d,c | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive | - | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive | - | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive | - | g,i | ghi,ghi,ghi | depart,exit roundabout right,arrive | - | g,f | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive | - | g,c | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive | - | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive | - | j,l | jkl,jkl,jkl | depart,exit roundabout right,arrive | - | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive | - | j,f | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive | - | j,c | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,exit roundabout right,arrive | a,a,c | + | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive | a,?,j,l | + | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive | a,?,g,i | + | a,f | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive | a,?,d,f | + | d,f | def,def,def | depart,exit roundabout right,arrive | d,d,f | + | d,c | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive | d,?,a,c | + | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive | d,?,j,l | + | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive | d,?,g,i | + | g,i | ghi,ghi,ghi | depart,exit roundabout right,arrive | g,g,i | + | g,f | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive | g,?,d,f | + | g,c | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive | g,?,a,c | + | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive | g,?,j,l | + | j,l | jkl,jkl,jkl | depart,exit roundabout right,arrive | j,j,l | + | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive | j,?,g,i | + | j,f | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive | j,?,d,f | + | j,c | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive | j,?,a,c | diff --git a/features/guidance/roundabout-left-sided.feature b/features/guidance/roundabout-left-sided.feature index 9555a24cae2..e2ac21b0b2f 100644 --- a/features/guidance/roundabout-left-sided.feature +++ b/features/guidance/roundabout-left-sided.feature @@ -27,10 +27,10 @@ Feature: Basic Roundabout | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,roundabout turn left exit-1,arrive | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | - | a,h | ab,gh,gh | depart,roundabout turn right exit-3,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-1,arrive | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-3,arrive | a,?,h | Scenario: Mixed Entry and Exit Given a grid size of 10 meters @@ -52,7 +52,7 @@ Feature: Basic Roundabout | behkb | roundabout | yes | When I route I should get - | waypoints | route | turns | - | c,a | cba,cba,cba | depart,exit roundabout left,arrive | - | l,a | lkj,cba,cba,cba | depart,roundabout-exit-2,exit roundabout straight,arrive | - | i,a | ihg,cba,cba,cba | depart,roundabout-exit-3,exit roundabout straight,arrive | + | waypoints | route | turns | locations | + | c,a | cba,cba,cba | depart,exit roundabout left,arrive | c,c,a | + | l,a | lkj,cba,cba,cba | depart,roundabout-exit-2,exit roundabout straight,arrive | l,?,c,a | + | i,a | ihg,cba,cba,cba | depart,roundabout-exit-3,exit roundabout straight,arrive | i,?,c,a | diff --git a/features/guidance/roundabout-turn-bike.feature b/features/guidance/roundabout-turn-bike.feature index 3eee61614ae..d4a41cdb49a 100644 --- a/features/guidance/roundabout-turn-bike.feature +++ b/features/guidance/roundabout-turn-bike.feature @@ -25,16 +25,16 @@ Feature: Basic Roundabout | bgecb | roundabout | residential | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,roundabout turn left exit-1,arrive | - | a,f | ab,ef,ef,ef | depart,roundabout turn straight exit-1,exit roundabout right,arrive | - | a,h | ab,gh,gh,gh | depart,roundabout turn right exit-1,exit roundabout right,arrive | - | d,f | cd,ef,ef,ef | depart,roundabout turn left exit-2,exit roundabout right,arrive | - | d,h | cd,gh,gh,gh | depart,roundabout turn straight exit-2,exit roundabout right,arrive | - | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | - | f,h | ef,gh,gh,gh | depart,roundabout turn left exit-3,exit roundabout right,arrive | - | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | - | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | - | h,a | gh,ab,ab | depart,roundabout turn left exit-2,arrive | - | h,d | gh,cd,cd | depart,roundabout turn straight exit-1,arrive | - | h,f | gh,ef,ef,ef | depart,roundabout turn right exit-1,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-1,arrive | a,?,d | + | a,f | ab,ef,ef,ef | depart,roundabout turn straight exit-1,exit roundabout right,arrive | a,?,e,f | + | a,h | ab,gh,gh,gh | depart,roundabout turn right exit-1,exit roundabout right,arrive | a,?,g,h | + | d,f | cd,ef,ef,ef | depart,roundabout turn left exit-2,exit roundabout right,arrive | d,?,e,f | + | d,h | cd,gh,gh,gh | depart,roundabout turn straight exit-2,exit roundabout right,arrive | d,?,g,h | + | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | d,?,a | + | f,h | ef,gh,gh,gh | depart,roundabout turn left exit-3,exit roundabout right,arrive | f,?,g,h | + | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | f,?,a | + | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | f,?,d | + | h,a | gh,ab,ab | depart,roundabout turn left exit-2,arrive | h,?,a | + | h,d | gh,cd,cd | depart,roundabout turn straight exit-1,arrive | h,?,d | + | h,f | gh,ef,ef,ef | depart,roundabout turn right exit-1,exit roundabout right,arrive | h,?,e,f | diff --git a/features/guidance/roundabout-turn.feature b/features/guidance/roundabout-turn.feature index 93ce3c4e460..314bd469cc0 100644 --- a/features/guidance/roundabout-turn.feature +++ b/features/guidance/roundabout-turn.feature @@ -24,19 +24,19 @@ Feature: Basic Roundabout | bgecb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | - | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | - | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | - | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | - | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | - | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | - | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | - | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | - | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | - | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | - | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | a,?,h | + | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | d,?,f | + | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | d,?,h | + | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | d,?,a | + | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | f,?,h | + | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | f,?,a | + | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | f,?,d | + | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | h,?,a | + | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | h,?,d | + | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | h,?,f | Scenario: Enter and Exit - Rotated Given the node map @@ -56,19 +56,19 @@ Feature: Basic Roundabout | bgecb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | - | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | - | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | - | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | - | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | - | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | - | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | - | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | - | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | - | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | - | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | a,?,h | + | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | d,?,f | + | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | d,?,h | + | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | d,?,a | + | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | f,?,h | + | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | f,?,a | + | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | f,?,d | + | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | h,?,a | + | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | h,?,d | + | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | h,?,f | Scenario: Only Enter Given the node map @@ -89,19 +89,19 @@ Feature: Basic Roundabout | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | a,c | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | a,e | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | a,g | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | d,e | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | d,g | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | d,b | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | f,g | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | f,b | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | f,c | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | h,b | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | h,c | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | - | h,e | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | a,b,c | + | a,e | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | a,b,e | + | a,g | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | a,b,g | + | d,e | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | d,c,e | + | d,g | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | d,c,g | + | d,b | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | d,c,b | + | f,g | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | f,e,g | + | f,b | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | f,e,b | + | f,c | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | f,e,c | + | h,b | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | h,g,b | + | h,c | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | h,g,c | + | h,e | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive | h,g,e | Scenario: Only Exit Given the node map @@ -122,19 +122,19 @@ Feature: Basic Roundabout | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | b,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | b,f | bcegb,ef,ef | depart,exit roundabout right,arrive | - | b,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | c,f | bcegb,ef,ef | depart,exit roundabout right,arrive | - | c,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | c,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | e,h | bcegb,gh,gh | depart,exit roundabout right,arrive | - | e,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | e,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | g,a | bcegb,ab,ab | depart,exit roundabout right,arrive | - | g,d | bcegb,cd,cd | depart,exit roundabout right,arrive | - | g,f | bcegb,ef,ef | depart,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | b,d | bcegb,cd,cd | depart,exit roundabout right,arrive | b,c,d | + | b,f | bcegb,ef,ef | depart,exit roundabout right,arrive | b,e,f | + | b,h | bcegb,gh,gh | depart,exit roundabout right,arrive | b,g,h | + | c,f | bcegb,ef,ef | depart,exit roundabout right,arrive | c,e,f | + | c,h | bcegb,gh,gh | depart,exit roundabout right,arrive | c,g,h | + | c,a | bcegb,ab,ab | depart,exit roundabout right,arrive | c,b,a | + | e,h | bcegb,gh,gh | depart,exit roundabout right,arrive | e,g,h | + | e,a | bcegb,ab,ab | depart,exit roundabout right,arrive | e,b,a | + | e,d | bcegb,cd,cd | depart,exit roundabout right,arrive | e,c,d | + | g,a | bcegb,ab,ab | depart,exit roundabout right,arrive | g,b,a | + | g,d | bcegb,cd,cd | depart,exit roundabout right,arrive | g,c,d | + | g,f | bcegb,ef,ef | depart,exit roundabout right,arrive | g,e,f | #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits Scenario: Drive Around @@ -156,19 +156,19 @@ Feature: Basic Roundabout | bcegb | roundabout | When I route I should get - | waypoints | route | turns | - | b,c | bcegb,bcegb | depart,arrive | - | b,e | bcegb,bcegb | depart,arrive | - | b,g | bcegb,bcegb | depart,arrive | - | c,e | bcegb,bcegb | depart,arrive | - | c,g | bcegb,bcegb | depart,arrive | - | c,b | bcegb,bcegb | depart,arrive | - | e,g | bcegb,bcegb | depart,arrive | - | e,b | bcegb,bcegb | depart,arrive | - | e,c | bcegb,bcegb | depart,arrive | - | g,b | bcegb,bcegb | depart,arrive | - | g,c | bcegb,bcegb | depart,arrive | - | g,e | bcegb,bcegb | depart,arrive | + | waypoints | route | turns | locations | + | b,c | bcegb,bcegb | depart,arrive | b,c | + | b,e | bcegb,bcegb | depart,arrive | b,e | + | b,g | bcegb,bcegb | depart,arrive | b,g | + | c,e | bcegb,bcegb | depart,arrive | c,e | + | c,g | bcegb,bcegb | depart,arrive | c,g | + | c,b | bcegb,bcegb | depart,arrive | c,b | + | e,g | bcegb,bcegb | depart,arrive | e,g | + | e,b | bcegb,bcegb | depart,arrive | e,b | + | e,c | bcegb,bcegb | depart,arrive | e,c | + | g,b | bcegb,bcegb | depart,arrive | g,b | + | g,c | bcegb,bcegb | depart,arrive | g,c | + | g,e | bcegb,bcegb | depart,arrive | g,e | Scenario: Mixed Entry and Exit - Not an Intersection Given the node map @@ -189,23 +189,23 @@ Feature: Basic Roundabout | bkheb | roundabout | yes | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc | depart,exit roundabout right,arrive | - | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive | - | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive | - | a,f | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive | - | d,f | def,def,def | depart,exit roundabout right,arrive | - | d,c | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive | - | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive | - | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive | - | g,i | ghi,ghi,ghi | depart,exit roundabout right,arrive | - | g,f | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive | - | g,c | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive | - | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive | - | j,l | jkl,jkl,jkl | depart,exit roundabout right,arrive | - | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive | - | j,f | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive | - | j,c | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc | depart,exit roundabout right,arrive | a,a,c | + | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive | a,?,j,l | + | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive | a,?,g,i | + | a,f | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive | a,?,d,f | + | d,f | def,def,def | depart,exit roundabout right,arrive | d,d,f | + | d,c | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive | d,?,a,c | + | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive | d,?,j,l | + | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive | d,?,g,i | + | g,i | ghi,ghi,ghi | depart,exit roundabout right,arrive | g,g,i | + | g,f | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive | g,?,d,f | + | g,c | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive | g,?,a,c | + | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive | g,?,j,l | + | j,l | jkl,jkl,jkl | depart,exit roundabout right,arrive | j,j,l | + | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive | j,?,g,i | + | j,f | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive | j,?,d,f | + | j,c | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive | j,?,a,c | Scenario: Segregated roads - Not an intersection Given the node map @@ -226,23 +226,23 @@ Feature: Basic Roundabout | bkheb | roundabout | yes | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive | - | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive | - | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive | - | a,f | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive | - | d,f | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive | - | d,c | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive | - | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive | - | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive | - | g,i | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive | - | g,f | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive | - | g,c | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive | - | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive | - | j,l | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive | - | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive | - | j,f | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive | - | j,c | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive | a,a,a,c | + | a,l | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive | a,?,j,l | + | a,i | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive | a,?,g,i | + | a,f | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive | a,?,d,f | + | d,f | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive | d,d,d,f | + | d,c | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive | d,?,a,c | + | d,l | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive | d,?,j,l | + | d,i | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive | d,?,g,i | + | g,i | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive | g,g,g,i | + | g,f | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive | g,?,d,f | + | g,c | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive | g,?,a,c | + | g,l | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive | g,?,j,l | + | j,l | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive | j,j,j,l | + | j,i | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive | j,?,g,i | + | j,f | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive | j,?,d,f | + | j,c | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive | j,?,a,c | Scenario: Collinear in X Given the node map @@ -259,9 +259,9 @@ Feature: Basic Roundabout | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce | depart,roundabout turn right exit-1,arrive | - | a,f | ab,df,df | depart,roundabout turn straight exit-2,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce | depart,roundabout turn right exit-1,arrive | a,?,e | + | a,f | ab,df,df | depart,roundabout turn straight exit-2,arrive | a,?,f | Scenario: Collinear in Y Given the node map @@ -281,9 +281,9 @@ Feature: Basic Roundabout | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce | depart,roundabout turn right exit-1,arrive | - | a,f | ab,df,df | depart,roundabout turn straight exit-2,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce | depart,roundabout turn right exit-1,arrive | a,?,e | + | a,f | ab,df,df | depart,roundabout turn straight exit-2,arrive | a,?,f | Scenario: Collinear in X,Y Given the node map @@ -302,9 +302,9 @@ Feature: Basic Roundabout | df | | When I route I should get - | waypoints | route | turns | - | a,e | ab,ce,ce | depart,roundabout turn straight exit-1,arrive | - | a,f | ab,df,df | depart,roundabout turn left exit-2,arrive | + | waypoints | route | turns | locations | + | a,e | ab,ce,ce | depart,roundabout turn straight exit-1,arrive | a,?,e | + | a,f | ab,df,df | depart,roundabout turn left exit-2,arrive | a,?,f | Scenario: Collinear in X,Y Given the node map @@ -323,9 +323,9 @@ Feature: Basic Roundabout | cf | | When I route I should get - | waypoints | route | turns | - | a,e | ad,be,be | depart,roundabout turn straight exit-1,arrive | - | a,f | ad,cf,cf | depart,roundabout turn left exit-2,arrive | + | waypoints | route | turns | locations | + | a,e | ad,be,be | depart,roundabout turn straight exit-1,arrive | a,?,e | + | a,f | ad,cf,cf | depart,roundabout turn left exit-2,arrive | a,?,f | Scenario: Collinear in X,Y Given the node map @@ -344,9 +344,9 @@ Feature: Basic Roundabout | bf | | When I route I should get - | waypoints | route | turns | - | a,e | ac,de,de | depart,roundabout turn straight exit-1,arrive | - | a,f | ac,bf,bf | depart,roundabout turn left exit-2,arrive | + | waypoints | route | turns | locations | + | a,e | ac,de,de | depart,roundabout turn straight exit-1,arrive | a,?,e | + | a,f | ac,bf,bf | depart,roundabout turn left exit-2,arrive | a,?,f | Scenario: Enter and Exit -- too complex Given the node map @@ -368,19 +368,19 @@ Feature: Basic Roundabout | bigecb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd,cd | depart,roundabout-exit-4,exit roundabout right,arrive | - | a,f | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive | - | a,h | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout right,arrive | - | d,f | cd,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive | - | d,h | cd,gh,gh,gh | depart,roundabout-exit-3,exit roundabout right,arrive | - | d,a | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive | - | f,h | ef,gh,gh,gh | depart,roundabout-exit-4,exit roundabout right,arrive | - | f,a | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive | - | f,d | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive | - | h,a | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive | - | h,d | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive | - | h,f | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd,cd | depart,roundabout-exit-4,exit roundabout right,arrive | a,?,c,d | + | a,f | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive | a,?,e,f | + | a,h | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout right,arrive | a,?,g,h | + | d,f | cd,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive | d,?,e,f | + | d,h | cd,gh,gh,gh | depart,roundabout-exit-3,exit roundabout right,arrive | d,?,g,h | + | d,a | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive | d,?,a,a | + | f,h | ef,gh,gh,gh | depart,roundabout-exit-4,exit roundabout right,arrive | f,?,g,h | + | f,a | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive | f,?,a,a | + | f,d | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive | f,?,c,d | + | h,a | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive | h,?,a,a | + | h,d | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive | h,?,c,d | + | h,f | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive | h,?,e,f | Scenario: Enter and Exit -- Non-Distinct Given the node map @@ -401,19 +401,19 @@ Feature: Basic Roundabout | bgecb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd,cd | depart,roundabout-exit-3,exit roundabout right,arrive | - | a,f | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive | - | a,h | ab,gh,gh,gh | depart,roundabout-exit-1,exit roundabout straight,arrive | - | d,f | cd,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive | - | d,h | cd,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive | - | d,a | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive | - | f,h | ef,gh,gh,gh | depart,roundabout-exit-3,exit roundabout straight,arrive | - | f,a | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive | - | f,d | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive | - | h,a | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive | - | h,d | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive | - | h,f | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd,cd | depart,roundabout-exit-3,exit roundabout right,arrive | a,?,c,d | + | a,f | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive | a,?,e,f | + | a,h | ab,gh,gh,gh | depart,roundabout-exit-1,exit roundabout straight,arrive | a,?,g,h | + | d,f | cd,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive | d,?,e,f | + | d,h | cd,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive | d,?,g,h | + | d,a | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive | d,?,a,a | + | f,h | ef,gh,gh,gh | depart,roundabout-exit-3,exit roundabout straight,arrive | f,?,g,h | + | f,a | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive | f,?,a,a | + | f,d | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive | f,?,c,d | + | h,a | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive | h,?,a,a | + | h,d | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive | h,?,c,d | + | h,f | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive | h,?,e,f | Scenario: Enter and Exit -- Bearing Given the node map @@ -434,10 +434,10 @@ Feature: Basic Roundabout | bgecb | roundabout | When I route I should get - | waypoints | route | turns | bearing | - | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | 0->180,180->225,90->0 | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | 0->180,180->225,180->0 | - | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | 0->180,180->225,270->0 | + | waypoints | route | turns | bearing | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | 0->180,180->225,90->0 | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | 0->180,180->225,180->0 | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | 0->180,180->225,270->0 | a,?,h | Scenario: Enter and Exit - Bearings Given the node map @@ -460,10 +460,10 @@ Feature: Basic Roundabout | bigjekclb | roundabout | When I route I should get - | waypoints | route | turns | bearing | - | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | 0->180,180->270,90->0 | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | 0->180,180->270,180->0 | - | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | 0->180,180->270,270->0 | + | waypoints | route | turns | bearing | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | 0->180,180->270,90->0 | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | 0->180,180->270,180->0 | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | 0->180,180->270,270->0 | a,?,h | Scenario: Large radius Roundabout Intersection and ways modelled out: East Mission St, North 7th St # http://www.openstreetmap.org/way/348812150 @@ -494,19 +494,19 @@ Feature: Basic Roundabout | bcdfgijkmnb | roundabout | tertiary | Roundabout | When I route I should get - | waypoints | route | turns | - | a,e | North 7th St,East Mission St,East Mission St | depart,roundabout turn right exit-1,arrive | - | a,h | North 7th St,North 7th St,North 7th St | depart,roundabout turn straight exit-2,arrive | - | a,l | North 7th St,East Mission St,East Mission St | depart,roundabout turn left exit-3,arrive | - | h,l | North 7th St,East Mission St,East Mission St | depart,roundabout turn right exit-1,arrive | - | h,a | North 7th St,North 7th St,North 7th St | depart,roundabout turn straight exit-2,arrive | - | h,e | North 7th St,East Mission St,East Mission St | depart,roundabout turn left exit-3,arrive | - | e,h | East Mission St,North 7th St,North 7th St | depart,roundabout turn right exit-1,arrive | - | e,l | East Mission St,East Mission St,East Mission St | depart,roundabout turn straight exit-2,arrive | - | e,a | East Mission St,North 7th St,North 7th St | depart,roundabout turn left exit-3,arrive | - | l,a | East Mission St,North 7th St,North 7th St | depart,roundabout turn right exit-1,arrive | - | l,e | East Mission St,East Mission St,East Mission St | depart,roundabout turn straight exit-2,arrive | - | l,h | East Mission St,North 7th St,North 7th St | depart,roundabout turn left exit-3,arrive | + | waypoints | route | turns | locations | + | a,e | North 7th St,East Mission St,East Mission St | depart,roundabout turn right exit-1,arrive | a,t,e | + | a,h | North 7th St,North 7th St,North 7th St | depart,roundabout turn straight exit-2,arrive | a,N,h | + | a,l | North 7th St,East Mission St,East Mission St | depart,roundabout turn left exit-3,arrive | a,t,l | + | h,l | North 7th St,East Mission St,East Mission St | depart,roundabout turn right exit-1,arrive | h,t,l | + | h,a | North 7th St,North 7th St,North 7th St | depart,roundabout turn straight exit-2,arrive | h,N,a | + | h,e | North 7th St,East Mission St,East Mission St | depart,roundabout turn left exit-3,arrive | h,t,e | + | e,h | East Mission St,North 7th St,North 7th St | depart,roundabout turn right exit-1,arrive | e,t,h | + | e,l | East Mission St,East Mission St,East Mission St | depart,roundabout turn straight exit-2,arrive | e,E,l | + | e,a | East Mission St,North 7th St,North 7th St | depart,roundabout turn left exit-3,arrive | e,t,a | + | l,a | East Mission St,North 7th St,North 7th St | depart,roundabout turn right exit-1,arrive | l,t,a | + | l,e | East Mission St,East Mission St,East Mission St | depart,roundabout turn straight exit-2,arrive | l,E,e | + | l,h | East Mission St,North 7th St,North 7th St | depart,roundabout turn left exit-3,arrive | l,t,h | Scenario: Enter and Exit - Traffic Signals Given the node map @@ -534,19 +534,19 @@ Feature: Basic Roundabout | bigjekclb | roundabout | When I route I should get - | waypoints | route | turns | - | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | - | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | - | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | - | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | - | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | - | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | - | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | - | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | - | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | - | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | - | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | - | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | + | waypoints | route | turns | locations | + | a,d | ab,cd,cd | depart,roundabout turn left exit-3,arrive | a,?,d | + | a,f | ab,ef,ef | depart,roundabout turn straight exit-2,arrive | a,?,f | + | a,h | ab,gh,gh | depart,roundabout turn right exit-1,arrive | a,?,h | + | d,f | cd,ef,ef | depart,roundabout turn left exit-3,arrive | d,?,f | + | d,h | cd,gh,gh | depart,roundabout turn straight exit-2,arrive | d,?,h | + | d,a | cd,ab,ab | depart,roundabout turn right exit-1,arrive | d,?,a | + | f,h | ef,gh,gh | depart,roundabout turn left exit-3,arrive | f,?,h | + | f,a | ef,ab,ab | depart,roundabout turn straight exit-2,arrive | f,?,a | + | f,d | ef,cd,cd | depart,roundabout turn right exit-1,arrive | f,?,d | + | h,a | gh,ab,ab | depart,roundabout turn left exit-3,arrive | h,?,a | + | h,d | gh,cd,cd | depart,roundabout turn straight exit-2,arrive | h,?,d | + | h,f | gh,ef,ef | depart,roundabout turn right exit-1,arrive | h,?,f | #http://www.openstreetmap.org/#map=19/41.03275/-2.18990 #at some point we probably want to recognise these situations and don't mention the roundabout at all here @@ -567,5 +567,5 @@ Feature: Basic Roundabout | ab | residential | in | | | When I route I should get - | waypoints | turns | route | - | a,f | depart,turn right,arrive | in,through,through | + | waypoints | turns | route | locations | + | a,f | depart,turn right,arrive | in,through,through | a,?,f | diff --git a/features/guidance/suffix-changes.feature b/features/guidance/suffix-changes.feature index 6ec44d2c787..d0d02b512ea 100644 --- a/features/guidance/suffix-changes.feature +++ b/features/guidance/suffix-changes.feature @@ -17,8 +17,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | 42 S | When I route I should get - | waypoints | route | turns | - | a,c | 42 N,42 S | depart,arrive | + | waypoints | route | turns | locations | + | a,c | 42 N,42 S | depart,arrive | a,c | Scenario: Suffix To Suffix Ref Given the node map @@ -32,8 +32,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | 42 S | 101 | When I route I should get - | waypoints | route | turns | ref | - | a,c | 42 N,42 S | depart,arrive | ,101 | + | waypoints | route | turns | ref | locations | + | a,c | 42 N,42 S | depart,arrive | ,101 | a,c | Scenario: Prefix Change Given the node map @@ -47,8 +47,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | East 42 | When I route I should get - | waypoints | route | turns | - | a,c | West 42,East 42 | depart,arrive | + | waypoints | route | turns | locations | + | a,c | West 42,East 42 | depart,arrive | a,c | Scenario: Prefix Change ref Given the node map @@ -62,8 +62,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | 42 | When I route I should get - | waypoints | route | turns | - | a,c | West 42,42 | depart,arrive | + | waypoints | route | turns | locations | + | a,c | West 42,42 | depart,arrive | a,c | Scenario: Prefix Change and Reference Given the node map @@ -77,8 +77,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | East 42 | | When I route I should get - | waypoints | route | turns | ref | - | a,c | West 42,East 42 | depart,arrive | 101, | + | waypoints | route | turns | ref | locations | + | a,c | West 42,East 42 | depart,arrive | 101, | a,c | Scenario: Suffix To Suffix - Turn Given the node map @@ -94,9 +94,9 @@ Feature: Suppress New Names on dedicated Suffices | bd | 42 E | When I route I should get - | waypoints | route | turns | - | a,c | 42 N,42 S | depart,arrive | - | a,d | 42 N,42 E,42 E | depart,continue right,arrive | + | waypoints | route | turns | locations | + | a,c | 42 N,42 S | depart,arrive | a,c | + | a,d | 42 N,42 E,42 E | depart,continue right,arrive | a,4,d | Scenario: Suffix To No Suffix Given the node map @@ -110,8 +110,8 @@ Feature: Suppress New Names on dedicated Suffices | bc | 42 | When I route I should get - | waypoints | route | turns | - | a,c | 42 N,42 | depart,arrive | + | waypoints | route | turns | locations | + | a,c | 42 N,42 | depart,arrive | a,c | Scenario: No Suffix To Suffix Given the node map @@ -125,6 +125,6 @@ Feature: Suppress New Names on dedicated Suffices | bc | 42 S | When I route I should get - | waypoints | route | turns | - | a,c | 42,42 S | depart,arrive | + | waypoints | route | turns | locations | + | a,c | 42,42 S | depart,arrive | a,c | diff --git a/features/guidance/suppressed.feature b/features/guidance/suppressed.feature index b0580996a41..3baca6576ef 100644 --- a/features/guidance/suppressed.feature +++ b/features/guidance/suppressed.feature @@ -18,8 +18,8 @@ Feature: Suppressed Turns | bfg | motorway_link | When I route I should get - | waypoints | route | turns | - | a,e | abcde,abcde | depart,arrive | + | waypoints | route | turns | locations | + | a,e | abcde,abcde | depart,arrive | a,e | Scenario: Do not announce reference changes Given the node map @@ -36,8 +36,8 @@ Feature: Suppressed Turns | ef | motorway | highway | A1 | When I route I should get - | waypoints | route | turns | ref | - | a,f | highway,highway | depart,arrive | A1,A1 | + | waypoints | route | turns | ref | locations | + | a,f | highway,highway | depart,arrive | A1,A1 | a,f | Scenario: Don't Announce Turn on following major road class -- service @@ -53,8 +53,8 @@ Feature: Suppressed Turns | bd | service | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | Scenario: Don't Announce Turn on following major road class -- residential Given the node map @@ -69,6 +69,6 @@ Feature: Suppressed Turns | bd | residential | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,bd,bd | depart,turn straight,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,bd,bd | depart,turn straight,arrive | a,b,d | diff --git a/features/guidance/trimming.feature b/features/guidance/trimming.feature index 2be378f7deb..4c6199891cb 100644 --- a/features/guidance/trimming.feature +++ b/features/guidance/trimming.feature @@ -50,5 +50,5 @@ Feature: General Post-Processing related features | fghij | When I route I should get - | waypoints | route | - | a,j | ef,ef | + | waypoints | route | locations | + | a,j | ef,ef | | diff --git a/features/guidance/turn.feature b/features/guidance/turn.feature index 450fddd6043..8e3e164cbd1 100644 --- a/features/guidance/turn.feature +++ b/features/guidance/turn.feature @@ -21,19 +21,19 @@ Feature: Simple Turns | eb | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,cb,cb | depart,turn left,arrive | - | a,e | ab,eb | depart,arrive | - | a,d | ab,db,db | depart,turn right,arrive | - | c,a | cb,ab,ab | depart,turn right,arrive | - | c,d | cb,db | depart,arrive | - | c,e | cb,eb,eb | depart,turn left,arrive | - | d,a | db,ab,ab | depart,turn left,arrive | - | d,c | db,cb | depart,arrive | - | d,e | db,eb,eb | depart,turn right,arrive | - | e,a | eb,ab | depart,arrive | - | e,c | eb,cb,cb | depart,turn right,arrive | - | e,d | eb,db,db | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,cb,cb | depart,turn left,arrive | a,b,c | + | a,e | ab,eb | depart,arrive | a,e | + | a,d | ab,db,db | depart,turn right,arrive | a,b,d | + | c,a | cb,ab,ab | depart,turn right,arrive | c,b,a | + | c,d | cb,db | depart,arrive | c,d | + | c,e | cb,eb,eb | depart,turn left,arrive | c,b,e | + | d,a | db,ab,ab | depart,turn left,arrive | d,b,a | + | d,c | db,cb | depart,arrive | d,c | + | d,e | db,eb,eb | depart,turn right,arrive | d,b,e | + | e,a | eb,ab | depart,arrive | e,a | + | e,c | eb,cb,cb | depart,turn right,arrive | e,b,c | + | e,d | eb,db,db | depart,turn left,arrive | e,b,d | Scenario: Rotated Four Way Intersection Given the node map @@ -51,19 +51,19 @@ Feature: Simple Turns | eb | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,cb,cb | depart,turn left,arrive | - | a,e | ab,eb | depart,arrive | - | a,d | ab,db,db | depart,turn right,arrive | - | c,a | cb,ab,ab | depart,turn right,arrive | - | c,d | cb,db | depart,arrive | - | c,e | cb,eb,eb | depart,turn left,arrive | - | d,a | db,ab,ab | depart,turn left,arrive | - | d,c | db,cb | depart,arrive | - | d,e | db,eb,eb | depart,turn right,arrive | - | e,a | eb,ab | depart,arrive | - | e,c | eb,cb,cb | depart,turn right,arrive | - | e,d | eb,db,db | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,cb,cb | depart,turn left,arrive | a,b,c | + | a,e | ab,eb | depart,arrive | a,e | + | a,d | ab,db,db | depart,turn right,arrive | a,b,d | + | c,a | cb,ab,ab | depart,turn right,arrive | c,b,a | + | c,d | cb,db | depart,arrive | c,d | + | c,e | cb,eb,eb | depart,turn left,arrive | c,b,e | + | d,a | db,ab,ab | depart,turn left,arrive | d,b,a | + | d,c | db,cb | depart,arrive | d,c | + | d,e | db,eb,eb | depart,turn right,arrive | d,b,e | + | e,a | eb,ab | depart,arrive | e,a | + | e,c | eb,cb,cb | depart,turn right,arrive | e,b,c | + | e,d | eb,db,db | depart,turn left,arrive | e,b,d | Scenario: Four Way Intersection Through Street @@ -81,19 +81,19 @@ Feature: Simple Turns | db | primary | When I route I should get - | waypoints | route | turns | - | a,c | abe,cb,cb | depart,turn left,arrive | - | a,e | abe,abe | depart,arrive | - | a,d | abe,db,db | depart,turn right,arrive | - | c,a | cb,abe,abe | depart,turn right,arrive | - | c,d | cb,db | depart,arrive | - | c,e | cb,abe,abe | depart,turn left,arrive | - | d,a | db,abe,abe | depart,turn left,arrive | - | d,c | db,cb | depart,arrive | - | d,e | db,abe,abe | depart,turn right,arrive | - | e,a | abe,abe | depart,arrive | - | e,c | abe,cb,cb | depart,turn right,arrive | - | e,d | abe,db,db | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | abe,cb,cb | depart,turn left,arrive | a,b,c | + | a,e | abe,abe | depart,arrive | a,e | + | a,d | abe,db,db | depart,turn right,arrive | a,b,d | + | c,a | cb,abe,abe | depart,turn right,arrive | c,b,a | + | c,d | cb,db | depart,arrive | c,d | + | c,e | cb,abe,abe | depart,turn left,arrive | c,b,e | + | d,a | db,abe,abe | depart,turn left,arrive | d,b,a | + | d,c | db,cb | depart,arrive | d,c | + | d,e | db,abe,abe | depart,turn right,arrive | d,b,e | + | e,a | abe,abe | depart,arrive | e,a | + | e,c | abe,cb,cb | depart,turn right,arrive | e,b,c | + | e,d | abe,db,db | depart,turn left,arrive | e,b,d | Scenario: Four Way Intersection Double Through Street Given the node map @@ -109,19 +109,19 @@ Feature: Simple Turns | cbd | primary | When I route I should get - | waypoints | route | turns | - | a,c | abe,cbd,cbd | depart,turn left,arrive | - | a,e | abe,abe | depart,arrive | - | a,d | abe,cbd,cbd | depart,turn right,arrive | - | c,a | cbd,abe,abe | depart,turn right,arrive | - | c,d | cbd,cbd | depart,arrive | - | c,e | cbd,abe,abe | depart,turn left,arrive | - | d,a | cbd,abe,abe | depart,turn left,arrive | - | d,c | cbd,cbd | depart,arrive | - | d,e | cbd,abe,abe | depart,turn right,arrive | - | e,a | abe,abe | depart,arrive | - | e,c | abe,cbd,cbd | depart,turn right,arrive | - | e,d | abe,cbd,cbd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | abe,cbd,cbd | depart,turn left,arrive | a,b,c | + | a,e | abe,abe | depart,arrive | a,e | + | a,d | abe,cbd,cbd | depart,turn right,arrive | a,b,d | + | c,a | cbd,abe,abe | depart,turn right,arrive | c,b,a | + | c,d | cbd,cbd | depart,arrive | c,d | + | c,e | cbd,abe,abe | depart,turn left,arrive | c,b,e | + | d,a | cbd,abe,abe | depart,turn left,arrive | d,b,a | + | d,c | cbd,cbd | depart,arrive | d,c | + | d,e | cbd,abe,abe | depart,turn right,arrive | d,b,e | + | e,a | abe,abe | depart,arrive | e,a | + | e,c | abe,cbd,cbd | depart,turn right,arrive | e,b,c | + | e,d | abe,cbd,cbd | depart,turn left,arrive | e,b,d | Scenario: Three Way Intersection Given the node map @@ -137,11 +137,11 @@ Feature: Simple Turns | db | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,cb,cb | depart,turn left,arrive | - | a,d | ab,db | depart,arrive | - | d,c | db,cb,cb | depart,turn right,arrive | - | d,a | db,ab | depart,arrive | + | waypoints | route | turns | locations | + | a,c | ab,cb,cb | depart,turn left,arrive | a,b,c | + | a,d | ab,db | depart,arrive | a,d | + | d,c | db,cb,cb | depart,turn right,arrive | d,b,c | + | d,a | db,ab | depart,arrive | d,a | Scenario: Three Way Intersection - Meeting Oneways Given the node map @@ -157,9 +157,9 @@ Feature: Simple Turns | db | primary | yes | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,turn left,arrive | - | d,c | db,bc,bc | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,turn left,arrive | a,b,c | + | d,c | db,bc,bc | depart,turn right,arrive | d,b,c | Scenario: Three Way Intersection on Through Street Given the node map @@ -174,11 +174,11 @@ Feature: Simple Turns | db | primary | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | a,d | abc,db,db | depart,turn left,arrive | - | c,a | abc,abc | depart,arrive | - | c,d | abc,db,db | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | a,d | abc,db,db | depart,turn left,arrive | a,b,d | + | c,a | abc,abc | depart,arrive | c,a | + | c,d | abc,db,db | depart,turn right,arrive | c,b,d | Scenario: High Degree Intersection Given the node map @@ -204,14 +204,14 @@ Feature: Simple Turns | ai | primary | When I route I should get - | waypoints | route | turns | - | b,c | ab,ac,ac | depart,turn sharp left,arrive | - | b,d | ab,ad,ad | depart,turn left,arrive | - | b,e | ab,ae,ae | depart,turn slight left,arrive | - | b,f | ab,af | depart,arrive | - | b,g | ab,ag,ag | depart,turn slight right,arrive | - | b,h | ab,ah,ah | depart,turn right,arrive | - | b,i | ab,ai,ai | depart,turn sharp right,arrive | + | waypoints | route | turns | locations | + | b,c | ab,ac,ac | depart,turn sharp left,arrive | b,a,c | + | b,d | ab,ad,ad | depart,turn left,arrive | b,a,d | + | b,e | ab,ae,ae | depart,turn slight left,arrive | b,a,e | + | b,f | ab,af | depart,arrive | b,f | + | b,g | ab,ag,ag | depart,turn slight right,arrive | b,a,g | + | b,h | ab,ah,ah | depart,turn right,arrive | b,a,h | + | b,i | ab,ai,ai | depart,turn sharp right,arrive | b,a,i | Scenario: Disturbed High Degree Intersection Given the node map @@ -237,14 +237,14 @@ Feature: Simple Turns | ai | primary | When I route I should get - | waypoints | route | turns | - | b,c | ab,ac,ac | depart,turn sharp left,arrive | - | b,d | ab,ad,ad | depart,turn left,arrive | - | b,e | ab,ae,ae | depart,turn slight left,arrive | - | b,f | ab,af | depart,arrive | - | b,g | ab,ag,ag | depart,turn slight right,arrive | - | b,h | ab,ah,ah | depart,turn right,arrive | - | b,i | ab,ai,ai | depart,turn sharp right,arrive | + | waypoints | route | turns | locations | + | b,c | ab,ac,ac | depart,turn sharp left,arrive | b,a,c | + | b,d | ab,ad,ad | depart,turn left,arrive | b,a,d | + | b,e | ab,ae,ae | depart,turn slight left,arrive | b,a,e | + | b,f | ab,af | depart,arrive | b,f | + | b,g | ab,ag,ag | depart,turn slight right,arrive | b,a,g | + | b,h | ab,ah,ah | depart,turn right,arrive | b,a,h | + | b,i | ab,ai,ai | depart,turn sharp right,arrive | b,a,i | Scenario: Turn instructions at high latitude Given the node locations @@ -272,11 +272,11 @@ Feature: Simple Turns | wy | When I route I should get - | from | to | route | turns | - | a | c | ab,bc,bc | depart,turn left,arrive | - | c | a | bc,ab,ab | depart,turn right,arrive | - | x | z | xy,yz,yz | depart,turn right,arrive | - | z | x | yz,xy,xy | depart,turn left,arrive | + | from | to | route | turns | locations | + | a | c | ab,bc,bc | depart,turn left,arrive | a,b,c | + | c | a | bc,ab,ab | depart,turn right,arrive | c,b,a | + | x | z | xy,yz,yz | depart,turn right,arrive | x,y,z | + | z | x | yz,xy,xy | depart,turn left,arrive | z,y,x | Scenario: Three Way Similar Sharp Turns Given the node map @@ -293,11 +293,11 @@ Feature: Simple Turns | bd | primary | When I route I should get - | waypoints | route | turns | - | a,c | ab,bc,bc | depart,turn sharp right,arrive | - | a,d | ab,bd,bd | depart,turn sharp right,arrive | - | d,c | bd,bc,bc | depart,turn sharp left,arrive | - | d,a | bd,ab,ab | depart,turn sharp left,arrive | + | waypoints | route | turns | locations | + | a,c | ab,bc,bc | depart,turn sharp right,arrive | a,b,c | + | a,d | ab,bd,bd | depart,turn sharp right,arrive | a,b,d | + | d,c | bd,bc,bc | depart,turn sharp left,arrive | d,b,c | + | d,a | bd,ab,ab | depart,turn sharp left,arrive | d,b,a | Scenario: Left Turn Assignment (1) Given the node map @@ -314,8 +314,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn slight left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn slight left,arrive | a,b,d | Scenario: Left Turn Assignment (2) Given the node map @@ -333,8 +333,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn left,arrive | a,b,d | Scenario: Left Turn Assignment (3) Given the node map @@ -353,8 +353,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn left,arrive | a,b,d | Scenario: Left Turn Assignment (4) Given the node map @@ -374,8 +374,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn left,arrive | a,b,d | Scenario: Left Turn Assignment (5) Given the node map @@ -394,8 +394,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn left,arrive | a,b,d | Scenario: Left Turn Assignment (6) Given the node map @@ -413,8 +413,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp left,arrive | a,b,d | Scenario: Left Turn Assignment (7) Given the node map @@ -431,8 +431,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp left,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp left,arrive | a,b,d | Scenario: Right Turn Assignment (1) Given the node map @@ -449,8 +449,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | Scenario: Right Turn Assignment (2) Given the node map @@ -468,8 +468,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | Scenario: Right Turn Assignment (3) Given the node map @@ -488,8 +488,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | Scenario: Right Turn Assignment (4) Given the node map @@ -509,8 +509,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | Scenario: Right Turn Assignment (5) Given the node map @@ -529,8 +529,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | Scenario: Right Turn Assignment (6) Given the node map @@ -549,8 +549,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp right,arrive | a,b,d | Scenario: Right Turn Assignment (7) Given the node map @@ -568,8 +568,8 @@ Feature: Simple Turns | be | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp right,arrive | a,b,d | Scenario: Right Turn Assignment Two Turns Given the node map @@ -589,9 +589,9 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp right,arrive | - | a,e | abc,be,be | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn right,arrive | a,b,e | Scenario: Right Turn Assignment Two Turns (2) Given the node map @@ -611,9 +611,9 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | - | a,e | abc,be,be | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn slight right,arrive | a,b,e | Scenario: Right Turn Assignment Two Turns (3) Given the node map @@ -633,9 +633,9 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | - | a,e | abc,be,be | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn slight right,arrive | a,b,e | Scenario: Right Turn Assignment Two Turns (4) Given the node map @@ -655,9 +655,9 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | - | a,e | abc,be,be | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn slight right,arrive | a,b,e | Scenario: Right Turn Assignment Three Turns Given the node map @@ -677,10 +677,10 @@ Feature: Simple Turns | bg | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp right,arrive | - | a,e | abc,be,be | depart,turn right,arrive | - | a,f | abc,bf,bf | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn right,arrive | a,b,e | + | a,f | abc,bf,bf | depart,turn slight right,arrive | a,b,f | Scenario: Slight Turn involving Oneways Given the node map @@ -698,10 +698,10 @@ Feature: Simple Turns | dbe | primary | no | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | d,e | dbe,dbe | depart,arrive | - | e,d | dbe,dbe | depart,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | d,e | dbe,dbe | depart,arrive | d,e | + | e,d | dbe,dbe | depart,arrive | e,d | Scenario: Slight Turn involving Oneways Given the node map @@ -720,10 +720,10 @@ Feature: Simple Turns | dbe | primary | no | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | d,e | dbe,dbe | depart,arrive | - | e,d | dbe,dbe | depart,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | d,e | dbe,dbe | depart,arrive | d,e | + | e,d | dbe,dbe | depart,arrive | e,d | Scenario: Slight Turn involving Oneways - Name Change @@ -743,10 +743,10 @@ Feature: Simple Turns | be | primary | no | When I route I should get - | waypoints | route | turns | - | a,c | abc,abc | depart,arrive | - | d,e | db,be | depart,arrive | - | e,d | be,db | depart,arrive | + | waypoints | route | turns | locations | + | a,c | abc,abc | depart,arrive | a,c | + | d,e | db,be | depart,arrive | d,e | + | e,d | be,db | depart,arrive | e,d | Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 1 Given the node map @@ -766,9 +766,9 @@ Feature: Simple Turns | bg | primary | no | When I route I should get - | waypoints | route | turns | - | a,e | abc,eb,eb | depart,turn right,arrive | - | a,f | abc,fb,fb | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,e | abc,eb,eb | depart,turn right,arrive | a,b,e | + | a,f | abc,fb,fb | depart,turn slight right,arrive | a,b,f | Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 2 Given the node map @@ -788,9 +788,9 @@ Feature: Simple Turns | bg | primary | yes | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn right,arrive | - | a,f | abc,bf,bf | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn right,arrive | a,b,d | + | a,f | abc,bf,bf | depart,turn slight right,arrive | a,b,f | Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 3 Given the node map @@ -810,9 +810,9 @@ Feature: Simple Turns | bg | primary | no | When I route I should get - | waypoints | route | turns | - | a,d | abc,db,db | depart,turn sharp right,arrive | - | a,e | abc,be,be | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,db,db | depart,turn sharp right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn right,arrive | a,b,e | Scenario: Conflicting Turns with well distinguished turn Given the node map @@ -831,10 +831,10 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn slight right,arrive | - | a,e | abc,be,be | depart,turn right,arrive | - | a,f | abc,bf,bf | depart,turn sharp right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn slight right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn right,arrive | a,b,e | + | a,f | abc,bf,bf | depart,turn sharp right,arrive | a,b,f | Scenario: Conflicting Turns with well distinguished turn (back) Given the node map @@ -853,10 +853,10 @@ Feature: Simple Turns | bf | primary | When I route I should get - | waypoints | route | turns | - | a,d | abc,bd,bd | depart,turn sharp right,arrive | - | a,e | abc,be,be | depart,turn right,arrive | - | a,f | abc,bf,bf | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | abc,bd,bd | depart,turn sharp right,arrive | a,b,d | + | a,e | abc,be,be | depart,turn right,arrive | a,b,e | + | a,f | abc,bf,bf | depart,turn slight right,arrive | a,b,f | Scenario: Turn Lane on Splitting up Road Given the node map @@ -882,10 +882,10 @@ Feature: Simple Turns | restriction | ehb | be | b | no_left_turn | When I route I should get - | waypoints | route | turns | - | a,d | road,road | depart,arrive | - | d,i | road,cross,cross | depart,turn left,arrive | - | d,g | road,road | depart,arrive | + | waypoints | route | turns | locations | + | a,d | road,road | depart,arrive | a,d | + | d,i | road,cross,cross | depart,turn left,arrive | d,r,i | + | d,g | road,road | depart,arrive | d,g | Scenario: Go onto turning major road Given the node map @@ -904,10 +904,10 @@ Feature: Simple Turns | bd | residential | in | 1 | When I route I should get - | waypoints | turns | route | - | a,c | depart,arrive | road,road | - | d,a | depart,turn left,arrive | in,road,road | - | d,c | depart,arrive | in,road | + | waypoints | turns | route | locations | + | a,c | depart,arrive | road,road | a,c | + | d,a | depart,turn left,arrive | in,road,road | d,?,a | + | d,c | depart,arrive | in,road | d,c | Scenario: Channing Street Given the node map @@ -933,9 +933,9 @@ Feature: Simple Turns | gch | North Capitol Street Northeast | primary | yes | When I route I should get - | waypoints | turns | route | - | a,d | depart,arrive | Channing Street Northeast,Channing Street Northwest | - | a,h | depart,turn left,arrive | Channing Street Northeast,North Capitol Street Northeast,North Capitol Street Northeast | + | waypoints | turns | route | locations | + | a,d | depart,arrive | Channing Street Northeast,Channing Street Northwest | a,d | + | a,h | depart,turn left,arrive | Channing Street Northeast,North Capitol Street Northeast,North Capitol Street Northeast | a,t,h | Scenario: V St NW, Florida Ave NW: Turn Instruction # https://www.mapillary.com/app/?focus=map&lat=38.91815595&lng=-77.03880249&z=17&pKey=sCxepTOCTZD3OoBXuqGEOw @@ -956,8 +956,8 @@ Feature: Simple Turns | yd | Champlain St NW | residential | | When I route I should get - | waypoints | turns | route | - | a,e | depart,turn left,arrive | V St NW,Florida Ave NW,Florida Ave NW | + | waypoints | turns | route | locations | + | a,e | depart,turn left,arrive | V St NW,Florida Ave NW,Florida Ave NW | a,W,e | # http://www.openstreetmap.org/node/182805179 Scenario: Make Sharp Left at Traffic Signal @@ -991,8 +991,8 @@ Feature: Simple Turns | kh | kh | trunk_link | yes | When I route I should get - | waypoints | turns | route | - | a,q | depart,off ramp right,turn sharp left,arrive | Blue Star Memorial Hwy,bcde,Centreville Road,Centreville Road | + | waypoints | turns | route | locations | + | a,q | depart,off ramp right,turn sharp left,arrive | Blue Star Memorial Hwy,bcde,Centreville Road,Centreville Road | a,e,e,q | @todo # https://www.openstreetmap.org/#map=20/52.51609/13.41080 @@ -1012,9 +1012,9 @@ Feature: Simple Turns | ec | Molkenmarkt | secondary | yes | When I route I should get - | waypoints | turns | route | - | a,d | depart,arrive | Molkenmarkt,Stralauer Str | - | e,d | depart,arrive | Molkenmarkt,Stralauer Str | + | waypoints | turns | route | locations | + | a,d | depart,arrive | Molkenmarkt,Stralauer Str | a,d | + | e,d | depart,arrive | Molkenmarkt,Stralauer Str | e,d | Scenario: Unnecessary Slight Left onto Stralauer Strasse Given the node map @@ -1032,9 +1032,9 @@ Feature: Simple Turns | ec | Molkenmarkt | secondary | yes | When I route I should get - | waypoints | turns | route | - | a,d | depart,arrive | Molkenmarkt,Stralauer Str | - | e,d | depart,arrive | Molkenmarkt,Stralauer Str | + | waypoints | turns | route | locations | + | a,d | depart,arrive | Molkenmarkt,Stralauer Str | a,d | + | e,d | depart,arrive | Molkenmarkt,Stralauer Str | e,d | # http://www.openstreetmap.org/#map=18/39.28158/-76.62291 @3002 @@ -1051,9 +1051,9 @@ Feature: Simple Turns | bd | primary_link | | When I route I should get - | waypoints | turns | route | - | a,c | depart,arrive | road,road | - | a,d | depart,turn slight right,arrive | road,, | + | waypoints | turns | route | locations | + | a,c | depart,arrive | road,road | a,c | + | a,d | depart,turn slight right,arrive | road,, | a,?,d | # http://www.openstreetmap.org/#map=18/39.28158/-76.62291 @3002 @@ -1071,9 +1071,9 @@ Feature: Simple Turns | edf | primary_link | | When I route I should get - | waypoints | turns | route | - | a,c | depart,arrive | road,road | - | a,f | depart,turn slight right,arrive | road,, | + | waypoints | turns | route | locations | + | a,c | depart,arrive | road,road | a,c | + | a,f | depart,turn slight right,arrive | road,, | a,?,f | # http://www.openstreetmap.org/#map=18/39.28158/-76.62291 @3002 @@ -1090,9 +1090,9 @@ Feature: Simple Turns | bd | primary_link | | When I route I should get - | waypoints | turns | route | - | a,c | depart,arrive | road,road | - | a,d | depart,turn slight left,arrive | road,, | + | waypoints | turns | route | locations | + | a,c | depart,arrive | road,road | a,c | + | a,d | depart,turn slight left,arrive | road,, | a,?,d | # http://www.openstreetmap.org/#map=18/39.28158/-76.62291 @3002 @@ -1110,9 +1110,9 @@ Feature: Simple Turns | edf | primary_link | | When I route I should get - | waypoints | turns | route | - | a,f | depart,turn slight left,arrive | road,, | - | a,c | depart,arrive | road,road | + | waypoints | turns | route | locations | + | a,f | depart,turn slight left,arrive | road,, | a,?,f | + | a,c | depart,arrive | road,road | a,c | Scenario: Non-Obvious Turn Next to service road Given the node map @@ -1147,8 +1147,8 @@ Feature: Simple Turns | bd | service | | When I route I should get - | waypoints | route | turns | - | a,c | in,through,through | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,c | in,through,through | depart,turn left,arrive | a,?,c | # http://www.openstreetmap.org/#map=19/52.51556/13.41832 Scenario: No Slight Right at Stralauer Strasse @@ -1177,8 +1177,8 @@ Feature: Simple Turns | kchm | Alexanderstr | primary | yes | When I route I should get - | waypoints | turns | route | - | a,e | depart,arrive | Stralauer Str,Holzmarktstr | + | waypoints | turns | route | locations | + | a,e | depart,arrive | Stralauer Str,Holzmarktstr | a,e | Scenario: No Slight Right at Stralauer Strasse -- less extreme Given the node map @@ -1206,8 +1206,8 @@ Feature: Simple Turns | kchm | Alexanderstr | primary | yes | When I route I should get - | waypoints | turns | route | - | a,e | depart,arrive | Stralauer Str,Holzmarktstr | + | waypoints | turns | route | locations | + | a,e | depart,arrive | Stralauer Str,Holzmarktstr | a,e | Scenario: No Slight Right at Stralauer Strasse Given the node map @@ -1235,8 +1235,8 @@ Feature: Simple Turns | kchm | Alexanderstr | primary | yes | When I route I should get - | waypoints | turns | route | - | a,d | depart,arrive | Stralauer Str,Holzmarktstr | + | waypoints | turns | route | locations | + | a,d | depart,arrive | Stralauer Str,Holzmarktstr | a,d | #http://www.openstreetmap.org/#map=19/49.48761/8.47618 @todo @3365 @@ -1259,9 +1259,9 @@ Feature: Simple Turns | fbg | Fried | | yes | When I route I should get - | waypoints | route | turns | - | a,d | Goethe,Fried,Fried | depart,continue left,arrive | - | a,g | Goethe,Fried,Fried | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,d | Goethe,Fried,Fried | depart,continue left,arrive | a,e,d | + | a,g | Goethe,Fried,Fried | depart,turn right,arrive | a,e,g | # Conflicting roads (https://www.openstreetmap.org/export#map=19/37.57805/-77.46049) Scenario: Turning at forklike structure @@ -1279,8 +1279,8 @@ Feature: Simple Turns | eb | some | yes | tertiary_link | When I route I should get - | waypoints | route | turns | - | a,d | foo,bar,bar | depart,turn slight right,arrive | + | waypoints | route | turns | locations | + | a,d | foo,bar,bar | depart,turn slight right,arrive | a,?,d | Scenario: UTurn onto ramp Given the node map @@ -1299,8 +1299,8 @@ Feature: Simple Turns When I route I should get - | waypoints | route | ref | turns | - | a,h | Road,,, | ,,C 42,C 42 | depart,on ramp right,merge slight left,arrive | + | waypoints | route | ref | turns | locations | + | a,h | Road,,, | ,,C 42,C 42 | depart,on ramp right,merge slight left,arrive | a,?,?,h | Scenario: UTurn onto ramp (same ref) Given the node map @@ -1319,8 +1319,8 @@ Feature: Simple Turns When I route I should get - | waypoints | route | ref | turns | - | a,h | Road,,, | C 42,,C 42,C 42 | depart,on ramp right,merge slight left,arrive | + | waypoints | route | ref | turns | locations | + | a,h | Road,,, | C 42,,C 42,C 42 | depart,on ramp right,merge slight left,arrive | a,?,?,h | Scenario: End of road, T-intersection, no obvious turn, only one road allowed Given the node map @@ -1349,8 +1349,8 @@ Feature: Simple Turns | restriction | be | ef | e | only_right_turn | When I route I should get - | waypoints | route | turns | - | a,d | ab,dc,dc | depart,turn left,arrive | + | waypoints | route | turns | locations | + | a,d | ab,dc,dc | depart,turn left,arrive | a,?,d | # https://www.openstreetmap.org/node/1332083066 @@ -1369,9 +1369,9 @@ Feature: Simple Turns | befg | primary | yes | When I route I should get - | waypoints | route | turns | - | a,d | ab,bcd,bcd | depart,fork slight right,arrive | - | a,g | ab,befg,befg | depart,fork slight left,arrive | + | waypoints | route | turns | locations | + | a,d | ab,bcd,bcd | depart,fork slight right,arrive | a,b,d | + | a,g | ab,befg,befg | depart,fork slight left,arrive | a,b,g | @routing @car Scenario: No turn instruction when turning from unnamed onto unnamed @@ -1399,9 +1399,9 @@ Feature: Simple Turns | bc | secondary | | | When I route I should get - | from | to | route | ref | turns | - | d | c | ,, | L 460,, | depart,turn right,arrive | - | c | d | ,, | ,L 460,L 460 | depart,turn left,arrive | + | from | to | route | ref | turns | locations | + | d | c | ,, | L 460,, | depart,turn right,arrive | d,?,c | + | c | d | ,, | ,L 460,L 460 | depart,turn left,arrive | c,?,d | # https://www.openstreetmap.org/#map=18/52.25130/10.42545 Scenario: Turn for roads with no name, ref changes @@ -1427,8 +1427,8 @@ Feature: Simple Turns | ce | residential | | Heinrichshöhe | When I route I should get - | waypoints | route | turns | - | a,f | ,, | depart,turn right,arrive | + | waypoints | route | turns | locations | + | a,f | ,, | depart,turn right,arrive | a,?,f | # https://www.openstreetmap.org/#map=18/52.24071/10.29066 Scenario: Turn for roads with no name, ref changes @@ -1460,6 +1460,6 @@ Feature: Simple Turns | etcpf | primary | B 1 | | no | When I route I should get - | waypoints | route | turns | - | e,x | ,, | depart,turn left,arrive | - | f,a | ,, | depart,turn left,arrive | + | waypoints | route | turns | locations | + | e,x | ,, | depart,turn left,arrive | e,?,x | + | f,a | ,, | depart,turn left,arrive | f,?,a |