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

fix turn scenarios

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-10-21 10:39:06 +02:00 committed by Daniel J. Hofmann
parent e8b947bca6
commit ba5871cfa1
4 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/guidance/collapse.feature
View File

@ -635,12 +635,14 @@ Feature: Collapse
| bd | road | yes | primary | | bd | road | yes | primary |
| bc | road | yes | primary | | bc | road | yes | primary |
| de | road | yes | primary | | de | road | yes | primary |
| fdcg | cross | no | secondary | | fd | cross | no | secondary |
| dc | cross | no | secondary |
| cg | cross | no | secondary |
And the relations And the relations
| type | way:from | way:to | node:via | restriction | | type | way:from | way:to | node:via | restriction |
| restriction | bd | fdcg | d | no_left_turn | | restriction | bd | dc | d | no_left_turn |
| restriction | bc | fdcg | c | no_right_turn | | restriction | bc | dc | c | no_right_turn |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |

10
features/guidance/dedicated-turn-roads.feature
View File

@ -21,13 +21,15 @@ Feature: Slipways and Dedicated Turn Lanes
And the ways And the ways
| nodes | highway | name | | nodes | highway | name |
| abcd | trunk | first | | abc | trunk | first |
| cd | trunk | first |
| bhf | trunk_link | | | bhf | trunk_link | |
| ecfg | primary | second | | cfg | primary | second |
| ec | primary | second |
And the relations And the relations
| type | way:from | way:to | node:via | restriction | | type | way:from | way:to | node:via | restriction |
| restriction | abcd | ecfg | c | no_right_turn | | restriction | abc | cfg | c | no_right_turn |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -53,8 +55,8 @@ Feature: Slipways and Dedicated Turn Lanes
| abc | trunk | first | 70 | | abc | trunk | first | 70 |
| cd | trunk | first | 2 | | cd | trunk | first | 2 |
| bhf | trunk_link | | 2 | | bhf | trunk_link | | 2 |
| ec | primary | second | 50 |
| cfg | primary | second | 50 | | cfg | primary | second | 50 |
| ec | primary | second | 50 |
And the relations And the relations
| type | way:from | way:to | node:via | restriction | | type | way:from | way:to | node:via | restriction |

31
features/guidance/roundabout.feature
View File

@ -281,18 +281,23 @@ Feature: Basic Roundabout
| a,e | crescent,crescent,crescent | depart,roundabout-exit-3,arrive | US 130,US 130,US 130 | | a,e | crescent,crescent,crescent | depart,roundabout-exit-3,arrive | US 130,US 130,US 130 |
| j,l | ,, | depart,roundabout-exit-2,arrive | NJ 38,NJ 38,NJ 38 | | j,l | ,, | depart,roundabout-exit-2,arrive | NJ 38,NJ 38,NJ 38 |
@todo
# this test previously only passed by accident. We need to handle throughabouts correctly, since staying on massachusetts is actually
# the desired setting. Rotary instructions here are not wanted but rather no instruction at all to go through the roundabout (or add
# a throughabout instruction)
# see https://github.com/Project-OSRM/osrm-backend/issues/3142
Scenario: Double Roundabout with through-lane Scenario: Double Roundabout with through-lane
#http://map.project-osrm.org/?z=18&center=38.911752%2C-77.048667&loc=38.912003%2C-77.050831&loc=38.909277%2C-77.042516&hl=en&alt=0 #http://map.project-osrm.org/?z=18&center=38.911752%2C-77.048667&loc=38.912003%2C-77.050831&loc=38.909277%2C-77.042516&hl=en&alt=0
Given the node map Given the node map
""" """
o n o n
e j .e. _j_.
/ '. / \
q / q__ / |
a b s f g i k a---b | >s---f-------g i---k
r p . r'' | .' . .p'|
t . | t . .'
c d h 'c---d 'h'
l m l m
""" """
@ -304,9 +309,13 @@ Feature: Basic Roundabout
| nodes | junction | name | oneway | | nodes | junction | name | oneway |
| bcdrqeb | roundabout | sheridan circle | yes | | bcdrqeb | roundabout | sheridan circle | yes |
| ghi | roundabout | dupont circle | yes | | ghi | roundabout | dupont circle | yes |
| ijg | roundabout | dupont circle | yes | | ij | roundabout | dupont circle | yes |
| jg | roundabout | dupont circle | yes |
| ab | | massachusetts | no | | ab | | massachusetts | no |
| sfgpik | | massachusetts | no | | gp | | massachusetts | no |
| pi | | massachusetts | no |
| sfg | | massachusetts | no |
| ik | | massachusetts | no |
| cl | | 23rd street | no | | cl | | 23rd street | no |
| oe | | r street | no | | oe | | r street | no |
| jn | | new hampshire | no | | jn | | new hampshire | no |
@ -316,11 +325,11 @@ Feature: Basic Roundabout
And the relations And the relations
| type | way:from | way:to | node:via | restriction | | type | way:from | way:to | node:via | restriction |
| restriction | sfgpik | ijg | i | no_left_turn | | restriction | pi | ij | i | no_left_turn |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| a,k | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,dupont circle-exit-1,arrive | | a,k | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,rotary-exit-1,arrive |
#2856 - http://www.openstreetmap.org/#map=19/47.23318/-1.56563 #2856 - http://www.openstreetmap.org/#map=19/47.23318/-1.56563
Scenario: Linked Roundabouts Scenario: Linked Roundabouts

4
features/guidance/turn.feature
View File

@ -907,8 +907,8 @@ Feature: Simple Turns
Scenario: Turn Lane on Splitting up Road Scenario: Turn Lane on Splitting up Road
Given the node map Given the node map
""" """
g - - - f g - - - f -
\ ' .
. h - - e - - c - - d . h - - e - - c - - d
a - - b _______/ a - - b _______/
i i