Merge pull request #2403 from mapbox/maxim/2399-route-options-crash

Add exception in case if leg in route doesn't contain any steps.
mapbox · Jul 27, 2020 · 45ff7c3 · 45ff7c3
2 parents 5640465 + 1e62b49
commit 45ff7c3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -37,7 +37,7 @@ class ViewController: UIViewController {
 
     var response: RouteResponse? {
         didSet {
-            guard let routes = response?.routes, let current = routes.first else {
+            guard let routes = response?.routes, let current = routes.first, let steps = current.legs.first?.steps, !steps.isEmpty else {
                 startButton.isEnabled = false
                 mapView?.removeRoutes()
                 return

diff --git a/MapboxCoreNavigation/RouteProgress.swift b/MapboxCoreNavigation/RouteProgress.swift
@@ -425,6 +425,9 @@ open class RouteLegProgress {
     public init(leg: RouteLeg, stepIndex: Int = 0, spokenInstructionIndex: Int = 0) {
         self.leg = leg
         self.stepIndex = stepIndex
+
+        precondition(leg.steps.indices.contains(stepIndex), "It's not possible to create RouteLegProgress without any steps or when stepIndex is higher than steps count.")
+
         currentStepProgress = RouteStepProgress(step: leg.steps[stepIndex], spokenInstructionIndex: spokenInstructionIndex)
     }
 

diff --git a/MapboxCoreNavigationTests/RouteProgressTests.swift b/MapboxCoreNavigationTests/RouteProgressTests.swift
@@ -239,6 +239,7 @@ class RouteProgressTests: XCTestCase {
             .init(value: 50, unit: .kilometersPerHour),
             .init(value: .infinity, unit: .kilometersPerHour),
         ]
+
         let legProgress = RouteLegProgress(leg: leg)
 
         XCTAssertEqual(legProgress.distanceTraveled, 0)

diff --git a/MapboxNavigationTests/SKUTests.swift b/MapboxNavigationTests/SKUTests.swift
@@ -35,7 +35,7 @@ class SKUTests: XCTestCase {
 
         wait(for: [tokenExpectation], timeout: 5)
 
-        XCTAssertEqual(viewController.mapViewToken!.skuId, SkuID.navigationUser.rawValue)
+        XCTAssertEqual(viewController.mapViewToken?.skuId, SkuID.navigationUser.rawValue)
         XCTAssertEqual(viewController.mapViewToken, viewController.directionsToken)
         XCTAssertEqual(viewController.mapViewToken, viewController.speechSynthesizerToken)