Skip to content

Commit

Permalink
highway=motorway_link does not imply oneway, fixes #1662
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@daniel-j-h
daniel-j-h committed Jun 1, 2016
1 parent 5031372 commit de85bec
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 63 deletions.
14 changes: 7 additions & 7 deletions features/bicycle/oneway.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ Feature: Bike - Oneway streets

Scenario: Bike - Implied oneways
Then routability should be
| highway | foot | bicycle | junction | forw | backw |
| | no | | | x | x |
| | no | | roundabout | x | |
| motorway | no | yes | | x | |
| motorway_link | no | yes | | x | |
| motorway | no | yes | roundabout | x | |
| motorway_link | no | yes | roundabout | x | |
| highway | foot | bicycle | junction | forw | backw | # |
| | no | | | x | x | |
| | no | | roundabout | x | | |
| motorway | no | yes | | x | | |
| motorway_link | no | yes | | x | x | does not imply oneway |
| motorway | no | yes | roundabout | x | | |
| motorway_link | no | yes | roundabout | x | | |

Scenario: Bike - Overriding implied oneways
Then routability should be
Expand Down
22 changes: 12 additions & 10 deletions features/car/oneway.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,21 @@ Feature: Car - Oneway streets

Scenario: Car - Implied oneways
Then routability should be
| highway | junction | forw | backw |
| motorway | | x | |
| motorway_link | | x | |
| primary | | x | x |
| motorway | roundabout | x | |
| motorway_link | roundabout | x | |
| primary | roundabout | x | |
| highway | junction | forw | backw | # |
| motorway | | x | | |
| motorway_link | | x | x | does not imply oneway |
| primary | | x | x | |
| motorway | roundabout | x | | |
| motorway_link | roundabout | x | | |
| primary | roundabout | x | | |

Scenario: Car - Overrule implied oneway
Then routability should be
| highway | oneway | forw | backw |
| motorway | no | x | x |
| motorway_link | no | x | x |
| highway | oneway | forw | backw | # |
| motorway | 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
Given the node map
Expand Down
88 changes: 44 additions & 44 deletions features/guidance/motorway.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Feature: Motorway Guidance
| | | | f | g |

And the ways
| nodes | highway |
| abcde | motorway |
| bfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| bfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -27,9 +27,9 @@ Feature: Motorway Guidance
| | | | g | e |

And the ways
| nodes | highway |
| abcde | motorway |
| bfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| bfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -44,9 +44,9 @@ Feature: Motorway Guidance


And the ways
| nodes | highway |
| abcde | motorway |
| cfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| cfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -60,9 +60,9 @@ Feature: Motorway Guidance
| a | b | c | d | e |

And the ways
| nodes | highway |
| abcde | motorway |
| bfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| bfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -76,9 +76,9 @@ Feature: Motorway Guidance
| a | b | c | | |

And the ways
| nodes | highway |
| abcde | motorway |
| bfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| bfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -92,9 +92,9 @@ Feature: Motorway Guidance
| | | | | e |

And the ways
| nodes | highway |
| abcde | motorway |
| cfg | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| cfg | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -107,9 +107,9 @@ Feature: Motorway Guidance
| f | g | | | |

And the ways
| nodes | highway |
| abcde | motorway |
| fgd | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| fgd | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand All @@ -122,9 +122,9 @@ Feature: Motorway Guidance
| a | b | c | d | e |

And the ways
| nodes | highway |
| abcde | motorway |
| fgd | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| fgd | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
Expand Down Expand Up @@ -154,10 +154,10 @@ Feature: Motorway Guidance
| | | | | f | g |

And the ways
| nodes | highway |
| abc | motorway_link |
| cde | motorway |
| cfg | motorway |
| nodes | highway | oneway |
| abc | motorway_link | yes |
| cde | motorway | |
| cfg | motorway | |

When I route I should get
| waypoints | route | turns |
Expand All @@ -170,35 +170,35 @@ Feature: Motorway Guidance
| f | g | | | | h | i |

And the ways
| nodes | highway |
| abcde | motorway |
| fgc | motorway_link |
| chi | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| fgc | motorway_link | yes |
| chi | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight left,arrive |
| waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight left,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
Given the node map
| f | g | | | | h | i |
| a | b | | c | | d | e |

And the ways
| nodes | highway |
| abcde | motorway |
| fgc | motorway_link |
| chi | motorway_link |
| nodes | highway | oneway |
| abcde | motorway | |
| fgc | motorway_link | yes |
| chi | motorway_link | yes |

When I route I should get
| waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight right,arrive |
| waypoints | route | turns |
| a,e | abcde,abcde | depart,arrive |
| f,e | fgc,abcde,abcde | depart,merge slight right,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
Given the node map
Expand Down
2 changes: 1 addition & 1 deletion profiles/bicycle.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ function way_function (way, result)

-- direction
local impliedOneway = false
if junction == "roundabout" or highway == "motorway_link" or highway == "motorway" then
if junction == "roundabout" or highway == "motorway" then
impliedOneway = true
end

Expand Down
1 change: 0 additions & 1 deletion profiles/car.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ function way_function (way, result)
oneway == "1" or
oneway == "true" or
junction == "roundabout" or
(highway == "motorway_link" and oneway ~="no") or
(highway == "motorway" and oneway ~= "no") then
result.backward_mode = mode.inaccessible

Expand Down

0 comments on commit de85bec

Please sign in to comment.