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

use white list as a set complement of blacklist for bicycle profile

Browse Source 
http://www.openstreetmap.org/way/4788559
This commit is contained in:
Michael Krasnyk 2017-02-04 19:53:55 +01:00 committed by Patrick Niklaus
parent aa3f208032
commit 112cf55aae
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/bicycle/access.feature
View File

@ -185,8 +185,9 @@ Feature: Bike - Access tags on ways
Scenario: Bike - Tram with oneway when access is implicit Scenario: Bike - Tram with oneway when access is implicit
Then routability should be Then routability should be
| highway | railway | oneway | bothw | | highway | railway | access | oneway | bothw |
| residential | tram | yes | x | | residential | tram | | yes | x |
| service | tram | psv | yes | x |
Scenario: Bike - Access combinations Scenario: Bike - Access combinations
Then routability should be Then routability should be

4
profiles/bicycle.lua
View File

@ -338,7 +338,7 @@ function way_function (way, result)
result.forward_mode = mode.train result.forward_mode = mode.train
result.backward_mode = mode.train result.backward_mode = mode.train
-- railways -- 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.forward_speed = profile.railway_speeds[railway]
result.backward_speed = profile.railway_speeds[railway] result.backward_speed = profile.railway_speeds[railway]
end end
@ -350,7 +350,7 @@ function way_function (way, result)
-- regular ways -- regular ways
result.forward_speed = profile.bicycle_speeds[data.highway] result.forward_speed = profile.bicycle_speeds[data.highway]
result.backward_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 -- unknown way, but valid access tag
result.forward_speed = default_speed result.forward_speed = default_speed
result.backward_speed = default_speed result.backward_speed = default_speed