From aa51e8dadd2ccf9aed98038468013c5e603637da Mon Sep 17 00:00:00 2001 From: karenzshea Date: Tue, 28 Nov 2017 10:34:46 +0100 Subject: [PATCH] check empty name string in turn handler --- src/extractor/guidance/sliproad_handler.cpp | 6 ++++-- src/extractor/guidance/turn_handler.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/extractor/guidance/sliproad_handler.cpp b/src/extractor/guidance/sliproad_handler.cpp index 644a088c2..2d041d759 100644 --- a/src/extractor/guidance/sliproad_handler.cpp +++ b/src/extractor/guidance/sliproad_handler.cpp @@ -502,9 +502,11 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter .name_id; const auto &sliproad_annotation = node_data_container.GetAnnotation(sliproad_edge_data.annotation_data); - const auto &sliproad_name = name_table.GetNameForID(sliproad_annotation.name_id).to_string(); + 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(); + const auto &candidate_road_name = + name_table.GetNameForID(candidate_data.name_id).to_string(); if (!sliproad_edge_data.flags.road_classification.IsLinkClass() && !sliproad_name.empty() && !main_road_name.empty() && !candidate_road_name.empty() && util::guidance::requiresNameAnnounced(main_road_name_id, diff --git a/src/extractor/guidance/turn_handler.cpp b/src/extractor/guidance/turn_handler.cpp index 5b5200665..38473afa8 100644 --- a/src/extractor/guidance/turn_handler.cpp +++ b/src/extractor/guidance/turn_handler.cpp @@ -199,7 +199,8 @@ bool TurnHandler::isObviousOfTwo(const EdgeID via_edge, const bool turn_is_perfectly_straight = angularDeviation(road.angle, STRAIGHT_ANGLE) < std::numeric_limits::epsilon(); - if (via_data.name_id != EMPTY_NAMEID) + const auto &via_name = name_table.GetNameForID(via_data.name_id).to_string(); + if (!via_name.empty()) { const auto same_name = !util::guidance::requiresNameAnnounced( via_data.name_id, road_data.name_id, name_table, street_name_suffix_table);