From 14016fc5d8b9c62752969ac9d8301a8657d4542f Mon Sep 17 00:00:00 2001
From: Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com>
Date: Fri, 3 Mar 2017 17:22:06 -0800
Subject: [PATCH 1/7] Snap to route

---
 Examples/Swift/Base.lproj/Main.storyboard     |  2 +-
 Examples/Swift/ViewController.swift           |  2 +-
 MapboxNavigation.xcodeproj/project.pbxproj    | 12 +++++
 MapboxNavigation/RouteController.swift        |  2 +-
 .../MGLMapView+MGLNavigationAdditions.h       |  7 +++
 .../MGLMapView+MGLNavigationAdditions.m       |  5 ++
 MapboxNavigationUI/MGLMapView.swift           | 19 ++++++++
 MapboxNavigationUI/MapboxNavigationUI.h       |  3 +-
 .../Resources/Navigation.storyboard           | 48 +++++++++----------
 .../RouteMapViewController.swift              | 22 ++++++++-
 10 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
 create mode 100644 MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.m

diff --git a/Examples/Swift/Base.lproj/Main.storyboard b/Examples/Swift/Base.lproj/Main.storyboard
index f5f84044481..592d190e176 100644
--- a/Examples/Swift/Base.lproj/Main.storyboard
+++ b/Examples/Swift/Base.lproj/Main.storyboard
@@ -20,7 +20,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A3N-JT-loC" customClass="MGLMapView">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="A3N-JT-loC" customClass="NavigationMapView" customModule="MapboxNavigationUI">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <subviews>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8Sl-bV-xyU">
diff --git a/Examples/Swift/ViewController.swift b/Examples/Swift/ViewController.swift
index 7efcba9fb03..85d70949933 100644
--- a/Examples/Swift/ViewController.swift
+++ b/Examples/Swift/ViewController.swift
@@ -15,7 +15,7 @@ class ViewController: UIViewController, MGLMapViewDelegate {
     var routeViewController: RouteViewController?
     var userRoute: Route?
     
-    @IBOutlet weak var mapView: MGLMapView!
+    @IBOutlet weak var mapView: NavigationMapView!
     @IBOutlet weak var toggleNavigationButton: UIButton!
     @IBOutlet weak var howToBeginLabel: UILabel!
     
diff --git a/MapboxNavigation.xcodeproj/project.pbxproj b/MapboxNavigation.xcodeproj/project.pbxproj
index 5a4d346d85e..77643889822 100644
--- a/MapboxNavigation.xcodeproj/project.pbxproj
+++ b/MapboxNavigation.xcodeproj/project.pbxproj
@@ -97,6 +97,9 @@
 		35B839491E2E3D5D0045A868 /* MBRouteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35B839481E2E3D5D0045A868 /* MBRouteController.m */; };
 		35C6A35B1E5E418D0004CA57 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C6A34D1E5E418D0004CA57 /* ViewController.m */; };
 		35D457A71E2D253100A89946 /* MBRouteController.h in Headers */ = {isa = PBXBuildFile; fileRef = 35D457A61E2D253100A89946 /* MBRouteController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		35D825FB1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 35D825F91E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		35D825FC1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D825FA1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.m */; };
+		35D825FE1E6A2EC60088F83B /* MapboxNavigationUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 35D825FD1E6A2EC60088F83B /* MapboxNavigationUI.h */; };
 		C52AC1261DF0E48600396B9F /* RouteProgressTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52AC1251DF0E48600396B9F /* RouteProgressTests.swift */; };
 		C52D09CC1DEF444D00BE3C5C /* GeometryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52D09CB1DEF444D00BE3C5C /* GeometryTests.swift */; };
 		C52D09CE1DEF5E5100BE3C5C /* route.json in Resources */ = {isa = PBXBuildFile; fileRef = C52D09CD1DEF5E5100BE3C5C /* route.json */; };
@@ -306,6 +309,9 @@
 		35C6A34C1E5E418D0004CA57 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		35C6A34D1E5E418D0004CA57 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		35D457A61E2D253100A89946 /* MBRouteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBRouteController.h; sourceTree = "<group>"; };
+		35D825F91E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLMapView+MGLNavigationAdditions.h"; sourceTree = "<group>"; };
+		35D825FA1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MGLMapView+MGLNavigationAdditions.m"; sourceTree = "<group>"; };
+		35D825FD1E6A2EC60088F83B /* MapboxNavigationUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapboxNavigationUI.h; sourceTree = "<group>"; };
 		C52AC1251DF0E48600396B9F /* RouteProgressTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RouteProgressTests.swift; sourceTree = "<group>"; };
 		C52D09CB1DEF444D00BE3C5C /* GeometryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeometryTests.swift; sourceTree = "<group>"; };
 		C52D09CD1DEF5E5100BE3C5C /* route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = route.json; sourceTree = "<group>"; };
@@ -434,6 +440,9 @@
 		351BEBD81E5BCC28006FE110 /* MapboxNavigationUI */ = {
 			isa = PBXGroup;
 			children = (
+				35D825FD1E6A2EC60088F83B /* MapboxNavigationUI.h */,
+				35D825F91E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.h */,
+				35D825FA1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.m */,
 				351BEC081E5BCC72006FE110 /* Bundle.swift */,
 				351BEC091E5BCC72006FE110 /* DashedLineView.swift */,
 				351BEC0A1E5BCC72006FE110 /* Directions.swift */,
@@ -638,7 +647,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				35D825FE1E6A2EC60088F83B /* MapboxNavigationUI.h in Headers */,
 				351BEBDB1E5BCC28006FE110 /* MapboxNavigationUI.h in Headers */,
+				35D825FB1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1014,6 +1025,7 @@
 				352BBC421E5E72C500703DF1 /* Geometry.swift in Sources */,
 				351BEC061E5BCC6C006FE110 /* ManeuverDirection.swift in Sources */,
 				351BEBFD1E5BCC63006FE110 /* String.swift in Sources */,
+				35D825FC1E6A2DBE0088F83B /* MGLMapView+MGLNavigationAdditions.m in Sources */,
 				351BEBFF1E5BCC63006FE110 /* StyleKitArrows.swift in Sources */,
 				351BEBF91E5BCC63006FE110 /* RouteTableViewCell.swift in Sources */,
 				351BEBFC1E5BCC63006FE110 /* RouteViewController.swift in Sources */,
diff --git a/MapboxNavigation/RouteController.swift b/MapboxNavigation/RouteController.swift
index b9bd70e3305..6d5022f2033 100644
--- a/MapboxNavigation/RouteController.swift
+++ b/MapboxNavigation/RouteController.swift
@@ -107,7 +107,7 @@ extension RouteController: CLLocationManagerDelegate {
         monitorStepProgress(location)
     }
     
-    func userIsOnRoute(_ location: CLLocation) -> Bool {
+    public func userIsOnRoute(_ location: CLLocation) -> Bool {
         // Find future location of user
         let metersInFrontOfUser = location.speed * RouteControllerDeadReckoningTimeInterval
         let locationInfrontOfUser = location.coordinate.coordinate(at: metersInFrontOfUser, facing: location.course)
diff --git a/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
new file mode 100644
index 00000000000..47d62fa4fed
--- /dev/null
+++ b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
@@ -0,0 +1,7 @@
+#import <Mapbox/Mapbox.h>
+
+@interface MGLMapView (MGLNavigationAdditions)
+
+- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations;
+
+@end
diff --git a/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.m b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.m
new file mode 100644
index 00000000000..914be70aeec
--- /dev/null
+++ b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.m
@@ -0,0 +1,5 @@
+#import "MGLMapView+MGLNavigationAdditions.h"
+
+@implementation MGLMapView (MGLNavigationAdditions)
+
+@end
diff --git a/MapboxNavigationUI/MGLMapView.swift b/MapboxNavigationUI/MGLMapView.swift
index 87a61ec9931..bd5c04595b2 100644
--- a/MapboxNavigationUI/MGLMapView.swift
+++ b/MapboxNavigationUI/MGLMapView.swift
@@ -174,3 +174,22 @@ extension MGLMapView {
         }
     }
 }
+
+protocol NavigationMapViewDelegate {
+    func navigationMapView(_ mapView: NavigationMapView, shouldUpdateTo location: CLLocation) -> CLLocation?
+}
+
+public class NavigationMapView: MGLMapView {
+    
+    var navigationMapDelegate: NavigationMapViewDelegate?
+    
+    public override func locationManager(_ manager: CLLocationManager!, didUpdateLocations locations: [Any]!) {
+        guard let location = locations.first as? CLLocation else { return }
+        
+        if let modifiedLocation = navigationMapDelegate?.navigationMapView(self, shouldUpdateTo: location) {
+            super.locationManager(manager, didUpdateLocations: [modifiedLocation])
+        } else {
+            super.locationManager(manager, didUpdateLocations: locations)
+        }
+    }
+}
diff --git a/MapboxNavigationUI/MapboxNavigationUI.h b/MapboxNavigationUI/MapboxNavigationUI.h
index 2f3a5268ce9..814f440e85b 100644
--- a/MapboxNavigationUI/MapboxNavigationUI.h
+++ b/MapboxNavigationUI/MapboxNavigationUI.h
@@ -6,5 +6,4 @@ FOUNDATION_EXPORT double MapboxNavigationUIVersionNumber;
 //! Project version string for MapboxNavigationUI.
 FOUNDATION_EXPORT const unsigned char MapboxNavigationUIVersionString[];
 
-
-
+#import "MGLMapView+MGLNavigationAdditions.h"
diff --git a/MapboxNavigationUI/Resources/Navigation.storyboard b/MapboxNavigationUI/Resources/Navigation.storyboard
index 1fc777487a5..09d86e07f09 100644
--- a/MapboxNavigationUI/Resources/Navigation.storyboard
+++ b/MapboxNavigationUI/Resources/Navigation.storyboard
@@ -67,7 +67,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="323.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" restorationIdentifier="mapView" translatesAutoresizingMaskIntoConstraints="NO" id="nNr-30-cGD" customClass="MGLMapView">
+                            <view contentMode="scaleToFill" restorationIdentifier="mapView" translatesAutoresizingMaskIntoConstraints="NO" id="nNr-30-cGD" customClass="NavigationMapView" customModule="MapboxNavigationUI" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="324"/>
                                 <subviews>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yQ4-ig-aIN" customClass="StyleButton" customModule="MapboxNavigationUI" customModuleProvider="target">
@@ -223,14 +223,14 @@
                                             <constraint firstItem="BR8-8N-Rhk" firstAttribute="leading" secondItem="yJp-ub-NDb" secondAttribute="leading" id="wvz-Fj-7MY"/>
                                         </constraints>
                                     </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Fv-nY-OMF" userLabel="StackViewContainer">
+                                    <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Fv-nY-OMF" userLabel="StackViewContainer">
                                         <rect key="frame" x="-3" y="129" width="310" height="40"/>
                                         <subviews>
-                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b4Z-dg-EH7">
-                                                <rect key="frame" x="0.0" y="0.0" width="310" height="40"/>
+                                            <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="b4Z-dg-EH7">
+                                                <rect key="frame" x="0.0" y="0.0" width="10" height="10"/>
                                                 <subviews>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="0bs-3z-hNh" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="5" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0bs-3z-hNh" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="9u5-JM-rz5"/>
@@ -242,8 +242,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="xwq-ce-lBE" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="35" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xwq-ce-lBE" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="Yj3-WT-VYi"/>
@@ -255,8 +255,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="eHe-aK-9BX" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="65" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eHe-aK-9BX" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="D5v-3d-Jeh"/>
@@ -268,8 +268,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="tg6-zK-yeN" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="95" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tg6-zK-yeN" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" priority="999" constant="30" id="MCS-vE-znn"/>
@@ -281,8 +281,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="1SY-R8-0Ga" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="125" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1SY-R8-0Ga" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" priority="999" constant="30" id="IYA-R3-E7i"/>
@@ -294,8 +294,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="wG2-Wg-gPO" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="155" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wG2-Wg-gPO" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" priority="999" constant="30" id="SCC-vU-ZoY"/>
@@ -307,8 +307,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="y28-An-Esx" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="185" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y28-An-Esx" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" priority="999" constant="30" id="DsZ-2f-pEu"/>
@@ -320,8 +320,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="W9A-Qo-Q2I" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="215" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="W9A-Qo-Q2I" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="18o-rV-gwp"/>
@@ -333,8 +333,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="Q0R-gA-tRA" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="245" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Q0R-gA-tRA" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="CMh-Oa-n2C"/>
@@ -346,8 +346,8 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </view>
-                                                    <view hidden="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="WfH-xJ-3Pp" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
-                                                        <rect key="frame" x="275" y="5" width="30" height="30"/>
+                                                    <view hidden="YES" contentMode="center" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WfH-xJ-3Pp" customClass="LaneArrowView" customModule="MapboxNavigationUI" customModuleProvider="target">
+                                                        <rect key="frame" x="-167" y="-129" width="0.0" height="30"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="DAD-7R-XgQ"/>
diff --git a/MapboxNavigationUI/RouteMapViewController.swift b/MapboxNavigationUI/RouteMapViewController.swift
index a0fa7195fd3..f83fb75593c 100644
--- a/MapboxNavigationUI/RouteMapViewController.swift
+++ b/MapboxNavigationUI/RouteMapViewController.swift
@@ -11,7 +11,7 @@ class ArrowStrokePolyline: ArrowFillPolyline {}
 
 
 class RouteMapViewController: UIViewController, PulleyPrimaryContentControllerDelegate {
-    @IBOutlet weak var mapView: MGLMapView!
+    @IBOutlet weak var mapView: NavigationMapView!
     @IBOutlet weak var recenterButton: UIButton!
     
     var routePageViewController: RoutePageViewController!
@@ -39,6 +39,7 @@ class RouteMapViewController: UIViewController, PulleyPrimaryContentControllerDe
         automaticallyAdjustsScrollViewInsets = false
         
         mapView.delegate = self
+        mapView.navigationMapDelegate = self
         mapView.tintColor = NavigationUI.shared.tintColor
         recenterButton.applyDefaultCornerRadiusShadow(cornerRadius: 22)
     }
@@ -238,6 +239,25 @@ class RouteMapViewController: UIViewController, PulleyPrimaryContentControllerDe
     }
 }
 
+// MARK: NavigationMapViewDelegate
+
+extension RouteMapViewController: NavigationMapViewDelegate {
+    
+    func navigationMapView(_ mapView: NavigationMapView, shouldUpdateTo location: CLLocation) -> CLLocation? {
+
+        guard routeController.userIsOnRoute(location) else { return nil }
+        
+        let route = routeController.routeProgress.route
+        guard let coordinates = route.coordinates else  { return nil }
+        
+        // Snap to route
+        let snappedCoordinate = closestCoordinate(on: coordinates, to: location.coordinate)
+        guard let newCoordinate = snappedCoordinate?.coordinate else { return nil }
+        
+        return CLLocation(coordinate: newCoordinate, altitude: location.altitude, horizontalAccuracy: location.horizontalAccuracy, verticalAccuracy: location.verticalAccuracy, course: location.course, speed: location.speed, timestamp: location.timestamp)
+    }
+}
+
 // MARK: MGLMapViewDelegate
 
 extension RouteMapViewController: MGLMapViewDelegate {

From beedcac68fc7423ab059db634d8c1d7952d6dede Mon Sep 17 00:00:00 2001
From: Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com>
Date: Fri, 3 Mar 2017 18:21:48 -0800
Subject: [PATCH 2/7] Tweak userIsOnRoute

---
 MapboxNavigation/Constants.swift       | 4 ++++
 MapboxNavigation/RouteController.swift | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/MapboxNavigation/Constants.swift b/MapboxNavigation/Constants.swift
index e6bc4b2a817..470c2e079dc 100644
--- a/MapboxNavigation/Constants.swift
+++ b/MapboxNavigation/Constants.swift
@@ -19,6 +19,10 @@ public let RouteControllerShouldReroute = Notification.Name(MBRouteControllerSho
 */
 public var RouteControllerMaximumDistanceBeforeRecalculating: CLLocationDistance = 50
 
+/*
+ Accepted deviation excluding horizontal accuracy before the user is considered to be off route.
+ */
+public var RouteControllerHorizontalAccuracyAnomaly: CLLocationDistance = 5
 
 /*
  Threshold user must be in within to count as completing a step. One of two heuristics used to know when a user completes a step, see `RouteControllerManeuverZoneRadius`.
diff --git a/MapboxNavigation/RouteController.swift b/MapboxNavigation/RouteController.swift
index 6d5022f2033..847697392ab 100644
--- a/MapboxNavigation/RouteController.swift
+++ b/MapboxNavigation/RouteController.swift
@@ -112,7 +112,13 @@ extension RouteController: CLLocationManagerDelegate {
         let metersInFrontOfUser = location.speed * RouteControllerDeadReckoningTimeInterval
         let locationInfrontOfUser = location.coordinate.coordinate(at: metersInFrontOfUser, facing: location.course)
         let newLocation = CLLocation(latitude: locationInfrontOfUser.latitude, longitude: locationInfrontOfUser.longitude)
-        return newLocation.isWithin(RouteControllerMaximumDistanceBeforeRecalculating, of: routeProgress.currentLegProgress.currentStep)
+        var radius = RouteControllerMaximumDistanceBeforeRecalculating
+        
+        if 0...RouteControllerMaximumDistanceBeforeRecalculating ~= location.horizontalAccuracy {
+            radius = location.horizontalAccuracy + RouteControllerHorizontalAccuracyAnomaly
+        }
+        
+        return newLocation.isWithin(radius, of: routeProgress.currentLegProgress.currentStep)
     }
     
     func monitorStepProgress(_ location: CLLocation) {

From f71ec065b251ff9c0307dd8b41e967109c73c341 Mon Sep 17 00:00:00 2001
From: Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com>
Date: Thu, 9 Mar 2017 14:37:27 -0800
Subject: [PATCH 3/7] Avoid infinite rerouting

---
 MapboxNavigation/Constants.swift             | 2 +-
 MapboxNavigation/RouteController.swift       | 7 ++-----
 MapboxNavigationUI/RouteViewController.swift | 9 +++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/MapboxNavigation/Constants.swift b/MapboxNavigation/Constants.swift
index 470c2e079dc..64109dd1829 100644
--- a/MapboxNavigation/Constants.swift
+++ b/MapboxNavigation/Constants.swift
@@ -22,7 +22,7 @@ public var RouteControllerMaximumDistanceBeforeRecalculating: CLLocationDistance
 /*
  Accepted deviation excluding horizontal accuracy before the user is considered to be off route.
  */
-public var RouteControllerHorizontalAccuracyAnomaly: CLLocationDistance = 5
+public var RouteControllerHorizontalAccuracyAnomaly: CLLocationDistance = 10
 
 /*
  Threshold user must be in within to count as completing a step. One of two heuristics used to know when a user completes a step, see `RouteControllerManeuverZoneRadius`.
diff --git a/MapboxNavigation/RouteController.swift b/MapboxNavigation/RouteController.swift
index 847697392ab..cd06d3e74f1 100644
--- a/MapboxNavigation/RouteController.swift
+++ b/MapboxNavigation/RouteController.swift
@@ -112,11 +112,8 @@ extension RouteController: CLLocationManagerDelegate {
         let metersInFrontOfUser = location.speed * RouteControllerDeadReckoningTimeInterval
         let locationInfrontOfUser = location.coordinate.coordinate(at: metersInFrontOfUser, facing: location.course)
         let newLocation = CLLocation(latitude: locationInfrontOfUser.latitude, longitude: locationInfrontOfUser.longitude)
-        var radius = RouteControllerMaximumDistanceBeforeRecalculating
-        
-        if 0...RouteControllerMaximumDistanceBeforeRecalculating ~= location.horizontalAccuracy {
-            radius = location.horizontalAccuracy + RouteControllerHorizontalAccuracyAnomaly
-        }
+        let radius = min(RouteControllerMaximumDistanceBeforeRecalculating,
+                         location.horizontalAccuracy + RouteControllerHorizontalAccuracyAnomaly)
         
         return newLocation.isWithin(radius, of: routeProgress.currentLegProgress.currentStep)
     }
diff --git a/MapboxNavigationUI/RouteViewController.swift b/MapboxNavigationUI/RouteViewController.swift
index 727ad5295b9..b8740ee4b64 100644
--- a/MapboxNavigationUI/RouteViewController.swift
+++ b/MapboxNavigationUI/RouteViewController.swift
@@ -78,6 +78,8 @@ public class RouteViewController: NavigationPulleyViewController {
     var routeTask: URLSessionDataTask?
     let routeStepFormatter = RouteStepFormatter()
     
+    var lastReRouteLocation: CLLocation?
+    
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
@@ -139,6 +141,13 @@ public class RouteViewController: NavigationPulleyViewController {
     
     func shouldReroute(notification: NSNotification) {
         let location = notification.userInfo![RouteControllerNotificationShouldRerouteKey] as! CLLocation
+        
+        if let previousLocation = lastReRouteLocation {
+            guard location.distance(from: previousLocation) >= RouteControllerMaximumDistanceBeforeRecalculating else {
+                return
+            }
+        }
+        
         routeTask?.cancel()
         
         let options = RouteOptions.preferredOptions(from: location.coordinate, to: destination.coordinate, heading: location.course)

From accc5f3a033294dc0afc7c46952c3cdb5d301434 Mon Sep 17 00:00:00 2001
From: bsudekum <bobby@mapbox.com>
Date: Tue, 21 Mar 2017 17:44:52 -0700
Subject: [PATCH 4/7] move NavigationMapView to own file

---
 MapboxNavigation.xcodeproj/project.pbxproj |  4 ++++
 MapboxNavigationUI/MGLMapView.swift        | 15 --------------
 MapboxNavigationUI/NavigationMapView.swift | 24 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 MapboxNavigationUI/NavigationMapView.swift

diff --git a/MapboxNavigation.xcodeproj/project.pbxproj b/MapboxNavigation.xcodeproj/project.pbxproj
index ac8b63727fa..9da2d078f19 100644
--- a/MapboxNavigation.xcodeproj/project.pbxproj
+++ b/MapboxNavigation.xcodeproj/project.pbxproj
@@ -102,6 +102,7 @@
 		C52D09CC1DEF444D00BE3C5C /* GeometryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52D09CB1DEF444D00BE3C5C /* GeometryTests.swift */; };
 		C52D09CE1DEF5E5100BE3C5C /* route.json in Resources */ = {isa = PBXBuildFile; fileRef = C52D09CD1DEF5E5100BE3C5C /* route.json */; };
 		C52D09D31DEF636C00BE3C5C /* Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52D09D21DEF636C00BE3C5C /* Fixture.swift */; };
+		C53208AB1E81FFB900910266 /* NavigationMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C53208AA1E81FFB900910266 /* NavigationMapView.swift */; };
 		C561DF5D1E650EC8004137B8 /* DistanceFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C561DF5C1E650EC8004137B8 /* DistanceFormatter.swift */; };
 		C58D6BAD1DDCF2AE00387F53 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C58D6BAC1DDCF2AE00387F53 /* Constants.swift */; };
 		C5ADFBD81DDCC7840011824B /* MapboxNavigationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5ADFBD71DDCC7840011824B /* MapboxNavigationTests.swift */; };
@@ -311,6 +312,7 @@
 		C52D09CB1DEF444D00BE3C5C /* GeometryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeometryTests.swift; sourceTree = "<group>"; };
 		C52D09CD1DEF5E5100BE3C5C /* route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = route.json; sourceTree = "<group>"; };
 		C52D09D21DEF636C00BE3C5C /* Fixture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fixture.swift; sourceTree = "<group>"; };
+		C53208AA1E81FFB900910266 /* NavigationMapView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationMapView.swift; sourceTree = "<group>"; };
 		C561DF5C1E650EC8004137B8 /* DistanceFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DistanceFormatter.swift; sourceTree = "<group>"; };
 		C58D6BAC1DDCF2AE00387F53 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		C5ADFBC91DDCC7840011824B /* MapboxNavigation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MapboxNavigation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -460,6 +462,7 @@
 				351BEC201E5BD4DC006FE110 /* Supporting files */,
 				351BEBEF1E5BCC63006FE110 /* TurnArrowView.swift */,
 				351BEBF01E5BCC63006FE110 /* UIView.swift */,
+				C53208AA1E81FFB900910266 /* NavigationMapView.swift */,
 			);
 			path = MapboxNavigationUI;
 			sourceTree = "<group>";
@@ -1045,6 +1048,7 @@
 				351BEC0F1E5BCC72006FE110 /* Directions.swift in Sources */,
 				35C997411E732C5400544D1C /* RouteStepFormatter.swift in Sources */,
 				351BEBFB1E5BCC63006FE110 /* RouteTableViewHeaderView.swift in Sources */,
+				C53208AB1E81FFB900910266 /* NavigationMapView.swift in Sources */,
 				351BEBF61E5BCC63006FE110 /* RouteMapViewController.swift in Sources */,
 				351BEBF51E5BCC63006FE110 /* RouteManeuverViewController.swift in Sources */,
 				351BEC011E5BCC63006FE110 /* TurnArrowView.swift in Sources */,
diff --git a/MapboxNavigationUI/MGLMapView.swift b/MapboxNavigationUI/MGLMapView.swift
index 1cf3be6b5e8..c3dffb6ef99 100644
--- a/MapboxNavigationUI/MGLMapView.swift
+++ b/MapboxNavigationUI/MGLMapView.swift
@@ -177,18 +177,3 @@ extension MGLMapView {
 protocol NavigationMapViewDelegate {
     func navigationMapView(_ mapView: NavigationMapView, shouldUpdateTo location: CLLocation) -> CLLocation?
 }
-
-public class NavigationMapView: MGLMapView {
-    
-    var navigationMapDelegate: NavigationMapViewDelegate?
-    
-    public override func locationManager(_ manager: CLLocationManager!, didUpdateLocations locations: [Any]!) {
-        guard let location = locations.first as? CLLocation else { return }
-        
-        if let modifiedLocation = navigationMapDelegate?.navigationMapView(self, shouldUpdateTo: location) {
-            super.locationManager(manager, didUpdateLocations: [modifiedLocation])
-        } else {
-            super.locationManager(manager, didUpdateLocations: locations)
-        }
-    }
-}
diff --git a/MapboxNavigationUI/NavigationMapView.swift b/MapboxNavigationUI/NavigationMapView.swift
new file mode 100644
index 00000000000..75faca32123
--- /dev/null
+++ b/MapboxNavigationUI/NavigationMapView.swift
@@ -0,0 +1,24 @@
+//
+//  NavigationMapView.swift
+//  MapboxNavigation
+//
+//  Created by Bobby Sudekum on 3/21/17.
+//  Copyright © 2017 Mapbox. All rights reserved.
+//
+
+import Foundation
+
+public class NavigationMapView: MGLMapView {
+    
+    var navigationMapDelegate: NavigationMapViewDelegate?
+    
+    public override func locationManager(_ manager: CLLocationManager!, didUpdateLocations locations: [Any]!) {
+        guard let location = locations.first as? CLLocation else { return }
+        
+        if let modifiedLocation = navigationMapDelegate?.navigationMapView(self, shouldUpdateTo: location) {
+            super.locationManager(manager, didUpdateLocations: [modifiedLocation])
+        } else {
+            super.locationManager(manager, didUpdateLocations: locations)
+        }
+    }
+}

From 15da62ddb7bd8720283dfe100c3e4a2e80b2f5b7 Mon Sep 17 00:00:00 2001
From: bsudekum <bobby@mapbox.com>
Date: Tue, 21 Mar 2017 18:09:52 -0700
Subject: [PATCH 5/7] Make snapping optional

---
 MapboxNavigation/RouteController.swift          |  6 ++++++
 MapboxNavigationUI/NavigationMapView.swift      |  8 --------
 MapboxNavigationUI/RouteMapViewController.swift | 11 ++++++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/MapboxNavigation/RouteController.swift b/MapboxNavigation/RouteController.swift
index 49075d34b02..f381b26b374 100644
--- a/MapboxNavigation/RouteController.swift
+++ b/MapboxNavigation/RouteController.swift
@@ -23,6 +23,12 @@ open class RouteController: NSObject {
     public var routeProgress: RouteProgress
     
     
+    /*
+     If true, the user puck is snapped to closest location on the route.
+    */
+    public var snapUserToRoute = false
+    
+    
     /*
      Intializes a new `RouteController`.
      
diff --git a/MapboxNavigationUI/NavigationMapView.swift b/MapboxNavigationUI/NavigationMapView.swift
index 75faca32123..51a4e413152 100644
--- a/MapboxNavigationUI/NavigationMapView.swift
+++ b/MapboxNavigationUI/NavigationMapView.swift
@@ -1,11 +1,3 @@
-//
-//  NavigationMapView.swift
-//  MapboxNavigation
-//
-//  Created by Bobby Sudekum on 3/21/17.
-//  Copyright © 2017 Mapbox. All rights reserved.
-//
-
 import Foundation
 
 public class NavigationMapView: MGLMapView {
diff --git a/MapboxNavigationUI/RouteMapViewController.swift b/MapboxNavigationUI/RouteMapViewController.swift
index a95bc85be53..513e9e2f952 100644
--- a/MapboxNavigationUI/RouteMapViewController.swift
+++ b/MapboxNavigationUI/RouteMapViewController.swift
@@ -230,9 +230,14 @@ extension RouteMapViewController: NavigationMapViewDelegate {
         let route = routeController.routeProgress.route
         guard let coordinates = route.coordinates else  { return nil }
         
-        // Snap to route
-        let snappedCoordinate = closestCoordinate(on: coordinates, to: location.coordinate)
-        guard let newCoordinate = snappedCoordinate?.coordinate else { return nil }
+        var newCoordinate = location.coordinate
+        if routeController.snapUserToRoute {
+            // Snap to route
+            let snappedCoordinate = closestCoordinate(on: coordinates, to: location.coordinate)
+            if let coordinate = snappedCoordinate?.coordinate {
+                newCoordinate = coordinate
+            }
+        }
         
         return CLLocation(coordinate: newCoordinate, altitude: location.altitude, horizontalAccuracy: location.horizontalAccuracy, verticalAccuracy: location.verticalAccuracy, course: location.course, speed: location.speed, timestamp: location.timestamp)
     }

From 123763c7d69d6771701010dc3e5a7ec94f096254 Mon Sep 17 00:00:00 2001
From: bsudekum <bobby@mapbox.com>
Date: Wed, 22 Mar 2017 09:13:01 -0700
Subject: [PATCH 6/7] improve var names

---
 MapboxNavigation/Constants.swift                | 2 +-
 MapboxNavigation/RouteController.swift          | 6 +++---
 MapboxNavigationUI/RouteMapViewController.swift | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MapboxNavigation/Constants.swift b/MapboxNavigation/Constants.swift
index 45908c5d61f..6a0a998cc94 100644
--- a/MapboxNavigation/Constants.swift
+++ b/MapboxNavigation/Constants.swift
@@ -23,7 +23,7 @@ public var RouteControllerMaximumDistanceBeforeRecalculating: CLLocationDistance
 /*
  Accepted deviation excluding horizontal accuracy before the user is considered to be off route.
  */
-public var RouteControllerHorizontalAccuracyAnomaly: CLLocationDistance = 10
+public var RouteControllerUserLocationSnappingDistance: CLLocationDistance = 10
 
 /*
  Threshold user must be in within to count as completing a step. One of two heuristics used to know when a user completes a step, see `RouteControllerManeuverZoneRadius`.
diff --git a/MapboxNavigation/RouteController.swift b/MapboxNavigation/RouteController.swift
index f381b26b374..d683eb4444b 100644
--- a/MapboxNavigation/RouteController.swift
+++ b/MapboxNavigation/RouteController.swift
@@ -26,7 +26,7 @@ open class RouteController: NSObject {
     /*
      If true, the user puck is snapped to closest location on the route.
     */
-    public var snapUserToRoute = false
+    public var snapsUserLocationAnnotationToRoute = false
     
     
     /*
@@ -119,8 +119,8 @@ extension RouteController: CLLocationManagerDelegate {
         let locationInfrontOfUser = location.coordinate.coordinate(at: metersInFrontOfUser, facing: location.course)
         let newLocation = CLLocation(latitude: locationInfrontOfUser.latitude, longitude: locationInfrontOfUser.longitude)
         let radius = min(RouteControllerMaximumDistanceBeforeRecalculating,
-                         location.horizontalAccuracy + RouteControllerHorizontalAccuracyAnomaly)
-        
+                         location.horizontalAccuracy + RouteControllerUserLocationSnappingDistance)
+
         return newLocation.isWithin(radius, of: routeProgress.currentLegProgress.currentStep)
     }
     
diff --git a/MapboxNavigationUI/RouteMapViewController.swift b/MapboxNavigationUI/RouteMapViewController.swift
index 513e9e2f952..31d07b9847b 100644
--- a/MapboxNavigationUI/RouteMapViewController.swift
+++ b/MapboxNavigationUI/RouteMapViewController.swift
@@ -231,7 +231,7 @@ extension RouteMapViewController: NavigationMapViewDelegate {
         guard let coordinates = route.coordinates else  { return nil }
         
         var newCoordinate = location.coordinate
-        if routeController.snapUserToRoute {
+        if routeController.snapsUserLocationAnnotationToRoute {
             // Snap to route
             let snappedCoordinate = closestCoordinate(on: coordinates, to: location.coordinate)
             if let coordinate = snappedCoordinate?.coordinate {

From 7394d33747aa4409ee64e6740dd136eb16d7a033 Mon Sep 17 00:00:00 2001
From: bsudekum <bobby@mapbox.com>
Date: Wed, 22 Mar 2017 12:40:17 -0700
Subject: [PATCH 7/7] improvements

---
 MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h | 3 ++-
 MapboxNavigationUI/RouteMapViewController.swift        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
index 47d62fa4fed..7ef39281e1e 100644
--- a/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
+++ b/MapboxNavigationUI/MGLMapView+MGLNavigationAdditions.h
@@ -1,7 +1,8 @@
 #import <Mapbox/Mapbox.h>
 
-@interface MGLMapView (MGLNavigationAdditions)
+@interface MGLMapView (MGLNavigationAdditions) <CLLocationManagerDelegate>
 
+// FIXME: This will be removed once https://github.com/mapbox/mapbox-gl-native/issues/6867 is implemented
 - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations;
 
 @end
diff --git a/MapboxNavigationUI/RouteMapViewController.swift b/MapboxNavigationUI/RouteMapViewController.swift
index 31d07b9847b..ecdad910b12 100644
--- a/MapboxNavigationUI/RouteMapViewController.swift
+++ b/MapboxNavigationUI/RouteMapViewController.swift
@@ -223,6 +223,7 @@ class RouteMapViewController: UIViewController, PulleyPrimaryContentControllerDe
 
 extension RouteMapViewController: NavigationMapViewDelegate {
     
+    @objc(navigationMapView:shouldUpdateToLocation:)
     func navigationMapView(_ mapView: NavigationMapView, shouldUpdateTo location: CLLocation) -> CLLocation? {
 
         guard routeController.userIsOnRoute(location) else { return nil }