Support for visual sub-maneuvers

stadiamaps · Oct 21, 2024 · 0e20949 · 0e20949
1 parent 93b13b4
commit 0e20949
Show file tree

Hide file tree

Showing 12 changed files with 288 additions and 17 deletions.
diff --git a/android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/InstructionsView.kt b/android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/InstructionsView.kt
@@ -68,8 +68,10 @@ fun PreviewInstructionsView() {
                   text = "Hyde Street",
                   maneuverType = ManeuverType.TURN,
                   maneuverModifier = ManeuverModifier.LEFT,
-                  roundaboutExitDegrees = null),
+                  roundaboutExitDegrees = null,
+                  laneInfo = null),
           secondaryContent = null,
+          subContent = null,
           triggerDistanceBeforeManeuver = 42.0)
 
   InstructionsView(instructions = instructions, distanceToNextManeuver = 42.0)
@@ -85,8 +87,10 @@ fun PreviewRTLInstructionsView() {
                   text = "ادمج يسارًا",
                   maneuverType = ManeuverType.TURN,
                   maneuverModifier = ManeuverModifier.LEFT,
-                  roundaboutExitDegrees = null),
+                  roundaboutExitDegrees = null,
+                  laneInfo = null),
           secondaryContent = null,
+          subContent = null,
           triggerDistanceBeforeManeuver = 42.0)
 
   InstructionsView(

diff --git a/...omposeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/maneuver/ManeuverImage.kt b/...omposeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/maneuver/ManeuverImage.kt
@@ -53,5 +53,6 @@ fun ManeuverImagePreview() {
           text = "",
           maneuverType = ManeuverType.TURN,
           maneuverModifier = ManeuverModifier.LEFT,
-          roundaboutExitDegrees = null))
+          roundaboutExitDegrees = null,
+          laneInfo = null))
 }
diff --git a/android/core/src/main/java/com/stadiamaps/ferrostar/core/mock/MockNavigationState.kt b/android/core/src/main/java/com/stadiamaps/ferrostar/core/mock/MockNavigationState.kt
@@ -50,8 +50,10 @@ fun NavigationState.Companion.pedestrianExample(): NavigationState {
                               text = "Head east",
                               maneuverType = ManeuverType.TURN,
                               maneuverModifier = ManeuverModifier.RIGHT,
-                              roundaboutExitDegrees = null),
+                              roundaboutExitDegrees = null,
+                              laneInfo = null),
                       secondaryContent = null,
+                      subContent = null,
                       triggerDistanceBeforeManeuver = 0.0,
                   ),
               spokenInstruction = null,

diff --git a/apple/Sources/FerrostarCore/Mock/MockNavigationState.swift b/apple/Sources/FerrostarCore/Mock/MockNavigationState.swift
@@ -59,9 +59,12 @@ public extension NavigationState {
                                     text: "Hyde Street",
                                     maneuverType: .turn,
                                     maneuverModifier: .left,
-                                    roundaboutExitDegrees: nil
+                                    roundaboutExitDegrees: nil,
+                                    laneInfo: nil
                                 ),
-                                secondaryContent: nil, triggerDistanceBeforeManeuver: 42.0
+                                secondaryContent: nil,
+                                subContent: nil,
+                                triggerDistanceBeforeManeuver: 42.0
                             ),
                         ],
                         spokenInstructions: [],

diff --git a/apple/Sources/FerrostarSwiftUI/TestFixtureFactory.swift b/apple/Sources/FerrostarSwiftUI/TestFixtureFactory.swift
@@ -29,7 +29,8 @@ struct VisualInstructionContentFactory: TestFixtureFactory {
             text: textBuilder(n),
             maneuverType: .turn,
             maneuverModifier: .left,
-            roundaboutExitDegrees: nil
+            roundaboutExitDegrees: nil,
+            laneInfo: nil
         )
     }
 }
@@ -53,6 +54,7 @@ struct VisualInstructionFactory: TestFixtureFactory {
         VisualInstruction(
             primaryContent: primaryContentBuilder(n),
             secondaryContent: secondaryContentBuilder(n),
+            subContent: nil,
             triggerDistanceBeforeManeuver: 42.0
         )
     }

diff --git a/apple/Sources/FerrostarSwiftUI/Views/InstructionsView.swift b/apple/Sources/FerrostarSwiftUI/Views/InstructionsView.swift
@@ -156,14 +156,17 @@ public struct InstructionsView: View {
                     text: "Turn right on Something Dr.",
                     maneuverType: .turn,
                     maneuverModifier: .right,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
                 secondaryContent: VisualInstructionContent(
                     text: "Merge onto Hwy 123",
                     maneuverType: .merge,
                     maneuverModifier: .right,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
+                subContent: nil,
                 triggerDistanceBeforeManeuver: 123
             )
         )
@@ -174,9 +177,11 @@ public struct InstructionsView: View {
                     text: "Use the second exit to leave the roundabout.",
                     maneuverType: .rotary,
                     maneuverModifier: .slightRight,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
                 secondaryContent: nil,
+                subContent: nil,
                 triggerDistanceBeforeManeuver: 123
             )
         )
@@ -187,9 +192,11 @@ public struct InstructionsView: View {
                     text: "Links einfädeln.",
                     maneuverType: .merge,
                     maneuverModifier: .slightLeft,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
                 secondaryContent: nil,
+                subContent: nil,
                 triggerDistanceBeforeManeuver: 123
             ),
             distanceFormatter: germanFormatter,
@@ -202,14 +209,17 @@ public struct InstructionsView: View {
                     text: "Turn right on Something Dr.",
                     maneuverType: .turn,
                     maneuverModifier: .right,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
                 secondaryContent: VisualInstructionContent(
                     text: "Merge onto Hwy 123",
                     maneuverType: .merge,
                     maneuverModifier: .right,
-                    roundaboutExitDegrees: nil
+                    roundaboutExitDegrees: nil,
+                    laneInfo: nil
                 ),
+                subContent: nil,
                 triggerDistanceBeforeManeuver: 123
             )
         )