Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
f04d146ca3
osrm-backend/features/guidance/collapse.feature

1029 lines
42 KiB
Gherkin
Raw Normal View History

handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
@routing @guidance @collapsing
Feature: Collapse
Background:
Given the profile "car"
Given a grid size of 20 meters
Scenario: Segregated Intersection, Cross Belonging to Single Street
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i l
d c b a
e f g h
j k
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | first | yes |
| cd | primary | first | yes |
| ef | primary | first | yes |
| fg | primary | first | yes |
| gh | primary | first | yes |
| ic | primary | second | yes |
| bl | primary | second | yes |
| kg | primary | second | yes |
| fj | primary | second | yes |
| cf | primary | first | yes |
| gb | primary | first | yes |
When I route I should get
| waypoints | route | turns |
| a,l | first,second,second | depart,turn right,arrive |
| a,d | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,h | first,first,first | depart,continue uturn,arrive |
| e,j | first,second,second | depart,turn right,arrive |
| e,h | first,first | depart,arrive |
| e,l | first,second,second | depart,turn left,arrive |
| e,d | first,first,first | depart,continue uturn,arrive |
| k,h | second,first,first | depart,turn right,arrive |
| k,l | second,second | depart,arrive |
| k,d | second,first,first | depart,turn left,arrive |
| k,j | second,second,second | depart,continue uturn,arrive |
| i,d | second,first,first | depart,turn right,arrive |
| i,j | second,second | depart,arrive |
| i,h | second,first,first | depart,turn left,arrive |
| i,l | second,second,second | depart,continue uturn,arrive |
Scenario: Segregated Intersection, Cross Belonging to Correct Street
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i l
d c b a
e f g h
j k
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | first | yes |
| cd | primary | first | yes |
| ef | primary | first | yes |
| fg | primary | first | yes |
| gh | primary | first | yes |
| ic | primary | second | yes |
| bl | primary | second | yes |
| kg | primary | second | yes |
| fj | primary | second | yes |
| cf | primary | second | yes |
| gb | primary | second | yes |
When I route I should get
| waypoints | route | turns |
| a,l | first,second,second | depart,turn right,arrive |
| a,d | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,h | first,first,first | depart,continue uturn,arrive |
| e,j | first,second,second | depart,turn right,arrive |
| e,h | first,first | depart,arrive |
| e,l | first,second,second | depart,turn left,arrive |
| e,d | first,first,first | depart,continue uturn,arrive |
| k,h | second,first,first | depart,turn right,arrive |
| k,l | second,second | depart,arrive |
| k,d | second,first,first | depart,turn left,arrive |
| k,j | second,second,second | depart,continue uturn,arrive |
| i,d | second,first,first | depart,turn right,arrive |
| i,j | second,second | depart,arrive |
| i,h | second,first,first | depart,turn left,arrive |
| i,l | second,second,second | depart,continue uturn,arrive |
Scenario: Segregated Intersection, Cross Belonging to Mixed Streets
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i l
d c b a
e f g h
j k
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | second | yes |
| cd | primary | first | yes |
| ef | primary | first | yes |
| fg | primary | first | yes |
| gh | primary | first | yes |
| ic | primary | second | yes |
| bl | primary | second | yes |
| kg | primary | second | yes |
| fj | primary | second | yes |
| cf | primary | second | yes |
| gb | primary | first | yes |
When I route I should get
| waypoints | route | turns |
| a,l | first,second,second | depart,turn right,arrive |
| a,d | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,h | first,first,first | depart,continue uturn,arrive |
| e,j | first,second,second | depart,turn right,arrive |
| e,h | first,first | depart,arrive |
| e,l | first,second,second | depart,turn left,arrive |
| e,d | first,first,first | depart,continue uturn,arrive |
| k,h | second,first,first | depart,turn right,arrive |
| k,l | second,second | depart,arrive |
| k,d | second,first,first | depart,turn left,arrive |
| k,j | second,second,second | depart,continue uturn,arrive |
| i,d | second,first,first | depart,turn right,arrive |
| i,j | second,second | depart,arrive |
| i,h | second,first,first | depart,turn left,arrive |
| i,l | second,second,second | depart,continue uturn,arrive |
Scenario: Partly Segregated Intersection, Two Segregated Roads
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
n m
g h
c b a
d e f
j i
k l
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | first | yes |
| de | primary | first | yes |
| ef | primary | first | yes |
| be | primary | first | no |
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
| ngbhm | primary | second | yes |
| liejk | primary | second | yes |
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
When I route I should get
| waypoints | route | turns |
| a,h | first,second,second | depart,turn right,arrive |
| a,c | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,f | first,first,first | depart,continue uturn,arrive |
| d,j | first,second,second | depart,turn right,arrive |
| d,f | first,first | depart,arrive |
| d,h | first,second,second | depart,turn left,arrive |
| d,c | first,first,first | depart,continue uturn,arrive |
| g,c | second,first,first | depart,turn right,arrive |
| g,j | second,second | depart,arrive |
| g,f | second,first,first | depart,turn left,arrive |
| g,h | second,second,second | depart,continue uturn,arrive |
| i,f | second,first,first | depart,turn right,arrive |
| i,h | second,second | depart,arrive |
| i,c | second,first,first | depart,turn left,arrive |
| i,j | second,second,second | depart,continue uturn,arrive |
Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
n m
g h
c b a
d e f
j i
k l
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | first | yes |
| de | primary | first | yes |
| ef | primary | first | yes |
| be | primary | second | no |
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
| ngbhm | primary | second | yes |
| liejk | primary | second | yes |
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
When I route I should get
| waypoints | route | turns |
| a,h | first,second,second | depart,turn right,arrive |
| a,c | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,f | first,first,first | depart,continue uturn,arrive |
| d,j | first,second,second | depart,turn right,arrive |
| d,f | first,first | depart,arrive |
| d,h | first,second,second | depart,turn left,arrive |
| d,c | first,first,first | depart,continue uturn,arrive |
| g,c | second,first,first | depart,turn right,arrive |
| g,j | second,second | depart,arrive |
| g,f | second,first,first | depart,turn left,arrive |
| g,h | second,second,second | depart,continue uturn,arrive |
| i,f | second,first,first | depart,turn right,arrive |
| i,h | second,second | depart,arrive |
| i,c | second,first,first | depart,turn left,arrive |
| i,j | second,second,second | depart,continue uturn,arrive |
Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i l
a
c b h
d f g
e
j k
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | second | yes |
| cd | primary | first | yes |
| ef | primary | first | yes |
| fg | primary | first | yes |
| gh | primary | first | yes |
| ic | primary | second | yes |
| bl | primary | second | yes |
| kg | primary | second | yes |
| fj | primary | second | yes |
| cf | primary | second | yes |
| gb | primary | first | yes |
When I route I should get
| waypoints | route | turns |
| a,l | first,second,second | depart,turn right,arrive |
| a,d | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,h | first,first,first | depart,continue uturn,arrive |
| e,j | first,second,second | depart,turn right,arrive |
| e,h | first,first | depart,arrive |
| e,l | first,second,second | depart,turn left,arrive |
| e,d | first,first,first | depart,continue uturn,arrive |
| k,h | second,first,first | depart,turn right,arrive |
| k,l | second,second | depart,arrive |
| k,d | second,first,first | depart,turn left,arrive |
| k,j | second,second,second | depart,continue uturn,arrive |
| i,d | second,first,first | depart,turn right,arrive |
| i,j | second,second | depart,arrive |
| i,h | second,first,first | depart,turn left,arrive |
| i,l | second,second,second | depart,continue uturn,arrive |
Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles (2)
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i l
c b
d f g a
e h
j k
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | second | yes |
| cd | primary | first | yes |
| ef | primary | first | yes |
| fg | primary | first | yes |
| gh | primary | first | yes |
| ic | primary | second | yes |
| bl | primary | second | yes |
| kg | primary | second | yes |
| fj | primary | second | yes |
| cf | primary | second | yes |
| gb | primary | first | yes |
When I route I should get
| waypoints | route | turns |
| a,l | first,second,second | depart,turn right,arrive |
| a,d | first,first | depart,arrive |
| a,j | first,second,second | depart,turn left,arrive |
| a,h | first,first,first | depart,continue uturn,arrive |
| e,j | first,second,second | depart,turn right,arrive |
| e,h | first,first | depart,arrive |
| e,l | first,second,second | depart,turn left,arrive |
| e,d | first,first,first | depart,continue uturn,arrive |
| k,h | second,first,first | depart,turn right,arrive |
| k,l | second,second | depart,arrive |
| k,d | second,first,first | depart,turn left,arrive |
| k,j | second,second,second | depart,continue uturn,arrive |
| i,d | second,first,first | depart,turn right,arrive |
| i,j | second,second | depart,arrive |
| i,h | second,first,first | depart,turn left,arrive |
| i,l | second,second,second | depart,continue uturn,arrive |
Scenario: Entering a segregated road
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a f g
reduce numbers of intersections in findNextIntersection, don't normalise for turn lanes
2016-11-15 05:21:26 -05:00
| | . '
b-e '
/ /
/ /
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
c d
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
| nodes | highway | name | oneway |
| abc | primary | first | yes |
| def | primary | first | yes |
| be | primary | first | no |
| ge | primary | second | no |
When I route I should get
reduce numbers of intersections in findNextIntersection, don't normalise for turn lanes
2016-11-15 05:21:26 -05:00
| waypoints | route | turns |
| d,c | first,first,first | depart,continue uturn,arrive |
| a,f | first,first,first | depart,continue uturn,arrive |
| a,g | first,second,second | depart,turn left,arrive |
| d,g | first,second,second | depart,turn right,arrive |
| g,f | second,first,first | depart,turn right,arrive |
| g,c | second,first,first | depart,turn left,arrive |
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
Scenario: Do not collapse turning roads
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
e
c d
a b f
"""
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
And the ways
handle non-through case
2016-08-10 08:35:02 -04:00
| nodes | highway | name | oneway |
| ab | primary | first | yes |
| bc | primary | first | yes |
| cd | primary | first | yes |
| ce | primary | second | yes |
| bf | primary | third | yes |
handle combined turns at segregated roads
2016-04-14 04:41:56 -04:00
When I route I should get
| waypoints | route | turns |
| a,d | first,first,first,first | depart,continue left,continue right,arrive |
| a,e | first,second,second | depart,turn left,arrive |
emit turn-straight for obvious turns where the main road continues
2016-05-11 10:15:34 -04:00
| a,f | first,third,third | depart,turn straight,arrive |
improve collapse-handling
2016-05-30 11:42:28 -04:00
Scenario: Bridge on unnamed road
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a b c d
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name |
| ab | primary | |
| bc | primary | Bridge |
| cd | primary | |
When I route I should get
| waypoints | route | turns |
| a,d | , | depart,arrive |
Scenario: Crossing Bridge into Segregated Turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
f
i h g e
a b c d
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | oneway | name |
| ab | primary | yes | to_bridge |
| bc | primary | yes | bridge |
| cd | primary | yes | off_bridge |
| de | primary | yes | |
| ef | primary | no | target_road |
| eg | primary | yes | off_bridge |
| gh | primary | yes | bridge |
| hi | primary | yes | to_bridge |
When I route I should get
| waypoints | route | turns |
| a,f | to_bridge,target_road,target_road | depart,turn left,arrive |
Scenario: Pankenbruecke
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
j h i
b c d e f g
k a
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name | oneway |
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
| kabhj | primary | inroad | yes |
improve collapse-handling
2016-05-30 11:42:28 -04:00
| bc | primary | inroad | no |
| cd | primary | bridge | no |
| defg | primary | outroad | no |
| fi | primary | cross | no |
When I route I should get
| waypoints | route | turns |
| a,g | inroad,outroad,outroad | depart,new name straight,arrive |
| a,i | inroad,cross,cross | depart,turn left,arrive |
Scenario: Close Turns - Don't Collapse
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
g d
e b c f
a h
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name |
| ab | primary | in |
| ebcf | primary | cross |
| cd | primary | out |
| bg | primary | straight |
| ch | primary | reverse |
When I route I should get
| waypoints | route | turns |
| a,d | in,cross,out,out | depart,turn right,turn left,arrive |
| a,h | in,cross,reverse,reverse | depart,turn right,turn right,arrive |
| g,d | straight,cross,out,out | depart,turn left,turn left,arrive |
Scenario: No Name During Turns
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a b
c d
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name |
| ab | tertiary | road |
| bc | tertiary | |
| cd | tertiary | road |
When I route I should get
| waypoints | route | turns |
| a,d | road,road | depart,arrive |
add testscases for mode changes / additional assertions
2016-11-04 09:44:23 -04:00
Scenario: No Name During Turns - Ferry
Given the node map
"""
a b
c d
"""
And the ways
| nodes | highway | name | route |
| ab | tertiary | road | |
| bc | tertiary | | ferry |
| cd | tertiary | road | |
When I route I should get
| waypoints | route | turns |
| a,d | road,,road,road | depart,notification right,notification left,arrive |
improve collapse-handling
2016-05-30 11:42:28 -04:00
Scenario: No Name During Turns, Random Oneway
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a b
c d
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name | oneway |
| ab | tertiary | road | no |
| bc | tertiary | | yes |
| cd | tertiary | road | no |
When I route I should get
| waypoints | route | turns |
| a,d | road,road | depart,arrive |
Scenario: Pulled Back Turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
d
a b c
e
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name |
| abc | tertiary | road |
| cd | tertiary | left |
| be | tertiary | right |
When I route I should get
| waypoints | route | turns |
| a,d | road,left,left | depart,turn left,arrive |
| a,e | road,right,right | depart,turn right,arrive |
Scenario: No Name During Turns, keep important turns
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a b e
c d
"""
improve collapse-handling
2016-05-30 11:42:28 -04:00
And the ways
| nodes | highway | name |
| ab | tertiary | road |
| bc | tertiary | |
| cd | tertiary | road |
| be | tertiary | other |
When I route I should get
| waypoints | route | turns |
| a,d | road,road,road | depart,continue right,arrive |
handle merge on collapsed instructions
2016-06-06 05:01:55 -04:00
Scenario: Segregated Intersection into Slight Turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
h
a
g
b f
c
e
d
j i
"""
handle merge on collapsed instructions
2016-06-06 05:01:55 -04:00
And the ways
| nodes | highway | name | oneway |
| abcd | primary | road | yes |
| efgh | primary | road | yes |
| icf | secondary | in | yes |
| gbj | secondary | out | yes |
change paradigm of merge to only emit on motorway-like roads
2016-07-14 09:05:46 -04:00
When I route I should get
| waypoints | route | turns |
| i,h | in,road,road | depart,turn left,arrive |
| a,d | road,road | depart,arrive |
| a,j | road,out,out | depart,turn slight right,arrive |
Scenario: Segregated Intersection into Very Slight Turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
h
a
g
b
f
c
e
d
j i
"""
change paradigm of merge to only emit on motorway-like roads
2016-07-14 09:05:46 -04:00
And the ways
| nodes | highway | name | oneway |
| abcd | primary | road | yes |
| efgh | primary | road | yes |
| icf | secondary | in | yes |
| gbj | secondary | out | yes |
handle merge on collapsed instructions
2016-06-06 05:01:55 -04:00
When I route I should get
| waypoints | route | turns |
| i,h | in,road,road | depart,turn slight left,arrive |
| a,d | road,road | depart,arrive |
| a,j | road,out,out | depart,turn slight right,arrive |
add testcase
2016-06-10 04:17:37 -04:00
Scenario: Don't collapse everything to u-turn / too wide
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a b e
d c f
"""
add testcase
2016-06-10 04:17:37 -04:00
And the ways
| nodes | highway | name |
| abcd | primary | road |
| be | secondary | top |
| cf | secondary | bottom |
When I route I should get
reduce number of end-of-road instructions in unnecessary cases
2016-06-24 11:02:22 -04:00
| waypoints | turns | route |
| a,d | depart,continue right,turn right,arrive | road,road,road,road |
| d,a | depart,continue left,turn left,arrive | road,road,road,road |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
Scenario: Forking before a turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
g
c
a b d e
f
"""
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the ways
| nodes | name | oneway | highway |
| ab | road | yes | primary |
| bd | road | yes | primary |
| bc | road | yes | primary |
| de | road | yes | primary |
fix turn scenarios
2016-10-21 04:39:06 -04:00
| fd | cross | no | secondary |
| dc | cross | no | secondary |
| cg | cross | no | secondary |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the relations
| type | way:from | way:to | node:via | restriction |
fix turn scenarios
2016-10-21 04:39:06 -04:00
| restriction | bd | dc | d | no_left_turn |
| restriction | bc | dc | c | no_right_turn |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
When I route I should get
| waypoints | route | turns |
| a,g | road,cross,cross | depart,turn left,arrive |
| a,e | road,road | depart,arrive |
Scenario: Forking before a turn (narrow)
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
g
c
a b d e
f
"""
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the ways
| nodes | name | oneway | highway |
| ab | road | yes | primary |
| bd | road | yes | primary |
| bc | road | yes | primary |
| de | road | yes | primary |
moved obviousness discovery. updated sliproad handler. back to original cases failing
2016-08-10 07:35:21 -04:00
| fd | cross | no | secondary |
handle non-through case
2016-08-10 08:35:02 -04:00
| dc | cross | no | secondary |
| cg | cross | no | secondary |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the relations
| type | way:from | way:to | node:via | restriction |
moved obviousness discovery. updated sliproad handler. back to original cases failing
2016-08-10 07:35:21 -04:00
| restriction | bd | dc | d | no_left_turn |
| restriction | bc | dc | c | no_right_turn |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
When I route I should get
moved obviousness discovery. updated sliproad handler. back to original cases failing
2016-08-10 07:35:21 -04:00
| waypoints | route | turns |
| a,g | road,cross,cross | depart,turn left,arrive |
| a,e | road,road | depart,arrive |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
Scenario: Forking before a turn (forky)
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
g
Refactors and improves the Sliproad Handler, resolves #3109
2016-10-26 17:32:29 -04:00
.
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
c
Refactors and improves the Sliproad Handler, resolves #3109
2016-10-26 17:32:29 -04:00
a . . b .'
` d.
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
f e
"""
Refactors and improves the Sliproad Handler, resolves #3109
2016-10-26 17:32:29 -04:00
# as it is right now we don't classify this as a sliproad,
# check collapse-detail.feature for a similar test case
# which removes the fork here due to it being a Sliproad.
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the ways
| nodes | name | oneway | highway |
| ab | road | yes | primary |
| bd | road | yes | primary |
| bc | road | yes | primary |
| de | road | yes | primary |
moved obviousness discovery. updated sliproad handler. back to original cases failing
2016-08-10 07:35:21 -04:00
| fd | cross | no | secondary |
handle non-through case
2016-08-10 08:35:02 -04:00
| dc | cross | no | secondary |
| cg | cross | no | secondary |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the relations
| type | way:from | way:to | node:via | restriction |
moved obviousness discovery. updated sliproad handler. back to original cases failing
2016-08-10 07:35:21 -04:00
| restriction | bd | dc | d | no_left_turn |
| restriction | bc | dc | c | no_right_turn |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
When I route I should get
fix getTurnDirection, widen `straight` range, adjust tests accordingly
2016-11-11 05:32:57 -05:00
| waypoints | route | turns |
Refactors and improves the Sliproad Handler, resolves #3109
2016-10-26 17:32:29 -04:00
| a,g | road,cross,cross | depart,fork left,arrive |
| a,e | road,road,road | depart,fork slight right,arrive |
| a,f | road,road,cross,cross | depart,fork slight right,turn right,arrive |
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
fix obvious turn collapsing for straight turns
2016-07-04 10:31:30 -04:00
Scenario: On-Off on Highway
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
f
a b c d
e
"""
improve slipway handling to allow multiple styles of turn lanes / turn roads
2016-06-08 08:55:59 -04:00
And the ways
| nodes | name | highway | oneway |
| abcd | Hwy | motorway | yes |
| fb | on | motorway_link | yes |
| ce | off | motorway_link | yes |
When I route I should get
| waypoints | route | turns |
| a,d | Hwy,Hwy | depart,arrive |
| f,d | on,Hwy,Hwy | depart,merge slight right,arrive |
| f,e | on,Hwy,off,off | depart,merge slight right,off ramp right,arrive |
| a,e | Hwy,off,off | depart,off ramp right,arrive |
change paradigm of merge to only emit on motorway-like roads
2016-07-14 09:05:46 -04:00
@negative @straight
Scenario: Don't collapse going straight if actual turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
fix getTurnDirection, widen `straight` range, adjust tests accordingly
2016-11-11 05:32:57 -05:00
e
c |
\ d - - - f
\|
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
b
fix getTurnDirection, widen `straight` range, adjust tests accordingly
2016-11-11 05:32:57 -05:00
|
|
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
a
"""
change paradigm of merge to only emit on motorway-like roads
2016-07-14 09:05:46 -04:00
And the ways
| nodes | name | highway |
| abc | main | primary |
| bde | straight | residential |
| df | right | residential |
When I route I should get
fix getTurnDirection, widen `straight` range, adjust tests accordingly
2016-11-11 05:32:57 -05:00
| waypoints | route | turns | locations |
| a,c | main,main | depart,arrive | a,c |
| a,e | main,straight,straight | depart,turn straight,arrive | a,b,e |
| a,f | main,straight,right,right | depart,turn straight,turn right,arrive | a,b,d,f |
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
Scenario: Entering a segregated road
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a f
g
b e
c d
"""
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
And the ways
| nodes | highway | name | oneway |
| abc | primary | first | yes |
| def | primary | first | yes |
| be | primary | first | no |
| ge | primary | second | no |
When I route I should get
| waypoints | route | turns |
| d,c | first,first,first | depart,continue uturn,arrive |
Scenario: Entering a segregated road slight turn
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
a f
g
b e
c d
"""
handle stronger merge cases as well
2016-08-11 08:21:34 -04:00
And the ways
| nodes | highway | name | oneway |
| abc | primary | first | yes |
| def | primary | first | yes |
| be | primary | first | no |
| ge | primary | second | no |
When I route I should get
| waypoints | route | turns |
| d,c | first,first,first | depart,continue uturn,arrive |
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
Scenario: Do not collapse UseLane step when lanes change
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
f g
a b c d e
h i
"""
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
And the ways
don't assign lanes on delayed turns
2016-07-08 05:45:36 -04:00
| nodes | turn:lanes:forward | name |
| ab | | main |
| bc | left\|through\|through\|through\|right | main |
| cd | left\|through\|right | main |
| de | | main |
| cf | | off |
| ch | | off |
| dg | | off |
| di | | off |
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
When I route I should get
adjust testscases for collapse of use lane
2016-07-22 03:08:40 -04:00
| waypoints | route | turns |
| a,e | main,main,main | depart,use lane straight,arrive |
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
Scenario: But _do_ collapse UseLane step when lanes stay the same
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
f g
a b c d e
h i
"""
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
And the ways
don't assign lanes on delayed turns
2016-07-08 05:45:36 -04:00
| nodes | turn:lanes:forward | name |
| ab | | main |
| bc | left\|through\|through\|through\|right | main |
| cd | left\|through\|through\|through\|right | main |
| de | | main |
| cf | | off |
| ch | | off |
| dg | | off |
| di | | off |
Do not collapse away lane information as long as it is necessary
2016-07-07 10:15:43 -04:00
When I route I should get
adjust testscases for collapse of use lane
2016-07-22 03:08:40 -04:00
| waypoints | route | turns |
| a,e | main,main | depart,arrive |
make sure to not-collapse different travel modes
2016-09-08 08:03:02 -04:00
Scenario: Don't collapse different travel modes
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
g h
a b c e f
d
i j
"""
make sure to not-collapse different travel modes
2016-09-08 08:03:02 -04:00
And the ways
| nodes | highway | route | name |
| ab | primary | | road |
| bc | primary | ferry | |
| cd | primary | | road |
| de | | ferry | |
| ef | primary | | road |
| bg | service | | turn |
| ci | service | | turn |
| dj | service | | turn |
| eh | service | | turn |
When I route I should get
| waypoints | route |
| a,f | road,,road,,road,road |
Scenario: U-Turn onto a Ferry
Given the node map
cucumber: change syntax of node maps
2016-09-30 03:33:08 -04:00
"""
i
j e d c h
k g a b f
"""
make sure to not-collapse different travel modes
2016-09-08 08:03:02 -04:00
And the ways
| nodes | highway | route | name | oneway |
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
| abf | primary | | road | yes |
make sure to not-collapse different travel modes
2016-09-08 08:03:02 -04:00
| hcd | primary | | road | yes |
| bc | primary | | | yes |
| di | service | | serv | yes |
| ed | | ferry | ferry | |
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
| ga | | ferry | ferry | |
make sure to not-collapse different travel modes
2016-09-08 08:03:02 -04:00
| kg | primary | | on | yes |
| ej | primary | | off | yes |
When I route I should get
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
| waypoints | route | turns |
| k,j | on,ferry,road,road,ferry,off,off | depart,notification straight,notification straight,continue uturn,turn straight,notification straight,arrive |
fix u-turn collapsing onto empty name / in presence of turning use lane
2016-10-17 08:29:10 -04:00
# http://www.openstreetmap.org/#map=19/37.78090/-122.41251
Scenario: U-Turn onto unnamed-road
Given the node map
"""
d . _ h
' b . _ |
| ' e g
| f '
| 1 '
a '
"""
And the ways
| nodes | highway | turn:lanes | name | oneway |
| ab | secondary | | up | yes |
| gfa | secondary | | | yes |
| dbe | tertiary | | turn | no |
| he | secondary | through\|right | down | yes |
| ef | secondary | | down | yes |
When I route I should get
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
| waypoints | route | turns |
| a,1 | up,turn,, | depart,turn right,turn sharp right,arrive |
#http://www.openstreetmap.org/#map=19/52.48778/13.30024
Scenario: Hohenzollerdammbrücke
add comments, refactor find obvious turn
2016-10-24 20:29:51 -04:00
Given a grid size of 10 meters
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
Given the node map
"""
q s
p o
add comments, refactor find obvious turn
2016-10-24 20:29:51 -04:00
.. ..
. . . .
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
j - i - - - h - - - g - f
> k < > l <
a - b - - - c - - - d - e
add comments, refactor find obvious turn
2016-10-24 20:29:51 -04:00
. . . .
Turn Angles in OSRM were computed using a lookahead of 10 meters. This PR adds more advanced coordinate extraction, analysing the road to detect offsets due to OSM way modelling. In addition it improves the handling of bearings. Right now OSM reports bearings simply based on the very first coordinate along a way. With this PR, we store the bearings for a turn correctly, making the bearings for turns correct.
2016-08-17 03:49:19 -04:00
.. ..
m n
t r
"""
And the ways
| nodes | highway | name | oneway |
| ab | secondary | hohe | yes |
| bc | secondary | hohebruecke | yes |
| cd | secondary | hohebruecke | yes |
| bk | secondary | hohebruecke | yes |
| kh | secondary | hohebruecke | yes |
| ki | secondary | hohebruecke | yes |
| ck | secondary | hohebruecke | yes |
| de | secondary | hohe | yes |
| fg | secondary | hohe | yes |
| gh | secondary | hohebruecke | yes |
| hi | secondary | hohebruecke | yes |
| gl | secondary | hohebruecke | yes |
| lc | secondary | hohebruecke | yes |
| hl | secondary | hohebruecke | yes |
| ld | secondary | hohebruecke | yes |
| ij | secondary | hohe | yes |
| bm | motorway_link | a100 | yes |
| cm | motorway_link | a100 | yes |
| nc | motorway_link | a100 | yes |
| nd | motorway_link | a100 | yes |
| go | motorway_link | a100 | yes |
| ho | motorway_link | a100 | yes |
| ph | motorway_link | a100 | yes |
| pi | motorway_link | a100 | yes |
| qp | motorway_link | a100 | yes |
| mt | motorway_link | a100 | yes |
| rn | motorway_link | a100 | yes |
| os | motorway_link | a100 | yes |
And the relations
| type | way:from | way:to | node:via | restriction |
| restriction | ck | kh | k | no_right_turn |
| restriction | bk | ki | k | no_left_turn |
| restriction | hl | lc | l | no_right_turn |
| restriction | gl | ld | l | no_left_turn |
| restriction | bc | cm | c | no_right_turn |
| restriction | bc | ck | c | no_left_turn |
| restriction | nc | cm | c | no_left_turn |
| restriction | nc | cd | c | no_right_turn |
| restriction | lc | ck | c | no_left_turn |
| restriction | lc | cd | c | no_right_turn |
| restriction | gh | ho | h | no_right_turn |
| restriction | gh | hl | h | no_left_turn |
| restriction | kh | hi | h | no_left_turn |
| restriction | kh | hl | h | no_right_turn |
| restriction | ph | ho | h | no_left_turn |
| restriction | ph | hi | h | no_right_turn |
When I route I should get
add comments, refactor find obvious turn
2016-10-24 20:29:51 -04:00
| waypoints | route | turns | locations |
| a,e | hohe,hohe | depart,arrive | a,e |
| a,s | hohe,a100,a100 | depart,on ramp left,arrive | a,b,s |
| a,t | hohe,a100,a100 | depart,on ramp right,arrive | a,b,t |
| a,j | | | |
| f,j | hohe,hohe | depart,arrive | f,j |
| a,t | hohe,a100,a100 | depart,on ramp right,arrive | a,b,t |
| f,e | | | |
| q,j | a100,hohe,hohe | depart,turn right,arrive | q,p,j |
| q,e | a100,hohebruecke,hohe | depart,turn left,arrive | q,p,e |
Reference in New Issue Copy Permalink