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

highway=motorway_link does not imply oneway, fixes #1662

Browse Source 
References:
- http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway_link#Tagging_oneway
- http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway_link
- http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway
This commit is contained in:
Daniel J. Hofmann 2016-05-31 18:00:48 +02:00
parent 6edc565c01
commit c490752ca7
5 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features/bicycle/oneway.feature
View File

@ -48,14 +48,14 @@ Feature: Bike - Oneway streets
Scenario: Bike - Implied oneways Scenario: Bike - Implied oneways
Then routability should be Then routability should be
| highway | foot | bicycle | junction | forw | backw | | highway | foot | bicycle | junction | forw | backw | # |
| | no | | | x | x | | | no | | | x | x | |
| | no | | roundabout | x | | | | no | | roundabout | x | | |
| motorway | no | yes | | x | | | motorway | no | yes | | x | | |
| motorway_link | no | yes | | x | | | motorway_link | no | yes | | x | x | does not imply oneway |
| motorway | no | yes | roundabout | x | | | motorway | no | yes | roundabout | x | | |
| motorway_link | no | yes | roundabout | x | | | motorway_link | no | yes | roundabout | x | | |
| mini_roundabout | no | yes | | x | | | mini_roundabout | no | yes | | x | | |
Scenario: Bike - Overriding implied oneways Scenario: Bike - Overriding implied oneways
Then routability should be Then routability should be

24
features/car/oneway.feature
View File

@ -17,20 +17,22 @@ Feature: Car - Oneway streets
Scenario: Car - Implied oneways Scenario: Car - Implied oneways
Then routability should be Then routability should be
| highway | junction | forw | backw | | highway | junction | forw | backw | # |
| motorway | | x | | | motorway | | x | | |
| motorway_link | | x | | | motorway_link | | x | x | does not imply oneway |
| primary | | x | x | | primary | | x | x | |
| motorway | roundabout | x | | | motorway | roundabout | x | | |
| motorway_link | roundabout | x | | | motorway_link | roundabout | x | | |
| primary | roundabout | x | | | primary | roundabout | x | | |
| mini_roundabout | | x | | | mini_roundabout | | x | | |
Scenario: Car - Overrule implied oneway Scenario: Car - Overrule implied oneway
Then routability should be Then routability should be
| highway | oneway | forw | backw | | highway | oneway | forw | backw | # |
| motorway | no | x | x | | motorway | no | x | x | |
| motorway_link | no | x | x | | motorway_link | no | x | x | |
| motorway_link | yes | x | | |
| motorway_link | | x | x | does not imply onway |
Scenario: Car - Around the Block Scenario: Car - Around the Block
Given the node map Given the node map

88
features/guidance/motorway.feature
View File

@ -11,9 +11,9 @@ Feature: Motorway Guidance
| | | | f | g | | | | | f | g |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| bfg | motorway_link | | bfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -27,9 +27,9 @@ Feature: Motorway Guidance
| | | | g | e | | | | | g | e |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| bfg | motorway_link | | bfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -44,9 +44,9 @@ Feature: Motorway Guidance
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| cfg | motorway_link | | cfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -60,9 +60,9 @@ Feature: Motorway Guidance
| a | b | c | d | e | | a | b | c | d | e |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| bfg | motorway_link | | bfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -76,9 +76,9 @@ Feature: Motorway Guidance
| a | b | c | | | | a | b | c | | |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| bfg | motorway_link | | bfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -92,9 +92,9 @@ Feature: Motorway Guidance
| | | | | e | | | | | | e |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| cfg | motorway_link | | cfg | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -107,9 +107,9 @@ Feature: Motorway Guidance
| f | g | | | | | f | g | | | |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| fgd | motorway_link | | fgd | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -122,9 +122,9 @@ Feature: Motorway Guidance
| a | b | c | d | e | | a | b | c | d | e |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| fgd | motorway_link | | fgd | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -154,10 +154,10 @@ Feature: Motorway Guidance
| | | | | f | g | | | | | | f | g |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abc | motorway_link | | abc | motorway_link | yes |
| cde | motorway | | cde | motorway | |
| cfg | motorway | | cfg | motorway | |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
@ -170,17 +170,17 @@ Feature: Motorway Guidance
| f | g | | | | h | i | | f | g | | | | h | i |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| fgc | motorway_link | | fgc | motorway_link | yes |
| chi | motorway_link | | chi | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive | | a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight left,arrive | | f,e | fgc,abcde,abcde | depart,merge slight left,arrive |
| a,i | abcde,chi,chi | depart,off ramp slight right,arrive | | a,i | abcde,chi,chi | depart,off ramp slight right,arrive |
| f,i | fgc,chi,chi | depart,off ramp right,arrive | | f,i | fgc,chi,chi | depart,off ramp right,arrive |
Scenario: On And Off Ramp Left Scenario: On And Off Ramp Left
Given the node map Given the node map
@ -188,17 +188,17 @@ Feature: Motorway Guidance
| a | b | | c | | d | e | | a | b | | c | | d | e |
And the ways And the ways
| nodes | highway | | nodes | highway | oneway |
| abcde | motorway | | abcde | motorway | |
| fgc | motorway_link | | fgc | motorway_link | yes |
| chi | motorway_link | | chi | motorway_link | yes |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive | | a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight right,arrive | | f,e | fgc,abcde,abcde | depart,merge slight right,arrive |
| a,i | abcde,chi,chi | depart,off ramp slight left,arrive | | a,i | abcde,chi,chi | depart,off ramp slight left,arrive |
| f,i | fgc,chi,chi | depart,off ramp left,arrive | | f,i | fgc,chi,chi | depart,off ramp left,arrive |
Scenario: Merging Motorways Scenario: Merging Motorways
Given the node map Given the node map

2
profiles/bicycle.lua
View File

@ -318,7 +318,7 @@ function way_function (way, result)
-- direction -- direction
local impliedOneway = false local impliedOneway = false
if junction == "roundabout" or highway == "mini_roundabout" or highway == "motorway_link" or highway == "motorway" then if junction == "roundabout" or highway == "mini_roundabout" or highway == "motorway" then
impliedOneway = true impliedOneway = true
end end

1
profiles/car.lua
View File

@ -396,7 +396,6 @@ function way_function (way, result)
oneway == "true" or oneway == "true" or
junction == "roundabout" or junction == "roundabout" or
highway == "mini_roundabout" or highway == "mini_roundabout" or
(highway == "motorway_link" and oneway ~="no") or
(highway == "motorway" and oneway ~= "no") then (highway == "motorway" and oneway ~= "no") then
result.backward_mode = mode.inaccessible result.backward_mode = mode.inaccessible