From b906f2a628e0866d3fb5bcbd8e8a78b5c5e9cf33 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 13 Feb 2017 09:25:13 +0000 Subject: [PATCH] Fix side road penalties and add test --- features/car/speed.feature | 6 ++++++ profiles/lib/handlers.lua | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/features/car/speed.feature b/features/car/speed.feature index 5855cafd4..099983c2a 100644 --- a/features/car/speed.feature +++ b/features/car/speed.feature @@ -45,3 +45,9 @@ Feature: Car - speeds | primary | 60 | 47 km/h | 47 km/h | | primary | 60 | 47 km/h | 47 km/h | | primary | 60 | 47 km/h | 47 km/h | + + Scenario: Car - Side road penalties + Then routability should be + + | highway | side_road | forw | backw | forw_rate | backw_rate | + | primary | yes | 64 km/h | 64 km/h | 14 | 14 | diff --git a/profiles/lib/handlers.lua b/profiles/lib/handlers.lua index e206723a1..33c6d52e6 100644 --- a/profiles/lib/handlers.lua +++ b/profiles/lib/handlers.lua @@ -327,7 +327,7 @@ function Handlers.handle_penalties(way,result,data,profile) local sideroad_penalty = 1.0 data.sideroad = way:get_value_by_key("side_road") if "yes" == data.sideroad or "rotary" == data.sideroad then - sideroad_penalty = side_road_multiplier; + sideroad_penalty = profile.side_road_multiplier end local forward_penalty = math.min(service_penalty, width_penalty, alternating_penalty, sideroad_penalty, forward_hov_penalty)