Set max_turn_weight as a profile property

oxidase · oxidase · commit 62a081971aa1 · 2017-05-26T11:34:10.000+02:00
diff --git a/profiles/car.lua b/profiles/car.lua
@@ -318,7 +318,7 @@ function way_function(way, result)
   }
 
   -- perform an quick initial check and abort if the way is
-  -- obviously not routable. 
+  -- obviously not routable.
   -- highway or route tags must be in data table, bridge is optional
   if (not data.highway or data.highway == '') and
   (not data.route or data.route == '')
@@ -412,7 +412,7 @@ function turn_function (turn)
   if profile.weight_name == 'routability' then
       -- penalize turns from non-local access only segments onto local access only tags
       if not turn.source_restricted and turn.target_restricted then
-          turn.weight = constants.max_turn_weight
+          turn.weight = profile.max_turn_weight
       end
   end
 end
diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
@@ -401,12 +401,6 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
 
     context.state.script_file(file_name);
 
-
-    // set constants in 'constants' table
-    context.state["constants"] = context.state.create_table_with(
-        "max_turn_weight", std::numeric_limits<TurnPenalty>::max()
-    );
-
     // read properties from 'profile' table
     sol::optional<std::string> weight_name = context.state["profile"]["weight_name"];
     if( weight_name != sol::nullopt)
@@ -444,6 +438,11 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
     if( force_split_edges != sol::nullopt)
       context.properties.force_split_edges = force_split_edges.value();
 
+    if(auto profile = context.state["profile"])
+    { // set computed profile properties
+        profile["max_turn_weight"] = context.properties.GetMaxTurnWeight();
+    }
+
     sol::function turn_function = context.state["turn_function"];
     sol::function node_function = context.state["node_function"];
     sol::function way_function = context.state["way_function"];
