Fix rebase problems

include/extractor/files.hpp

@@ -225,7 +225,7 @@ inline void writeTurnData(const boost::filesystem::path &path, const TurnDataT &
     serialization::write(writer, turn_data);
 }
 
-// reads .osrm.nodes_data
+// reads .osrm.ebg_nodes
 template <typename NodeDataT>
 inline void readNodeData(const boost::filesystem::path &path, NodeDataT &node_data)
 {
@@ -239,7 +239,7 @@ inline void readNodeData(const boost::filesystem::path &path, NodeDataT &node_da
     serialization::read(reader, node_data);
 }
 
-// writes .osrm.nodes_data
+// writes .osrm.ebg_nodes
 template <typename NodeDataT>
 inline void writeNodeData(const boost::filesystem::path &path, const NodeDataT &node_data)
 {

include/storage/io_config.hpp

@@ -38,11 +38,12 @@ struct IOConfig
         mld_graph_path = {osrm_path.string() + ".mldgr"};
         level_path = {osrm_path.string() + ".level"};
         node_path = {osrm_path.string() + ".enw"};
-        edge_based_nodes_data_path = {osrm_path.string() + ".nodes_data"};
+        edge_based_nodes_data_path = {osrm_path.string() + ".ebg_nodes"};
+        node_based_nodes_data_path = {osrm_path.string() + ".nbg_nodes"};
         edge_based_graph_path = {osrm_path.string() + ".ebg"};
         compressed_node_based_graph_path = {osrm_path.string() + ".cnbg"};
         cnbg_ebg_mapping_path = {osrm_path.string() + ".cnbg_to_ebg"};
-        restriction_path = {osrm_path.string() + ".restrictions"};
+        turn_restrictions_path = {osrm_path.string() + ".restrictions"};
         intersection_class_data_path = {osrm_path.string() + ".icd"};
     }
 
@@ -72,10 +73,11 @@ struct IOConfig
     boost::filesystem::path level_path;
     boost::filesystem::path node_path;
     boost::filesystem::path edge_based_nodes_data_path;
+    boost::filesystem::path node_based_nodes_data_path;
     boost::filesystem::path edge_based_graph_path;
     boost::filesystem::path compressed_node_based_graph_path;
     boost::filesystem::path cnbg_ebg_mapping_path;
-    boost::filesystem::path restriction_path;
+    boost::filesystem::path turn_restrictions_path;
     boost::filesystem::path intersection_class_data_path;
 };
 }

include/updater/updater_config.hpp

@@ -51,6 +51,7 @@ struct UpdaterConfig final : storage::IOConfig
 
     std::vector<std::string> segment_speed_lookup_paths;
     std::vector<std::string> turn_penalty_lookup_paths;
+    std::string tz_file_path;
 };
 }
 }