diff --git a/features/bicycle/access.feature b/features/bicycle/access.feature index 9f2e3ea98..faf05746f 100644 --- a/features/bicycle/access.feature +++ b/features/bicycle/access.feature @@ -185,8 +185,9 @@ Feature: Bike - Access tags on ways Scenario: Bike - Tram with oneway when access is implicit Then routability should be - | highway | railway | oneway | bothw | - | residential | tram | yes | x | + | highway | railway | access | oneway | bothw | + | residential | tram | | yes | x | + | service | tram | psv | yes | x | Scenario: Bike - Access combinations Then routability should be diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua index 22e13fb29..81fcfd039 100644 --- a/profiles/bicycle.lua +++ b/profiles/bicycle.lua @@ -338,7 +338,7 @@ function way_function (way, result) result.forward_mode = mode.train result.backward_mode = mode.train -- railways - if (not access and data.highway) or profile.access_tag_whitelist[access] then + if (not access and data.highway) or (access and not profile.access_tag_blacklist[access]) then result.forward_speed = profile.railway_speeds[railway] result.backward_speed = profile.railway_speeds[railway] end @@ -350,7 +350,7 @@ function way_function (way, result) -- regular ways result.forward_speed = profile.bicycle_speeds[data.highway] result.backward_speed = profile.bicycle_speeds[data.highway] - elseif access and profile.access_tag_whitelist[access] then + elseif access and not profile.access_tag_blacklist[access] then -- unknown way, but valid access tag result.forward_speed = default_speed result.backward_speed = default_speed