Merge pull request #1406 from mapbox/navigation/arrival_banners_enhancement

Changes to adopt the named arrival instructions from Directions API

Author: Bobby Sudekum

Cartfile

@@ -1,5 +1,5 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.0
-github "mapbox/MapboxDirections.swift" ~> 0.20.0
+github "mapbox/MapboxDirections.swift" ~> 0.21.0
 github "mapbox/turf-swift" ~> 0.1
 github "mapbox/mapbox-events-ios" ~> 0.4
 github "ceeK/Solar" ~> 2.1.0

Cartfile.resolved

@@ -1,6 +1,6 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.0.1"
 github "ceeK/Solar" "2.1.0"
-github "mapbox/MapboxDirections.swift" "v0.20.0"
+github "mapbox/MapboxDirections.swift" "v0.21.0"
 github "mapbox/mapbox-events-ios" "v0.4.0"
 github "mapbox/mapbox-voice-swift" "v0.0.1"
 github "mapbox/turf-swift" "v0.1.1"

Examples/Swift/ViewController.swift

@@ -154,8 +154,11 @@ class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDel
             multipleStopsAction.isEnabled = false
         }
 
+        
         let coordinates = mapView.convert(tap.location(in: mapView), toCoordinateFrom: mapView)
-        let waypoint = Waypoint(coordinate: coordinates)
+        // Note: The destination name can be modified. The value is used in the top banner when arriving at a destination.
+        let destinationName = "Dropped Pin #\(waypoints.endIndex + 1)"
+        let waypoint = Waypoint(coordinate: coordinates, name: destinationName)
         waypoint.coordinateAccuracy = -1
         waypoints.append(waypoint)
 
@@ -202,7 +205,8 @@ class ViewController: UIViewController, MGLMapViewDelegate, CLLocationManagerDel
         guard waypoints.count > 0 else { return }
         guard let mapView = mapView else { return }
 
-        let userWaypoint = Waypoint(location: mapView.userLocation!.location!, heading: mapView.userLocation?.heading, name: "user")
+        let departureName = "User location"
+        let userWaypoint = Waypoint(location: mapView.userLocation!.location!, heading: mapView.userLocation?.heading, name: departureName)
         waypoints.insert(userWaypoint, at: 0)
 
         let options = NavigationRouteOptions(waypoints: waypoints)

MapboxCoreNavigation.podspec

@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxDirections.swift", "~> 0.20.0"
+  s.dependency "MapboxDirections.swift", "~> 0.21.0"
   s.dependency "MapboxMobileEvents", "~> 0.4"
   s.dependency "Turf", "~> 0.1"
 

MapboxCoreNavigationTests/BridgingTests.m

@@ -21,7 +21,7 @@ - (void)testUpdateRoute {
     MBWaypoint *wp2 = [[MBWaypoint alloc] initWithCoordinate:CLLocationCoordinate2DMake(37.7727, -122.433378) coordinateAccuracy:0 name:@"wp2"];
     NSArray<MBWaypoint *> *waypoints = @[wp1, wp2];
     MBNavigationRouteOptions *options = [[MBNavigationRouteOptions alloc] initWithWaypoints:waypoints profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
-    MBRoute *route = [[MBRoute alloc] initWithJson:routeDict waypoints:waypoints routeOptions:options];
+    MBRoute *route = [[MBRoute alloc] initWithJSON:routeDict waypoints:waypoints routeOptions:options];
     route.accessToken = @"garbage";
     XCTAssertNotNil(route);
     MBEventsManagerSpy *eventsManager = [[MBEventsManagerSpy alloc] init];

MapboxNavigation-Documentation.podspec

@@ -43,7 +43,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxNavigation"
 
-  s.dependency "MapboxDirections.swift", "~> 0.19.1"
+  s.dependency "MapboxDirections.swift", "~> 0.21.0"
   s.dependency "Mapbox-iOS-SDK", "~> 4.0"
   s.dependency "MapboxMobileEvents", "~> 0.4"
   s.dependency "Solar", "~> 2.1"

MapboxNavigation/ManeuverView.swift

@@ -83,7 +83,7 @@ open class ManeuverView: UIView {
             ManeuversStyleKit.drawFork(frame: bounds, resizing: resizing, primaryColor: primaryColor, secondaryColor: secondaryColor)
             flip = [.left, .slightLeft, .sharpLeft].contains(direction)
         case .takeRoundabout, .turnAtRoundabout, .takeRotary:
-            ManeuversStyleKit.drawRoundabout(frame: bounds, resizing: resizing, primaryColor: primaryColor, secondaryColor: secondaryColor, roundabout_angle: CGFloat(visualInstruction.primaryInstruction.degrees))
+            ManeuversStyleKit.drawRoundabout(frame: bounds, resizing: resizing, primaryColor: primaryColor, secondaryColor: secondaryColor, roundabout_angle: CGFloat(visualInstruction.primaryInstruction.finalHeading))
             flip = visualInstruction.drivingSide == .left
 
         case .arrive:

MapboxNavigation/StepsViewController.swift

@@ -234,12 +234,6 @@ extension StepsViewController: UITableViewDataSource {
         return cell
     }
 
-    func instructionForArrivalInstruction(text: String?) -> VisualInstruction {
-        let component = VisualInstructionComponent(type: .text, text: text, imageURL: nil, abbreviation: nil, abbreviationPriority: NSNotFound)
-        let instruction = VisualInstruction(text: nil, maneuverType: .arrive, maneuverDirection: .none, textComponents: [component])
-        return instruction
-    }
-    
     public func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
         updateCell(cell as! StepTableViewCell, at: indexPath)
     }
@@ -249,13 +243,10 @@ extension StepsViewController: UITableViewDataSource {
         cell.instructionsView.secondaryLabel.viewForAvailableBoundsCalculation = cell
 
         let step = sections[indexPath.section][indexPath.row]
-       
-        let leg = routeProgress.route.legs[indexPath.section]
-        let arrivalSecondaryInstruction = leg.destination.name
 
         if let instructions = step.instructionsDisplayedAlongStep?.last {
             cell.instructionsView.set(instructions)
-            cell.instructionsView.secondaryLabel.instruction = step.maneuverType == .arrive && arrivalSecondaryInstruction != nil ? instructionForArrivalInstruction(text: arrivalSecondaryInstruction) : instructions.secondaryInstruction
+            cell.instructionsView.secondaryLabel.instruction = instructions.secondaryInstruction
         }
         cell.instructionsView.distance = step.distance