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

check empty name string in sliproad handler

Browse Source
This commit is contained in:
karenzshea 2017-11-27 18:31:19 +01:00 committed by Patrick Niklaus
parent 701c5f853d
commit 8bce061691
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/extractor/guidance/sliproad_handler.cpp
View File

@ -474,7 +474,8 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
// Name mismatch: check roads at `c` and `d` for same name // Name mismatch: check roads at `c` and `d` for same name
const auto name_mismatch = [&](const NameID road_name_id) { const auto name_mismatch = [&](const NameID road_name_id) {
const auto unnamed = road_name_id == EMPTY_NAMEID; const auto &road_name = name_table.GetNameForID(road_name_id).to_string();
const auto unnamed = road_name.empty();
return unnamed || return unnamed ||
util::guidance::requiresNameAnnounced(road_name_id, // util::guidance::requiresNameAnnounced(road_name_id, //
@ -501,9 +502,11 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
.name_id; .name_id;
const auto &sliproad_annotation = const auto &sliproad_annotation =
node_data_container.GetAnnotation(sliproad_edge_data.annotation_data); node_data_container.GetAnnotation(sliproad_edge_data.annotation_data);
const auto &sliproad_name = name_table.GetNameForID(sliproad_annotation.name_id).to_string();
const auto &main_road_name = name_table.GetNameForID(main_road_name_id).to_string();
const auto &candidate_road_name = name_table.GetNameForID(candidate_data.name_id).to_string();
if (!sliproad_edge_data.flags.road_classification.IsLinkClass() && if (!sliproad_edge_data.flags.road_classification.IsLinkClass() &&
sliproad_annotation.name_id != EMPTY_NAMEID && main_road_name_id != EMPTY_NAMEID && !sliproad_name.empty() && !main_road_name.empty() && !candidate_road_name.empty() &&
candidate_data.name_id != EMPTY_NAMEID &&
util::guidance::requiresNameAnnounced(main_road_name_id, util::guidance::requiresNameAnnounced(main_road_name_id,
sliproad_annotation.name_id, sliproad_annotation.name_id,
name_table, name_table,