Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
features/bicycle/mode.feature
+42 -42
View File
@@ -16,13 +16,13 @@ Feature: Bike - Mode flag
| cd | primary | | |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,ferry,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,ferry,cycling |
| c | a | bc,ab | head,left,destination | ferry,cycling |
| d | b | cd,bc | head,right,destination | cycling,ferry |
| a | c | ab,bc | head,right,destination | cycling,ferry |
| b | d | bc,cd | head,left,destination | ferry,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,ferry,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,ferry,cycling |
| c | a | bc,ab | depart,left,arrive | ferry,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,ferry |
| a | c | ab,bc | depart,right,arrive | cycling,ferry |
| b | d | bc,cd | depart,left,arrive | ferry,cycling |
Scenario: Bike - Mode when using a train
Given the node map
@@ -36,13 +36,13 @@ Feature: Bike - Mode flag
| cd | primary | | |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,train,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,train,cycling |
| c | a | bc,ab | head,left,destination | train,cycling |
| d | b | cd,bc | head,right,destination | cycling,train |
| a | c | ab,bc | head,right,destination | cycling,train |
| b | d | bc,cd | head,left,destination | train,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,train,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,train,cycling |
| c | a | bc,ab | depart,left,arrive | train,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,train |
| a | c | ab,bc | depart,right,arrive | cycling,train |
| b | d | bc,cd | depart,left,arrive | train,cycling |
@mokobreview
Scenario: Bike - Mode when pushing bike against oneways
@@ -57,13 +57,13 @@ Feature: Bike - Mode flag
| cd | primary | |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,cycling,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling |
| c | a | bc,ab | head,left,destination | pushing bike,cycling |
| d | b | cd,bc | head,right,destination | cycling,pushing bike |
| a | c | ab,bc | head,right,destination | cycling,cycling |
| b | d | bc,cd | head,left,destination | cycling,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,cycling,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,cycling |
| b | d | bc,cd | depart,left,arrive | cycling,cycling |
Scenario: Bike - Mode when pushing on pedestrain streets
Given the node map
@@ -77,13 +77,13 @@ Feature: Bike - Mode flag
| cd | primary |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling |
| c | a | bc,ab | head,left,destination | pushing bike,cycling |
| d | b | cd,bc | head,right,destination | cycling,pushing bike |
| a | c | ab,bc | head,right,destination | cycling,pushing bike |
| b | d | bc,cd | head,left,destination | pushing bike,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
Scenario: Bike - Mode when pushing on pedestrain areas
Given the node map
@@ -117,13 +117,13 @@ Feature: Bike - Mode flag
| cd | primary |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling |
| c | a | bc,ab | head,left,destination | pushing bike,cycling |
| d | b | cd,bc | head,right,destination | cycling,pushing bike |
| a | c | ab,bc | head,right,destination | cycling,pushing bike |
| b | d | bc,cd | head,left,destination | pushing bike,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
Scenario: Bike - Mode when bicycle=dismount
Given the node map
@@ -137,13 +137,13 @@ Feature: Bike - Mode flag
| cd | primary | |
When I route I should get
| from | to | route | turns | modes |
| a | d | ab,bc,cd | head,right,left,destination | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | head,right,left,destination | cycling,pushing bike,cycling |
| c | a | bc,ab | head,left,destination | pushing bike,cycling |
| d | b | cd,bc | head,right,destination | cycling,pushing bike |
| a | c | ab,bc | head,right,destination | cycling,pushing bike |
| b | d | bc,cd | head,left,destination | pushing bike,cycling |
| from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | cycling,pushing bike,cycling |
| d | a | cd,bc,ab | depart,right,left,arrive | cycling,pushing bike,cycling |
| c | a | bc,ab | depart,left,arrive | pushing bike,cycling |
| d | b | cd,bc | depart,right,arrive | cycling,pushing bike |
| a | c | ab,bc | depart,right,arrive | cycling,pushing bike |
| b | d | bc,cd | depart,left,arrive | pushing bike,cycling |
Scenario: Bicycle - Modes when starting on forward oneway
Given the node map
features/bicycle/pushing.feature
+15 -15
View File
@@ -32,7 +32,7 @@ Feature: Bike - Accessability of different way types
| primary | -1 | foot | bike |
| pedestrian | -1 | foot | foot |
@square
@square
Scenario: Bike - Push bikes on pedestrian areas
Given the node map
| x | |
@@ -62,7 +62,7 @@ Feature: Bike - Accessability of different way types
| motorway | yes | foot | |
| runway | | | |
| runway | yes | foot | foot |
@todo
Scenario: Bike - Pushing bikes on ways with foot=yes in one direction
Then routability should be
@@ -72,20 +72,20 @@ Feature: Bike - Accessability of different way types
| motorway | | yes | | foot |
@construction
Scenario: Bike - Don't allow routing on ways still under construction
Scenario: Bike - Don't allow routing on ways still under construction
Then routability should be
| highway | foot | bicycle | bothw |
| primary | | | x |
| construction | | | |
| construction | yes | | |
| construction | | yes | |
@roundabout
Scenario: Bike - Don't push bikes against oneway flow on roundabouts
Then routability should be
| junction | forw | backw |
| roundabout | x | |
Scenario: Bike - Instructions when pushing bike on oneways
Given the node map
| a | b | |
@@ -98,11 +98,11 @@ Feature: Bike - Accessability of different way types
| cd | primary | |
When I route I should get
| from | to | route | turns |
| a | d | ab,bc,cd | head,straight,straight,destination |
| d | a | cd,bc,ab | head,right,left,destination |
| c | a | bc,ab | head,left,destination |
| d | b | cd,bc | head,right,destination |
| from | to | route | turns |
| a | d | ab,bc,cd | depart,straight,straight,arrive |
| d | a | cd,bc,ab | depart,right,left,arrive |
| c | a | bc,ab | depart,left,arrive |
| d | b | cd,bc | depart,right,arrive |
@todo
Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
@@ -117,8 +117,8 @@ Feature: Bike - Accessability of different way types
| cd | primary |
When I route I should get
| from | to | route | turns |
| a | d | ab,bc,cd | head,right,left,destination |
| d | a | cd,bc,ab | head,right,left,destination |
| c | a | bc,ab | head,left,destination |
| d | b | cd,bc | head,right,destination |
| from | to | route | turns |
| a | d | ab,bc,cd | depart,right,left,arrive |
| d | a | cd,bc,ab | depart,right,left,arrive |
| c | a | bc,ab | depart,left,arrive |
| d | b | cd,bc | depart,right,arrive |
features/bicycle/roundabout.feature
+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 |