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

Moves invalid id warnings to debug, closes #2630

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-07-25 10:28:50 +02:00 committed by Patrick Niklaus
parent e83905b783
commit eaf42ba437
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/extractor/extraction_containers.cpp
View File

@ -96,7 +96,6 @@ struct CmpEdgeByInternalSourceTargetAndName
const oe::ExtractionContainers::STXXLNameCharData &name_data; const oe::ExtractionContainers::STXXLNameCharData &name_data;
const oe::ExtractionContainers::STXXLNameOffsets &name_offsets; const oe::ExtractionContainers::STXXLNameOffsets &name_offsets;
}; };
} }
namespace osrm namespace osrm
@ -192,7 +191,8 @@ void ExtractionContainers::WriteCharData(const std::string &file_name)
// transforms in-place name offsets to name lengths // transforms in-place name offsets to name lengths
BOOST_ASSERT(!name_offsets.empty()); BOOST_ASSERT(!name_offsets.empty());
for (auto curr = name_offsets.begin(), next = name_offsets.begin() + 1; for (auto curr = name_offsets.begin(), next = name_offsets.begin() + 1;
next != name_offsets.end(); ++curr, ++next) next != name_offsets.end();
++curr, ++next)
{ {
*curr = *next - *curr; *curr = *next - *curr;
} }
@ -316,8 +316,8 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
{ {
if (edge_iterator->result.osm_source_id < node_iterator->node_id) if (edge_iterator->result.osm_source_id < node_iterator->node_id)
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) << "Found invalid node reference " util::SimpleLogger().Write(LogLevel::logDEBUG) << "Found invalid node reference "
<< edge_iterator->result.source; << edge_iterator->result.source;
edge_iterator->result.source = SPECIAL_NODEID; edge_iterator->result.source = SPECIAL_NODEID;
++edge_iterator; ++edge_iterator;
continue; continue;
@ -352,8 +352,8 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
// Remove all remaining edges. They are invalid because there are no corresponding nodes for // Remove all remaining edges. They are invalid because there are no corresponding nodes for
// them. This happens when using osmosis with bbox or polygon to extract smaller areas. // them. This happens when using osmosis with bbox or polygon to extract smaller areas.
auto markSourcesInvalid = [](InternalExtractorEdge &edge) { auto markSourcesInvalid = [](InternalExtractorEdge &edge) {
util::SimpleLogger().Write(LogLevel::logWARNING) << "Found invalid node reference " util::SimpleLogger().Write(LogLevel::logDEBUG) << "Found invalid node reference "
<< edge.result.source; << edge.result.source;
edge.result.source = SPECIAL_NODEID; edge.result.source = SPECIAL_NODEID;
edge.result.osm_source_id = SPECIAL_OSM_NODEID; edge.result.osm_source_id = SPECIAL_OSM_NODEID;
}; };
@ -387,7 +387,7 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
if (edge_iterator->result.osm_target_id < node_iterator->node_id) if (edge_iterator->result.osm_target_id < node_iterator->node_id)
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Found invalid node reference " << "Found invalid node reference "
<< static_cast<uint64_t>(edge_iterator->result.osm_target_id); << static_cast<uint64_t>(edge_iterator->result.osm_target_id);
edge_iterator->result.target = SPECIAL_NODEID; edge_iterator->result.target = SPECIAL_NODEID;
@ -455,8 +455,8 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
// Remove all remaining edges. They are invalid because there are no corresponding nodes for // Remove all remaining edges. They are invalid because there are no corresponding nodes for
// them. This happens when using osmosis with bbox or polygon to extract smaller areas. // them. This happens when using osmosis with bbox or polygon to extract smaller areas.
auto markTargetsInvalid = [](InternalExtractorEdge &edge) { auto markTargetsInvalid = [](InternalExtractorEdge &edge) {
util::SimpleLogger().Write(LogLevel::logWARNING) << "Found invalid node reference " util::SimpleLogger().Write(LogLevel::logDEBUG) << "Found invalid node reference "
<< edge.result.target; << edge.result.target;
edge.result.target = SPECIAL_NODEID; edge.result.target = SPECIAL_NODEID;
}; };
std::for_each(edge_iterator, all_edges_list_end_, markTargetsInvalid); std::for_each(edge_iterator, all_edges_list_end_, markTargetsInvalid);
@ -715,7 +715,7 @@ void ExtractionContainers::PrepareRestrictions()
if (way_start_and_end_iterator->way_id > if (way_start_and_end_iterator->way_id >
OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.from.way)}) OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.from.way)})
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Restriction references invalid way: " << "Restriction references invalid way: "
<< restrictions_iterator->restriction.from.way; << restrictions_iterator->restriction.from.way;
restrictions_iterator->restriction.from.node = SPECIAL_NODEID; restrictions_iterator->restriction.from.node = SPECIAL_NODEID;
@ -723,8 +723,9 @@ void ExtractionContainers::PrepareRestrictions()
continue; continue;
} }
BOOST_ASSERT(way_start_and_end_iterator->way_id == BOOST_ASSERT(
OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.from.way)}); way_start_and_end_iterator->way_id ==
OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.from.way)});
// we do not remap the via id yet, since we will need it for the to node as well // we do not remap the via id yet, since we will need it for the to node as well
const OSMNodeID via_node_id = OSMNodeID{restrictions_iterator->restriction.via.node}; const OSMNodeID via_node_id = OSMNodeID{restrictions_iterator->restriction.via.node};
@ -732,7 +733,7 @@ void ExtractionContainers::PrepareRestrictions()
auto via_id_iter = external_to_internal_node_id_map.find(via_node_id); auto via_id_iter = external_to_internal_node_id_map.find(via_node_id);
if (via_id_iter == external_to_internal_node_id_map.end()) if (via_id_iter == external_to_internal_node_id_map.end())
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Restriction references invalid node: " << "Restriction references invalid node: "
<< restrictions_iterator->restriction.via.node; << restrictions_iterator->restriction.via.node;
restrictions_iterator->restriction.via.node = SPECIAL_NODEID; restrictions_iterator->restriction.via.node = SPECIAL_NODEID;
@ -747,7 +748,7 @@ void ExtractionContainers::PrepareRestrictions()
way_start_and_end_iterator->first_segment_target_id); way_start_and_end_iterator->first_segment_target_id);
if (id_iter == external_to_internal_node_id_map.end()) if (id_iter == external_to_internal_node_id_map.end())
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Way references invalid node: " << "Way references invalid node: "
<< way_start_and_end_iterator->first_segment_target_id; << way_start_and_end_iterator->first_segment_target_id;
restrictions_iterator->restriction.from.node = SPECIAL_NODEID; restrictions_iterator->restriction.from.node = SPECIAL_NODEID;
@ -764,7 +765,7 @@ void ExtractionContainers::PrepareRestrictions()
way_start_and_end_iterator->last_segment_source_id); way_start_and_end_iterator->last_segment_source_id);
if (id_iter == external_to_internal_node_id_map.end()) if (id_iter == external_to_internal_node_id_map.end())
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Way references invalid node: " << "Way references invalid node: "
<< way_start_and_end_iterator->last_segment_target_id; << way_start_and_end_iterator->last_segment_target_id;
restrictions_iterator->restriction.from.node = SPECIAL_NODEID; restrictions_iterator->restriction.from.node = SPECIAL_NODEID;
@ -821,8 +822,9 @@ void ExtractionContainers::PrepareRestrictions()
++restrictions_iterator; ++restrictions_iterator;
continue; continue;
} }
BOOST_ASSERT(way_start_and_end_iterator->way_id == BOOST_ASSERT(
OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.to.way)}); way_start_and_end_iterator->way_id ==
OSMWayID{static_cast<std::uint32_t>(restrictions_iterator->restriction.to.way)});
const OSMNodeID via_node_id = OSMNodeID{restrictions_iterator->restriction.via.node}; const OSMNodeID via_node_id = OSMNodeID{restrictions_iterator->restriction.via.node};
// assign new via node id // assign new via node id
@ -836,7 +838,7 @@ void ExtractionContainers::PrepareRestrictions()
way_start_and_end_iterator->first_segment_target_id); way_start_and_end_iterator->first_segment_target_id);
if (to_id_iter == external_to_internal_node_id_map.end()) if (to_id_iter == external_to_internal_node_id_map.end())
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Way references invalid node: " << "Way references invalid node: "
<< way_start_and_end_iterator->first_segment_source_id; << way_start_and_end_iterator->first_segment_source_id;
restrictions_iterator->restriction.to.node = SPECIAL_NODEID; restrictions_iterator->restriction.to.node = SPECIAL_NODEID;
@ -852,7 +854,7 @@ void ExtractionContainers::PrepareRestrictions()
way_start_and_end_iterator->last_segment_source_id); way_start_and_end_iterator->last_segment_source_id);
if (to_id_iter == external_to_internal_node_id_map.end()) if (to_id_iter == external_to_internal_node_id_map.end())
{ {
util::SimpleLogger().Write(LogLevel::logWARNING) util::SimpleLogger().Write(LogLevel::logDEBUG)
<< "Way references invalid node: " << "Way references invalid node: "
<< way_start_and_end_iterator->last_segment_source_id; << way_start_and_end_iterator->last_segment_source_id;
restrictions_iterator->restriction.to.node = SPECIAL_NODEID; restrictions_iterator->restriction.to.node = SPECIAL_NODEID;