Add flag to allow skipping calling node function for nodes with no tags.

Project-OSRM · Jun 12, 2017 · 8d91351 · 8d91351
1 parent 9e6a226
commit 8d91351
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/include/extractor/profile_properties.hpp b/include/extractor/profile_properties.hpp
@@ -22,7 +22,7 @@ struct ProfileProperties
         : traffic_signal_penalty(0), u_turn_penalty(0),
           max_speed_for_map_matching(DEFAULT_MAX_SPEED), continue_straight_at_waypoint(true),
           use_turn_restrictions(false), left_hand_driving(false), fallback_to_duration(true),
-          weight_name{"duration"}
+          weight_name{"duration"}, call_tagless_node_function(true)
     {
         BOOST_ASSERT(weight_name[MAX_WEIGHT_NAME_LENGTH] == '\0');
     }
@@ -88,6 +88,8 @@ struct ProfileProperties
     char weight_name[MAX_WEIGHT_NAME_LENGTH + 1];
     unsigned weight_precision = 1;
     bool force_split_edges = false;
+
+    bool call_tagless_node_function = true;
 };
 }
 }

diff --git a/profiles/car.lua b/profiles/car.lua
@@ -20,6 +20,12 @@ properties.weight_name                     = 'routability'
 -- For shortest distance without penalties for accessibility
 --properties.weight_name                     = 'distance'
 
+-- Set to true if you need to call the node_function for every node.
+-- Generally can be left as false to avoid unnecessary Lua calls
+-- (which slow down pre-processing).
+properties.call_tagless_node_function      = false
+
+
 local profile = {
   default_mode      = mode.driving,
   default_speed     = 10,

diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp
@@ -249,7 +249,9 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
         "max_turn_weight",
         sol::property(&ProfileProperties::GetMaxTurnWeight),
         "force_split_edges",
-        &ProfileProperties::force_split_edges);
+        &ProfileProperties::force_split_edges,
+        "call_tagless_node_function",
+        &ProfileProperties::call_tagless_node_function);
 
     context.state.new_usertype<std::vector<std::string>>(
         "vector",
@@ -510,7 +512,9 @@ void Sol2ScriptingEnvironment::ProcessElements(
                 {
                 case osmium::item_type::node:
                     result_node.clear();
-                    if (local_context.has_node_function)
+                    if (local_context.has_node_function &&
+                        (!static_cast<const osmium::Node &>(*entity).tags().empty() ||
+                         local_context.properties.call_tagless_node_function))
                     {
                         local_context.ProcessNode(static_cast<const osmium::Node &>(*entity),
                                                   result_node);