Fix help texts and .nbg_to_ebg -> .cnbg_to_ebg

include/extractor/edge_based_graph_factory.hpp

@@ -114,9 +114,8 @@ class EdgeBasedGraphFactory
              const std::string &turn_weight_penalties_filename,
              const std::string &turn_duration_penalties_filename,
              const std::string &turn_penalties_index_filename,
-             const bool generate_edge_lookup,
-             const bool generate_nbg_ebg_mapping,
-             const std::string &nbg_ebg_mapping_path);
+             const std::string &cnbg_ebg_mapping_path,
+             const bool generate_edge_lookup);
 
     // The following get access functions destroy the content in the factory
     void GetEdgeBasedEdges(util::DeallocatingVector<EdgeBasedEdge> &edges);
@@ -176,8 +175,7 @@ class EdgeBasedGraphFactory
 
     unsigned RenumberEdges();
 
-    void GenerateEdgeExpandedNodes(const bool generate_nbg_ebg_mapping,
-                                   const std::string &nbg_ebg_mapping_path);
+    void GenerateEdgeExpandedNodes(const std::string &nbg_ebg_mapping_path);
 
     void GenerateEdgeExpandedEdges(ScriptingEnvironment &scripting_environment,
                                    const std::string &original_edge_data_filename,

include/extractor/extractor_config.hpp

@@ -78,7 +78,7 @@ struct ExtractorConfig
         profile_properties_output_path = basepath + ".osrm.properties";
         intersection_class_data_output_path = basepath + ".osrm.icd";
         compressed_node_based_graph_output_path = basepath + ".osrm.cnbg";
-        nbg_ebg_graph_mapping_output_path = basepath + ".osrm.nbg_to_ebg";
+        cnbg_ebg_graph_mapping_output_path = basepath + ".osrm.cnbg_to_ebg";
     }
 
     boost::filesystem::path input_path;
@@ -101,6 +101,8 @@ struct ExtractorConfig
     std::string intersection_class_data_output_path;
     std::string turn_weight_penalties_path;
     std::string turn_duration_penalties_path;
+    std::string compressed_node_based_graph_output_path;
+    std::string cnbg_ebg_graph_mapping_output_path;
 
     unsigned requested_num_threads;
     unsigned small_component_size;
@@ -110,11 +112,6 @@ struct ExtractorConfig
     std::string edge_segment_lookup_path;
 
     bool use_metadata;
-
-    // Auxiliary data for osrm-partition
-    bool dump_compressed_node_based_graph;
-    std::string compressed_node_based_graph_output_path;
-    std::string nbg_ebg_graph_mapping_output_path;
 };
 }
 }

include/partition/partition_config.hpp

@@ -32,7 +32,7 @@ struct PartitionConfig
 
         edge_based_graph_path = basepath + ".osrm.ebg";
         compressed_node_based_graph_path = basepath + ".osrm.cnbg";
-        nbg_ebg_mapping_path = basepath + ".osrm.nbg_to_ebg";
+        cnbg_ebg_mapping_path = basepath + ".osrm.cnbg_to_ebg";
         partition_path = basepath + ".osrm.partition";
     }
 
@@ -40,7 +40,7 @@ struct PartitionConfig
     boost::filesystem::path base_path;
     boost::filesystem::path edge_based_graph_path;
     boost::filesystem::path compressed_node_based_graph_path;
-    boost::filesystem::path nbg_ebg_mapping_path;
+    boost::filesystem::path cnbg_ebg_mapping_path;
     boost::filesystem::path partition_path;
 
     unsigned requested_num_threads;