Adding a new command line option osrm-extract --with-osm-metadata

This keep the metadata reader flag disabled by default unless explicitly specified.

Signed-off-by: FILLAU Jean-Maxime <jean-maxime.fillau@mapotempo.com>
This commit is contained in:
FILLAU Jean-Maxime 2017-01-04 10:49:34 +01:00 committed by Daniel J. H
parent aad2124faa
commit 300283d572
3 changed files with 13 additions and 2 deletions

View File

@ -102,6 +102,8 @@ struct ExtractorConfig
bool generate_edge_lookup; bool generate_edge_lookup;
std::string edge_penalty_path; std::string edge_penalty_path;
std::string edge_segment_lookup_path; std::string edge_segment_lookup_path;
bool use_metadata;
}; };
} }
} }

View File

@ -130,7 +130,11 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
auto extractor_callbacks = std::make_unique<ExtractorCallbacks>(extraction_containers); auto extractor_callbacks = std::make_unique<ExtractorCallbacks>(extraction_containers);
const osmium::io::File input_file(config.input_path.string()); const osmium::io::File input_file(config.input_path.string());
osmium::io::Reader reader(input_file, osmium::io::read_meta::no);
osmium::io::Reader reader(
input_file,
(config.use_metadata ? osmium::io::read_meta::yes : osmium::io::read_meta::no));
const osmium::io::Header header = reader.header(); const osmium::io::Header header = reader.header();
unsigned number_of_nodes = 0; unsigned number_of_nodes = 0;

View File

@ -50,7 +50,12 @@ return_code parseArguments(int argc, char *argv[], extractor::ExtractorConfig &e
boost::program_options::value<unsigned int>(&extractor_config.small_component_size) boost::program_options::value<unsigned int>(&extractor_config.small_component_size)
->default_value(1000), ->default_value(1000),
"Number of nodes required before a strongly-connected-componennt is considered big " "Number of nodes required before a strongly-connected-componennt is considered big "
"(affects nearest neighbor snapping)"); "(affects nearest neighbor snapping)")(
"with-osm-metadata",
boost::program_options::value<bool>(&extractor_config.use_metadata)
->implicit_value(true)
->default_value(false),
"Use metada during osm parsing (This can affect the extraction performance).");
// hidden options, will be allowed on command line, but will not be // hidden options, will be allowed on command line, but will not be
// shown to the user // shown to the user