From d6dfe1201adf0a6ccdd3cd2566f98e0801b6957b Mon Sep 17 00:00:00 2001
From: Bobby Sudekum <bobby@mapbox.com>
Date: Wed, 27 Sep 2017 17:26:13 -0700
Subject: [PATCH] Improve departure announcement (#654)

---
 MapboxCoreNavigation/Constants.swift          |  5 +++
 .../SpokenInstructionFormatter.swift          | 32 ++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/MapboxCoreNavigation/Constants.swift b/MapboxCoreNavigation/Constants.swift
index 434cf47af63..4ffa2f5c763 100644
--- a/MapboxCoreNavigation/Constants.swift
+++ b/MapboxCoreNavigation/Constants.swift
@@ -150,3 +150,8 @@ let milesToMeters = 1609.34
  The mimimum speed value before the user is snapped to the route. This is used to overcome inaccurate course values when a user's speed is low.
  */
 public var RouteControllerMinimumSpeedThresholdForSnappingUserToRoute: CLLocationSpeed = 2
+
+/**
+ The minimum distance threshold used for giving a "Continue" type instructions.
+ */
+public var RouteControllerMinDistanceForContinueInstruction: CLLocationDistance = 2_000
diff --git a/MapboxCoreNavigation/SpokenInstructionFormatter.swift b/MapboxCoreNavigation/SpokenInstructionFormatter.swift
index 1c3de6cb34a..9fdf59e4bc1 100644
--- a/MapboxCoreNavigation/SpokenInstructionFormatter.swift
+++ b/MapboxCoreNavigation/SpokenInstructionFormatter.swift
@@ -72,10 +72,34 @@ public class SpokenInstructionFormatter: NSObject {
         // We only want to announce this special depature announcement once.
         // Once it has been announced, all subsequnt announcements will not have an alert level of low
         // since the user will be approaching the maneuver location.
-        let isDeparture = routeProgress.currentLegProgress.currentStep.maneuverType == .depart && alertLevel == .depart
-        let didCompleteManeuver = routeProgress.currentLegProgress.currentStep.distance > 2_000 && routeProgress.currentLegProgress.alertUserLevel == .low
-        if isDeparture || didCompleteManeuver {
-            if isDeparture && upcomingStepDuration < linkedInstructionMultiplier {
+        let isStartingDeparture = routeProgress.currentLegProgress.currentStep.maneuverType == .depart && (alertLevel == .depart || alertLevel == .low)
+        if let currentInstruction = currentInstruction, isStartingDeparture {
+            if routeProgress.currentLegProgress.currentStep.distance > RouteControllerMinDistanceForContinueInstruction {
+                text = currentInstruction
+            } else if upcomingStepDuration > linkedInstructionMultiplier {
+                // If the upcoming step is an .exitRoundabout or .exitRotary, don't link the instruction
+                if let followOnStep = routeProgress.currentLegProgress.followOnStep, followOnStep.maneuverType == .exitRoundabout || followOnStep.maneuverType == .exitRotary {
+                    text = upComingInstruction
+                } else {
+                    let phrase = escapeIfNecessary(routeStepFormatter.instructions.phrase(named: .twoInstructionsWithDistance))
+                    text = phrase.replacingTokens { (tokenType) -> String in
+                        switch tokenType {
+                        case .firstInstruction:
+                            return currentInstruction
+                        case .secondInstruction:
+                            return upComingInstruction
+                        case .distance:
+                            return maneuverVoiceDistanceFormatter.string(from: userDistance)
+                        default:
+                            fatalError("Unexpected token \(tokenType)")
+                        }
+                    }
+                }
+            } else {
+                text = upComingInstruction
+            }
+        } else if routeProgress.currentLegProgress.currentStep.distance > RouteControllerMinDistanceForContinueInstruction && routeProgress.currentLegProgress.alertUserLevel == .low {
+            if isStartingDeparture && upcomingStepDuration < linkedInstructionMultiplier {
                 let phrase = escapeIfNecessary(routeStepFormatter.instructions.phrase(named: .twoInstructionsWithDistance))
                 text = phrase.replacingTokens { (tokenType) -> String in
                     switch tokenType {