From d5ffbc6a9a19b1349fdfe95bcc7ca1047ebef246 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Sat, 23 Dec 2017 19:04:24 +0100 Subject: [PATCH] Remove check unnamed check in sliproad handler --- features/guidance/dedicated-turn-roads.feature | 4 ++-- src/extractor/guidance/sliproad_handler.cpp | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/features/guidance/dedicated-turn-roads.feature b/features/guidance/dedicated-turn-roads.feature index b8f2a7eef..38d30bdc0 100644 --- a/features/guidance/dedicated-turn-roads.feature +++ b/features/guidance/dedicated-turn-roads.feature @@ -1095,5 +1095,5 @@ Feature: Slipways and Dedicated Turn Lanes | ac | primary_link | | | yes | When I route I should get - | waypoints | route | turns | locations | - | s,f | road,,, | depart,turn right,turn slight right,arrive | s,a,c,f | + | waypoints | route | turns | locations | + | s,f | road,, | depart,turn right,arrive | s,a,f | diff --git a/src/extractor/guidance/sliproad_handler.cpp b/src/extractor/guidance/sliproad_handler.cpp index 71b69dea5..abdc72297 100644 --- a/src/extractor/guidance/sliproad_handler.cpp +++ b/src/extractor/guidance/sliproad_handler.cpp @@ -475,10 +475,7 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter // Name mismatch: check roads at `c` and `d` for same name const auto name_mismatch = [&](const NameID road_name_id) { - const auto unnamed = name_table.GetNameForID(road_name_id).empty(); - - return unnamed || - util::guidance::requiresNameAnnounced(road_name_id, // + return util::guidance::requiresNameAnnounced(road_name_id, // candidate_data.name_id, // name_table, // street_name_suffix_table); //