kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

osrm-prepare command line parser fix

Browse source
This commit is contained in:
Lev Dragunov 2015-06-12 23:48:22 +03:00 • committed by Alex Zolotarev
parent db11c26d24
commit 366c9af196
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
3party/osrm/osrm-backend/contractor/processing_chain.cpp
View file

@ -343,10 +343,11 @@ bool Prepare::ParseArguments(int argc, char *argv[])
"Path to a configuration file.");
// declare a group of options that will be allowed both on command line and in config file
std::string string_restrictions_path;
boost::program_options::options_description config_options("Configuration");
config_options.add_options()(
"restrictions,r",
boost::program_options::value<boost::filesystem::path>(&restrictions_path),
boost::program_options::value<std::string>(&string_restrictions_path),
"Restrictions file in .osrm.restrictions format")(
"profile,p", boost::program_options::value<boost::filesystem::path>(&profile_path)
->default_value("profile.lua"),
@ -408,6 +409,9 @@ bool Prepare::ParseArguments(int argc, char *argv[])
boost::program_options::notify(option_variables);
input_path = boost::filesystem::path(string_input_path);
restrictions_path = boost::filesystem::path(string_restrictions_path);
if (!option_variables.count("restrictions"))
{
restrictions_path = std::string(input_path.string() + ".restrictions");
@ -419,7 +423,6 @@ bool Prepare::ParseArguments(int argc, char *argv[])
return false;
}
input_path = boost::filesystem::path(string_input_path);
return true;
}