Create public facing libraries for extractor, contractor and datastore

New libraries libosrm_extract, libosrm_contract, libosrm_store

include/extractor/external_memory_node.hpp

@@ -12,13 +12,23 @@ namespace extractor
 
 struct ExternalMemoryNode : QueryNode
 {
-    ExternalMemoryNode(int lat, int lon, OSMNodeID id, bool barrier, bool traffic_light);
+    ExternalMemoryNode(int lat, int lon, OSMNodeID node_id, bool barrier, bool traffic_lights)
+        : QueryNode(lat, lon, node_id), barrier(barrier), traffic_lights(traffic_lights)
+    {
+    }
 
-    ExternalMemoryNode();
+    ExternalMemoryNode() : barrier(false), traffic_lights(false) {}
 
-    static ExternalMemoryNode min_value();
+    static ExternalMemoryNode min_value()
+    {
+        return ExternalMemoryNode(0, 0, MIN_OSM_NODEID, false, false);
+    }
 
-    static ExternalMemoryNode max_value();
+    static ExternalMemoryNode max_value()
+    {
+        return ExternalMemoryNode(std::numeric_limits<int>::max(), std::numeric_limits<int>::max(),
+                                  MAX_OSM_NODEID, false, false);
+    }
 
     bool barrier;
     bool traffic_lights;
@@ -27,9 +37,12 @@ struct ExternalMemoryNode : QueryNode
 struct ExternalMemoryNodeSTXXLCompare
 {
     using value_type = ExternalMemoryNode;
-    bool operator()(const ExternalMemoryNode &left, const ExternalMemoryNode &right) const;
-    value_type max_value();
-    value_type min_value();
+    value_type max_value() { return value_type::max_value(); }
+    value_type min_value() { return value_type::min_value(); }
+    bool operator()(const value_type &left, const value_type &right) const
+    {
+        return left.node_id < right.node_id;
+    }
 };
 }
 }

include/extractor/extractor.hpp

@@ -2,7 +2,7 @@
 #define EXTRACTOR_HPP
 
 #include "extractor/edge_based_edge.hpp"
-#include "extractor/extractor_options.hpp"
+#include "extractor/extractor_config.hpp"
 #include "extractor/edge_based_graph_factory.hpp"
 #include "extractor/graph_compressor.hpp"
 

include/extractor/extractor_config.hpp

@@ -0,0 +1,78 @@
+#ifndef EXTRACTOR_CONFIG_HPP
+#define EXTRACTOR_CONFIG_HPP
+
+#include <boost/filesystem/path.hpp>
+
+#include <string>
+#include <array>
+
+namespace osrm
+{
+namespace extractor
+{
+
+struct ExtractorConfig
+{
+    ExtractorConfig() noexcept : requested_num_threads(0) {}
+    void UseDefaultOutputNames()
+    {
+        std::string basepath = input_path.string();
+
+        auto pos = std::string::npos;
+        std::array<std::string, 5> known_extensions{
+            {".osm.bz2", ".osm.pbf", ".osm.xml", ".pbf", ".osm"}};
+        for (auto ext : known_extensions)
+        {
+            pos = basepath.find(ext);
+            if (pos != std::string::npos)
+            {
+                basepath.replace(pos, ext.size(), "");
+                break;
+            }
+        }
+
+        output_file_name = basepath + ".osrm";
+        restriction_file_name = basepath + ".osrm.restrictions";
+        names_file_name = basepath + ".osrm.names";
+        timestamp_file_name = basepath + ".osrm.timestamp";
+        geometry_output_path = basepath + ".osrm.geometry";
+        node_output_path = basepath + ".osrm.nodes";
+        edge_output_path = basepath + ".osrm.edges";
+        edge_graph_output_path = basepath + ".osrm.ebg";
+        rtree_nodes_output_path = basepath + ".osrm.ramIndex";
+        rtree_leafs_output_path = basepath + ".osrm.fileIndex";
+        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";
+    }
+
+    boost::filesystem::path config_file_path;
+    boost::filesystem::path input_path;
+    boost::filesystem::path profile_path;
+
+    std::string output_file_name;
+    std::string restriction_file_name;
+    std::string names_file_name;
+    std::string timestamp_file_name;
+    std::string geometry_output_path;
+    std::string edge_output_path;
+    std::string edge_graph_output_path;
+    std::string edge_based_node_weights_output_path;
+    std::string node_output_path;
+    std::string rtree_nodes_output_path;
+    std::string rtree_leafs_output_path;
+
+    unsigned requested_num_threads;
+    unsigned small_component_size;
+
+    bool generate_edge_lookup;
+    std::string edge_penalty_path;
+    std::string edge_segment_lookup_path;
+#ifdef DEBUG_GEOMETRY
+    std::string debug_turns_path;
+#endif
+};
+}
+}
+
+#endif // EXTRACTOR_CONFIG_HPP

include/extractor/extractor_options.hpp

@@ -1,63 +0,0 @@
-#ifndef EXTRACTOR_OPTIONS_HPP
-#define EXTRACTOR_OPTIONS_HPP
-
-#include <boost/filesystem/path.hpp>
-
-#include <string>
-
-namespace osrm
-{
-namespace extractor
-{
-
-enum class return_code : unsigned
-{
-    ok,
-    fail,
-    exit
-};
-
-struct ExtractorConfig
-{
-    ExtractorConfig() : requested_num_threads(0) {}
-    boost::filesystem::path config_file_path;
-    boost::filesystem::path input_path;
-    boost::filesystem::path profile_path;
-
-    std::string output_file_name;
-    std::string restriction_file_name;
-    std::string names_file_name;
-    std::string timestamp_file_name;
-    std::string geometry_output_path;
-    std::string edge_output_path;
-    std::string edge_graph_output_path;
-    std::string node_output_path;
-    std::string rtree_nodes_output_path;
-    std::string rtree_leafs_output_path;
-
-    // every edge based node represents a segment in the original graph. During contraciton we need
-    // to know about this segment length, as we might have to add self-loops in cases of shorter
-    // parts than the segment represents itself
-    std::string edge_based_node_weights_output_path;
-
-    unsigned requested_num_threads;
-    unsigned small_component_size;
-
-    bool generate_edge_lookup;
-    std::string edge_penalty_path;
-    std::string edge_segment_lookup_path;
-#ifdef DEBUG_GEOMETRY
-    std::string debug_turns_path;
-#endif
-};
-
-struct ExtractorOptions
-{
-    static return_code ParseArguments(int argc, char *argv[], ExtractorConfig &extractor_config);
-
-    static void GenerateOutputFilesNames(ExtractorConfig &extractor_config);
-};
-}
-}
-
-#endif // EXTRACTOR_OPTIONS_HPP