Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Maps v10.10.0-rc.1, NavNative 122.0.0, Common v23.2.0-rc.3 #4283

Merged
merged 5 commits into from Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions CHANGELOG.md
Expand Up @@ -4,17 +4,21 @@

### Packaging

* MapboxCoreNavigation now requires [MapboxNavigationNative v121._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/121.0.0). ([#4256](https://github.com/mapbox/mapbox-navigation-ios/pull/4256))
* MapboxNavigation now requires [MapboxMaps v10.10.0-beta.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.10.0-beta.1). ([#4256](https://github.com/mapbox/mapbox-navigation-ios/pull/4256))
* MapboxCoreNavigation now requires [MapboxNavigationNative v122._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/122.0.0). ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))
* MapboxNavigation now requires [MapboxMaps v10.10.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.10.0-rc.1). ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))

### Routing

* Added `RouterDelegate.router(:shouldProactivelyRerouteFrom:to:completion)`, `NavigationServiceDelegate.navigationService(:shouldProactivelyRerouteFrom:to:completion)` and `NavigationViewControllerDelegate.navigationViewController(:shouldProactivelyRerouteFrom:to:completion)` methods to inform and providing control over each individual proactive rerouting attempt. ([#4229](https://github.com/mapbox/mapbox-navigation-ios/pull/4229))
* Added `RouteController.updateRouteLeg(to:completionHandler:)` method to allow switching route legs arbitrarily. ([#4261](https://github.com/mapbox/mapbox-navigation-ios/pull/4261))
* Predictive cache optimization for reducing memory and CPU consumption on very long and complex routes. ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))
* Fixed reset of DR driving out of the tunnel for a brief moment. ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))

### Map

* The maneuver arrow now extends 50 points along the route before and after an intersection, compared to 30 points previously. ([#4230](https://github.com/mapbox/mapbox-navigation-ios/pull/4230))
* Fixed issue with simultaneous recognition of tap gesture. ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))
* Fixed label localization to properly handle Simplified and Traditional Chinese. ([#4283](https://github.com/mapbox/mapbox-navigation-ios/pull/4283))
ShanMa1991 marked this conversation as resolved.
Show resolved Hide resolved

### Location tracking

Expand Down
4 changes: 2 additions & 2 deletions Cartfile
@@ -1,4 +1,4 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.2.0-beta.1
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 121.0
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.2.0-rc.3
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 122.0
github "mapbox/mapbox-directions-swift" ~> 2.8
github "mapbox/mapbox-events-ios" ~> 1.0.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
@@ -1,5 +1,5 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.2.0-beta.1"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "121.0.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.2.0-rc.3"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "122.0.0"
github "Quick/Nimble" "v9.2.1"
github "Quick/Quick" "v3.1.2"
github "mapbox/mapbox-directions-swift" "v2.8.0"
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation.podspec
Expand Up @@ -40,7 +40,7 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = "MapboxCoreNavigation"

s.dependency "MapboxNavigationNative", "~> 121.0"
s.dependency "MapboxNavigationNative", "~> 122.0"
s.dependency "MapboxDirections", "~> 2.8"
s.dependency "MapboxMobileEvents", "~> 1.0"

Expand Down
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "3f170b36659c6e499a6b2079f661a76ce7596b08",
"version": "23.2.0-beta.1"
"revision": "9c387749d705972ffadb5ed60376cc3688f9d61b",
"version": "23.2.0-rc.3"
}
},
{
"package": "MapboxCoreMaps",
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state": {
"branch": null,
"revision": "d84784c95dfc5081ddab63759acc2b089321f60b",
"version": "10.10.0-beta.1"
"revision": "120770014441b34327c6edda9f3be56183f7dc25",
"version": "10.10.0-rc.1"
}
},
{
Expand All @@ -60,17 +60,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
"state": {
"branch": null,
"revision": "51a3cd3c6c60fc0aa501f198f24ac3d01e36e7f4",
"version": "10.10.0-beta.1"
"revision": "e6269d683716f0b31178bb7c3977348cba936031",
"version": "10.10.0-rc.1"
}
},
{
"package": "MapboxNavigationNative",
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "0b4c33bb80601eb1130fb85e3f3aec9d1f1253a7",
"version": "121.0.0"
"revision": "c473d5fa0c18b99d9541290e825e7153e76bec80",
"version": "122.0.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation.podspec
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
s.module_name = "MapboxNavigation"

s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
s.dependency "MapboxMaps", "10.10.0-beta.1"
s.dependency "MapboxMaps", "10.10.0-rc.1"
s.dependency "Solar-dev", "~> 3.0"
s.dependency "MapboxSpeech", "~> 2.0"
s.dependency "MapboxMobileEvents", "~> 1.0"
Expand Down
16 changes: 8 additions & 8 deletions Package.resolved
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "3f170b36659c6e499a6b2079f661a76ce7596b08",
"version": "23.2.0-beta.1"
"revision": "9c387749d705972ffadb5ed60376cc3688f9d61b",
"version": "23.2.0-rc.3"
}
},
{
"package": "MapboxCoreMaps",
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state": {
"branch": null,
"revision": "d84784c95dfc5081ddab63759acc2b089321f60b",
"version": "10.10.0-beta.1"
"revision": "120770014441b34327c6edda9f3be56183f7dc25",
"version": "10.10.0-rc.1"
}
},
{
Expand All @@ -60,17 +60,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
"state": {
"branch": null,
"revision": "51a3cd3c6c60fc0aa501f198f24ac3d01e36e7f4",
"version": "10.10.0-beta.1"
"revision": "e6269d683716f0b31178bb7c3977348cba936031",
"version": "10.10.0-rc.1"
}
},
{
"package": "MapboxNavigationNative",
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "0b4c33bb80601eb1130fb85e3f3aec9d1f1253a7",
"version": "121.0.0"
"revision": "c473d5fa0c18b99d9541290e825e7153e76bec80",
"version": "122.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Expand Up @@ -24,8 +24,8 @@ let package = Package(
dependencies: [
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.8.0"),
.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: "121.0.0"),
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.10.0-beta.1")),
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "122.0.0"),
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.10.0-rc.1")),
.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"),
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxCoreNavigation/MapboxRoutingProvider.swift
Expand Up @@ -209,7 +209,7 @@ public class MapboxRoutingProvider: RoutingProvider {
let directionsUri = settings.directions.url(forCalculating: options).removingSKU().absoluteString
var requestId: RequestId!

requestId = router.getRouteForDirectionsUri(directionsUri) { [weak self] (result, origin) in
requestId = router.getRouteForDirectionsUri(directionsUri, options: GetRouteOptions(timeoutSeconds: nil)) { [weak self] (result, origin) in
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we set a default timeout for the route request? @mapbox/navigation-ios

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have 60 seconds timeout in Directions, but since this setting allows a 'default' nil - we should probably use that.

guard let self = self else { return }

self.parseResponse(requestId: requestId,
Expand Down
32 changes: 16 additions & 16 deletions Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
PODS:
- MapboxCommon (23.2.0-beta.1)
- MapboxCoreMaps (10.10.0-beta.1):
- MapboxCommon (~> 23.2.0-beta)
- MapboxCommon (23.2.0-rc.3)
- MapboxCoreMaps (10.10.0-rc.1):
- MapboxCommon (~> 23.2.0-rc)
- MapboxCoreNavigation (2.10.0-alpha.2):
- MapboxDirections (~> 2.8)
- MapboxMobileEvents (~> 1.0)
- MapboxNavigationNative (~> 121.0)
- MapboxNavigationNative (~> 122.0)
- MapboxDirections (2.8.0):
- Polyline (~> 5.0)
- Turf (~> 2.6.1)
- MapboxMaps (10.10.0-beta.1):
- MapboxCommon (= 23.2.0-beta.1)
- MapboxCoreMaps (= 10.10.0-beta.1)
- MapboxMaps (10.10.0-rc.1):
- MapboxCommon (= 23.2.0-rc.3)
- MapboxCoreMaps (= 10.10.0-rc.1)
- MapboxMobileEvents (= 1.0.8)
- Turf (~> 2.0)
- MapboxMobileEvents (1.0.8)
- MapboxNavigation (2.10.0-alpha.2):
- MapboxCoreNavigation (= 2.10.0-alpha.2)
- MapboxMaps (= 10.10.0-beta.1)
- MapboxMaps (= 10.10.0-rc.1)
- MapboxMobileEvents (~> 1.0)
- MapboxSpeech (~> 2.0)
- Solar-dev (~> 3.0)
- MapboxNavigationNative (121.0.0):
- MapboxCommon (~> 23.2.0-beta.1)
- MapboxNavigationNative (122.0.0):
- MapboxCommon (~> 23.2.0-rc.3)
- MapboxSpeech (2.1.0)
- Polyline (5.1.0)
- Solar-dev (3.0.1)
Expand Down Expand Up @@ -52,14 +52,14 @@ EXTERNAL SOURCES:
:path: "../../../"

SPEC CHECKSUMS:
MapboxCommon: 03c7667b7e014c9f9cf7a28e7fc7bc97d4e78ec0
MapboxCoreMaps: 1c5d4508a703a4a7f8eed8930aecf5a48887d582
MapboxCoreNavigation: 7414a18b640e3bb27d206553aa8d717589a61c7c
MapboxCommon: 7e6a9870c7425e4f72139fd2ca70bc4a906744a1
MapboxCoreMaps: 884d2430c873c0d35cd32cf695afa00934128438
MapboxCoreNavigation: 1e1c01543724dcac89b0c90bada6d7f166320150
MapboxDirections: fa70b4970f974dd39463657d3c2d5cbd0c504b7b
MapboxMaps: e66387da6b5a05594c6dcd8577c3f2cc8db1ff63
MapboxMaps: 92e6b6ef7e9e1b947e4916f7487c57d0f4989fc4
MapboxMobileEvents: febdd92835daa258ca1c1faad0821c0b3394ef40
MapboxNavigation: 411d25d3815dff7bda11a9a025094aebd74405ea
MapboxNavigationNative: a8b29fdc0351a1c9f714559fa60684f158b25eda
MapboxNavigation: e0f6295880038935e4ec79624214fa072e255d51
MapboxNavigationNative: 259a864c11e1daa041dcb53df23b26187ea9ebde
MapboxSpeech: a3789121e8d91eb9bc9af6ddd60768729a918f71
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
Expand Down