Add loading of .core file to InternalDataFacade

server/data_structures/datafacade_base.hpp

@@ -113,6 +113,8 @@ template <class EdgeDataT> class BaseDataFacade
 
     virtual unsigned GetCheckSum() const = 0;
 
+    virtual bool IsCoreNode(const NodeID id) const = 0;
+
     virtual unsigned GetNameIndexFromEdgeID(const unsigned id) const = 0;
 
     virtual std::string get_name_for_id(const unsigned name_id) const = 0;

server/data_structures/internal_datafacade.hpp

@@ -73,6 +73,7 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
     ShM<bool, false>::vector m_edge_is_compressed;
     ShM<unsigned, false>::vector m_geometry_indices;
     ShM<unsigned, false>::vector m_geometry_list;
+    ShM<bool, false>::vector m_is_core_node;
 
     boost::thread_specific_ptr<
         StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false>> m_static_rtree;
@@ -171,6 +172,23 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         edges_input_stream.close();
     }
 
+    void LoadCoreInformation(const boost::filesystem::path &core_data_file)
+    {
+        std::ifstream core_stream(core_data_file.string().c_str(), std::ios::binary);
+        unsigned number_of_markers;
+        core_stream.read((char *)&number_of_markers, sizeof(unsigned));
+
+        std::vector<char> unpacked_core_markers(number_of_markers);
+        core_stream.read((char *)unpacked_core_markers.data(), sizeof(char)*number_of_markers);
+
+        m_is_core_node.resize(number_of_markers);
+        for (auto i = 0u; i < number_of_markers; ++i)
+        {
+            BOOST_ASSERT(unpacked_core_markers[i] == 0 || unpacked_core_markers[i] == 1);
+            m_is_core_node[i] = unpacked_core_markers[i] == 1;
+        }
+    }
+
     void LoadGeometries(const boost::filesystem::path &geometry_file)
     {
         std::ifstream geometry_stream(geometry_file.string().c_str(), std::ios::binary);
@@ -255,6 +273,10 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         {
             throw osrm::exception("no nodes file given in ini file");
         }
+        if (server_paths.find("coredata") == server_paths.end())
+        {
+            throw osrm::exception("no core file given in ini file");
+        }
         if (server_paths.find("edgesdata") == server_paths.end())
         {
             throw osrm::exception("no edges file given in ini file");
@@ -288,6 +310,9 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         paths_iterator = server_paths.find("geometries");
         BOOST_ASSERT(server_paths.end() != paths_iterator);
         const boost::filesystem::path &geometries_path = paths_iterator->second;
+        paths_iterator = server_paths.find("coredata");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &core_data_path = paths_iterator->second;
 
         // load data
         SimpleLogger().Write() << "loading graph data";
@@ -297,6 +322,9 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         AssertPathExists(nodes_data_path);
         AssertPathExists(edges_data_path);
         LoadNodeAndEdgeInformation(nodes_data_path, edges_data_path);
+        SimpleLogger().Write() << "loading core information";
+        AssertPathExists(core_data_path);
+        LoadCoreInformation(core_data_path);
         SimpleLogger().Write() << "loading geometries";
         AssertPathExists(geometries_path);
         LoadGeometries(geometries_path);
@@ -464,6 +492,11 @@ template <class EdgeDataT> class InternalDataFacade final : public BaseDataFacad
         return m_via_node_list.at(id);
     }
 
+    virtual bool IsCoreNode(const NodeID id) const override final
+    {
+        return m_is_core_node[id];
+    }
+
     virtual void GetUncompressedGeometry(const unsigned id,
                                          std::vector<unsigned> &result_nodes) const override final
     {

server/data_structures/shared_datafacade.hpp

@@ -84,6 +84,7 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
     ShM<bool, true>::vector m_edge_is_compressed;
     ShM<unsigned, true>::vector m_geometry_indices;
     ShM<unsigned, true>::vector m_geometry_list;
+    ShM<bool, true>::vector m_is_core_node;
 
     boost::thread_specific_ptr<std::pair<unsigned, std::shared_ptr<SharedRTree>>> m_static_rtree;
     boost::filesystem::path file_index_path;
@@ -447,6 +448,12 @@ template <class EdgeDataT> class SharedDataFacade final : public BaseDataFacade<
         return result;
     }
 
+    bool IsCoreNode(const NodeID id) const override final
+    {
+        //return m_is_core_node[id];
+        return false;
+    }
+
     std::string GetTimestamp() const override final { return m_timestamp; }
 };
 

util/routed_options.hpp

@@ -59,6 +59,8 @@ inline void populate_base_path(ServerPaths &server_paths)
         BOOST_ASSERT(server_paths.find("hsgrdata") != server_paths.end());
         server_paths["nodesdata"] = base_string + ".nodes";
         BOOST_ASSERT(server_paths.find("nodesdata") != server_paths.end());
+        server_paths["coredata"] = base_string + ".core";
+        BOOST_ASSERT(server_paths.find("coredata") != server_paths.end());
         server_paths["edgesdata"] = base_string + ".edges";
         BOOST_ASSERT(server_paths.find("edgesdata") != server_paths.end());
         server_paths["geometries"] = base_string + ".geometry";