make sure VisualInstructionTests pass

mapbox · Mar 31, 2021 · 92880c5 · 92880c5
1 parent 8d410a3
commit 92880c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Sources/MapboxDirections/Intersection.swift b/Sources/MapboxDirections/Intersection.swift
@@ -326,7 +326,7 @@ extension Intersection: Codable {
                     usableIndications.append(lane.validIndication!)
                 }
             }
-            usableLaneIndication = usableIndications.reduce(temp) { return ($0).union($1) }
+            usableLaneIndication = usableIndications.reduce(temp) { return $0.union($1) }
         } else {
             approachLanes = nil
             usableApproachLanes = nil

diff --git a/Sources/MapboxDirections/VisualInstructionComponent.swift b/Sources/MapboxDirections/VisualInstructionComponent.swift
@@ -281,7 +281,7 @@ extension VisualInstruction.Component: Codable {
             textRepresentation = .init(text: "", abbreviation: nil, abbreviationPriority: nil)
             try container.encode(indications, forKey: .directions)
             try container.encode(isUsable, forKey: .isActive)
-            try container.encode(preferredDirection, forKey: .activeDirection)
+            try container.encodeIfPresent(preferredDirection, forKey: .activeDirection)
         case .guidanceView(let image, let alternativeText):
             try container.encode(Kind.guidanceView, forKey: .kind)
             textRepresentation = alternativeText

diff --git a/Tests/MapboxDirectionsTests/VisualInstructionTests.swift b/Tests/MapboxDirectionsTests/VisualInstructionTests.swift
@@ -256,13 +256,15 @@ class VisualInstructionsTests: XCTestCase {
         XCTAssertEqual(laneIndicationComponents?.count, 2)
 
         if let laneIndicationComponents = laneIndicationComponents, laneIndicationComponents.count > 1 {
-            if case let VisualInstruction.Component.lane(indications, isUsable) = laneIndicationComponents[0] {
+            if case let VisualInstruction.Component.lane(indications, isUsable, preferredDirection) = laneIndicationComponents[0] {
                 XCTAssertEqual(indications, .straightAhead)
                 XCTAssertFalse(isUsable)
+                XCTAssertEqual(preferredDirection, nil)
             }
-            if case let VisualInstruction.Component.lane(indications, isUsable) = laneIndicationComponents[1] {
+            if case let VisualInstruction.Component.lane(indications, isUsable, preferredDirection) = laneIndicationComponents[1] {
                 XCTAssertEqual(indications, .right)
                 XCTAssertTrue(isUsable)
+                XCTAssertEqual(preferredDirection, nil)
             }
         }
     }