Don't use sliproad scenario if two name announcements are required

Project-OSRM · Sep 12, 2017 · ad9ef92 · ad9ef92
1 parent 57e5d1e
commit ad9ef92
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/features/guidance/dedicated-turn-roads.feature b/features/guidance/dedicated-turn-roads.feature
@@ -1016,7 +1016,7 @@ Feature: Slipways and Dedicated Turn Lanes
             | nodes | highway      | name  | oneway |
             | sab   | primary      | sab   |        |
             | dbcef | primary      | dbcef |        |
-            | ae    | primary_link | ae    | yes    |
+            | ae    | primary_link | sab   | yes    |
             | cg    | primary      | cg    |        |
 
 

diff --git a/src/extractor/guidance/sliproad_handler.cpp b/src/extractor/guidance/sliproad_handler.cpp
@@ -487,6 +487,22 @@ operator()(const NodeID /*nid*/, const EdgeID source_edge_id, Intersection inter
                 continue;
             }
 
+            // Check if main road -> sliproad -> candidate road requires two name announcements
+            const auto main_road_name_id = node_based_graph.GetEdgeData(main_road.eid).name_id;
+            if (sliproad_data.name_id != EMPTY_NAMEID && main_road_name_id != EMPTY_NAMEID &&
+                candidate_data.name_id != EMPTY_NAMEID &&
+                util::guidance::requiresNameAnnounced(main_road_name_id,
+                                                      sliproad_data.name_id,
+                                                      name_table,
+                                                      street_name_suffix_table) &&
+                util::guidance::requiresNameAnnounced(sliproad_data.name_id,
+                                                      candidate_data.name_id,
+                                                      name_table,
+                                                      street_name_suffix_table))
+            {
+                continue;
+            }
+
             // If the Sliproad `bd` is a link, `bc` and `cd` must not be links.
             if (!isValidSliproadLink(sliproad, main_road, candidate_road))
             {