do not consider empty-names + empty-refs a valid name for u-turns

Project-OSRM · Oct 27, 2017 · 650ff37 · 650ff37
1 parent dd3c894
commit 650ff37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/features/guidance/collapse.feature b/features/guidance/collapse.feature
@@ -1096,5 +1096,5 @@ Feature: Collapse
             | be    | residential   | cross | no     |                 |
 
         When I route I should get
-            | waypoints | route  | turns                        |
-            | a,f       | road,, | depart,continue uturn,arrive |
+            | waypoints | route        | turns                                |
+            | a,f       | road,cross,, | depart,turn left,on ramp left,arrive |
diff --git a/include/engine/guidance/collapsing_utility.hpp b/include/engine/guidance/collapsing_utility.hpp
@@ -121,9 +121,14 @@ inline bool haveSameMode(const RouteStep &first, const RouteStep &second, const
 // alias for readability
 inline bool haveSameName(const RouteStep &lhs, const RouteStep &rhs)
 {
+    const auto has_name_or_ref = [](auto const& step) {
+        return !step.name.empty() || !step.ref.empty();
+    };
+
     // make sure empty is not involved
-    if (lhs.name_id == EMPTY_NAMEID || rhs.name_id == EMPTY_NAMEID)
+    if (!has_name_or_ref(lhs) || !has_name_or_ref(rhs)) {
         return false;
+    }
 
     // easy check to not go over the strings if not necessary
     else if (lhs.name_id == rhs.name_id)