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

check empty string name in mergable road detector

Browse Source
This commit is contained in:
karenzshea 2017-11-27 17:56:59 +01:00 committed by Patrick Niklaus
parent 8cf8f0d7d6
commit d1e4ba373a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/extractor/guidance/mergable_road_detector.cpp
View File

@ -32,15 +32,17 @@ inline auto makeCheckRoadForName(const NameID name_id,
return [name_id, &node_based_graph, &node_data_container, &name_table, &suffix_table]( return [name_id, &node_based_graph, &node_data_container, &name_table, &suffix_table](
const MergableRoadDetector::MergableRoadData &road) { const MergableRoadDetector::MergableRoadData &road) {
// since we filter here, we don't want any other name than the one we are looking for // since we filter here, we don't want any other name than the one we are looking for
const auto road_name = const auto road_name_id =
node_data_container node_data_container
.GetAnnotation(node_based_graph.GetEdgeData(road.eid).annotation_data) .GetAnnotation(node_based_graph.GetEdgeData(road.eid).annotation_data)
.name_id; .name_id;
if (name_id == EMPTY_NAMEID || road_name == EMPTY_NAMEID) const auto road_name = name_table.GetNameForID(road_name_id).to_string();
if (name_id == EMPTY_NAMEID || road_name.empty())
return true; return true;
const auto requires_announcement = const auto requires_announcement =
util::guidance::requiresNameAnnounced(name_id, road_name, name_table, suffix_table) || util::guidance::requiresNameAnnounced(
util::guidance::requiresNameAnnounced(road_name, name_id, name_table, suffix_table); name_id, road_name_id, name_table, suffix_table) ||
util::guidance::requiresNameAnnounced(road_name_id, name_id, name_table, suffix_table);
return requires_announcement; return requires_announcement;
}; };
@ -465,16 +467,19 @@ bool MergableRoadDetector::IsTrafficIsland(const NodeID intersection_node,
.name_id; .name_id;
const auto has_required_name = [this, required_name_id](const auto edge_id) { const auto has_required_name = [this, required_name_id](const auto edge_id) {
const auto road_name = const auto road_name_id =
node_data_container node_data_container
.GetAnnotation(node_based_graph.GetEdgeData(edge_id).annotation_data) .GetAnnotation(node_based_graph.GetEdgeData(edge_id).annotation_data)
.name_id; .name_id;
if (required_name_id == EMPTY_NAMEID || road_name == EMPTY_NAMEID) const auto &road_name = name_table.GetNameForID(road_name_id).to_string();
const auto &required_name = name_table.GetNameForID(required_name_id).to_string();
if (required_name_id == EMPTY_NAMEID || road_name_id == EMPTY_NAMEID ||
(required_name.empty() && road_name.empty()))
return false; return false;
return !util::guidance::requiresNameAnnounced( return !util::guidance::requiresNameAnnounced(
required_name_id, road_name, name_table, street_name_suffix_table) || required_name_id, road_name_id, name_table, street_name_suffix_table) ||
!util::guidance::requiresNameAnnounced( !util::guidance::requiresNameAnnounced(
road_name, required_name_id, name_table, street_name_suffix_table); road_name_id, required_name_id, name_table, street_name_suffix_table);
}; };
/* the beautiful way would be: /* the beautiful way would be: