Handle motorway forks with links as a normal motorway ...

passing some ramps or mering onto another motorway
Project-OSRM · Feb 16, 2018 · fe5d39c · fe5d39c
1 parent 4ffca4a
commit fe5d39c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature
@@ -316,7 +316,7 @@ Feature: Motorway Guidance
             | cd    | motorway_link |
 
        When I route I should get
-            | waypoints | route          | turns                           |
-            | a,d       | abce,cd,cd     | depart,turn straight,arrive     |
-            | a,e       | abce,abce,abce | depart,fork slight left,arrive  |
-            | a,f       | abce,cf,cf     | depart,fork slight right,arrive |
+            | waypoints | route      | turns                              |
+            | a,d       | abce,cd,cd | depart,off ramp slight left,arrive |
+            | a,e       | abce,abce  | depart,arrive                      |
+            | a,f       | abce,cf,cf | depart,turn slight right,arrive |
diff --git a/src/guidance/motorway_handler.cpp b/src/guidance/motorway_handler.cpp
@@ -219,7 +219,10 @@ Intersection MotorwayHandler::fromMotorway(const EdgeID via_eid, Intersection in
     }
     else
     {
-        const unsigned exiting_motorways = countExitingMotorways(intersection);
+        const auto valid_exits = std::count_if(intersection.begin(),
+                                               intersection.end(),
+                                               [](const auto &road) { return road.entry_allowed; });
+        const auto exiting_motorways = countExitingMotorways(intersection);
 
         if (exiting_motorways == 0)
         {
@@ -233,7 +236,7 @@ Intersection MotorwayHandler::fromMotorway(const EdgeID via_eid, Intersection in
                 }
             }
         }
-        else if (exiting_motorways == 1)
+        else if (exiting_motorways == 1 || exiting_motorways != valid_exits)
         {
             // normal motorway passing some ramps or mering onto another motorway
             if (intersection.size() == 2)