diff options
| author | l.dragunov <l.dragunov@corp.mail.ru> | 2015-03-18 17:30:36 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:40:27 +0300 |
| commit | 6560d0c0c34aa522c525ab9e0b76604cca982faa (patch) | |
| tree | db30862dd1296de19a9547ed1e0a343cbd3a880d /3party/osrm | |
| parent | f7b102135d7c3c7bb63738bcb0c936bf2a9bab54 (diff) | |
OSRM input parametr fix + sh script to generate all routing files
Diffstat (limited to '3party/osrm')
| -rw-r--r-- | 3party/osrm/osrm-backend/Contractor/Prepare.cpp | 5 | ||||
| -rw-r--r-- | 3party/osrm/osrm-backend/Extractor/Extractor.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/3party/osrm/osrm-backend/Contractor/Prepare.cpp b/3party/osrm/osrm-backend/Contractor/Prepare.cpp index a56e068aba..807b7560f9 100644 --- a/3party/osrm/osrm-backend/Contractor/Prepare.cpp +++ b/3party/osrm/osrm-backend/Contractor/Prepare.cpp @@ -366,10 +366,11 @@ bool Prepare::ParseArguments(int argc, char *argv[]) // hidden options, will be allowed both on command line and in config file, but will not be // shown to the user + std::string string_input_path; boost::program_options::options_description hidden_options("Hidden options"); hidden_options.add_options()( "input,i", - boost::program_options::value<boost::filesystem::path>(&input_path), + boost::program_options::value<std::string>(&string_input_path), "Input file in .osm, .osm.bz2 or .osm.pbf format"); // positional option @@ -420,6 +421,8 @@ bool Prepare::ParseArguments(int argc, char *argv[]) return false; } + input_path = boost::filesystem::path(string_input_path); + return true; } diff --git a/3party/osrm/osrm-backend/Extractor/Extractor.cpp b/3party/osrm/osrm-backend/Extractor/Extractor.cpp index 0849768510..c9c870bf15 100644 --- a/3party/osrm/osrm-backend/Extractor/Extractor.cpp +++ b/3party/osrm/osrm-backend/Extractor/Extractor.cpp @@ -81,10 +81,11 @@ bool Extractor::ParseArguments(int argc, char *argv[]) // hidden options, will be allowed both on command line and in config file, but will not be // shown to the user + std::string string_input_path; boost::program_options::options_description hidden_options("Hidden options"); hidden_options.add_options()( "input,i", - boost::program_options::value<boost::filesystem::path>(&input_path), + boost::program_options::value<std::string>(&string_input_path), "Input file in .osm, .osm.bz2 or .osm.pbf format"); // positional option @@ -141,6 +142,8 @@ bool Extractor::ParseArguments(int argc, char *argv[]) return false; } + input_path = boost::filesystem::path(string_input_path); + return true; } |