Skip to content

Commit

Permalink
Adding a new command line option osrm-extract --with-osm-metadata
Browse files Browse the repository at this point in the history
This keep the metadata reader flag disabled by default unless explicitly specified.

Signed-off-by: FILLAU Jean-Maxime <jean-maxime.fillau@mapotempo.com>
  • Loading branch information
FILLAU Jean-Maxime committed Jan 4, 2017
1 parent 6c316f6 commit 0f9ef40
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 2 additions & 0 deletions include/extractor/extractor_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ struct ExtractorConfig
bool generate_edge_lookup;
std::string edge_penalty_path;
std::string edge_segment_lookup_path;

bool use_metadata;
};
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/extractor/extractor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
auto extractor_callbacks = std::make_unique<ExtractorCallbacks>(extraction_containers);

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();

unsigned number_of_nodes = 0;
Expand Down
7 changes: 6 additions & 1 deletion src/tools/extract.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
->default_value(1000),
"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
// shown to the user
Expand Down

0 comments on commit 0f9ef40

Please sign in to comment.