Skip to content

Commit 2347c0a

Browse files
karenzsheakarenzshea
committed
check for empty on string_ref, rather than string itself
1 parent 6503461 commit 2347c0a

File tree

6 files changed

+26
-29
lines changed

6 files changed

+26
-29
lines changed

‎src/extractor/guidance/intersection_handler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ TurnType::Enum IntersectionHandler::findBasicTurnType(const EdgeID via_edge,
7777
const auto &out_name_id =
7878
node_data_container.GetAnnotation(node_based_graph.GetEdgeData(road.eid).annotation_data)
7979
.name_id;
80-
const auto &in_name_empty = name_table.GetNameForID(in_name_id).to_string().empty();
81-
const auto &out_name_empty = name_table.GetNameForID(out_name_id).to_string().empty();
80+
const auto &in_name_empty = name_table.GetNameForID(in_name_id).empty();
81+
const auto &out_name_empty = name_table.GetNameForID(out_name_id).empty();
8282

8383
const auto same_name = !util::guidance::requiresNameAnnounced(
8484
in_name_id, out_name_id, name_table, street_name_suffix_table);

‎src/extractor/guidance/mergable_road_detector.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ inline auto makeCheckRoadForName(const NameID name_id,
4040
.name_id;
4141
if (name_id == EMPTY_NAMEID || road_name_id == EMPTY_NAMEID)
4242
return true;
43-
const auto road_name_empty = name_table.GetNameForID(road_name_id).to_string().empty();
44-
const auto in_name_empty = name_table.GetNameForID(name_id).to_string().empty();
43+
const auto road_name_empty = name_table.GetNameForID(road_name_id).empty();
44+
const auto in_name_empty = name_table.GetNameForID(name_id).empty();
4545
if (in_name_empty || road_name_empty)
4646
return true;
4747
const auto requires_announcement =
@@ -480,9 +480,8 @@ bool MergableRoadDetector::IsTrafficIsland(const NodeID intersection_node,
480480
.name_id;
481481
if (road_name_id == EMPTY_NAMEID)
482482
return false;
483-
const auto &road_name_empty = name_table.GetNameForID(road_name_id).to_string().empty();
484-
const auto &required_name_empty =
485-
name_table.GetNameForID(required_name_id).to_string().empty();
483+
const auto &road_name_empty = name_table.GetNameForID(road_name_id).empty();
484+
const auto &required_name_empty = name_table.GetNameForID(required_name_id).empty();
486485
if (required_name_empty && road_name_empty)
487486
return false;
488487
return !util::guidance::requiresNameAnnounced(

‎src/extractor/guidance/motorway_handler.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,14 +386,14 @@ Intersection MotorwayHandler::fromRamp(const EdgeID via_eid, Intersection inters
386386
//
387387
// 7 1
388388
// 0
389-
const auto &first_intersection_name =
390-
name_table.GetNameForID(first_intersection_data.name_id).to_string();
391-
const auto &second_intersection_name =
392-
name_table.GetNameForID(second_intersection_data.name_id).to_string();
389+
const auto &first_intersection_name_empty =
390+
name_table.GetNameForID(first_intersection_data.name_id).empty();
391+
const auto &second_intersection_name_empty =
392+
name_table.GetNameForID(second_intersection_data.name_id).empty();
393393
if (intersection[1].entry_allowed)
394394
{
395395
if (isMotorwayClass(intersection[1].eid, node_based_graph) &&
396-
!second_intersection_name.empty() && !first_intersection_name.empty() &&
396+
!second_intersection_name_empty && !first_intersection_name_empty &&
397397
first_second_same_name)
398398
{
399399
// circular order indicates a merge to the left (0-3 onto 4
@@ -418,7 +418,7 @@ Intersection MotorwayHandler::fromRamp(const EdgeID via_eid, Intersection inters
418418
{
419419
BOOST_ASSERT(intersection[2].entry_allowed);
420420
if (isMotorwayClass(intersection[2].eid, node_based_graph) &&
421-
!second_intersection_name.empty() && !first_intersection_name.empty() &&
421+
!second_intersection_name_empty && !first_intersection_name_empty &&
422422
first_second_same_name)
423423
{
424424
// circular order (5-0) onto 4

‎src/extractor/guidance/roundabout_handler.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,9 @@ RoundaboutType RoundaboutHandler::getRoundaboutType(const NodeID nid) const
297297

298298
if (edge_data.name_id != EMPTY_NAMEID)
299299
{
300-
const auto &edge_name = name_table.GetNameForID(edge_data.name_id).to_string();
301-
if (!edge_name.empty())
300+
const auto &edge_name_empty =
301+
name_table.GetNameForID(edge_data.name_id).empty();
302+
if (!edge_name_empty)
302303
{
303304

304305
const auto announce = [&](unsigned id) {

‎src/extractor/guidance/sliproad_handler.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,7 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
475475
// Name mismatch: check roads at `c` and `d` for same name
476476
const auto name_mismatch = [&](const NameID road_name_id) {
477477
const auto unnamed =
478-
road_name_id == EMPTY_NAMEID
479-
? true
480-
: name_table.GetNameForID(road_name_id).to_string().empty();
478+
road_name_id == EMPTY_NAMEID || name_table.GetNameForID(road_name_id).empty();
481479

482480
return unnamed ||
483481
util::guidance::requiresNameAnnounced(road_name_id, //
@@ -502,17 +500,18 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
502500
node_data_container
503501
.GetAnnotation(node_based_graph.GetEdgeData(main_road.eid).annotation_data)
504502
.name_id;
503+
const auto main_road_name_empty = main_road_name_id == EMPTY_NAMEID ||
504+
name_table.GetNameForID(main_road_name_id).empty();
505505
const auto &sliproad_annotation =
506506
node_data_container.GetAnnotation(sliproad_edge_data.annotation_data);
507-
const auto &sliproad_name_empty =
508-
sliproad_annotation.name_id == EMPTY_NAMEID
509-
? true
510-
: name_table.GetNameForID(sliproad_annotation.name_id).to_string().empty();
511-
const auto &main_road_name = name_table.GetNameForID(main_road_name_id).to_string();
512-
const auto &candidate_road_name =
513-
name_table.GetNameForID(candidate_data.name_id).to_string();
507+
const auto sliproad_name_empty =
508+
sliproad_annotation.name_id == EMPTY_NAMEID ||
509+
name_table.GetNameForID(sliproad_annotation.name_id).empty();
510+
const auto candidate_road_name_empty =
511+
candidate_data.name_id == EMPTY_NAMEID ||
512+
name_table.GetNameForID(candidate_data.name_id).empty();
514513
if (!sliproad_edge_data.flags.road_classification.IsLinkClass() &&
515-
!sliproad_name_empty && !main_road_name.empty() && !candidate_road_name.empty() &&
514+
!sliproad_name_empty && !main_road_name_empty && !candidate_road_name_empty &&
516515
util::guidance::requiresNameAnnounced(main_road_name_id,
517516
sliproad_annotation.name_id,
518517
name_table,

‎src/extractor/guidance/turn_handler.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,7 @@ bool TurnHandler::isObviousOfTwo(const EdgeID via_edge,
200200
const bool turn_is_perfectly_straight =
201201
angularDeviation(road.angle, STRAIGHT_ANGLE) < std::numeric_limits<double>::epsilon();
202202
const auto &via_name_empty =
203-
via_data.name_id == EMPTY_NAMEID
204-
? true
205-
: name_table.GetNameForID(via_data.name_id).to_string().empty();
203+
via_data.name_id == EMPTY_NAMEID || name_table.GetNameForID(via_data.name_id).empty();
206204
if (!via_name_empty)
207205
{
208206
const auto same_name = !util::guidance::requiresNameAnnounced(

0 commit comments

Comments
 (0)