Add waypoint handling

Examples/Swift/Base.lproj/Main.storyboard

@@ -106,8 +106,20 @@
                             <constraint firstAttribute="trailing" secondItem="Tfo-Ic-OqD" secondAttribute="trailing" constant="16" id="veQ-GA-9Zk"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" title="Mapbox Navigation" id="zxr-0T-HBr"/>
+                    <navigationItem key="navigationItem" title="Mapbox Navigation" id="zxr-0T-HBr">
+                        <barButtonItem key="leftBarButtonItem" style="plain" id="XbQ-fY-lUb">
+                            <button key="customView" hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="6ux-mK-LQF">
+                                <rect key="frame" x="16" y="7" width="83" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Clear map"/>
+                                <connections>
+                                    <action selector="clearMapPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="SHt-XT-eUM"/>
+                                </connections>
+                            </button>
+                        </barButtonItem>
+                    </navigationItem>
                     <connections>
+                        <outlet property="clearMap" destination="6ux-mK-LQF" id="9M7-CK-q1M"/>
                         <outlet property="longPressHintView" destination="Tfo-Ic-OqD" id="gYu-YW-6FX"/>
                         <outlet property="mapView" destination="A3N-JT-loC" id="iZS-hq-X5f"/>
                         <outlet property="simulationButton" destination="iiq-Gf-SKY" id="DHR-zB-Mwv"/>

Examples/Swift/ViewController.swift

@@ -16,7 +16,7 @@ enum ExampleMode {
 
 class ViewController: UIViewController, MGLMapViewDelegate {
 
-    var destination: MGLPointAnnotation?
+    var waypoints: [Waypoint] = []
     var currentRoute: Route? {
         didSet {
             self.startButton.isEnabled = currentRoute != nil
@@ -29,8 +29,9 @@ class ViewController: UIViewController, MGLMapViewDelegate {
     @IBOutlet weak var simulationButton: UIButton!
     @IBOutlet weak var startButton: UIButton!
 
+    @IBOutlet weak var clearMap: UIButton!
+
     var exampleMode: ExampleMode?
-    var nextWaypoint: CLLocationCoordinate2D?
 
     // In this example, we show you how you can create custom UIView that is used to show the user's location.
     // Set `showCustomUserPuck` to true to view the custom user puck.
@@ -41,7 +42,7 @@ class ViewController: UIViewController, MGLMapViewDelegate {
 
         automaticallyAdjustsScrollViewInsets = false
         mapView.delegate = self
-        
+
         mapView.userTrackingMode = .follow
 
         simulationButton.isSelected = true
@@ -60,15 +61,21 @@ class ViewController: UIViewController, MGLMapViewDelegate {
             return
         }
 
-        if let destination = destination {
-            mapView.removeAnnotation(destination)
+        clearMap.isHidden = false
+        longPressHintView.isHidden = true
+
+        if let annotation = mapView.annotations?.last, waypoints.count > 2 {
+            mapView.removeAnnotation(annotation)
         }
 
-        longPressHintView.isHidden = true
+        if waypoints.count > 1 {
+            waypoints = Array(waypoints.suffix(1))
+        }
 
-        destination = MGLPointAnnotation()
-        destination?.coordinate = mapView.convert(sender.location(in: mapView), toCoordinateFrom: mapView)
-        mapView.addAnnotation(destination!)
+        let coordinates = mapView.convert(sender.location(in: mapView), toCoordinateFrom: mapView)
+        let waypoint = Waypoint(coordinate: coordinates)
+        waypoint.coordinateAccuracy = -1
+        waypoints.append(waypoint)
 
         requestRoute()
     }
@@ -90,6 +97,13 @@ class ViewController: UIViewController, MGLMapViewDelegate {
         simulationButton.isSelected = !simulationButton.isSelected
     }
 
+    @IBAction func clearMapPressed(_ sender: Any) {
+        clearMap.isHidden = true
+        mapView.removeRoute()
+        mapView.removeWaypoints()
+        waypoints.removeAll()
+    }
+
     @IBAction func startButtonPressed(_ sender: Any) {
         DispatchQueue.main.async {
             let alertController = UIAlertController(title: "Start Navigation", message: "Select the navigation type", preferredStyle: .actionSheet)
@@ -102,11 +116,13 @@ class ViewController: UIViewController, MGLMapViewDelegate {
             alertController.addAction(UIAlertAction(title: "Styled UI", style: .default, handler: { (action) in
                 self.startStyledNavigation()
             }))
-            alertController.addAction(UIAlertAction(title: "Multiple Stops", style: .default, handler: { (action) in
-                self.startMultipleWaypoints()
-            }))
-            alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
 
+            if self.waypoints.count > 2 {
+                alertController.addAction(UIAlertAction(title: "Multiple Stops", style: .default, handler: { (action) in
+                    self.startMultipleWaypoints()
+                }))
+            }
+            alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
             if let popoverController = alertController.popoverPresentationController {
                 popoverController.sourceView = self.startButton
             }
@@ -116,16 +132,17 @@ class ViewController: UIViewController, MGLMapViewDelegate {
 
     // Helper for requesting a route
     func requestRoute() {
-        guard let destination = destination else { return }
+        guard waypoints.count > 0 else { return }
 
-        let options = RouteOptions(forNavigationWithCoordinates: [
-            mapView.userLocation!.coordinate,
-            destination.coordinate
-        ])
+        let userWaypoint = Waypoint(location: mapView.userLocation!.location!, heading: mapView.userLocation?.heading, name: "user")
+        userWaypoint.coordinateAccuracy = -1
+        waypoints.insert(userWaypoint, at: 0)
+
+        let options = RouteOptions(forNavigationWithWaypoints: waypoints)
 
         _ = Directions.shared.calculate(options) { [weak self] (waypoints, routes, error) in
             guard error == nil else {
-                print(error!)
+                print(error!.localizedDescription)
                 return
             }
             guard let route = routes?.first else { return }
@@ -134,14 +151,15 @@ class ViewController: UIViewController, MGLMapViewDelegate {
 
             // Open method for adding and updating the route line
             self?.mapView.showRoute(route)
+            self?.mapView.showWaypoints(route, legIndex: 0)
         }
     }
-    
+
     // MARK: - Basic Navigation
-    
+
     func startBasicNavigation() {
         guard let route = currentRoute else { return }
-            
+
         exampleMode = .default
 
         let navigationViewController = NavigationViewController(for: route, locationManager: locationManager())
@@ -157,18 +175,17 @@ class ViewController: UIViewController, MGLMapViewDelegate {
         guard let route = self.currentRoute else { return }
 
         guard let customViewController = storyboard?.instantiateViewController(withIdentifier: "custom") as? CustomViewController else { return }
-            
+
         exampleMode = .custom
 
         customViewController.simulateLocation = simulationButton.isSelected
         customViewController.userRoute = route
-        customViewController.destination = destination
-
+
         present(customViewController, animated: true, completion: nil)
     }
-
-    // MARK: - Styling the default UI
 
+    // MARK: - Styling the default UI
+
     func startStyledNavigation() {
         guard let route = self.currentRoute else { return }
 
@@ -218,7 +235,7 @@ class ViewController: UIViewController, MGLMapViewDelegate {
 
         // Set a custom style URL
         navigationViewController.mapView?.styleURL = URL(string: "mapbox://styles/mapbox/navigation-guidance-day-v2")
-        
+
         present(navigationViewController, animated: true, completion: nil)
     }
 
@@ -233,18 +250,46 @@ class ViewController: UIViewController, MGLMapViewDelegate {
         guard let route = self.currentRoute else { return }
 
         exampleMode = .multipleWaypoints
-
-        // When the user arrives at their destination, we'll prompt them to return back to where they started
-        nextWaypoint = self.currentRoute?.coordinates?.first
-
+
         let navigationViewController = NavigationViewController(for: route, locationManager: locationManager())
         navigationViewController.navigationDelegate = self
 
         present(navigationViewController, animated: true, completion: nil)
     }
+
+    // By default, when the user arrives at a waypoint, the next leg starts immediately.
+    // If however you would like to pause and allow the user to provide input, set this delegate method to false.
+    // This does however require you to increment the leg count on your own. See the example below in `confirmationControllerDidConfirm()`.
+    func navigationViewController(_ navigationViewController: NavigationViewController, shouldIncrementLegWhenArrivingAtWaypoint waypoint: Waypoint) -> Bool {
+        return false
+    }
+}
+
+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
+        })
+    }
 }
 
 extension ViewController: NavigationViewControllerDelegate {
+    func navigationViewController(_ navigationViewController: NavigationViewController, didArriveAt waypoint: Waypoint) {
+        // Multiple waypoint demo
+        guard exampleMode == .multipleWaypoints else { return }
+
+        // When the user arrives, present a view controller that prompts the user to continue to their next destination
+        // This typ of screen could show information about a destination, pickup/dropoff confirmation, instructions upon arrival, etc.
+        guard let confirmationController = self.storyboard?.instantiateViewController(withIdentifier: "waypointConfirmation") as? WaypointConfirmationViewController else { return }
+
+        confirmationController.delegate = self
+
+        navigationViewController.present(confirmationController, animated: true, completion: nil)
+    }
+
     func navigationMapView(_ mapView: MGLMapView, viewFor annotation: MGLAnnotation) -> MGLAnnotationView? {
         guard annotation is MGLUserLocation && showCustomUserPuck else { return nil }
 
@@ -259,51 +304,6 @@ extension ViewController: NavigationViewControllerDelegate {
 
         return annotationView
     }
-
-    func navigationViewController(_ navigationViewController: NavigationViewController, didArriveAt destination: MGLAnnotation) {
-
-        // Multiple waypoint demo
-        guard exampleMode == .multipleWaypoints, nextWaypoint != nil else { return }
-
-        // When the user arrives, present a view controller that prompts the user to continue to their next destination
-        // This typ of screen could show information about a destination, pickup/dropoff confirmation, instructions upon arrival, etc.
-        guard let confirmationController = self.storyboard?.instantiateViewController(withIdentifier: "waypointConfirmation") as? WaypointConfirmationViewController else { return }
-
-        confirmationController.delegate = self
-
-        navigationViewController.present(confirmationController, animated: true, completion: nil)
-    }
-}
-
-extension ViewController: WaypointConfirmationViewControllerDelegate {
-    func confirmationControllerDidConfirm(controller confirmationController: WaypointConfirmationViewController) {
-        guard let nextDestination = nextWaypoint else { return }
-        guard let navigationViewController = self.presentedViewController as? NavigationViewController else { return }
-
-        // Calculate directions to the next waypoint
-        let options = RouteOptions(forNavigationWithCoordinates: [
-            navigationViewController.mapView!.userLocation!.coordinate,
-            nextDestination
-        ])
-
-        _ = Directions.shared.calculate(options) { [weak self] (waypoints, routes, error) in
-            guard error == nil else {
-                print(error!)
-                return
-            }
-            guard let route = routes?.first else { return }
-
-            // update the navigationViewController with the route to the next waypoint
-            navigationViewController.route = route
-
-            // Set the next waypoint to our start point
-            // We'll continue this waypoint loop until the user exits navigation
-            self?.nextWaypoint = route.coordinates?.first
-
-            // Dismiss the confirmation screen
-            confirmationController.dismiss(animated: true, completion: nil)
-        }
-    }
 }
 
 class CustomAnnotationView: MGLUserLocationAnnotationView {

Examples/Swift/WaypointConfirmationViewController.swift

@@ -1,14 +1,14 @@
 import UIKit
 
 protocol WaypointConfirmationViewControllerDelegate: NSObjectProtocol {
-    func confirmationControllerDidConfirm(controller: WaypointConfirmationViewController)
+    func confirmationControllerDidConfirm(_ controller: WaypointConfirmationViewController)
 }
 
 class WaypointConfirmationViewController: UIViewController {
 
     weak var delegate: WaypointConfirmationViewControllerDelegate?
 
     @IBAction func continueButtonPressed(_ sender: Any) {
-        delegate?.confirmationControllerDidConfirm(controller: self)
+        delegate?.confirmationControllerDidConfirm(self)
     }
 }

MapboxCoreNavigation/RouteController.swift

@@ -22,6 +22,9 @@ public protocol RouteControllerDelegate: class {
     @objc(routeController:shouldRerouteFromLocation:)
     optional func routeController(_ routeController: RouteController, shouldRerouteFrom location: CLLocation) -> Bool
 
+    @objc(routeController:shouldIncrementLegWhenArrivingAtWaypoint:)
+    optional func routeController(_ routeController: RouteController, shouldIncrementLegWhenArrivingAtWaypoint waypoint: Waypoint) -> Bool
+
     /**
      Called immediately before the route controller calculates a new route.
 
@@ -427,7 +430,8 @@ extension RouteController: CLLocationManagerDelegate {
         let userSnapToStepDistanceFromManeuver = distance(along: routeProgress.currentLegProgress.currentStep.coordinates!, from: location.coordinate)
         let secondsToEndOfStep = userSnapToStepDistanceFromManeuver / location.speed
 
-        guard routeProgress.currentLegProgress.alertUserLevel != .arrive else {
+        guard routeProgress.currentLegProgress.alertUserLevel != .arrive,
+            routeProgress.remainingWaypoints.count > 0 else {
             NotificationCenter.default.post(name: RouteControllerProgressDidChange, object: self, userInfo: [
                 RouteControllerProgressDidChangeNotificationProgressKey: routeProgress,
                 RouteControllerProgressDidChangeNotificationLocationKey: location,
@@ -543,6 +547,7 @@ extension RouteController: CLLocationManagerDelegate {
 
         if routeProgress.currentLegProgress.alertUserLevel != newlyCalculatedAlertLevel || updateStepIndex {
             routeProgress.currentLegProgress.alertUserLevel = newlyCalculatedAlertLevel
+
             // Use fresh user location distance to end of step
             // since the step could of changed
             let userDistance = distance(along: routeProgress.currentLegProgress.currentStep.coordinates!, from: location.coordinate)
@@ -551,6 +556,12 @@ extension RouteController: CLLocationManagerDelegate {
                 RouteControllerAlertLevelDidChangeNotificationRouteProgressKey: routeProgress,
                 RouteControllerAlertLevelDidChangeNotificationDistanceToEndOfManeuverKey: userDistance
                 ])
+
+            if routeProgress.currentLegProgress.alertUserLevel == .arrive,
+                routeProgress.remainingWaypoints.count > 1,
+                (delegate?.routeController?(self, shouldIncrementLegWhenArrivingAtWaypoint: routeProgress.currentLeg.destination) ?? true) {
+                routeProgress.legIndex += 1
+            }
         }
     }
 

MapboxCoreNavigation/RouteProgress.swift

@@ -62,6 +62,7 @@ open class RouteProgress: NSObject {
         didSet {
             assert(legIndex >= 0 && legIndex < route.legs.endIndex)
             // TODO: Set stepIndex to 0 or last index based on whether leg index was incremented or decremented.
+            currentLegProgress.alertUserLevel = .none
             currentLegProgress = RouteLegProgress(leg: currentLeg)
         }
     }
@@ -146,8 +147,8 @@ open class RouteProgress: NSObject {
         super.init()
         currentLegProgress = RouteLegProgress(leg: currentLeg, stepIndex: 0, alertLevel: alertLevel)
 
-        var maneuverCoordinateIndex = 0
         for (legIndex, leg) in route.legs.enumerated() {
+            var maneuverCoordinateIndex = 0
 
             congestionTimesPerStep.append([])