head/destination -> depart/arrive to reflect guidance API changes; minor fixes for roundabout tests

This commit is contained in:
Lauren Budorick
2016-03-29 13:55:02 -07:00
committed by Patrick Niklaus
parent 91567cad9e
commit 2f793473cc
21 changed files with 365 additions and 337 deletions
+18
View File
@@ -34,6 +34,7 @@ OSRM will use 4/5 of the projected free-flow speed.
| a | b | ab | 47 km/h +- 1 |
| b | c | bc | 47 km/h +- 1 |
@mokob @2162
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c |
@@ -48,6 +49,23 @@ OSRM will use 4/5 of the projected free-flow speed.
| b | a | ab | 47 km/h +- 1 |
| c | b | bc | 47 km/h +- 1 |
@mokob @2162 @deleteme
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c | d |
And the ways
| nodes | highway | maxspeed:backward | maxspeed:advisory:backward |
| ab | residential | | 45 |
| bc | residential | 90 | 45 |
| cd | residential | | 45 |
When I route I should get
| from | to | route | speed |
| c | b | bc | 47 km/h +- 1 |
| d | c | cd | 47 km/h +- 1 |
@mokob @2162
Scenario: Car - Directional advisory speeds play nice with eachother
Given the node map
| a | b | c |
+9 -9
View File
@@ -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 | head,right,left,destination | driving,ferry,driving |
| d | a | cd,bc,ab | head,right,left,destination | driving,ferry,driving |
| c | a | bc,ab | head,left,destination | ferry,driving |
| d | b | cd,bc | head,right,destination | driving,ferry |
| a | c | ab,bc | head,right,destination | driving,ferry |
| b | d | bc,cd | head,left,destination | ferry,driving |
| 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 |
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 | head,destination | ferry | 600s |
| from | to | route | turns | modes | time |
| c | d | bcde | depart,arrive | ferry | 600s |
+7 -7
View File
@@ -21,10 +21,10 @@ Feature: Roundabout Instructions
| abcda | roundabout |
When I route I should get
| from | to | route | turns |
| s | t | sa,tb | head,enter_roundabout-1,destination |
| s | u | sa,uc | head,enter_roundabout-2,destination |
| s | v | sa,vd | head,enter_roundabout-3,destination |
| u | v | uc,vd | head,enter_roundabout-1,destination |
| u | s | uc,sa | head,enter_roundabout-2,destination |
| u | t | uc,tb | head,enter_roundabout-3,destination |
| from | to | route | turns |
| s | t | sa,tb | depart,enter_roundabout-1,arrive |
| s | u | sa,uc | depart,enter_roundabout-2,arrive |
| s | v | sa,vd | depart,enter_roundabout-3,arrive |
| u | v | uc,vd | depart,enter_roundabout-1,arrive |
| u | s | uc,sa | depart,enter_roundabout-2,arrive |
| u | t | uc,tb | depart,enter_roundabout-3,arrive |