Upgrade to MapboxMaps v10.5.0, MapboxNavigationNative v99.0.0 (#3869)

jill-cardamon · MaximAlien · web-flow · commit 6cc07bb5a62b · 2022-05-12T02:54:07.000-04:00
* Upgrade MapboxMaps to v10.5.0 and NN to v99.0.

* Add pr number to links in changelog.

* Maps from v10.5.0.

* Handle replacement of ReroutingError.wrongRequest.

* Improve error handling for routes generation.

* Fix RoutesCoordinatorTests.

* Add TollCollection.name property.

* Fix Podfile.lock issue from rebase.

* Remove print statement for debugging from tests.

* Keep .wrongRequest case.

* Update changelog.

Co-authored-by: Maxim Makhun &lt;maxim.makhun@mapbox.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@
 
 ### Packaging
 
-* MapboxNavigation now requires [MapboxMaps v10.5.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.5.0-rc.1). ([#3834](https://github.com/mapbox/mapbox-navigation-ios/pull/3834))
+* MapboxNavigation now requires [MapboxMaps v10.5.0](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.5.0). ([#3869](https://github.com/mapbox/mapbox-navigation-ios/pull/3869))
 * MapboxCoreNavigation now requires [MapboxDirections v2.5.0-beta.1](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.5.0-beta.1). ([#3871](https://github.com/mapbox/mapbox-navigation-ios/pull/3871))
-* MapboxCoreNavigation now requires [MapboxNavigationNative v98._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/98.0.0). ([#3862](https://github.com/mapbox/mapbox-navigation-ios/pull/3862))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v99._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/99.0.0). ([#3869](https://github.com/mapbox/mapbox-navigation-ios/pull/3869))
 
 ### User interface
 
@@ -41,6 +41,11 @@
    * Renamed the `Router(alongRouteAtIndex:in:options:routingProvider:dataSource:)` initializer to `Router(alongRouteAtIndex:in:options:customRoutingProvider:dataSource:)`
    * Replaced the `Router.routingProvider` property with `Router.customRoutingProvider`.
 * Renamed the `NavigationSettings.initialize(directions:tileStoreConfiguration:)` method to  `NavigationSettings.initialize(directions:tileStoreConfiguration:routingProviderSource:)`. This method allows you to control whether the rerouting uses the network or offline routing data. ([#3754](https://github.com/mapbox/mapbox-navigation-ios/pull/3754), [#3824](https://github.com/mapbox/mapbox-navigation-ios/pull/3824))
+* Fixed an issue where a failure to calculate a route offline could result in a successful result being passed to a `Directions.RouteCompletionHandler`. (mapbox/mapbox-navigation-native#5537)
+
+### Other Changes
+* During turn-by-turn navigation, incidents along the route are now refreshed periodically along with traffic congestion. (mapbox/api-valhalla#1023, mapbox/mapbox-navigation-native#5728)
+* When the user passes a named toll collection point, the `TollCollection` object obtained through the `Notification.Name.electronicHorizonDidPassRoadObject` notification now has the `TollCollection.name` property set. (mapbox/mapbox-navigation-native#5675, mapbox/mapbox-navigation-native#5721)
 
 ### CarPlay
 
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 21.3.0-rc.2
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 98.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 21.3.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 99.0
 github "mapbox/mapbox-directions-swift" == 2.5.0-beta.1
 github "mapbox/mapbox-events-ios" ~> 1.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "21.3.0-rc.2"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "98.0.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "21.3.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "99.0.0"
 github "Quick/Nimble" "v9.2.1"
 github "Quick/Quick" "v3.1.2"
 github "mapbox/mapbox-directions-swift" "v2.5.0-beta.1"
diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxNavigationNative", "~> 98.0"
+  s.dependency "MapboxNavigationNative", "~> 99.0"
   s.dependency "MapboxDirections-pre", "2.5.0-beta.1"
   s.dependency "MapboxMobileEvents", "~> 1.0"
 
diff --git a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
   s.module_name = "MapboxNavigation"
 
   s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
-  s.dependency "MapboxMaps", "10.5.0-rc.1"
+  s.dependency "MapboxMaps", "10.5.0"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech", "~> 2.0"
   s.dependency "MapboxMobileEvents", "~> 1.0"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -24,8 +24,8 @@ let package = Package(
     dependencies: [
         .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.5.0-beta.1")),
         .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "1.0.0"),
-        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "98.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.5.0-rc.1")),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "99.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.5.0"),
         .package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),
         .package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0"),
         .package(name: "Quick", url: "https://github.com/Quick/Quick.git", from: "3.1.2"),
diff --git a/Sources/MapboxCoreNavigation/RerouteControllerDelegate.swift b/Sources/MapboxCoreNavigation/RerouteControllerDelegate.swift
@@ -19,15 +19,17 @@ public enum ReroutingError: Error {
     case routeError
     /// Could not compose correct request for rerouting.
     case wrongRequest
+    /// Cause of reroute error is unknown.
+    case unknown
     /// Reroute was cancelled by user.
     case cancelled
 
     init(_ nativeError: RerouteError) {
         switch (nativeError.type) {
         case .routerError:
             self = .routeError
-        case .wrongRequest:
-            self = .wrongRequest
+        case .unknown:
+            self = .unknown
         case .cancelled:
             self = .cancelled
         @unknown default:
diff --git a/Sources/MapboxCoreNavigation/TollCollection.swift b/Sources/MapboxCoreNavigation/TollCollection.swift
@@ -7,9 +7,9 @@ extension TollCollection {
     init(_ tollInfo: TollCollectionInfo) {
         switch tollInfo.type {
         case .tollBooth:
-            self.init(type: .booth)
+            self.init(type: .booth, name: tollInfo.name)
         case .tollGantry:
-            self.init(type: .gantry)
+            self.init(type: .gantry, name: tollInfo.name)
         @unknown default:
             fatalError("Unknown TollCollectionInfo type.")
         }
diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (21.3.0-rc.2)
-  - MapboxCoreMaps (10.5.0-rc.1):
-    - MapboxCommon (~> 21.3.0-rc)
+  - MapboxCommon (21.3.0)
+  - MapboxCoreMaps (10.5.1):
+    - MapboxCommon (~> 21.3)
   - MapboxCoreNavigation (2.5.0-beta.3):
     - MapboxDirections-pre (= 2.5.0-beta.1)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 98.0)
+    - MapboxNavigationNative (~> 99.0)
   - MapboxDirections-pre (2.5.0-beta.1):
     - Polyline (~> 5.0)
     - Turf (~> 2.0)
-  - MapboxMaps (10.5.0-rc.1):
-    - MapboxCommon (= 21.3.0-rc.2)
-    - MapboxCoreMaps (= 10.5.0-rc.1)
+  - MapboxMaps (10.5.0):
+    - MapboxCommon (= 21.3.0)
+    - MapboxCoreMaps (= 10.5.1)
     - MapboxMobileEvents (= 1.0.7)
     - Turf (~> 2.0)
   - MapboxMobileEvents (1.0.7)
   - MapboxNavigation (2.5.0-beta.3):
     - MapboxCoreNavigation (= 2.5.0-beta.3)
-    - MapboxMaps (= 10.5.0-rc.1)
+    - MapboxMaps (= 10.5.0)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (98.0.0):
-    - MapboxCommon (~> 21.3.0-rc.2)
+  - MapboxNavigationNative (99.0.0):
+    - MapboxCommon (~> 21.3)
   - MapboxSpeech (2.0.0)
   - Polyline (5.0.2)
   - Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 4c7bbe5e3a06f6d5711cbbce0eb7d17d6f5ba5e7
-  MapboxCoreMaps: 66b814bc79930848ebd8c37beb267385e1f85d01
-  MapboxCoreNavigation: 7273979da9044d7f088dc944b237c680c64b3bda
+  MapboxCommon: a336e40b53e3fda5c419fe093c9c40aff4f4dd2b
+  MapboxCoreMaps: f0c995b043323571ec46d7d9e496390982f6509d
+  MapboxCoreNavigation: 9ec6c23d03f9a3683104f18f9310aa910d0d6168
   MapboxDirections-pre: b267332f864b83bcdf8681d7e2a20ac045df1dad
-  MapboxMaps: 68005489b42a825aeb0a8a31d92368d30578782d
+  MapboxMaps: e85375aa3d6bea94bf9c0221aa59f35ee0b29f29
   MapboxMobileEvents: f7f3e8daeb4b83688ae62a4172dce79169a97233
-  MapboxNavigation: 67f5e02cce104ab038670d0b3678f865198de4fd
-  MapboxNavigationNative: f0b23a5d6a1f056ca34a24bdf411fb471f329707
+  MapboxNavigation: 0e38c912839846bec00183f5ddb16ab59619b6c8
+  MapboxNavigationNative: 4632bc7931369f87b495e81e3d6612b5c1808648
   MapboxSpeech: e4ed02984444b6373374c72c369edaf045cc490c
   Polyline: fce41d72e1146c41c6d081f7656827226f643dff
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
diff --git a/Tests/MapboxCoreNavigationTests/RoutesCoordinatorTests.swift b/Tests/MapboxCoreNavigationTests/RoutesCoordinatorTests.swift
@@ -46,22 +46,27 @@ private extension RoutesCoordinatorTests {
         }
         let encoder = JSONEncoder()
         encoder.userInfo[.options] = routeOptions
-        guard let routeData = try? encoder.encode(route.route),
+        guard let routeData = try? encoder.encode(route.response),
               let routeJSONString = String(data: routeData, encoding: .utf8) else {
                   XCTFail("Failed to encode generated test Route.")
                   return nil
         }
-        
         let routeRequest = Directions(credentials: Fixture.credentials).url(forCalculating: routeOptions).absoluteString
         
         let parsedRoutes = RouteParser.parseDirectionsResponse(forResponse: routeJSONString,
                                                                request: routeRequest,
                                                                routeOrigin: RouterOrigin.custom)
-        
-        guard let generatedRoute = (parsedRoutes.value as? [RouteInterface])?.first else {
-            XCTFail("Failed to parse generated test Route.")
-            return nil
+        var generatedRoute: RouteInterface? = nil
+        if parsedRoutes.isValue(),
+           let validGeneratedRoute = (parsedRoutes.value as? [RouteInterface])?.first {
+            generatedRoute = validGeneratedRoute
+        } else if parsedRoutes.isError(),
+                  let errorReason = parsedRoutes.error as String? {
+            XCTFail("Failed to parse generated test route with error: \(errorReason).")
+        } else {
+            XCTFail("Failed to parse generated test route.")
         }
+        
         return generatedRoute
     }
 
