diff --git a/features/bicycle/oneway.feature b/features/bicycle/oneway.feature index 0cb774c555d..95c3dcbaaf1 100644 --- a/features/bicycle/oneway.feature +++ b/features/bicycle/oneway.feature @@ -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 diff --git a/features/car/oneway.feature b/features/car/oneway.feature index b1b08bfb23d..a2f63498f58 100644 --- a/features/car/oneway.feature +++ b/features/car/oneway.feature @@ -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 diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature index 4e792334b04..aa86c1885a9 100644 --- a/features/guidance/motorway.feature +++ b/features/guidance/motorway.feature @@ -176,11 +176,11 @@ Feature: Motorway Guidance | chi | motorway_link | 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 | - | a,i | abcde,chi,chi | depart,off ramp slight right,arrive | - | f,i | fgc,chi,chi | depart,off ramp right,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,on ramp slight right,arrive | + | f,i | fgc,chi,chi | depart,off ramp right,arrive | Scenario: On And Off Ramp Left Given the node map @@ -194,11 +194,11 @@ Feature: Motorway Guidance | chi | motorway_link | 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 | - | a,i | abcde,chi,chi | depart,off ramp slight left,arrive | - | f,i | fgc,chi,chi | depart,off ramp left,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,on ramp slight left,arrive | + | f,i | fgc,chi,chi | depart,off ramp left,arrive | Scenario: Merging Motorways Given the node map diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua index fc34ebead1c..7bbc621c89e 100644 --- a/profiles/bicycle.lua +++ b/profiles/bicycle.lua @@ -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 diff --git a/profiles/car.lua b/profiles/car.lua index ea50b86ccc3..8d4fe93a498 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -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