Adds .properties file to osrm-extract ouput

This file contains global properties set by the lua
profile, such as enabling uturns at vias and penalties.
This file will be consumed by the server.

include/extractor/edge_based_graph_factory.hpp

@@ -4,7 +4,7 @@
 #define EDGE_BASED_GRAPH_FACTORY_HPP_
 
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/speed_profile.hpp"
+#include "extractor/profile_properties.hpp"
 #include "extractor/restriction_map.hpp"
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/edge_based_node.hpp"
@@ -52,7 +52,7 @@ class EdgeBasedGraphFactory
                                    const std::unordered_set<NodeID> &traffic_lights,
                                    std::shared_ptr<const RestrictionMap> restriction_map,
                                    const std::vector<QueryNode> &node_info_list,
-                                   SpeedProfileProperties speed_profile,
+                                   ProfileProperties profile_properties,
                                    const util::NameTable &name_table);
 
     void Run(const std::string &original_edge_data_filename,
@@ -106,7 +106,7 @@ class EdgeBasedGraphFactory
     const std::unordered_set<NodeID> &m_traffic_lights;
     const CompressedEdgeContainer &m_compressed_edge_container;
 
-    SpeedProfileProperties speed_profile;
+    ProfileProperties profile_properties;
 
     const util::NameTable &name_table;
 

include/extractor/extractor.hpp

@@ -40,6 +40,8 @@ namespace osrm
 namespace extractor
 {
 
+class ProfileProperties;
+
 class Extractor
 {
   public:
@@ -49,13 +51,15 @@ class Extractor
   private:
     ExtractorConfig config;
 
-    void SetupScriptingEnvironment(lua_State *myLuaState, SpeedProfileProperties &speed_profile);
     std::pair<std::size_t, std::size_t>
-    BuildEdgeExpandedGraph(std::vector<QueryNode> &internal_to_external_node_map,
+    BuildEdgeExpandedGraph(lua_State* lua_state,
+                           const ProfileProperties& profile_properties,
+                           std::vector<QueryNode> &internal_to_external_node_map,
                            std::vector<EdgeBasedNode> &node_based_edge_list,
                            std::vector<bool> &node_is_startpoint,
                            std::vector<EdgeWeight> &edge_based_node_weights,
                            util::DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list);
+    void WriteProfileProperties(const std::string& output_path, const ProfileProperties& properties) const;
     void WriteNodeMapping(const std::vector<QueryNode> &internal_to_external_node_map);
     void FindComponents(unsigned max_edge_id,
                         const util::DeallocatingVector<EdgeBasedEdge> &edges,

include/extractor/extractor_config.hpp

@@ -71,6 +71,7 @@ struct ExtractorConfig
         edge_segment_lookup_path = basepath + ".osrm.edge_segment_lookup";
         edge_penalty_path = basepath + ".osrm.edge_penalties";
         edge_based_node_weights_output_path = basepath + ".osrm.enw";
+        profile_properties_output_path = basepath + ".osrm.properties";
     }
 
     boost::filesystem::path config_file_path;
@@ -88,6 +89,7 @@ struct ExtractorConfig
     std::string node_output_path;
     std::string rtree_nodes_output_path;
     std::string rtree_leafs_output_path;
+    std::string profile_properties_output_path;
 
     unsigned requested_num_threads;
     unsigned small_component_size;

include/extractor/graph_compressor.hpp

@@ -3,7 +3,6 @@
 
 #include "util/typedefs.hpp"
 
-#include "extractor/speed_profile.hpp"
 #include "util/node_based_graph.hpp"
 
 #include <memory>
@@ -22,7 +21,7 @@ class GraphCompressor
     using EdgeData = util::NodeBasedDynamicGraph::EdgeData;
 
   public:
-    GraphCompressor(SpeedProfileProperties speed_profile);
+    GraphCompressor();
 
     void Compress(const std::unordered_set<NodeID> &barrier_nodes,
                   const std::unordered_set<NodeID> &traffic_lights,
@@ -34,8 +33,6 @@ class GraphCompressor
     void PrintStatistics(unsigned original_number_of_nodes,
                          unsigned original_number_of_edges,
                          const util::NodeBasedDynamicGraph &graph) const;
-
-    SpeedProfileProperties speed_profile;
 };
 }
 }

include/extractor/profile_properties.hpp

@@ -0,0 +1,46 @@
+#ifndef PROFILE_PROPERTIES_HPP
+#define PROFILE_PROPERTIES_HPP
+
+namespace osrm
+{
+namespace extractor
+{
+
+struct ProfileProperties
+{
+    ProfileProperties()
+        : traffic_signal_penalty(0), u_turn_penalty(0), allow_u_turn_at_via(false), use_turn_restrictions(false)
+    {
+    }
+
+    double GetUturnPenalty() const
+    {
+        return u_turn_penalty / 10.;
+    }
+
+    void SetUturnPenalty(const double u_turn_penalty_)
+    {
+        u_turn_penalty = static_cast<int>(u_turn_penalty_ * 10.);
+    }
+
+    double GetTrafficSignalPenalty() const
+    {
+        return traffic_signal_penalty / 10.;
+    }
+
+    void SetTrafficSignalPenalty(const double traffic_signal_penalty_)
+    {
+        traffic_signal_penalty = static_cast<int>(traffic_signal_penalty_ * 10.);
+    }
+
+    //! penalty to cross a traffic light in deci-seconds
+    int traffic_signal_penalty;
+    //! penalty to do a uturn in deci-seconds
+    int u_turn_penalty;
+    bool allow_u_turn_at_via;
+    bool use_turn_restrictions;
+};
+}
+}
+
+#endif

include/extractor/restriction_parser.hpp

@@ -19,6 +19,8 @@ namespace osrm
 namespace extractor
 {
 
+class ProfileProperties;
+
 /**
  * Parses the relations that represents turn restrictions.
  *
@@ -40,11 +42,10 @@ namespace extractor
 class RestrictionParser
 {
   public:
-    RestrictionParser(lua_State *lua_state);
+    RestrictionParser(lua_State *lua_state, const ProfileProperties& properties);
     boost::optional<InputRestrictionContainer> TryParse(const osmium::Relation &relation) const;
 
   private:
-    void ReadUseRestrictionsSetting(lua_State *lua_state);
     void ReadRestrictionExceptions(lua_State *lua_state);
     bool ShouldIgnoreRestriction(const std::string &except_tag_string) const;
 

include/extractor/scripting_environment.hpp

@@ -1,6 +1,9 @@
 #ifndef SCRIPTING_ENVIRONMENT_HPP
 #define SCRIPTING_ENVIRONMENT_HPP
 
+#include "extractor/profile_properties.hpp"
+#include "extractor/raster_source.hpp"
+
 #include <string>
 #include <memory>
 #include <mutex>
@@ -23,18 +26,28 @@ namespace extractor
 class ScriptingEnvironment
 {
   public:
+    struct Context
+    {
+        Context();
+        ~Context();
+
+        ProfileProperties properties;
+        SourceContainer sources;
+        lua_State *state;
+    };
+
     explicit ScriptingEnvironment(const std::string &file_name);
 
     ScriptingEnvironment(const ScriptingEnvironment &) = delete;
     ScriptingEnvironment &operator=(const ScriptingEnvironment &) = delete;
 
-    lua_State *GetLuaState();
+    Context &GetContex();
 
   private:
-    void InitLuaState(lua_State *lua_state);
+    void InitContext(Context &context);
     std::mutex init_mutex;
     std::string file_name;
-    tbb::enumerable_thread_specific<std::shared_ptr<lua_State>> script_contexts;
+    tbb::enumerable_thread_specific<std::shared_ptr<Context>> script_contexts;
 };
 }
 }

include/extractor/speed_profile.hpp

@@ -1,23 +0,0 @@
-#ifndef SPEED_PROFILE_PROPERTIES_HPP
-#define SPEED_PROFILE_PROPERTIES_HPP
-
-namespace osrm
-{
-namespace extractor
-{
-
-struct SpeedProfileProperties
-{
-    SpeedProfileProperties()
-        : traffic_signal_penalty(0), u_turn_penalty(0), has_turn_penalty_function(false)
-    {
-    }
-
-    int traffic_signal_penalty;
-    int u_turn_penalty;
-    bool has_turn_penalty_function;
-};
-}
-}
-
-#endif