From 241d6b482e09b6f1f30f4105eb12f97c62799339 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 28 Apr 2014 17:26:31 +0200 Subject: [PATCH] reenable traffic signal penalty in car profile --- prepare.cpp | 7 ++----- profiles/car.lua | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/prepare.cpp b/prepare.cpp index 3b1ca3155..86065c792 100644 --- a/prepare.cpp +++ b/prepare.cpp @@ -213,11 +213,8 @@ int main (int argc, char *argv[]) { EdgeBasedGraphFactory::SpeedProfileProperties speedProfile; if(0 != luaL_dostring( myLuaState, "return traffic_signal_penalty\n")) { - std::cerr << - lua_tostring(myLuaState,-1) << - " occured in scripting block" << - std::endl; - return 1; + std::cerr << lua_tostring(myLuaState,-1) << " occured in scripting block" << std::endl; + return 1; } speedProfile.trafficSignalPenalty = 10*lua_tointeger(myLuaState, -1); SimpleLogger().Write(logDEBUG) << "traffic_signal_penalty: " << speedProfile.trafficSignalPenalty; diff --git a/profiles/car.lua b/profiles/car.lua index d57a6544e..98563aa1f 100644 --- a/profiles/car.lua +++ b/profiles/car.lua @@ -32,12 +32,14 @@ speed_profile = { ["default"] = 10 } -local take_minimum_of_speeds = false +traffic_signal_penalty = 2 + +-- End of globals +local take_minimum_of_speeds = false local obey_oneway = true local obey_bollards = true local use_turn_restrictions = true local ignore_areas = true -- future feature -local traffic_signal_penalty = 2 local u_turn_penalty = 20 local abs = math.abs @@ -46,7 +48,6 @@ local max = math.max local maxspeed_reduction = 0.66 --- End of globals local function find_access_tag(source,access_tags_hierachy) for i,v in ipairs(access_tags_hierachy) do local has_tag = source.tags:Holds(v)