diff --git a/features/car/advisory.feature b/features/car/advisory.feature index 0058e66ba..b84ff0555 100644 --- a/features/car/advisory.feature +++ b/features/car/advisory.feature @@ -17,8 +17,8 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | a | b | ab | 47 km/h +- 1 | - | b | c | bc | 47 km/h +- 1 | + | a | b | ab,ab | 47 km/h +- 1 | + | b | c | bc,bc | 47 km/h +- 1 | Scenario: Car - Advisory speed overwrites forward maxspeed Given the node map @@ -31,8 +31,8 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | a | b | ab | 47 km/h +- 1 | - | b | c | bc | 47 km/h +- 1 | + | a | b | ab,ab | 47 km/h +- 1 | + | b | c | bc,bc | 47 km/h +- 1 | @mokob @2162 Scenario: Car - Advisory speed overwrites backwards maxspeed @@ -46,8 +46,8 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | b | a | ab | 47 km/h +- 1 | - | c | b | bc | 47 km/h +- 1 | + | b | a | ab,ab | 47 km/h +- 1 | + | c | b | bc,bc | 47 km/h +- 1 | @mokob @2162 @deleteme Scenario: Car - Advisory speed overwrites backwards maxspeed @@ -62,8 +62,8 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | c | b | bc | 47 km/h +- 1 | - | d | c | cd | 47 km/h +- 1 | + | c | b | bc,bc | 47 km/h +- 1 | + | d | c | cd,cd | 47 km/h +- 1 | @mokob @2162 Scenario: Car - Directional advisory speeds play nice with eachother @@ -77,9 +77,9 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | a | b | ab | 47 km/h +- 1 | - | b | a | ab | 59 km/h +- 1 | - | b | c | bc | 59 km/h +- 1 | - | c | b | bc | 47 km/h +- 1 | + | a | b | ab,ab | 47 km/h +- 1 | + | b | a | ab,ab | 59 km/h +- 1 | + | b | c | bc,bc | 59 km/h +- 1 | + | c | b | bc,bc | 47 km/h +- 1 | diff --git a/features/car/bridge.feature b/features/car/bridge.feature index e1d0df696..931f1d9a7 100644 --- a/features/car/bridge.feature +++ b/features/car/bridge.feature @@ -17,15 +17,15 @@ Feature: Car - Handle movable bridge | efg | primary | | | When I route I should get - | from | to | route | modes | - | a | g | abc,cde,efg | driving,movable bridge,driving | - | b | f | abc,cde,efg | driving,movable bridge,driving | - | e | c | cde | movable bridge | - | e | b | cde,abc | movable bridge,driving | - | e | a | cde,abc | movable bridge,driving | - | c | e | cde | movable bridge | - | c | f | cde,efg | movable bridge,driving | - | c | g | cde,efg | movable bridge,driving | + | from | to | route | modes | + | a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving | + | b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving | + | e | c | cde,cde | movable bridge,movable bridge | + | e | b | cde,abc,abc | movable bridge,driving,driving | + | e | a | cde,abc,abc | movable bridge,driving,driving | + | c | e | cde,cde | movable bridge,movable bridge | + | c | f | cde,efg,efg | movable bridge,driving,driving | + | c | g | cde,efg,efg | movable bridge,driving,driving | Scenario: Car - Properly handle durations Given the node map @@ -40,8 +40,8 @@ Feature: Car - Handle movable bridge | efg | primary | | | When I route I should get - | from | to | route | modes | speed | - | a | g | abc,cde,efg | driving,movable bridge,driving | 7 km/h | - | b | f | abc,cde,efg | driving,movable bridge,driving | 5 km/h | - | c | e | cde | movable bridge | 2 km/h | - | e | c | cde | movable bridge | 2 km/h | + | from | to | route | modes | speed | + | a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving | 7 km/h | + | b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving | 5 km/h | + | c | e | cde,cde | movable bridge,movable bridge | 2 km/h | + | e | c | cde,cde | movable bridge,movable bridge | 2 km/h | diff --git a/features/car/ferry.feature b/features/car/ferry.feature index 6ea5a6151..c6adc9fa1 100644 --- a/features/car/ferry.feature +++ b/features/car/ferry.feature @@ -17,15 +17,15 @@ Feature: Car - Handle ferry routes | efg | primary | | | When I route I should get - | from | to | route | modes | - | a | g | abc,cde,efg | driving,ferry,driving | - | b | f | abc,cde,efg | driving,ferry,driving | - | e | c | cde | ferry | - | e | b | cde,abc | ferry,driving | - | e | a | cde,abc | ferry,driving | - | c | e | cde | ferry | - | c | f | cde,efg | ferry,driving | - | c | g | cde,efg | ferry,driving | + | from | to | route | modes | + | a | g | abc,cde,efg,efg | driving,ferry,driving,driving | + | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | + | e | c | cde,cde | ferry,ferry | + | e | b | cde,abc,abc | ferry,driving,driving | + | e | a | cde,abc,abc | ferry,driving,driving | + | c | e | cde,cde | ferry,ferry | + | c | f | cde,efg,efg | ferry,driving,driving | + | c | g | cde,efg,efg | ferry,driving,driving | Scenario: Car - Properly handle simple durations Given the node map @@ -40,11 +40,11 @@ Feature: Car - Handle ferry routes | efg | primary | | | When I route I should get - | from | to | route | modes | speed | - | a | g | abc,cde,efg | driving,ferry,driving | 25 km/h | - | b | f | abc,cde,efg | driving,ferry,driving | 20 km/h | - | c | e | cde | ferry | 12 km/h | - | e | c | cde | ferry | 12 km/h | + | from | to | route | modes | speed | + | a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h | + | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h | + | c | e | cde,cde | ferry,ferry | 12 km/h | + | e | c | cde,cde | ferry,ferry | 12 km/h | Scenario: Car - Properly handle ISO 8601 durations Given the node map @@ -59,8 +59,8 @@ Feature: Car - Handle ferry routes | efg | primary | | | When I route I should get - | from | to | route | modes | speed | - | a | g | abc,cde,efg | driving,ferry,driving | 25 km/h | - | b | f | abc,cde,efg | driving,ferry,driving | 20 km/h | - | c | e | cde | ferry | 12 km/h | - | e | c | cde | ferry | 12 km/h | + | from | to | route | modes | speed | + | a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h | + | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h | + | c | e | cde,cde | ferry,ferry | 12 km/h | + | e | c | cde,cde | ferry,ferry | 12 km/h | diff --git a/features/car/link.feature b/features/car/link.feature index f4628e4ce..26f32d1ea 100644 --- a/features/car/link.feature +++ b/features/car/link.feature @@ -24,9 +24,9 @@ Feature: Car - Speed on links | dy | unclassified | When I route I should get - | from | to | route | - | x | y | xa,ae,ef,fd,dy | - | b | c | bc | + | from | to | route | + | x | y | xa,ae,ef,fd,dy,dy | + | b | c | bc,bc | Scenario: Car - Use trunk_link when reasonable Given the node map @@ -44,9 +44,9 @@ Feature: Car - Speed on links | fd | trunk | | dy | unclassified | When I route I should get - | from | to | route | - | x | y | xa,ae,ef,fd,dy | - | b | c | bc | + | from | to | route | + | x | y | xa,ae,ef,fd,dy,dy | + | b | c | bc,bc | Scenario: Car - Use primary_link when reasonable Given the node map @@ -64,9 +64,9 @@ Feature: Car - Speed on links | fd | primary | | dy | unclassified | When I route I should get - | from | to | route | - | x | y | xa,ae,ef,fd,dy | - | b | c | bc | + | from | to | route | + | x | y | xa,ae,ef,fd,dy,dy | + | b | c | bc,bc | Scenario: Car - Use secondary_link when reasonable Given the node map @@ -85,9 +85,9 @@ Feature: Car - Speed on links | dy | unclassified | When I route I should get - | from | to | route | - | x | y | xa,ae,ef,fd,dy | - | b | c | bc | + | from | to | route | + | x | y | xa,ae,ef,fd,dy,dy | + | b | c | bc,bc | Scenario: Car - Use tertiary_link when reasonable Given the node map @@ -106,6 +106,6 @@ Feature: Car - Speed on links | dy | unclassified | When I route I should get - | from | to | route | - | x | y | xa,ae,ef,fd,dy | - | b | c | bc | + | from | to | route | + | x | y | xa,ae,ef,fd,dy,dy | + | b | c | bc,bc | diff --git a/features/car/maxspeed.feature b/features/car/maxspeed.feature index 9ba7aa7f1..3b94ac763 100644 --- a/features/car/maxspeed.feature +++ b/features/car/maxspeed.feature @@ -21,12 +21,12 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | a | b | ab | 79 km/h | - | b | c | bc | 59 km/h +- 1 | - | c | d | cd | 51 km/h | - | d | e | de | 75 km/h | - | e | f | ef | 91 km/h | - | f | g | fg | 107 km/h | + | a | b | ab,ab | 79 km/h | + | b | c | bc,bc | 59 km/h +- 1 | + | c | d | cd,cd | 51 km/h | + | d | e | de,de | 75 km/h | + | e | f | ef,ef | 91 km/h | + | f | g | fg,fg | 107 km/h | Scenario: Car - Do not ignore maxspeed when higher than way speed Given the node map @@ -40,9 +40,9 @@ OSRM will use 4/5 of the projected free-flow speed. When I route I should get | from | to | route | speed | - | a | b | ab | 31 km/h | - | b | c | bc | 83 km/h +- 1 | - | c | d | cd | 51 km/h | + | a | b | ab,ab | 31 km/h | + | b | c | bc,bc | 83 km/h +- 1 | + | c | d | cd,cd | 51 km/h | Scenario: Car - Forward/backward maxspeed Given a grid size of 100 meters diff --git a/features/car/mode.feature b/features/car/mode.feature index 87e6c9a62..f390982f8 100644 --- a/features/car/mode.feature +++ b/features/car/mode.feature @@ -15,13 +15,13 @@ Feature: Car - Mode flag | cd | primary | | | When I route I should get - | from | to | route | turns | modes | - | a | d | ab,bc,cd | depart,right,left,arrive | driving,ferry,driving | - | d | a | cd,bc,ab | depart,right,left,arrive | driving,ferry,driving | - | c | a | bc,ab | depart,left,arrive | ferry,driving | - | d | b | cd,bc | depart,right,arrive | driving,ferry | - | a | c | ab,bc | depart,right,arrive | driving,ferry | - | b | d | bc,cd | depart,left,arrive | ferry,driving | + | from | to | route | turns | modes | + | a | d | ab,bc,cd,cd | depart,right,left,arrive | driving,ferry,driving,driving | + | d | a | cd,bc,ab,ab | depart,right,left,arrive | driving,ferry,driving,driving | + | c | a | bc,ab,ab | depart,left,arrive | ferry,driving,driving | + | d | b | cd,bc,bc | depart,right,arrive | driving,ferry,ferry | + | a | c | ab,bc,bc | depart,right,arrive | driving,ferry,ferry | + | b | d | bc,cd,cd | depart,left,arrive | ferry,driving,driving | Scenario: Car - Snapping when using a ferry Given the node map @@ -34,7 +34,7 @@ Feature: Car - Mode flag | ef | primary | | | When I route I should get - | from | to | route | turns | modes | time | - | c | d | bcde | depart,arrive | ferry | 600s | + | from | to | route | turns | modes | time | + | c | d | bcde,bcde | depart,arrive | ferry,ferry | 600s | diff --git a/features/car/names.feature b/features/car/names.feature index b6a95ae7f..7a4725340 100644 --- a/features/car/names.feature +++ b/features/car/names.feature @@ -15,8 +15,8 @@ Feature: Car - Street names in instructions | bc | Your Way | A1 | When I route I should get - | from | to | route | - | a | c | My Way,Your Way (A1) | + | from | to | route | + | a | c | My Way,Your Way (A1),Your Way (A1) | @todo Scenario: Car - Use way type to describe unnamed ways @@ -29,5 +29,5 @@ Feature: Car - Street names in instructions | bcd | residential | | When I route I should get - | from | to | route | - | a | c | tertiary,residential | + | from | to | route | + | a | c | tertiary,residential,residential | diff --git a/features/car/oneway.feature b/features/car/oneway.feature index b47c3c6fd..b1b08bfb2 100644 --- a/features/car/oneway.feature +++ b/features/car/oneway.feature @@ -44,9 +44,9 @@ Feature: Car - Oneway streets | da | | When I route I should get - | from | to | route | - | a | b | ab | - | b | a | bc,cd,da | + | from | to | route | + | a | b | ab,ab | + | b | a | bc,cd,da,da | Scenario: Car - Cars should not be affected by bicycle tags Then routability should be @@ -75,5 +75,5 @@ Feature: Car - Oneway streets When I route I should get - | from | to | route | - | a | c | ab,bc | + | from | to | route | + | a | c | ab,bc,bc | diff --git a/features/car/restrictions.feature b/features/car/restrictions.feature index 89fffff75..d311fb0a9 100644 --- a/features/car/restrictions.feature +++ b/features/car/restrictions.feature @@ -25,10 +25,10 @@ Feature: Car - Turn restrictions | restriction | sj | wj | j | no_left_turn | When I route I should get - | from | to | route | - | s | w | | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Car - No straight on @@ -55,8 +55,8 @@ Feature: Car - Turn restrictions | restriction | bj | jd | j | no_straight_on | When I route I should get - | from | to | route | - | a | e | av,vw,wx,xy,yz,ze | + | from | to | route | + | a | e | av,vw,wx,xy,yz,ze,ze | @no_turning Scenario: Car - No right turn @@ -77,10 +77,10 @@ Feature: Car - Turn restrictions | restriction | sj | ej | j | no_right_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | | @no_turning Scenario: Car - No u-turn @@ -101,10 +101,10 @@ Feature: Car - Turn restrictions | restriction | sj | wj | j | no_u_turn | When I route I should get - | from | to | route | - | s | w | | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @no_turning Scenario: Car - Handle any no_* relation @@ -125,10 +125,10 @@ Feature: Car - Turn restrictions | restriction | sj | wj | j | no_weird_zigzags | When I route I should get - | from | to | route | - | s | w | | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @only_turning Scenario: Car - Only left turn @@ -149,10 +149,10 @@ Feature: Car - Turn restrictions | restriction | sj | wj | j | only_left_turn | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | | - | s | e | | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | | + | s | e | | @only_turning Scenario: Car - Only right turn @@ -173,10 +173,10 @@ Feature: Car - Turn restrictions | restriction | sj | ej | j | only_right_turn | When I route I should get - | from | to | route | - | s | w | | - | s | n | | - | s | e | sj,ej | + | from | to | route | + | s | w | | + | s | n | | + | s | e | sj,ej,ej | @only_turning Scenario: Car - Only straight on @@ -197,10 +197,10 @@ Feature: Car - Turn restrictions | restriction | sj | nj | j | only_straight_on | When I route I should get - | from | to | route | - | s | w | | - | s | n | sj,nj | - | s | e | | + | from | to | route | + | s | w | | + | s | n | sj,nj,nj | + | s | e | | @no_turning Scenario: Car - Handle any only_* restriction @@ -221,10 +221,10 @@ Feature: Car - Turn restrictions | restriction | sj | nj | j | only_weird_zigzags | When I route I should get - | from | to | route | - | s | w | | - | s | n | sj,nj | - | s | e | | + | from | to | route | + | s | w | | + | s | n | sj,nj,nj | + | s | e | | @specific Scenario: Car - :hgv-qualified on a standard turn restriction @@ -245,10 +245,10 @@ Feature: Car - Turn restrictions | restriction | sj | nj | j | no_straight_on | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | sj,nj | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | sj,nj,nj | + | s | e | sj,ej,ej | @specific Scenario: Car - :motorcar-qualified on a standard turn restriction @@ -269,10 +269,10 @@ Feature: Car - Turn restrictions | restriction | sj | nj | j | no_straight_on | When I route I should get - | from | to | route | - | s | w | sj,wj | - | s | n | | - | s | e | sj,ej | + | from | to | route | + | s | w | sj,wj,wj | + | s | n | | + | s | e | sj,ej,ej | @except Scenario: Car - Except tag and on no_ restrictions @@ -298,11 +298,11 @@ Feature: Car - Turn restrictions | restriction | sj | dj | j | no_right_turn | motorcar | When I route I should get - | from | to | route | - | s | a | sj,aj | - | s | b | | - | s | c | | - | s | d | sj,dj | + | from | to | route | + | s | a | sj,aj,aj | + | s | b | | + | s | c | | + | s | d | sj,dj,dj | @except Scenario: Car - Except tag and on only_ restrictions @@ -322,9 +322,9 @@ Feature: Car - Turn restrictions | restriction | sj | aj | j | only_straight_on | motorcar | When I route I should get - | from | to | route | - | s | a | sj,aj | - | s | b | sj,bj | + | from | to | route | + | s | a | sj,aj,aj | + | s | b | sj,bj,bj | @except Scenario: Car - Several only_ restrictions at the same segment @@ -356,10 +356,10 @@ Feature: Car - Turn restrictions | restriction | da | ae | a | only_right_turn | When I route I should get - | from | to | route | - | e | f | ae,xa,bx,fb | - | c | f | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb | - | d | f | da,ae,ge,hg,hg,ge,ae,xa,bx,fb | + | from | to | route | + | e | f | ae,xa,bx,fb,fb | + | c | f | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb | + | d | f | da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb | @except Scenario: Car - two only_ restrictions share same to-way @@ -391,9 +391,9 @@ Feature: Car - Turn restrictions | restriction | by | xy | y | only_straight_on | When I route I should get - | from | to | route | - | a | b | ax,xy,yb | - | b | a | yb,xy,ax | + | from | to | route | + | a | b | ax,xy,yb,yb | + | b | a | yb,xy,ax,ax | @except Scenario: Car - two only_ restrictions share same from-way @@ -425,7 +425,7 @@ Feature: Car - Turn restrictions | restriction | xy | yb | y | only_straight_on | When I route I should get - | from | to | route | - | a | b | ax,xy,yb | - | b | a | yb,xy,ax | + | from | to | route | + | a | b | ax,xy,yb,yb | + | b | a | yb,xy,ax,ax | diff --git a/features/car/roundabout.feature b/features/car/roundabout.feature index aaf1acf23..beb5d4e2e 100644 --- a/features/car/roundabout.feature +++ b/features/car/roundabout.feature @@ -21,10 +21,10 @@ Feature: Roundabout Instructions | abcda | roundabout | When I route I should get - | from | to | route | turns | - | s | t | sa,tb | depart,roundabout-exit-1,arrive | - | s | u | sa,uc | depart,roundabout-exit-2,arrive | - | s | v | sa,vd | depart,roundabout-exit-3,arrive | - | u | v | uc,vd | depart,roundabout-exit-1,arrive | - | u | s | uc,sa | depart,roundabout-exit-2,arrive | - | u | t | uc,tb | depart,roundabout-exit-3,arrive | + | from | to | route | turns | + | s | t | sa,tb,tb | depart,roundabout-exit-1,arrive | + | s | u | sa,uc,uc | depart,roundabout-exit-2,arrive | + | s | v | sa,vd,vd | depart,roundabout-exit-3,arrive | + | u | v | uc,vd,vd | depart,roundabout-exit-1,arrive | + | u | s | uc,sa,sa | depart,roundabout-exit-2,arrive | + | u | t | uc,tb,tb | depart,roundabout-exit-3,arrive | diff --git a/features/car/shuttle_train.feature b/features/car/shuttle_train.feature index 97f32e565..f6e8b84a6 100644 --- a/features/car/shuttle_train.feature +++ b/features/car/shuttle_train.feature @@ -19,13 +19,13 @@ Feature: Car - Handle ferryshuttle train routes | gh | primary | | no | When I route I should get - | from | to | route | - | a | f | abc,cde,ef | - | b | f | abc,cde,ef | - | e | c | cde | - | e | b | cde,abc | - | e | a | cde,abc | - | c | e | cde | - | c | f | cde,ef | - | f | g | | - | g | h | gh | + | from | to | route | + | a | f | abc,cde,ef,ef | + | b | f | abc,cde,ef,ef | + | e | c | cde,cde | + | e | b | cde,abc,abc | + | e | a | cde,abc,abc | + | c | e | cde,cde | + | c | f | cde,ef,ef | + | f | g | | + | g | h | gh,gh | diff --git a/features/car/traffic.feature b/features/car/traffic.feature index 14bb63c67..6d0c62d6b 100644 --- a/features/car/traffic.feature +++ b/features/car/traffic.feature @@ -36,12 +36,12 @@ Feature: Traffic - speeds Given the extract extra arguments "--generate-edge-lookup" Given the contract extra arguments "--segment-speed-file speeds.csv" And I route I should get - | from | to | route | speed | - | a | b | ab | 27 km/h | - | a | c | ab,bc | 27 km/h | - | b | c | bc | 27 km/h | - | a | d | ad | 27 km/h | - | d | c | dc | 36 km/h | - | g | b | ab | 27 km/h | - | a | g | ab | 27 km/h | + | from | to | route | speed | + | a | b | ab,ab | 27 km/h | + | a | c | ab,bc,bc | 27 km/h | + | b | c | bc,bc | 27 km/h | + | a | d | ad,ad | 27 km/h | + | d | c | dc,dc | 36 km/h | + | g | b | ab,ab | 27 km/h | + | a | g | ab,ab | 27 km/h |