Allow counting of service exits on service roundabouts, see #4075

2017-05-22 17:16:48 +02:00
parent ac35757616
commit 1d26deb0be
3 changed files with 19 additions and 14 deletions
@@ -478,13 +478,18 @@ Intersection RoundaboutHandler::handleRoundabouts(const RoundaboutType roundabou
                                return true;
                        }
                        return false;
-                    }();
+                    };

-                    if (has_non_ignorable_exit)
+                    if (out_data.road_classification.IsLowPriorityRoadClass() ||
+                        has_non_ignorable_exit())
+                    {
                        turn.instruction = TurnInstruction::REMAIN_ROUNDABOUT(
                            roundabout_type, getTurnDirection(turn.angle));
+                    }
                    else
+                    { // Suppress exit instructions from normal roundabouts to service roads
                        turn.instruction = {TurnType::Suppressed, getTurnDirection(turn.angle)};
+                    }
                }
            }
            else