Mode changes, guidance comments, fix turns

This commit is contained in:
Lauren Budorick
2016-03-28 21:15:15 -07:00
committed by Patrick Niklaus
parent 908e3a2af6
commit 126d2f85ac
10 changed files with 215 additions and 205 deletions
+15 -13
View File
@@ -4,6 +4,7 @@ Feature: Car - Handle movable bridge
Background:
Given the profile "car"
@mokob @2155
Scenario: Car - Use a ferry route
Given the node map
| a | b | c | | |
@@ -18,15 +19,16 @@ Feature: Car - Handle movable bridge
When I route I should get
| from | to | route | modes |
| a | g | abc,cde,efg | 1,3,1 |
| b | f | abc,cde,efg | 1,3,1 |
| e | c | cde | 3 |
| e | b | cde,abc | 3,1 |
| e | a | cde,abc | 3,1 |
| c | e | cde | 3 |
| c | f | cde,efg | 3,1 |
| c | g | cde,efg | 3,1 |
| 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 |
@mokob @2155
Scenario: Car - Properly handle durations
Given the node map
| a | b | c | | |
@@ -40,8 +42,8 @@ Feature: Car - Handle movable bridge
| efg | primary | | |
When I route I should get
| from | to | route | modes | speed |
| a | g | abc,cde,efg | 1,3,1 | 7 km/h |
| b | f | abc,cde,efg | 1,3,1 | 5 km/h |
| c | e | cde | 3 | 2 km/h |
| e | c | cde | 3 | 2 km/h |
| 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 |
+19 -19
View File
@@ -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 | 1,2,1 |
| b | f | abc,cde,efg | 1,2,1 |
| e | c | cde | 2 |
| e | b | cde,abc | 2,1 |
| e | a | cde,abc | 2,1 |
| c | e | cde | 2 |
| c | f | cde,efg | 2,1 |
| c | g | cde,efg | 2,1 |
| 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 |
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 | 1,2,1 | 25 km/h |
| b | f | abc,cde,efg | 1,2,1 | 20 km/h |
| c | e | cde | 2 | 12 km/h |
| e | c | cde | 2 | 12 km/h |
| 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 |
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 | 1,2,1 | 25 km/h |
| b | f | abc,cde,efg | 1,2,1 | 20 km/h |
| c | e | cde | 2 | 12 km/h |
| e | c | cde | 2 | 12 km/h |
| 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 |
+11 -9
View File
@@ -3,6 +3,7 @@ Feature: Car - Mode flag
Background:
Given the profile "car"
@mokob @2155
Scenario: Car - Mode when using a ferry
Given the node map
| a | b | |
@@ -15,14 +16,15 @@ 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 | 1,2,1 |
| d | a | cd,bc,ab | head,right,left,destination | 1,2,1 |
| c | a | bc,ab | head,left,destination | 2,1 |
| d | b | cd,bc | head,right,destination | 1,2 |
| a | c | ab,bc | head,right,destination | 1,2 |
| b | d | bc,cd | head,left,destination | 2,1 |
| 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 |
@mokob @2155
Scenario: Car - Snapping when using a ferry
Given the node map
| a | b | | c | d | | e | f |
@@ -34,7 +36,7 @@ Feature: Car - Mode flag
| ef | primary | | |
When I route I should get
| from | to | route | turns | modes | time |
| c | d | bcde | head,destination | 2 | 600s |
| from | to | route | turns | modes | time |
| c | d | bcde | head,destination | ferry | 600s |