only consider allowed entries when continuing on motorways

Moritz Kobitzsch · TheMarex · commit 070fa1a24c7c · 2017-07-13T09:00:00.000Z
diff --git a/features/guidance/motorway.feature b/features/guidance/motorway.feature
@@ -278,6 +278,6 @@ Feature: Motorway Guidance
             | cd    |      | US 50; I 66 | motorway | yes    |
 
         When I route I should get
-            | waypoints | route | turns                          |
-            | a,d       | ,     | depart,turn slight left,arrive |
-            | b,d       | ,     | depart,arrive                  |
+            | waypoints | route | turns         |
+            | a,d       | ,     | depart,arrive |
+            | b,d       | ,     | depart,arrive |
diff --git a/src/extractor/guidance/motorway_handler.cpp b/src/extractor/guidance/motorway_handler.cpp
@@ -118,6 +118,9 @@ Intersection MotorwayHandler::fromMotorway(const EdgeID via_eid, Intersection in
     const auto getContinueAngle = [this, in_data](const Intersection &intersection) {
         for (const auto &road : intersection)
         {
+            if (!road.entry_allowed)
+                continue;
+
             const auto &out_data = node_based_graph.GetEdgeData(road.eid);
 
             const auto same_name = !util::guidance::requiresNameAnnounced(

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@ Intersection MotorwayHandler::fromMotorway(const EdgeID via_eid, Intersection in`
`118`	`118`	`const auto getContinueAngle = [this, in_data](const Intersection &intersection) {`
`119`	`119`	`for (const auto &road : intersection)`
`120`	`120`	`{`
	`121`	`+ if (!road.entry_allowed)`
	`122`	`+ continue;`
	`123`	`+`
`121`	`124`	`const auto &out_data = node_based_graph.GetEdgeData(road.eid);`
`122`	`125`
`123`	`126`	`const auto same_name = !util::guidance::requiresNameAnnounced(`