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

fix generation of file names

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-26 18:08:33 +02:00
parent 6d9598cd4c
commit b7ea1dfcd0
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Extractor/Extractor.cpp
View File

@ -161,6 +161,7 @@ void Extractor::GenerateOutputFilesNames()
{ {
output_file_name = input_path.string(); output_file_name = input_path.string();
restriction_file_name = input_path.string(); restriction_file_name = input_path.string();
timestamp_file_name = input_path.string();
std::string::size_type pos = output_file_name.find(".osm.bz2"); std::string::size_type pos = output_file_name.find(".osm.bz2");
if (pos == std::string::npos) if (pos == std::string::npos)
{ {
@ -309,24 +310,24 @@ int Extractor::Run(int argc, char *argv[])
case osmium::item_type::node: case osmium::item_type::node:
++number_of_nodes; ++number_of_nodes;
result_node.Clear(); result_node.Clear();
luabind::call_function<void>( // luabind::call_function<void>(
lua_state, // lua_state,
"node_function", // "node_function",
boost::cref(static_cast<osmium::Node &>(entity)), // boost::cref(static_cast<osmium::Node &>(entity)),
boost::ref(result_node)); // boost::ref(result_node));
extractor_callbacks->ProcessNode(static_cast<osmium::Node &>(entity), // extractor_callbacks->ProcessNode(static_cast<osmium::Node &>(entity),
result_node); // result_node);
break; break;
case osmium::item_type::way: case osmium::item_type::way:
++number_of_ways; ++number_of_ways;
result_way.Clear(); result_way.Clear();
luabind::call_function<void>( // luabind::call_function<void>(
lua_state, // lua_state,
"way_function", // "way_function",
boost::cref(static_cast<osmium::Way &>(entity)), // boost::cref(static_cast<osmium::Way &>(entity)),
boost::ref(result_way)); // boost::ref(result_way));
extractor_callbacks->ProcessWay(static_cast<osmium::Way &>(entity), // extractor_callbacks->ProcessWay(static_cast<osmium::Way &>(entity),
result_way); // result_way);
break; break;
case osmium::item_type::relation: case osmium::item_type::relation:
++number_of_relations; ++number_of_relations;
@ -341,6 +342,8 @@ int Extractor::Run(int argc, char *argv[])
} }
TIMER_STOP(parsing); TIMER_STOP(parsing);
SimpleLogger().Write() << "Parsing finished after " << TIMER_SEC(parsing) << " seconds"; SimpleLogger().Write() << "Parsing finished after " << TIMER_SEC(parsing) << " seconds";
SimpleLogger().Write() << "Raw input contains " << number_of_nodes << " nodes, " << number_of_ways << " ways, and " << number_of_relations << " relations";
extractor_callbacks.reset(); extractor_callbacks.reset();
if (extraction_containers.all_edges_list.empty()) if (extraction_containers.all_edges_list.empty())