Update MapboxDirections, Maps, and SDWebImage

Cartfile

@@ -1,5 +1,5 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 3.7
-github "mapbox/MapboxDirections.swift" ~> 0.15
+github "mapbox/MapboxDirections.swift" ~> 0.16.0
 github "mapbox/turf-swift" ~> 0.0.3
 github "rs/SDWebImage" ~> 4.1
 github "frederoni/aws-sdk-ios" ~> 2.6

Cartfile.resolved

@@ -1,9 +1,9 @@
-binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "3.7.1"
+binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "3.7.3"
 github "ceeK/Solar" "2.1.0"
 github "facebook/ios-snapshot-test-case" "2.1.4"
 github "frederoni/aws-sdk-ios" "2.6.5"
-github "mapbox/MapboxDirections.swift" "v0.15.1"
+github "mapbox/MapboxDirections.swift" "v0.16.0"
 github "mapbox/mapbox-telemetry-ios" "v0.2.11"
 github "mapbox/turf-swift" "v0.0.4"
 github "raphaelmor/Polyline" "v4.2.0"
-github "rs/SDWebImage" "4.2.2"
+github "rs/SDWebImage" "4.2.3"

Examples/Swift/CustomViewController.swift

@@ -96,22 +96,21 @@ class CustomViewController: UIViewController, MGLMapViewDelegate, AVSpeechSynthe
     func updateRouteProgress(routeProgress: RouteProgress) {
         guard let step = routeProgress.currentLegProgress.upComingStep else { return }
 
-        if let direction = step.maneuverDirection {
-            switch direction {
-            case .slightRight:
-                self.arrowView.text = "↗️"
-            case .sharpRight, .right:
-                self.arrowView.text = "➡️"
-            case .slightLeft:
-                self.arrowView.text = "↖️"
-            case .sharpLeft, .left:
-                self.arrowView.text = "⬅️"
-            case .uTurn:
-                self.arrowView.text = "⤵️"
-            default:
-                self.arrowView.text = "⬆️"
-            }
+        switch step.maneuverDirection {
+        case .slightRight:
+            self.arrowView.text = "↗️"
+        case .sharpRight, .right:
+            self.arrowView.text = "➡️"
+        case .slightLeft:
+            self.arrowView.text = "↖️"
+        case .sharpLeft, .left:
+            self.arrowView.text = "⬅️"
+        case .uTurn:
+            self.arrowView.text = "⤵️"
+        default:
+            self.arrowView.text = "⬆️"
         }
+
         self.instructionLabel.text = routeProgress.currentLegProgress.currentStepProgress.step.instructionsDisplayedAlongStep?.first?.primaryText
         let distance = routeProgress.currentLegProgress.currentStepProgress.distanceRemaining
         self.distanceLabel.text = textDistanceFormatter.string(fromMeters: distance)

MapboxCoreNavigation.podspec

@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxDirections.swift", "~> 0.15"
+  s.dependency "MapboxDirections.swift", "~> 0.16.0"
   s.dependency "MapboxMobileEvents", "~> 0.2"
   s.dependency "Turf", "~> 0.0.4"
 

MapboxCoreNavigation/MMEEventsManager.swift

@@ -332,12 +332,12 @@ extension RouteLegProgress {
         get {
             return [
                 "upcomingInstruction": upComingStep?.instructions ?? NSNull(),
-                "upcomingType": upComingStep?.maneuverType?.description ?? NSNull(),
-                "upcomingModifier": upComingStep?.maneuverDirection?.description ?? NSNull(),
+                "upcomingType": upComingStep?.maneuverType.description ?? NSNull(),
+                "upcomingModifier": upComingStep?.maneuverDirection.description ?? NSNull(),
                 "upcomingName": upComingStep?.names?.joined(separator: ";") ?? NSNull(),
                 "previousInstruction": currentStep.instructions,
-                "previousType": currentStep.maneuverType?.description ?? NSNull(),
-                "previousModifier": currentStep.maneuverDirection?.description ?? NSNull(),
+                "previousType": currentStep.maneuverType.description,
+                "previousModifier": currentStep.maneuverDirection.description,
                 "previousName": currentStep.names?.joined(separator: ";") ?? NSNull(),
                 "distance": Int(currentStep.distance),
                 "duration": Int(currentStep.expectedTravelTime),

MapboxCoreNavigation/RouteStep.swift

@@ -8,15 +8,10 @@ extension RouteStep {
             finalHeading = leftFinalHeading == rightFinalHeading
         }
 
-        var maneuverType = false
-        if let leftType = left.maneuverType, let rightType = right.maneuverType {
-            maneuverType = leftType == rightType
-        }
-
+        let maneuverType = left.maneuverType == right.maneuverType
         let maneuverLocation = left.maneuverLocation == right.maneuverLocation
 
         return maneuverLocation && maneuverType && finalHeading
-
     }
 
     /**

MapboxCoreNavigationTests/MapboxCoreNavigationTests.swift

@@ -107,16 +107,11 @@ class MapboxCoreNavigationTests: XCTestCase {
     }
 
     func testArrive() {
-        let bundle = Bundle(for: MapboxCoreNavigationTests.self)
-        let filePath = bundle.path(forResource: "tunnel", ofType: "json")!
-
-        let locations = Array<CLLocation>.locations(from: filePath)!
+        route.accessToken = "foo"
+        let locations: [CLLocation] = route.coordinates!.map { CLLocation(latitude: $0.latitude, longitude: $0.longitude) }
         let locationManager = ReplayLocationManager(locations: locations)
         locationManager.speedMultiplier = 20
 
-        let routeFilePath = bundle.path(forResource: "tunnel", ofType: "route")!
-        let route = NSKeyedUnarchiver.unarchiveObject(withFile: routeFilePath) as! Route
-        route.accessToken = "foo"
         let navigation = RouteController(along: route, directions: directions, locationManager: locationManager)
 
         expectation(forNotification: .routeControllerProgressDidChange, object: navigation) { (notification) -> Bool in

MapboxNavigation/InstructionsBannerView.swift

@@ -88,7 +88,7 @@ open class BaseInstructionsBannerView: UIControl {
         super.prepareForInterfaceBuilder()
         maneuverView.isStart = true
 
-        primaryLabel.instruction = [VisualInstructionComponent(text: "Primary text label", imageURL: nil)]
+        primaryLabel.instruction = [VisualInstructionComponent(type: .destination, text: "Primary text label", imageURL: nil)]
 
         distance = 100
     }

MapboxNavigation/ManeuverView.swift

@@ -67,9 +67,9 @@ public class ManeuverView: UIView {
         }
 
         var flip: Bool = false
-        let type: ManeuverType = step.maneuverType ?? .turn
+        let type: ManeuverType = step.maneuverType != .none ? step.maneuverType : .turn
         let angle = ((step.finalHeading ?? 0) - (step.initialHeading ?? 0)).wrap(min: -180, max: 180)
-        let direction: ManeuverDirection = step.maneuverDirection ?? ManeuverDirection(angle: Int(angle))
+        let direction: ManeuverDirection = step.maneuverDirection != .none ? step.maneuverDirection : ManeuverDirection(angle: Int(angle))
 
         switch type {
         case .merge:

MapboxNavigation/NextBannerView.swift

@@ -52,7 +52,7 @@ open class NextBannerView: UIView {
     override open func prepareForInterfaceBuilder() {
         super.prepareForInterfaceBuilder()
         maneuverView.isEnd = true
-        instructionLabel.instruction = [VisualInstructionComponent(text: "Next step", imageURL: nil)]
+        instructionLabel.instruction = [VisualInstructionComponent(type: .destination, text: "Next step", imageURL: nil)]
     }
 
     func setupLayout() {

MapboxNavigation/StepsViewController.swift

@@ -207,22 +207,22 @@ extension StepsViewController: UITableViewDataSource {
             let leg = routeProgress.route.legs[indexPath.section-1]
             let stepBefore = leg.steps[leg.steps.count-1]
             if let instructions = stepBefore.instructionsDisplayedAlongStep?.last {
-                let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
+                let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(type: .destination, text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
                 cell.instructionsView.set(instructions.primaryTextComponents, secondaryInstruction: secondaryInstruction)
             }
             cell.instructionsView.distance = stepBefore.distance
         } else {
             let leg = routeProgress.route.legs[indexPath.section]
             if let stepBefore = leg.steps.stepBefore(step) {
                 if let instructions = stepBefore.instructionsDisplayedAlongStep?.last {
-                    let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
+                    let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(type: .destination, text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
                     cell.instructionsView.set(instructions.primaryTextComponents, secondaryInstruction: secondaryInstruction)
                 }
                 cell.instructionsView.distance = stepBefore.distance
             } else {
                 cell.instructionsView.distance = nil
                 if let instructions = step.instructionsDisplayedAlongStep?.last {
-                    let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
+                    let secondaryInstruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? [VisualInstructionComponent(type: .destination, text: arrivalSecondaryInstruction, imageURL: nil)] : instructions.secondaryTextComponents
                     cell.instructionsView.set(instructions.primaryTextComponents, secondaryInstruction: secondaryInstruction)
                 }
             }