Fix HOV lane support with penalties
This commit is contained in:
Patrick Niklaus
Patrick Niklaus
parent
1f3a8d4538
commit
2e6428e917
@ -181,32 +181,42 @@ Feature: Car - Restricted access
|
|||||||
@hov
|
@hov
|
||||||
Scenario: Car - designated HOV ways are rated low
|
Scenario: Car - designated HOV ways are rated low
|
||||||
Then routability should be
|
Then routability should be
|
||||||
| highway | hov | bothw | forw_rate |
|
| highway | hov | bothw | forw_rate | backw_rate |
|
||||||
| primary | designated | x | 2 |
|
| primary | designated | x | 2 | 2 |
|
||||||
| primary | yes | x | 18 |
|
| primary | yes | x | 18 | 18 |
|
||||||
| primary | no | x | 18 |
|
| primary | no | x | 18 | 18 |
|
||||||
|
|
||||||
|
# Models:
|
||||||
|
# https://www.openstreetmap.org/way/124891268
|
||||||
|
# https://www.openstreetmap.org/way/237173472
|
||||||
|
@hov
|
||||||
|
Scenario: Car - I-66 use HOV-only roads with heavy penalty
|
||||||
|
Then routability should be
|
||||||
|
| highway | hov | hov:lanes | lanes | access | oneway | forw | backw | forw_rate |
|
||||||
|
| motorway | designated | designated\|designated\|designated | 3 | hov | yes | x | | 3 |
|
||||||
|
| motorway | lane | | 3 | designated | yes | x | | 25 |
|
||||||
|
|
||||||
@hov
|
@hov
|
||||||
Scenario: Car - a way with all lanes HOV-designated is inaccessible by default (similar to hov=designated)
|
Scenario: Car - a way with all lanes HOV-designated is highly penalized by default (similar to hov=designated)
|
||||||
Then routability should be
|
Then routability should be
|
||||||
| highway | hov:lanes:forward | hov:lanes:backward | hov:lanes | oneway | forw | backw |
|
| highway | hov:lanes:forward | hov:lanes:backward | hov:lanes | oneway | forw | backw | forw_rate | backw_rate |
|
||||||
| primary | designated | designated | | | | |
|
| primary | designated | designated | | | x | x | 2 | 2 |
|
||||||
| primary | | designated | | | x | |
|
| primary | | designated | | | x | x | 18 | 2 |
|
||||||
| primary | designated | | | | | x |
|
| primary | designated | | | | x | x | 2 | 18 |
|
||||||
| primary | designated\|designated | designated\|designated | | | | |
|
| primary | designated\|designated | designated\|designated | | | x | x | 2 | 2 |
|
||||||
| primary | designated\|no | designated\|no | | | x | x |
|
| primary | designated\|no | designated\|no | | | x | x | 18 | 18 |
|
||||||
| primary | yes\|no | yes\|no | | | x | x |
|
| primary | yes\|no | yes\|no | | | x | x | 18 | 18 |
|
||||||
| primary | | | | | x | x |
|
| primary | | | | | x | x | 18 | 18 |
|
||||||
| primary | designated | | | -1 | | x |
|
| primary | designated | | | -1 | | x | | 18 |
|
||||||
| primary | | designated | | -1 | | |
|
| primary | | designated | | -1 | | x | | 2 |
|
||||||
| primary | | | designated | yes | | |
|
| primary | | | designated | yes | x | | 2 | |
|
||||||
| primary | | | designated | -1 | | |
|
| primary | | | designated | -1 | | x | | 2 |
|
||||||
| primary | | | designated\| | yes | x | |
|
| primary | | | designated\| | yes | x | | 18 | |
|
||||||
| primary | | | designated\| | -1 | | x |
|
| primary | | | designated\| | -1 | | x | | 18 |
|
||||||
| primary | | | designated\|designated | yes | | |
|
| primary | | | designated\|designated | yes | x | | 2 | |
|
||||||
| primary | | | designated\|designated | -1 | | |
|
| primary | | | designated\|designated | -1 | | x | | 2 |
|
||||||
| primary | | | designated\|yes | yes | x | |
|
| primary | | | designated\|yes | yes | x | | 18 | |
|
||||||
| primary | | | designated\|no | -1 | | x |
|
| primary | | | designated\|no | -1 | | x | | 18 |
|
||||||
|
|
||||||
Scenario: Car - these toll roads always work
|
Scenario: Car - these toll roads always work
|
||||||
Then routability should be
|
Then routability should be
|
||||||
|
|||||||
@ -63,7 +63,8 @@ local profile = {
|
|||||||
'vehicle',
|
'vehicle',
|
||||||
'permissive',
|
'permissive',
|
||||||
'designated',
|
'designated',
|
||||||
'destination'
|
'destination',
|
||||||
|
'hov' -- we might filter hov out later depending on the avoid settings or add penalties
|
||||||
},
|
},
|
||||||
|
|
||||||
access_tag_blacklist = Set {
|
access_tag_blacklist = Set {
|
||||||
|
|||||||
@ -173,7 +173,12 @@ end
|
|||||||
-- handle high occupancy vehicle tags
|
-- handle high occupancy vehicle tags
|
||||||
function Handlers.handle_hov(way,result,data,profile)
|
function Handlers.handle_hov(way,result,data,profile)
|
||||||
-- respect user-preference for HOV
|
-- respect user-preference for HOV
|
||||||
if not profile.avoid.hov_lanes or properties.weight_name ~= 'routability' then
|
if not profile.avoid.hov_lanes then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- in this case we will use penalties instead of filtering out
|
||||||
|
if properties.weight_name == 'routability' then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -268,19 +273,28 @@ end
|
|||||||
function Handlers.handle_penalties(way,result,data,profile)
|
function Handlers.handle_penalties(way,result,data,profile)
|
||||||
-- heavily penalize a way tagged with all HOV lanes
|
-- heavily penalize a way tagged with all HOV lanes
|
||||||
-- in order to only route over them if there is no other option
|
-- in order to only route over them if there is no other option
|
||||||
local hov_penalty = 1.0
|
local forward_hov_penalty = 1.0
|
||||||
|
local backward_hov_penalty = 1.0
|
||||||
if profile.avoid.hov_lanes then
|
if profile.avoid.hov_lanes then
|
||||||
local hov = way:get_value_by_key("hov")
|
local hov = way:get_value_by_key("hov")
|
||||||
local all_lanes_designated = Handlers.has_all_designated_hov_lanes(data.hov_lanes_forward)
|
if "designated" == hov then
|
||||||
if "designated" == hov or all_lanes_designated then
|
forward_hov_penalty = 0.1
|
||||||
hov_penalty = 0.1
|
backward_hov_penalty = 0.1
|
||||||
|
else
|
||||||
|
data.hov_lanes_forward, data.hov_lanes_backward = Tags.get_forward_backward_by_key(way,data,'hov:lanes')
|
||||||
|
if Handlers.has_all_designated_hov_lanes(data.hov_lanes_forward) then
|
||||||
|
forward_hov_penalty = 0.1
|
||||||
|
end
|
||||||
|
if Handlers.has_all_designated_hov_lanes(data.hov_lanes_backward) then
|
||||||
|
backward_hov_penalty = 0.1
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local service_penalty = 1.0
|
local service_penalty = 1.0
|
||||||
local service = way:get_value_by_key("service")
|
local service = way:get_value_by_key("service")
|
||||||
if service and profile.service_penalties[service] then
|
if service and profile.service_penalties[service] then
|
||||||
service_penalty = profile.service_penalties[service]
|
service_penalty = profile.service_penalties[service]
|
||||||
end
|
end
|
||||||
|
|
||||||
local width_penalty = 1.0
|
local width_penalty = 1.0
|
||||||
@ -316,17 +330,18 @@ function Handlers.handle_penalties(way,result,data,profile)
|
|||||||
sideroad_penalty = side_road_multiplier;
|
sideroad_penalty = side_road_multiplier;
|
||||||
end
|
end
|
||||||
|
|
||||||
local penalty = math.min(service_penalty, width_penalty, alternating_penalty, sideroad_penalty, hov_penalty)
|
local forward_penalty = math.min(service_penalty, width_penalty, alternating_penalty, sideroad_penalty, forward_hov_penalty)
|
||||||
|
local backward_penalty = math.min(service_penalty, width_penalty, alternating_penalty, sideroad_penalty, backward_hov_penalty)
|
||||||
|
|
||||||
if properties.weight_name == 'routability' then
|
if properties.weight_name == 'routability' then
|
||||||
if result.forward_speed > 0 then
|
if result.forward_speed > 0 then
|
||||||
result.forward_rate = (result.forward_speed * penalty) / 3.6
|
result.forward_rate = (result.forward_speed * forward_penalty) / 3.6
|
||||||
end
|
end
|
||||||
if result.backward_speed > 0 then
|
if result.backward_speed > 0 then
|
||||||
result.backward_rate = (result.backward_speed * penalty) / 3.6
|
result.backward_rate = (result.backward_speed * backward_penalty) / 3.6
|
||||||
end
|
end
|
||||||
if result.duration > 0 then
|
if result.duration > 0 then
|
||||||
result.weight = result.duration / penalty
|
result.weight = result.duration / forward_penalty
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user