Navigation Service, Part 1

Examples/Objective-C/ViewController.m

@@ -13,7 +13,7 @@ @interface ViewController () <AVSpeechSynthesizerDelegate>
 @property (nonatomic, assign) CLLocationCoordinate2D destination;
 @property (nonatomic) MBDirections *directions;
 @property (nonatomic) MBRoute *route;
-@property (nonatomic) MBRouteController *navigation;
+@property (nonatomic) MBNavigationService *navigation;
 @property (nonatomic) NSLengthFormatter *lengthFormatter;
 @property (nonatomic) AVSpeechSynthesizer *speechSynth;
 @end
@@ -37,7 +37,7 @@ - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
 
     [self suspendNotifications];
-    [self.navigation suspendLocationUpdates];
+    [self.navigation stop];
 }
 
 - (IBAction)didLongPress:(UILongPressGestureRecognizer *)sender {
@@ -121,10 +121,15 @@ -(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
     if ([segue.identifier isEqualToString:@"StartNavigation"]) {
         MBNavigationViewController *controller = (MBNavigationViewController *)[segue destinationViewController];
 
+        MBSimulatedLocationManager *locationManager = [[MBSimulatedLocationManager alloc] initWithRoute:self.route];
+
+        MBEventsManager *events = [[MBEventsManager alloc] initWithAccessToken:self.route.accessToken];
+
         controller.directions = [MBDirections sharedDirections];
         controller.route = self.route;
+        controller.navigationService = [[MBNavigationService alloc] initWithRoute:self.route directions:controller.directions locationSource:locationManager eventsManager:events];
 
-        controller.routeController.locationManager = [[MBSimulatedLocationManager alloc] initWithRoute:self.route];
+
     }
 }
 

Examples/Swift/CustomViewController.swift

@@ -11,7 +11,7 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
 
     var destination: MGLPointAnnotation!
     let directions = Directions.shared
-    var routeController: RouteController!
+    var navigationService: NavigationService!
     var simulateLocation = false
 
     var userRoute: Route?
@@ -27,7 +27,8 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
         super.viewDidLoad()
 
         let locationManager = simulateLocation ? SimulatedLocationManager(route: userRoute!) : NavigationLocationManager()
-        routeController = RouteController(along: userRoute!, locationManager: locationManager)
+        navigationService = MapboxNavigationService(route: userRoute!, locationSource: locationManager)
+
 
         mapView.delegate = self
         mapView.compassView.isHidden = true
@@ -36,7 +37,7 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
         resumeNotifications()
 
         // Start navigation
-        routeController.resume()
+        navigationService.start()
 
         // Center map on user
         mapView.recenterMap()
@@ -55,7 +56,7 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
     func resumeNotifications() {
         NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_ :)), name: .routeControllerProgressDidChange, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(rerouted(_:)), name: .routeControllerDidReroute, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(updateInstructionsBanner(notification:)), name: .routeControllerDidPassVisualInstructionPoint, object: routeController)
+        NotificationCenter.default.addObserver(self, selector: #selector(updateInstructionsBanner(notification:)), name: .routeControllerDidPassVisualInstructionPoint, object: navigationService.router)
     }
 
     func suspendNotifications() {
@@ -65,7 +66,7 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
     }
 
     func mapView(_ mapView: MGLMapView, didFinishLoading style: MGLStyle) {
-        self.mapView.showRoutes([routeController.routeProgress.route])
+        self.mapView.showRoutes([navigationService.route])
     }
 
     // Notifications sent on all location updates
@@ -96,7 +97,7 @@ class CustomViewController: UIViewController, MGLMapViewDelegate {
     // Fired when the user is no longer on the route.
     // Update the route on the map.
     @objc func rerouted(_ notification: NSNotification) {
-        self.mapView.showRoutes([routeController.routeProgress.route])
+        self.mapView.showRoutes([navigationService.route])
     }
 
     @IBAction func cancelButtonPressed(_ sender: Any) {

Examples/Swift/ViewController.swift

@@ -329,11 +329,14 @@ extension ViewController: VoiceControllerDelegate {
 extension ViewController: WaypointConfirmationViewControllerDelegate {
     func confirmationControllerDidConfirm(_ confirmationController: WaypointConfirmationViewController) {
         confirmationController.dismiss(animated: true, completion: {
-            guard let navigationViewController = self.presentedViewController as? NavigationViewController else { return }
-
-            guard navigationViewController.routeController.routeProgress.route.legs.count > navigationViewController.routeController.routeProgress.legIndex + 1 else { return }
-            navigationViewController.routeController.routeProgress.legIndex += 1
-            navigationViewController.routeController.resume()
+            guard let navigationViewController = self.presentedViewController as? NavigationViewController,
+                  let navService = navigationViewController.navigationService else { return }
+
+            let router = navService.router
+            guard router.route.legs.count > router.routeProgress.legIndex + 1 else { return }
+
+            router.routeProgress.legIndex += 1
+            navService.start()
         })
     }
 }
@@ -349,7 +352,7 @@ extension ViewController: NavigationViewControllerDelegate {
         // This type of screen could show information about a destination, pickup/dropoff confirmation, instructions upon arrival, etc.
 
         //If we're not in a "Multiple Stops" demo, show the normal EORVC
-        if navigationViewController.routeController.routeProgress.isFinalLeg {
+        if navigationViewController.navigationService.router.routeProgress.isFinalLeg {
             return true
         }
 

MapboxCoreNavigation/NavigationLocationManager.swift

@@ -15,6 +15,14 @@ import UIKit
 open class NavigationLocationManager: CLLocationManager {
 
     var lastKnownLocation: CLLocation?
+    override open var delegate: CLLocationManagerDelegate? {
+        get {
+            return super.delegate
+        }
+        set {
+            super.delegate = newValue
+        }
+    }
 
     override public init() {
         super.init()

MapboxCoreNavigation/NavigationService.swift

@@ -0,0 +1,110 @@
+import Foundation
+import CoreLocation
+import MapboxDirections
+
+@objc public protocol NavigationServiceDelegate: RouterDelegate, TunnelIntersectionManagerDelegate {}
+@objc(MBNavigationService)
+public protocol NavigationService: class, CLLocationManagerDelegate {
+    var locationSource: NavigationLocationManager { get }
+    var router: Router { get }
+    var route: Route { get set }
+    var eventsManager: EventsManager { get }
+    weak var delegate: NavigationServiceDelegate? { get set }
+
+    func start()
+    func stop()
+}
+
+@objc(MBNavigationService)
+public class MapboxNavigationService: NSObject, NavigationService {
+    public var locationSource: NavigationLocationManager
+    var directionsService: Directions
+    public var router: Router
+    public var eventsManager: EventsManager
+    public weak var delegate: NavigationServiceDelegate?
+
+    @objc convenience init(route: Route) {
+        self.init(route: route, directions: nil, locationSource: nil, eventsManager: nil)
+    }
+
+    @objc required public init(route: Route,
+                  directions directionsOverride: Directions? = nil,
+                  locationSource locationOverride: NavigationLocationManager? = nil,
+                  eventsManager eventsOverride: EventsManager? = nil)
+    {
+        eventsManager = eventsOverride ?? EventsManager(accessToken: route.accessToken)
+        directionsService = directionsOverride ?? Directions.shared
+        locationSource = locationOverride ?? NavigationLocationManager()
+        locationSource.activityType = route.routeOptions.activityType
+
+        router = RouteController(along: route, directions: directionsService, locationManager: locationSource, eventsManager: eventsManager)
+        super.init()
+
+        router.delegate = self
+        locationSource.delegate = self
+    }
+
+    public var route: Route {
+        get {
+            return router.route
+        }
+        set {
+            router.route = newValue
+        }
+    }
+    public func start() {
+        locationSource.startUpdatingHeading()
+        locationSource.startUpdatingLocation()
+    }
+
+    public func stop() {
+        locationSource.stopUpdatingHeading()
+        locationSource.stopUpdatingLocation()
+    }
+
+}
+
+extension MapboxNavigationService: CLLocationManagerDelegate {
+    public func locationManager(_ manager: CLLocationManager, didUpdateHeading newHeading: CLHeading) {
+        router.locationManager?(manager, didUpdateHeading: newHeading)
+    }
+    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        router.locationManager?(manager, didUpdateLocations: locations)
+    }
+}
+
+//MARK: - RouteControllerDelegate
+extension MapboxNavigationService: RouteControllerDelegate {
+    typealias Default = RouteController.DefaultBehavior
+
+    public func routeController(_ routeController: RouteController, willRerouteFrom location: CLLocation) {
+        delegate?.routeController?(routeController, willRerouteFrom: location)
+    }
+    public func routeController(_ routeController: RouteController, didRerouteAlong route: Route) {
+        delegate?.routeController?(routeController, didRerouteAlong: route)
+    }
+    public func routeController(_ routeController: RouteController, didFailToRerouteWith error: Error) {
+        delegate?.routeController?(routeController, didFailToRerouteWith: error)
+    }
+    public func routeController(_ routeController: RouteController, didUpdate locations: [CLLocation]) {
+        delegate?.routeController?(routeController, didUpdate: locations)
+    }
+
+    //MARK: Questions
+    public func routeController(_ routeController: RouteController, shouldRerouteFrom location: CLLocation) -> Bool {
+        return delegate?.routeController?(routeController, shouldRerouteFrom: location) ?? Default.shouldRerouteFromLocation
+    }
+    public func routeController(_ routeController: RouteController, shouldDiscard location: CLLocation) -> Bool {
+        return delegate?.routeController?(routeController,shouldDiscard: location) ?? Default.shouldDiscardLocation
+    }
+    public func routeController(_ routeController: RouteController, didArriveAt waypoint: Waypoint) -> Bool {
+        return delegate?.routeController?(routeController, didArriveAt: waypoint) ?? Default.didArriveAtWaypoint
+    }
+    public func routeController(_ routeController: RouteController, shouldPreventReroutesWhenArrivingAt waypoint: Waypoint) -> Bool {
+        return delegate?.routeController?(routeController, shouldPreventReroutesWhenArrivingAt: waypoint) ?? Default.shouldPreventReroutesWhenArrivingAtWaypoint
+    }
+    public func routeControllerShouldDisableBatteryMonitoring(_ routeController: RouteController) -> Bool {
+        return delegate?.routeControllerShouldDisableBatteryMonitoring?(routeController) ?? Default.shouldDisableBatteryMonitoring
+    }
+}
+