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

Update car features to reflect not cutting off arrival instruction

Browse Source
This commit is contained in:
Lauren Budorick 2016-03-31 16:39:31 -07:00 committed by Patrick Niklaus
parent f45daad6ca
commit 1a8097f810
12 changed files with 172 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
features/car/advisory.feature
View File

@ -17,8 +17,8 @@ OSRM will use 4/5 of the projected free-flow speed.
When I route I should get When I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 47 km/h +- 1 | | a | b | ab,ab | 47 km/h +- 1 |
| b | c | bc | 47 km/h +- 1 | | b | c | bc,bc | 47 km/h +- 1 |
Scenario: Car - Advisory speed overwrites forward maxspeed Scenario: Car - Advisory speed overwrites forward maxspeed
Given the node map 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 When I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 47 km/h +- 1 | | a | b | ab,ab | 47 km/h +- 1 |
| b | c | bc | 47 km/h +- 1 | | b | c | bc,bc | 47 km/h +- 1 |
@mokob @2162 @mokob @2162
Scenario: Car - Advisory speed overwrites backwards maxspeed 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 When I route I should get
| from | to | route | speed | | from | to | route | speed |
| b | a | ab | 47 km/h +- 1 | | b | a | ab,ab | 47 km/h +- 1 |
| c | b | bc | 47 km/h +- 1 | | c | b | bc,bc | 47 km/h +- 1 |
@mokob @2162 @deleteme @mokob @2162 @deleteme
Scenario: Car - Advisory speed overwrites backwards maxspeed 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 When I route I should get
| from | to | route | speed | | from | to | route | speed |
| c | b | bc | 47 km/h +- 1 | | c | b | bc,bc | 47 km/h +- 1 |
| d | c | cd | 47 km/h +- 1 | | d | c | cd,cd | 47 km/h +- 1 |
@mokob @2162 @mokob @2162
Scenario: Car - Directional advisory speeds play nice with eachother 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 When I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 47 km/h +- 1 | | a | b | ab,ab | 47 km/h +- 1 |
| b | a | ab | 59 km/h +- 1 | | b | a | ab,ab | 59 km/h +- 1 |
| b | c | bc | 59 km/h +- 1 | | b | c | bc,bc | 59 km/h +- 1 |
| c | b | bc | 47 km/h +- 1 | | c | b | bc,bc | 47 km/h +- 1 |

24
features/car/bridge.feature
View File

@ -18,14 +18,14 @@ Feature: Car - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | | from | to | route | modes |
| a | g | abc,cde,efg | driving,movable bridge,driving | | a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving |
| b | f | abc,cde,efg | driving,movable bridge,driving | | b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving |
| e | c | cde | movable bridge | | e | c | cde,cde | movable bridge,movable bridge |
| e | b | cde,abc | movable bridge,driving | | e | b | cde,abc,abc | movable bridge,driving,driving |
| e | a | cde,abc | movable bridge,driving | | e | a | cde,abc,abc | movable bridge,driving,driving |
| c | e | cde | movable bridge | | c | e | cde,cde | movable bridge,movable bridge |
| c | f | cde,efg | movable bridge,driving | | c | f | cde,efg,efg | movable bridge,driving,driving |
| c | g | cde,efg | movable bridge,driving | | c | g | cde,efg,efg | movable bridge,driving,driving |
Scenario: Car - Properly handle durations Scenario: Car - Properly handle durations
Given the node map Given the node map
@ -41,7 +41,7 @@ Feature: Car - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg | driving,movable bridge,driving | 7 km/h | | a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving | 7 km/h |
| b | f | abc,cde,efg | driving,movable bridge,driving | 5 km/h | | b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving | 5 km/h |
| c | e | cde | movable bridge | 2 km/h | | c | e | cde,cde | movable bridge,movable bridge | 2 km/h |
| e | c | cde | movable bridge | 2 km/h | | e | c | cde,cde | movable bridge,movable bridge | 2 km/h |

32
features/car/ferry.feature
View File

@ -18,14 +18,14 @@ Feature: Car - Handle ferry routes
When I route I should get When I route I should get
| from | to | route | modes | | from | to | route | modes |
| a | g | abc,cde,efg | driving,ferry,driving | | a | g | abc,cde,efg,efg | driving,ferry,driving,driving |
| b | f | abc,cde,efg | driving,ferry,driving | | b | f | abc,cde,efg,efg | driving,ferry,driving,driving |
| e | c | cde | ferry | | e | c | cde,cde | ferry,ferry |
| e | b | cde,abc | ferry,driving | | e | b | cde,abc,abc | ferry,driving,driving |
| e | a | cde,abc | ferry,driving | | e | a | cde,abc,abc | ferry,driving,driving |
| c | e | cde | ferry | | c | e | cde,cde | ferry,ferry |
| c | f | cde,efg | ferry,driving | | c | f | cde,efg,efg | ferry,driving,driving |
| c | g | cde,efg | ferry,driving | | c | g | cde,efg,efg | ferry,driving,driving |
Scenario: Car - Properly handle simple durations Scenario: Car - Properly handle simple durations
Given the node map Given the node map
@ -41,10 +41,10 @@ Feature: Car - Handle ferry routes
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg | driving,ferry,driving | 25 km/h | | a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
| b | f | abc,cde,efg | driving,ferry,driving | 20 km/h | | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
| c | e | cde | ferry | 12 km/h | | c | e | cde,cde | ferry,ferry | 12 km/h |
| e | c | cde | ferry | 12 km/h | | e | c | cde,cde | ferry,ferry | 12 km/h |
Scenario: Car - Properly handle ISO 8601 durations Scenario: Car - Properly handle ISO 8601 durations
Given the node map Given the node map
@ -60,7 +60,7 @@ Feature: Car - Handle ferry routes
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg | driving,ferry,driving | 25 km/h | | a | g | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
| b | f | abc,cde,efg | driving,ferry,driving | 20 km/h | | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
| c | e | cde | ferry | 12 km/h | | c | e | cde,cde | ferry,ferry | 12 km/h |
| e | c | cde | ferry | 12 km/h | | e | c | cde,cde | ferry,ferry | 12 km/h |

20
features/car/link.feature
View File

@ -25,8 +25,8 @@ Feature: Car - Speed on links
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| x | y | xa,ae,ef,fd,dy | | x | y | xa,ae,ef,fd,dy,dy |
| b | c | bc | | b | c | bc,bc |
Scenario: Car - Use trunk_link when reasonable Scenario: Car - Use trunk_link when reasonable
Given the node map Given the node map
@ -45,8 +45,8 @@ Feature: Car - Speed on links
| dy | unclassified | | dy | unclassified |
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| x | y | xa,ae,ef,fd,dy | | x | y | xa,ae,ef,fd,dy,dy |
| b | c | bc | | b | c | bc,bc |
Scenario: Car - Use primary_link when reasonable Scenario: Car - Use primary_link when reasonable
Given the node map Given the node map
@ -65,8 +65,8 @@ Feature: Car - Speed on links
| dy | unclassified | | dy | unclassified |
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| x | y | xa,ae,ef,fd,dy | | x | y | xa,ae,ef,fd,dy,dy |
| b | c | bc | | b | c | bc,bc |
Scenario: Car - Use secondary_link when reasonable Scenario: Car - Use secondary_link when reasonable
Given the node map Given the node map
@ -86,8 +86,8 @@ Feature: Car - Speed on links
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| x | y | xa,ae,ef,fd,dy | | x | y | xa,ae,ef,fd,dy,dy |
| b | c | bc | | b | c | bc,bc |
Scenario: Car - Use tertiary_link when reasonable Scenario: Car - Use tertiary_link when reasonable
Given the node map Given the node map
@ -107,5 +107,5 @@ Feature: Car - Speed on links
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| x | y | xa,ae,ef,fd,dy | | x | y | xa,ae,ef,fd,dy,dy |
| b | c | bc | | b | c | bc,bc |

18
features/car/maxspeed.feature
View File

@ -21,12 +21,12 @@ OSRM will use 4/5 of the projected free-flow speed.
When I route I should get When I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 79 km/h | | a | b | ab,ab | 79 km/h |
| b | c | bc | 59 km/h +- 1 | | b | c | bc,bc | 59 km/h +- 1 |
| c | d | cd | 51 km/h | | c | d | cd,cd | 51 km/h |
| d | e | de | 75 km/h | | d | e | de,de | 75 km/h |
| e | f | ef | 91 km/h | | e | f | ef,ef | 91 km/h |
| f | g | fg | 107 km/h | | f | g | fg,fg | 107 km/h |
Scenario: Car - Do not ignore maxspeed when higher than way speed Scenario: Car - Do not ignore maxspeed when higher than way speed
Given the node map 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 When I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 31 km/h | | a | b | ab,ab | 31 km/h |
| b | c | bc | 83 km/h +- 1 | | b | c | bc,bc | 83 km/h +- 1 |
| c | d | cd | 51 km/h | | c | d | cd,cd | 51 km/h |
Scenario: Car - Forward/backward maxspeed Scenario: Car - Forward/backward maxspeed
Given a grid size of 100 meters Given a grid size of 100 meters

14
features/car/mode.feature
View File

@ -16,12 +16,12 @@ Feature: Car - Mode flag
When I route I should get When I route I should get
| from | to | route | turns | modes | | from | to | route | turns | modes |
| a | d | ab,bc,cd | depart,right,left,arrive | driving,ferry,driving | | a | d | ab,bc,cd,cd | depart,right,left,arrive | driving,ferry,driving,driving |
| d | a | cd,bc,ab | depart,right,left,arrive | driving,ferry,driving | | d | a | cd,bc,ab,ab | depart,right,left,arrive | driving,ferry,driving,driving |
| c | a | bc,ab | depart,left,arrive | ferry,driving | | c | a | bc,ab,ab | depart,left,arrive | ferry,driving,driving |
| d | b | cd,bc | depart,right,arrive | driving,ferry | | d | b | cd,bc,bc | depart,right,arrive | driving,ferry,ferry |
| a | c | ab,bc | depart,right,arrive | driving,ferry | | a | c | ab,bc,bc | depart,right,arrive | driving,ferry,ferry |
| b | d | bc,cd | depart,left,arrive | ferry,driving | | b | d | bc,cd,cd | depart,left,arrive | ferry,driving,driving |
Scenario: Car - Snapping when using a ferry Scenario: Car - Snapping when using a ferry
Given the node map Given the node map
@ -35,6 +35,6 @@ Feature: Car - Mode flag
When I route I should get When I route I should get
| from | to | route | turns | modes | time | | from | to | route | turns | modes | time |
| c | d | bcde | depart,arrive | ferry | 600s | | c | d | bcde,bcde | depart,arrive | ferry,ferry | 600s |

4
features/car/names.feature
View File

@ -16,7 +16,7 @@ Feature: Car - Street names in instructions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | c | My Way,Your Way (A1) | | a | c | My Way,Your Way (A1),Your Way (A1) |
@todo @todo
Scenario: Car - Use way type to describe unnamed ways Scenario: Car - Use way type to describe unnamed ways
@ -30,4 +30,4 @@ Feature: Car - Street names in instructions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | c | tertiary,residential | | a | c | tertiary,residential,residential |

6
features/car/oneway.feature
View File

@ -45,8 +45,8 @@ Feature: Car - Oneway streets
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | b | ab | | a | b | ab,ab |
| b | a | bc,cd,da | | b | a | bc,cd,da,da |
Scenario: Car - Cars should not be affected by bicycle tags Scenario: Car - Cars should not be affected by bicycle tags
Then routability should be Then routability should be
@ -76,4 +76,4 @@ Feature: Car - Oneway streets
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | c | ab,bc | | a | c | ab,bc,bc |

58
features/car/restrictions.feature
View File

@ -27,8 +27,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | sj,ej | | s | e | sj,ej,ej |
@no_turning @no_turning
Scenario: Car - No straight on Scenario: Car - No straight on
@ -56,7 +56,7 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | e | av,vw,wx,xy,yz,ze | | a | e | av,vw,wx,xy,yz,ze,ze |
@no_turning @no_turning
Scenario: Car - No right turn Scenario: Car - No right turn
@ -78,8 +78,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj,wj |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | | | s | e | |
@no_turning @no_turning
@ -103,8 +103,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | sj,ej | | s | e | sj,ej,ej |
@no_turning @no_turning
Scenario: Car - Handle any no_* relation Scenario: Car - Handle any no_* relation
@ -127,8 +127,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | sj,ej | | s | e | sj,ej,ej |
@only_turning @only_turning
Scenario: Car - Only left turn Scenario: Car - Only left turn
@ -150,7 +150,7 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj,wj |
| s | n | | | s | n | |
| s | e | | | s | e | |
@ -176,7 +176,7 @@ Feature: Car - Turn restrictions
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | | | s | n | |
| s | e | sj,ej | | s | e | sj,ej,ej |
@only_turning @only_turning
Scenario: Car - Only straight on Scenario: Car - Only straight on
@ -199,7 +199,7 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | | | s | e | |
@no_turning @no_turning
@ -223,7 +223,7 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | | | s | w | |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | | | s | e | |
@specific @specific
@ -246,9 +246,9 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj,wj |
| s | n | sj,nj | | s | n | sj,nj,nj |
| s | e | sj,ej | | s | e | sj,ej,ej |
@specific @specific
Scenario: Car - :motorcar-qualified on a standard turn restriction Scenario: Car - :motorcar-qualified on a standard turn restriction
@ -270,9 +270,9 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | w | sj,wj | | s | w | sj,wj,wj |
| s | n | | | s | n | |
| s | e | sj,ej | | s | e | sj,ej,ej |
@except @except
Scenario: Car - Except tag and on no_ restrictions Scenario: Car - Except tag and on no_ restrictions
@ -299,10 +299,10 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | a | sj,aj | | s | a | sj,aj,aj |
| s | b | | | s | b | |
| s | c | | | s | c | |
| s | d | sj,dj | | s | d | sj,dj,dj |
@except @except
Scenario: Car - Except tag and on only_ restrictions Scenario: Car - Except tag and on only_ restrictions
@ -323,8 +323,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| s | a | sj,aj | | s | a | sj,aj,aj |
| s | b | sj,bj | | s | b | sj,bj,bj |
@except @except
Scenario: Car - Several only_ restrictions at the same segment Scenario: Car - Several only_ restrictions at the same segment
@ -357,9 +357,9 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| e | f | ae,xa,bx,fb | | e | f | ae,xa,bx,fb,fb |
| c | f | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,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 | | d | f | da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb |
@except @except
Scenario: Car - two only_ restrictions share same to-way Scenario: Car - two only_ restrictions share same to-way
@ -392,8 +392,8 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | b | ax,xy,yb | | a | b | ax,xy,yb,yb |
| b | a | yb,xy,ax | | b | a | yb,xy,ax,ax |
@except @except
Scenario: Car - two only_ restrictions share same from-way Scenario: Car - two only_ restrictions share same from-way
@ -426,6 +426,6 @@ Feature: Car - Turn restrictions
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | b | ax,xy,yb | | a | b | ax,xy,yb,yb |
| b | a | yb,xy,ax | | b | a | yb,xy,ax,ax |

12
features/car/roundabout.feature
View File

@ -22,9 +22,9 @@ Feature: Roundabout Instructions
When I route I should get When I route I should get
| from | to | route | turns | | from | to | route | turns |
| s | t | sa,tb | depart,roundabout-exit-1,arrive | | s | t | sa,tb,tb | depart,roundabout-exit-1,arrive |
| s | u | sa,uc | depart,roundabout-exit-2,arrive | | s | u | sa,uc,uc | depart,roundabout-exit-2,arrive |
| s | v | sa,vd | depart,roundabout-exit-3,arrive | | s | v | sa,vd,vd | depart,roundabout-exit-3,arrive |
| u | v | uc,vd | depart,roundabout-exit-1,arrive | | u | v | uc,vd,vd | depart,roundabout-exit-1,arrive |
| u | s | uc,sa | depart,roundabout-exit-2,arrive | | u | s | uc,sa,sa | depart,roundabout-exit-2,arrive |
| u | t | uc,tb | depart,roundabout-exit-3,arrive | | u | t | uc,tb,tb | depart,roundabout-exit-3,arrive |

16
features/car/shuttle_train.feature
View File

@ -20,12 +20,12 @@ Feature: Car - Handle ferryshuttle train routes
When I route I should get When I route I should get
| from | to | route | | from | to | route |
| a | f | abc,cde,ef | | a | f | abc,cde,ef,ef |
| b | f | abc,cde,ef | | b | f | abc,cde,ef,ef |
| e | c | cde | | e | c | cde,cde |
| e | b | cde,abc | | e | b | cde,abc,abc |
| e | a | cde,abc | | e | a | cde,abc,abc |
| c | e | cde | | c | e | cde,cde |
| c | f | cde,ef | | c | f | cde,ef,ef |
| f | g | | | f | g | |
| g | h | gh | | g | h | gh,gh |

14
features/car/traffic.feature
View File

@ -37,11 +37,11 @@ Feature: Traffic - speeds
Given the contract extra arguments "--segment-speed-file speeds.csv" Given the contract extra arguments "--segment-speed-file speeds.csv"
And I route I should get And I route I should get
| from | to | route | speed | | from | to | route | speed |
| a | b | ab | 27 km/h | | a | b | ab,ab | 27 km/h |
| a | c | ab,bc | 27 km/h | | a | c | ab,bc,bc | 27 km/h |
| b | c | bc | 27 km/h | | b | c | bc,bc | 27 km/h |
| a | d | ad | 27 km/h | | a | d | ad,ad | 27 km/h |
| d | c | dc | 36 km/h | | d | c | dc,dc | 36 km/h |
| g | b | ab | 27 km/h | | g | b | ab,ab | 27 km/h |
| a | g | ab | 27 km/h | | a | g | ab,ab | 27 km/h |