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

Removes profiles from osrm-prepare, only needed in osrm-extract. Fixes #1950.

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-02-08 12:18:16 -08:00
parent 04765d82ba
commit 96a5e594b3
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/contractor/contractor_config.hpp
View File

@ -28,7 +28,6 @@ struct ContractorConfig
boost::filesystem::path config_file_path; boost::filesystem::path config_file_path;
boost::filesystem::path osrm_input_path; boost::filesystem::path osrm_input_path;
boost::filesystem::path profile_path;
std::string level_output_path; std::string level_output_path;
std::string core_output_path; std::string core_output_path;

13
src/tools/contract.cpp
View File

@ -32,10 +32,6 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
// declare a group of options that will be allowed on command line // declare a group of options that will be allowed on command line
boost::program_options::options_description config_options("Configuration"); boost::program_options::options_description config_options("Configuration");
config_options.add_options()( config_options.add_options()(
"profile,p",
boost::program_options::value<boost::filesystem::path>(&contractor_config.profile_path)
->default_value("profile.lua"),
"Path to LUA routing profile")(
"threads,t", "threads,t",
boost::program_options::value<unsigned int>(&contractor_config.requested_num_threads) boost::program_options::value<unsigned int>(&contractor_config.requested_num_threads)
->default_value(tbb::task_scheduler_init::default_num_threads()), ->default_value(tbb::task_scheduler_init::default_num_threads()),
@ -147,17 +143,8 @@ int main(int argc, char *argv[]) try
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!boost::filesystem::is_regular_file(contractor_config.profile_path))
{
util::SimpleLogger().Write(logWARNING)
<< "Profile " << contractor_config.profile_path.string() << " not found!";
return EXIT_FAILURE;
}
util::SimpleLogger().Write() << "Input file: " util::SimpleLogger().Write() << "Input file: "
<< contractor_config.osrm_input_path.filename().string(); << contractor_config.osrm_input_path.filename().string();
util::SimpleLogger().Write() << "Profile: "
<< contractor_config.profile_path.filename().string();
util::SimpleLogger().Write() << "Threads: " << contractor_config.requested_num_threads; util::SimpleLogger().Write() << "Threads: " << contractor_config.requested_num_threads;
tbb::task_scheduler_init init(contractor_config.requested_num_threads); tbb::task_scheduler_init init(contractor_config.requested_num_threads);