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

check empty name string in turn handler

Browse Source
This commit is contained in:
karenzshea 2017-11-28 10:34:46 +01:00 committed by Patrick Niklaus
parent 8bce061691
commit 24562acd30
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,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 &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 &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() && if (!sliproad_edge_data.flags.road_classification.IsLinkClass() &&
!sliproad_name.empty() && !main_road_name.empty() && !candidate_road_name.empty() && !sliproad_name.empty() && !main_road_name.empty() && !candidate_road_name.empty() &&
util::guidance::requiresNameAnnounced(main_road_name_id, util::guidance::requiresNameAnnounced(main_road_name_id,

3
src/extractor/guidance/turn_handler.cpp
View File

@ -199,7 +199,8 @@ bool TurnHandler::isObviousOfTwo(const EdgeID via_edge,
const bool turn_is_perfectly_straight = const bool turn_is_perfectly_straight =
angularDeviation(road.angle, STRAIGHT_ANGLE) < std::numeric_limits<double>::epsilon(); angularDeviation(road.angle, STRAIGHT_ANGLE) < std::numeric_limits<double>::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( const auto same_name = !util::guidance::requiresNameAnnounced(
via_data.name_id, road_data.name_id, name_table, street_name_suffix_table); via_data.name_id, road_data.name_id, name_table, street_name_suffix_table);