Skip to content

Commit 7e860ff

Browse files
MaximAlienMaximAlien
authored
Update to Mapbox Navigation v2.3.1. Fix compilation warnings. (#169)
1 parent 1de70b6 commit 7e860ff

21 files changed

+177
-67
lines changed

‎Navigation-Examples/Examples/Advanced.swift

+7-3
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,15 @@ class AdvancedViewController: UIViewController, NavigationMapViewDelegate, Navig
100100
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
101101
routeIndex: currentRouteIndex,
102102
routeOptions: navigationRouteOptions,
103+
routingProvider: NavigationSettings.shared.directions,
104+
credentials: NavigationSettings.shared.directions.credentials,
103105
simulating: simulationIsEnabled ? .always : .onPoorGPS)
106+
104107
let navigationOptions = NavigationOptions(navigationService: navigationService)
105-
let navigationViewController = NavigationViewController(for: routeResponse, routeIndex: currentRouteIndex,
106-
routeOptions: navigationRouteOptions,
107-
navigationOptions: navigationOptions)
108+
let navigationViewController = NavigationViewController(for: routeResponse,
109+
routeIndex: currentRouteIndex,
110+
routeOptions: navigationRouteOptions,
111+
navigationOptions: navigationOptions)
108112
navigationViewController.delegate = self
109113

110114
present(navigationViewController, animated: true, completion: nil)

‎Navigation-Examples/Examples/Basic.swift

+11-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,18 @@ class BasicViewController: UIViewController {
3030

3131
// For demonstration purposes, simulate locations if the Simulate Navigation option is on.
3232
// Since first route is retrieved from response `routeIndex` is set to 0.
33-
let navigationService = MapboxNavigationService(routeResponse: response, routeIndex: 0, routeOptions: options, simulating: simulationIsEnabled ? .always : .onPoorGPS)
33+
let navigationService = MapboxNavigationService(routeResponse: response,
34+
routeIndex: 0,
35+
routeOptions: options,
36+
routingProvider: NavigationSettings.shared.directions,
37+
credentials: NavigationSettings.shared.directions.credentials,
38+
simulating: simulationIsEnabled ? .always : .onPoorGPS)
39+
3440
let navigationOptions = NavigationOptions(navigationService: navigationService)
35-
let navigationViewController = NavigationViewController(for: response, routeIndex: 0, routeOptions: options, navigationOptions: navigationOptions)
41+
let navigationViewController = NavigationViewController(for: response,
42+
routeIndex: 0,
43+
routeOptions: options,
44+
navigationOptions: navigationOptions)
3645
navigationViewController.modalPresentationStyle = .fullScreen
3746
// Render part of the route that has been traversed with full transparency, to give the illusion of a disappearing route.
3847
navigationViewController.routeLineTracksTraversal = true

‎Navigation-Examples/Examples/Beta-Query-Parameters.swift

+7-4
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,14 @@ class BetaQueryViewController: UIViewController, NavigationMapViewDelegate, Navi
121121
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
122122
routeIndex: 0,
123123
routeOptions: navigationRouteOptions,
124+
routingProvider: NavigationSettings.shared.directions,
125+
credentials: NavigationSettings.shared.directions.credentials,
124126
simulating: simulationIsEnabled ? .always : .onPoorGPS)
125127
let navigationOptions = NavigationOptions(navigationService: navigationService)
126-
let navigationViewController = NavigationViewController(for: routeResponse, routeIndex: 0,
127-
routeOptions: navigationRouteOptions,
128-
navigationOptions: navigationOptions)
128+
let navigationViewController = NavigationViewController(for: routeResponse,
129+
routeIndex: 0,
130+
routeOptions: navigationRouteOptions,
131+
navigationOptions: navigationOptions)
129132
navigationViewController.delegate = self
130133

131134
present(navigationViewController, animated: true, completion: nil)
@@ -195,7 +198,7 @@ class MopedRouteOptions: NavigationRouteOptions {
195198
fatalError("init(from:) has not been implemented")
196199
}
197200

198-
required init(waypoints: [Waypoint], profileIdentifier: DirectionsProfileIdentifier? = .automobileAvoidingTraffic) {
201+
required init(waypoints: [Waypoint], profileIdentifier: ProfileIdentifier? = .automobileAvoidingTraffic) {
199202
fatalError("init(waypoints:profileIdentifier:) has not been implemented")
200203
}
201204
}

‎Navigation-Examples/Examples/Building-Extrusion.swift

+2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ class BuildingExtrusionViewController: UIViewController, NavigationMapViewDelega
142142
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
143143
routeIndex: currentRouteIndex,
144144
routeOptions: navigationRouteOptions,
145+
routingProvider: NavigationSettings.shared.directions,
146+
credentials: NavigationSettings.shared.directions.credentials,
145147
simulating: simulationIsEnabled ? .always : .onPoorGPS)
146148
let navigationOptions = NavigationOptions(navigationService: navigationService)
147149
let navigationViewController = NavigationViewController(for: routeResponse,

‎Navigation-Examples/Examples/Custom-Destination-Marker.swift

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ class CustomDestinationMarkerController: UIViewController {
7070
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
7171
routeIndex: 0,
7272
routeOptions: routeOptions,
73+
routingProvider: NavigationSettings.shared.directions,
74+
credentials: NavigationSettings.shared.directions.credentials,
7375
simulating: simulationIsEnabled ? .always : .onPoorGPS)
7476
let navigationOptions = NavigationOptions(navigationService: navigationService)
7577
let navigationViewController = NavigationViewController(for: routeResponse,

‎Navigation-Examples/Examples/Custom-Server.swift

+10-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,17 @@ class CustomServerViewController: UIViewController {
3535
}
3636

3737
// For demonstration purposes, simulate locations if the Simulate Navigation option is on.
38-
let navigationService = MapboxNavigationService(routeResponse: response, routeIndex: 0, routeOptions: routeOptions, simulating: simulationIsEnabled ? .always : .onPoorGPS)
38+
let navigationService = MapboxNavigationService(routeResponse: response,
39+
routeIndex: 0,
40+
routeOptions: routeOptions,
41+
routingProvider: NavigationSettings.shared.directions,
42+
credentials: NavigationSettings.shared.directions.credentials,
43+
simulating: simulationIsEnabled ? .always : .onPoorGPS)
3944
let navigationOptions = NavigationOptions(navigationService: navigationService)
40-
strongSelf.navigationViewController = NavigationViewController(for: response, routeIndex: 0, routeOptions: routeOptions, navigationOptions: navigationOptions)
45+
strongSelf.navigationViewController = NavigationViewController(for: response,
46+
routeIndex: 0,
47+
routeOptions: routeOptions,
48+
navigationOptions: navigationOptions)
4149
strongSelf.navigationViewController?.modalPresentationStyle = .fullScreen
4250
strongSelf.navigationViewController?.delegate = strongSelf
4351

‎Navigation-Examples/Examples/Custom-User-Location.swift

+5-3
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,14 @@ class CustomUserLocationViewController: UIViewController, NavigationMapViewDeleg
278278
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
279279
routeIndex: 0,
280280
routeOptions: navigationRouteOptions,
281+
routingProvider: NavigationSettings.shared.directions,
282+
credentials: NavigationSettings.shared.directions.credentials,
281283
simulating: simulationIsEnabled ? .always : .onPoorGPS)
282284
let navigationOptions = NavigationOptions(navigationService: navigationService)
283285
let navigationViewController = NavigationViewController(for: routeResponse,
284-
routeIndex: 0,
285-
routeOptions: navigationRouteOptions,
286-
navigationOptions: navigationOptions)
286+
routeIndex: 0,
287+
routeOptions: navigationRouteOptions,
288+
navigationOptions: navigationOptions)
287289
navigationViewController.routeLineTracksTraversal = true
288290
navigationViewController.delegate = self
289291
navigationViewController.modalPresentationStyle = .fullScreen

‎Navigation-Examples/Examples/Custom-Voice-Controller.swift

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ class CustomVoiceControllerUI: UIViewController {
3737
let navigationService = MapboxNavigationService(routeResponse: response,
3838
routeIndex: 0,
3939
routeOptions: routeOptions,
40+
routingProvider: NavigationSettings.shared.directions,
41+
credentials: NavigationSettings.shared.directions.credentials,
4042
simulating: simulationIsEnabled ? .always : .onPoorGPS)
4143

4244
// `MultiplexedSpeechSynthesizer` will provide "a backup" functionality to cover cases, which

‎Navigation-Examples/Examples/Custom-Waypoints.swift

+6-3
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,14 @@ class CustomWaypointsViewController: UIViewController {
9393
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
9494
routeIndex: currentRouteIndex,
9595
routeOptions: navigationRouteOptions,
96+
routingProvider: NavigationSettings.shared.directions,
97+
credentials: NavigationSettings.shared.directions.credentials,
9698
simulating: simulationIsEnabled ? .always : .onPoorGPS)
9799
let navigationOptions = NavigationOptions(navigationService: navigationService)
98-
let navigationViewController = NavigationViewController(for: routeResponse, routeIndex: currentRouteIndex,
99-
routeOptions: navigationRouteOptions,
100-
navigationOptions: navigationOptions)
100+
let navigationViewController = NavigationViewController(for: routeResponse,
101+
routeIndex: currentRouteIndex,
102+
routeOptions: navigationRouteOptions,
103+
navigationOptions: navigationOptions)
101104
navigationViewController.delegate = self
102105

103106
present(navigationViewController, animated: true, completion: nil)

‎Navigation-Examples/Examples/CustomBars/CustomBarsViewController.swift

+13-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,25 @@ class CustomBarsViewController: UIViewController {
2929
}
3030

3131
// For demonstration purposes, simulate locations if the Simulate Navigation option is on.
32-
let navigationService = MapboxNavigationService(routeResponse: response, routeIndex: 0, routeOptions: routeOptions, simulating: simulationIsEnabled ? .always : .onPoorGPS)
32+
let navigationService = MapboxNavigationService(routeResponse: response,
33+
routeIndex: 0,
34+
routeOptions: routeOptions,
35+
routingProvider: NavigationSettings.shared.directions,
36+
credentials: NavigationSettings.shared.directions.credentials,
37+
simulating: simulationIsEnabled ? .always : .onPoorGPS)
3338

3439
// Pass your custom implementations of `topBanner` and/or `bottomBanner` to `NavigationOptions`
3540
// If you do not specify them explicitly, `TopBannerViewController` and `BottomBannerViewController` will be used by default.
3641
// Those are `Open`, so you can also check thier source for more examples of using standard UI controls!
3742
let topBanner = CustomTopBarViewController()
3843
let bottomBanner = CustomBottomBarViewController()
39-
let navigationOptions = NavigationOptions(navigationService: navigationService, topBanner: topBanner, bottomBanner: bottomBanner)
40-
let navigationViewController = NavigationViewController(for: response, routeIndex: 0, routeOptions: routeOptions, navigationOptions: navigationOptions)
44+
let navigationOptions = NavigationOptions(navigationService: navigationService,
45+
topBanner: topBanner,
46+
bottomBanner: bottomBanner)
47+
let navigationViewController = NavigationViewController(for: response,
48+
routeIndex: 0,
49+
routeOptions: routeOptions,
50+
navigationOptions: navigationOptions)
4151
bottomBanner.navigationViewController = navigationViewController
4252

4353
let parentSafeArea = navigationViewController.view.safeAreaLayoutGuide

‎Navigation-Examples/Examples/CustomSegue/Navigation-From-Segue.swift

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class SegueViewController: UIViewController {
4141
let navigationService = MapboxNavigationService(routeResponse: response,
4242
routeIndex: 0,
4343
routeOptions: self.navigationRouteOptions,
44+
routingProvider: NavigationSettings.shared.directions,
45+
credentials: NavigationSettings.shared.directions.credentials,
4446
simulating: simulationIsEnabled ? .always : .onPoorGPS)
4547
self.navigationOptions = NavigationOptions(navigationService: navigationService)
4648
}

‎Navigation-Examples/Examples/Embedded-Navigation.swift

+10-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,17 @@ class EmbeddedExampleViewController: UIViewController {
6161
func startEmbeddedNavigation() {
6262
// For demonstration purposes, simulate locations if the Simulate Navigation option is on.
6363
guard let routeResponse = routeResponse else { return }
64-
let navigationService = MapboxNavigationService(routeResponse: routeResponse, routeIndex: 0, routeOptions: routeOptions, simulating: simulationIsEnabled ? .always : .onPoorGPS)
64+
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
65+
routeIndex: 0,
66+
routeOptions: routeOptions,
67+
routingProvider: NavigationSettings.shared.directions,
68+
credentials: NavigationSettings.shared.directions.credentials,
69+
simulating: simulationIsEnabled ? .always : .onPoorGPS)
6570
let navigationOptions = NavigationOptions(navigationService: navigationService)
66-
let navigationViewController = NavigationViewController(for: routeResponse, routeIndex: 0, routeOptions: routeOptions, navigationOptions: navigationOptions)
71+
let navigationViewController = NavigationViewController(for: routeResponse,
72+
routeIndex: 0,
73+
routeOptions: routeOptions,
74+
navigationOptions: navigationOptions)
6775

6876
navigationViewController.delegate = self
6977
addChild(navigationViewController)

‎Navigation-Examples/Examples/NavigationCamera/Custom-Navigation-Camera.swift

+5-3
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,15 @@ class CustomNavigationCameraViewController: UIViewController {
7373
let navigationService = MapboxNavigationService(routeResponse: routeResponse,
7474
routeIndex: 0,
7575
routeOptions: navigationRouteOptions,
76+
routingProvider: NavigationSettings.shared.directions,
77+
credentials: NavigationSettings.shared.directions.credentials,
7678
simulating: simulationIsEnabled ? .always : .onPoorGPS)
7779

7880
let navigationOptions = NavigationOptions(navigationService: navigationService)
7981
let navigationViewController = NavigationViewController(for: routeResponse,
80-
routeIndex: 0,
81-
routeOptions: navigationRouteOptions,
82-
navigationOptions: navigationOptions)
82+
routeIndex: 0,
83+
routeOptions: navigationRouteOptions,
84+
navigationOptions: navigationOptions)
8385
navigationViewController.modalPresentationStyle = .fullScreen
8486

8587
// Modify default `NavigationViewportDataSource` and `NavigationCameraStateTransition` to change

0 commit comments

Comments
 (0)