Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

rename osrm_input_path to osrm_path, clang-format

Browse Source
This commit is contained in:
Pepijn Schoen
2017-05-05 10:23:09 +02:00
committed by Daniel J. H
parent 1b31099f73
commit 67fae1d1f0
11 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/extraction_containers.cpp
+2 -3
View File
@@ -125,12 +125,11 @@ ExtractionContainers::ExtractionContainers()
*
*/
void ExtractionContainers::PrepareData(ScriptingEnvironment &scripting_environment,
const std::string &osrm_input_path,
const std::string &osrm_path,
const std::string &restrictions_file_name,
const std::string &name_file_name)
{
storage::io::FileWriter file_out(osrm_input_path,
storage::io::FileWriter::GenerateFingerprint);
storage::io::FileWriter file_out(osrm_path, storage::io::FileWriter::GenerateFingerprint);
PrepareNodes();
WriteNodes(file_out);
src/extractor/extractor.cpp
+4 -4
View File
@@ -240,7 +240,7 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
util::Log() << "timestamp: " << timestamp;
extraction_containers.PrepareData(scripting_environment,
config.osrm_input_path.string(),
config.osrm_path.string(),
config.restriction_path.string(),
config.names_data_path.string());
@@ -339,7 +339,7 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
auto profile_properties = scripting_environment.GetProfileProperties();
SetClassNames(classes_map, profile_properties);
files::writeProfileProperties(config.profile_properties_output_path, profile_properties);
files::writeProfileProperties(config.profile_properties_path, profile_properties);
TIMER_STOP(extracting);
util::Log() << "extraction finished after " << TIMER_SEC(extracting) << "s";
@@ -414,7 +414,7 @@ Extractor::LoadNodeBasedGraph(std::unordered_set<NodeID> &barriers,
std::vector<util::Coordinate> &coordiantes,
extractor::PackedOSMIDs &osm_node_ids)
{
storage::io::FileReader file_reader(config.osrm_input_path,
storage::io::FileReader file_reader(config.osrm_path,
storage::io::FileReader::VerifyFingerprint);
auto barriers_iter = inserter(barriers, end(barriers));
@@ -431,7 +431,7 @@ Extractor::LoadNodeBasedGraph(std::unordered_set<NodeID> &barriers,
if (edge_list.empty())
{
throw util::exception("Node-based-graph (" + config.osrm_input_path.string() +
throw util::exception("Node-based-graph (" + config.osrm_path.string() +
") contains no edges." + SOURCE_REF);
}