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

Mode changes, guidance comments, fix turns

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
features/bicycle/area.feature
+3 -3
View File
@@ -4,7 +4,7 @@ Feature: Bike - Squares and other areas
Background:
Given the profile "bicycle"
@square
@square @mokob @2154
Scenario: Bike - Route along edge of a squares
Given the node map
| x | |
@@ -50,7 +50,7 @@ Feature: Bike - Squares and other areas
| d | a | xa |
| a | d | xa |
@parking
@parking @mokob @2154
Scenario: Bike - parking areas
Given the node map
| e | | | f |
@@ -77,7 +77,7 @@ Feature: Bike - Squares and other areas
| d | a | abcda |
| a | d | abcda |
@train @platform
@train @platform @mokob @2154
Scenario: Bike - railway platforms
Given the node map
| x | a | b | y |
features/bicycle/bridge.feature
+16 -14
View File
@@ -4,6 +4,7 @@ Feature: Bicycle - Handle movable bridge
Background:
Given the profile "bicycle"
@mokob @2155
Scenario: Bicycle - Use a ferry route
Given the node map
| a | b | c | | |
@@ -17,16 +18,17 @@ Feature: Bicycle - Handle movable bridge
| efg | primary | | |
When I route I should get
| from | to | route | modes |
| a | g | abc,cde,efg | 1,5,1 |
| b | f | abc,cde,efg | 1,5,1 |
| e | c | cde | 5 |
| e | b | cde,abc | 5,1 |
| e | a | cde,abc | 5,1 |
| c | e | cde | 5 |
| c | f | cde,efg | 5,1 |
| c | g | cde,efg | 5,1 |
| from | to | route | modes |
| a | g | abc,cde,efg | cycling,movable bridge,cycling |
| b | f | abc,cde,efg | cycling,movable bridge,cycling |
| e | c | cde | movable bridge |
| e | b | cde,abc | movable bridge,cycling |
| e | a | cde,abc | movable bridge,cycling |
| c | e | cde | movable bridge |
| c | f | cde,efg | movable bridge,cycling |
| c | g | cde,efg | movable bridge,cycling |
@mokob @2155
Scenario: Bicycle - Properly handle durations
Given the node map
| a | b | c | | |
@@ -40,8 +42,8 @@ Feature: Bicycle - Handle movable bridge
| efg | primary | | |
When I route I should get
| from | to | route | modes | speed |
| a | g | abc,cde,efg | 1,5,1 | 5 km/h |
| b | f | abc,cde,efg | 1,5,1 | 4 km/h |
| c | e | cde | 5 | 2 km/h |
| e | c | cde | 5 | 2 km/h |
| from | to | route | modes | speed |
| a | g | abc,cde,efg | cycling,movable bridge,cycling | 5 km/h |
| b | f | abc,cde,efg | cycling,movable bridge,cycling | 4 km/h |
| c | e | cde | movable bridge | 2 km/h |
| e | c | cde | movable bridge | 2 km/h |
features/bicycle/mode.feature
+55 -60
View File
@@ -1,12 +1,6 @@
@routing @bicycle @mode
Feature: Bike - Mode flag
# bicycle modes:
# 1 bike
# 2 pushing
# 3 ferry
# 4 train
Background:
Given the profile "bicycle"
@@ -22,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 | 1,3,1 |
| d | a | cd,bc,ab | head,right,left,destination | 1,3,1 |
| c | a | bc,ab | head,left,destination | 3,1 |
| d | b | cd,bc | head,right,destination | 1,3 |
| a | c | ab,bc | head,right,destination | 1,3 |
| b | d | bc,cd | head,left,destination | 3,1 |
| 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 |
Scenario: Bike - Mode when using a train
Given the node map
@@ -42,14 +36,15 @@ 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 | 1,4,1 |
| d | a | cd,bc,ab | head,right,left,destination | 1,4,1 |
| c | a | bc,ab | head,left,destination | 4,1 |
| d | b | cd,bc | head,right,destination | 1,4 |
| a | c | ab,bc | head,right,destination | 1,4 |
| b | d | bc,cd | head,left,destination | 4,1 |
| 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 |
@mokobreview
Scenario: Bike - Mode when pushing bike against oneways
Given the node map
| a | b | |
@@ -62,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,straight,straight,destination | 1,1,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,straight,destination | 1,1 |
| b | d | bc,cd | head,straight,destination | 1,1 |
| 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 |
Scenario: Bike - Mode when pushing on pedestrain streets
Given the node map
@@ -82,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 | 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 | 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 |
Scenario: Bike - Mode when pushing on pedestrain areas
Given the node map
@@ -103,12 +98,12 @@ Feature: Bike - Mode flag
When I route I should get
| from | to | route | modes |
| a | f | ab,bcd,df | 1,2,1 |
| f | a | df,bcd,ab | 1,2,1 |
| d | a | bcd,ab | 2,1 |
| f | b | df,bcd | 1,2 |
| a | d | ab,bcd | 1,2 |
| b | f | bcd,df | 2,1 |
| a | f | ab,bcd,df | cycling,pushing bike,cycling |
| f | a | df,bcd,ab | cycling,pushing bike,cycling |
| d | a | bcd,ab | pushing bike,cycling |
| f | b | df,bcd | cycling,pushing bike |
| a | d | ab,bcd | cycling,pushing bike |
| b | f | bcd,df | pushing bike,cycling |
Scenario: Bike - Mode when pushing on steps
Given the node map
@@ -122,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 | 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 | 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 |
Scenario: Bike - Mode when bicycle=dismount
Given the node map
@@ -142,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 | 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 | 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 |
Scenario: Bicycle - Modes when starting on forward oneway
Given the node map
@@ -159,9 +154,9 @@ Feature: Bike - Mode flag
| ab | yes |
When I route I should get
| from | to | route | modes |
| a | b | ab | 1 |
| b | a | ab | 2 |
| from | to | route | modes |
| a | b | ab | cycling |
| b | a | ab | pushing bike |
Scenario: Bicycle - Modes when starting on reverse oneway
Given the node map
@@ -172,6 +167,6 @@ Feature: Bike - Mode flag
| ab | -1 |
When I route I should get
| from | to | route | modes |
| a | b | ab | 2 |
| b | a | ab | 1 |
| from | to | route | modes |
| a | b | ab | pushing bike |
| b | a | ab | cycling |