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

check for empty on string_ref, rather than string itself

Browse Source
This commit is contained in:
karenzshea
2017-12-01 11:36:03 +01:00
committed by Patrick Niklaus
parent 89080fb2b0
commit 4166b1ebbf
6 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extractor/guidance/mergable_road_detector.cpp
+4 -5
View File
@@ -40,8 +40,8 @@ inline auto makeCheckRoadForName(const NameID name_id,
.name_id;
if (name_id == EMPTY_NAMEID || road_name_id == EMPTY_NAMEID)
return true;
const auto road_name_empty = name_table.GetNameForID(road_name_id).to_string().empty();
const auto in_name_empty = name_table.GetNameForID(name_id).to_string().empty();
const auto road_name_empty = name_table.GetNameForID(road_name_id).empty();
const auto in_name_empty = name_table.GetNameForID(name_id).empty();
if (in_name_empty || road_name_empty)
return true;
const auto requires_announcement =
@@ -480,9 +480,8 @@ bool MergableRoadDetector::IsTrafficIsland(const NodeID intersection_node,
.name_id;
if (road_name_id == EMPTY_NAMEID)
return false;
const auto &road_name_empty = name_table.GetNameForID(road_name_id).to_string().empty();
const auto &required_name_empty =
name_table.GetNameForID(required_name_id).to_string().empty();
const auto &road_name_empty = name_table.GetNameForID(road_name_id).empty();
const auto &required_name_empty = name_table.GetNameForID(required_name_id).empty();
if (required_name_empty && road_name_empty)
return false;
return !util::guidance::requiresNameAnnounced(