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

reenable traffic signal penalty in car profile

Browse Source
This commit is contained in:
Dennis Luxen 2014-04-28 17:26:31 +02:00
parent 45f0af2afc
commit 241d6b482e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prepare.cpp
View File

@ -213,10 +213,7 @@ int main (int argc, char *argv[]) {
EdgeBasedGraphFactory::SpeedProfileProperties speedProfile; EdgeBasedGraphFactory::SpeedProfileProperties speedProfile;
if(0 != luaL_dostring( myLuaState, "return traffic_signal_penalty\n")) { if(0 != luaL_dostring( myLuaState, "return traffic_signal_penalty\n")) {
std::cerr << std::cerr << lua_tostring(myLuaState,-1) << " occured in scripting block" << std::endl;
lua_tostring(myLuaState,-1) <<
" occured in scripting block" <<
std::endl;
return 1; return 1;
} }
speedProfile.trafficSignalPenalty = 10*lua_tointeger(myLuaState, -1); speedProfile.trafficSignalPenalty = 10*lua_tointeger(myLuaState, -1);

5
profiles/car.lua
View File

@ -32,12 +32,14 @@ speed_profile = {
["default"] = 10 ["default"] = 10
} }
traffic_signal_penalty = 2
-- End of globals
local take_minimum_of_speeds = false local take_minimum_of_speeds = false
local obey_oneway = true local obey_oneway = true
local obey_bollards = true local obey_bollards = true
local use_turn_restrictions = true local use_turn_restrictions = true
local ignore_areas = true -- future feature local ignore_areas = true -- future feature
local traffic_signal_penalty = 2
local u_turn_penalty = 20 local u_turn_penalty = 20
local abs = math.abs local abs = math.abs
@ -46,7 +48,6 @@ local max = math.max
local maxspeed_reduction = 0.66 local maxspeed_reduction = 0.66
-- End of globals
local function find_access_tag(source,access_tags_hierachy) local function find_access_tag(source,access_tags_hierachy)
for i,v in ipairs(access_tags_hierachy) do for i,v in ipairs(access_tags_hierachy) do
local has_tag = source.tags:Holds(v) local has_tag = source.tags:Holds(v)