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

make primaries and secondaries more dangerous

Browse Source 
only apply oneway safety considerations on primaries

re-adjust primary and secondary safeties
This commit is contained in:
Huyen Chau Nguyen 2018-04-10 18:59:45 +02:00 committed by Patrick Niklaus
parent c5cc4c5a74
commit e98859e4c0
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
profiles/bicycle.lua
View File

@ -109,11 +109,11 @@ function setup()
-- reduce the driving speed by 30% for unsafe roads -- reduce the driving speed by 30% for unsafe roads
-- only used for cyclability metric -- only used for cyclability metric
unsafe_highway_list = { unsafe_highway_list = {
primary = 0.7, primary = 0.5,
secondary = 0.75, secondary = 0.65,
tertiary = 0.8, tertiary = 0.8,
primary_link = 0.7, primary_link = 0.5,
secondary_link = 0.75, secondary_link = 0.65,
tertiary_link = 0.8, tertiary_link = 0.8,
}, },
@ -373,10 +373,10 @@ function handle_bicycle_tags(profile,way,result,data)
-- cycleway -- cycleway
local has_cycleway_forward = false local has_cycleway_forward = false
local has_cycleway_backward = false local has_cycleway_backward = false
local is_oneway = result.forward_mode ~= mode.inaccessible and result.backward_mode ~= mode.inaccessible and not implied_oneway local is_twoway = result.forward_mode ~= mode.inaccessible and result.backward_mode ~= mode.inaccessible and not implied_oneway
-- cycleways on normal roads -- cycleways on normal roads
if is_oneway then if is_twoway then
if cycleway and profile.cycleway_tags[cycleway] then if cycleway and profile.cycleway_tags[cycleway] then
has_cycleway_backward = true has_cycleway_backward = true
has_cycleway_forward = true has_cycleway_forward = true
@ -495,6 +495,15 @@ function handle_bicycle_tags(profile,way,result,data)
if profile.properties.weight_name == 'cyclability' then if profile.properties.weight_name == 'cyclability' then
local safety_penalty = profile.unsafe_highway_list[data.highway] or 1. local safety_penalty = profile.unsafe_highway_list[data.highway] or 1.
local is_unsafe = safety_penalty < 1 local is_unsafe = safety_penalty < 1
-- primaries that are one ways are probably huge primaries where the lanes need to be separated
if is_unsafe and data.highway == 'primary' and not is_twoway then
safety_penalty = safety_penalty * 0.5
end
if is_unsafe and data.highway == 'secondary' and not is_twoway then
safety_penalty = safety_penalty * 0.6
end
local forward_is_unsafe = is_unsafe and not has_cycleway_forward local forward_is_unsafe = is_unsafe and not has_cycleway_forward
local backward_is_unsafe = is_unsafe and not has_cycleway_backward local backward_is_unsafe = is_unsafe and not has_cycleway_backward
local is_undesireable = data.highway == "service" and profile.service_penalties[service] local is_undesireable = data.highway == "service" and profile.service_penalties[service]