Support for visual sub-maneuvers (#303)

* Support for visual sub-maneuvers * Address PR comments * Added and updated tests * Update release version * Fix a typo * Update _typos.toml to ignore extended response * Update common/ferrostar/src/routing_adapters/osrm/models.rs Co-authored-by: Ian Wagner <[email protected]> * Add Prettier (#304) * Update ferrostar version * Add prettier * Run Prettier * Update guide * Rename format to format:fix, add format:check script * Add format:check to GitHub workflow * Autocomplete search for Android Demo App (#295) * Support arbitrary Valhalla options (formerly we only merged costing options) * Fix argument * Improve docs of some convenience initializers * Align Android with iOS costing options * swiftformat * Don't forget the web ;) * Add Android-specific README * Set up Android to use API keys properly via local.properties * Fix CI * Fix subtle bug where Android location providers never updated lastLocation * Rename U-Turn images to match how Kotlin stringifies the maneuvers * Allow the fused location provider to report an initial fix faster * First pass at an actually usable demo app * Minor build script improvement * Checkpoint commit phase 1 * Checkpoint commit phase 2 highlighting some bad stuff to clean up * Add docs on the StaticLocationEngine * Fix formatting + doc test * Fix typo in Android readme Co-authored-by: Jacob Fielding <[email protected]> * Kotlin let closure idiom * ktfmtFormat + auto-commit * Remove extraneous env? * Try switching to a mix of Apple Silicon Ubuntu runners for Android * Fix runner permissions (I think) * Apply automatic changes * Address open thread re: iOS uturn image name * Add TODO docs * Fix the navigation camera (re-)application logic * Cleanup * Remove old comment * Apply automatic changes --------- Co-authored-by: Jacob Fielding <[email protected]> Co-authored-by: ianthetechie <[email protected]> * Fix ManeuverImage * Fix ManeuverImage again * Fix newline ending --------- Co-authored-by: Ian Wagner <[email protected]> Co-authored-by: Mike Hays <[email protected]> Co-authored-by: Ian Wagner <[email protected]> Co-authored-by: Jacob Fielding <[email protected]> Co-authored-by: ianthetechie <[email protected]>
stadiamaps · Oct 22, 2024 · 359ec90 · 359ec90
1 parent 40ee690
commit 359ec90
Show file tree

Hide file tree

Showing 28 changed files with 426 additions and 41 deletions.
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ if useLocalFramework {
         path: "./common/target/ios/libferrostar-rs.xcframework"
     )
 } else {
-    let releaseTag = "0.18.0"
+    let releaseTag = "0.19.0"
     let releaseChecksum = "c23dd4145abb11c97b8e26166999aa6b3b42b8f4b49ccf322764cf4a10cfc916"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",

diff --git a/_typos.toml b/_typos.toml
@@ -1,5 +1,10 @@
+[default]
+extend-ignore-re = [
+  "VALHALLA_EXTENDED_OSRM_RESPONSE.*",
+]
+
 [default.extend-words]
 rememberable = "rememberable"
 
 [files]
-extend-exclude = ["**/build/*", "*.pbxproj", "**/dist/*", "guide/**/*.js"]
+extend-exclude = ["**/build/*", "*.pbxproj", "**/dist/*", "guide/**/*.js"]
diff --git a/android/build.gradle b/android/build.gradle
@@ -13,5 +13,5 @@ plugins {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.18.0"
+    version = "0.19.0"
 }
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,7 +53,8 @@ fun ManeuverImageLeftTurnPreview() {
           text = "",
           maneuverType = ManeuverType.TURN,
           maneuverModifier = ManeuverModifier.LEFT,
-          roundaboutExitDegrees = null))
+          roundaboutExitDegrees = null,
+          laneInfo = null))
 }
 
 @Preview
@@ -64,5 +65,6 @@ fun ManeuverImageContinueUturnPreview() {
           text = "",
           maneuverType = ManeuverType.CONTINUE,
           maneuverModifier = ManeuverModifier.U_TURN,
-          roundaboutExitDegrees = null))
+          roundaboutExitDegrees = null,
+          laneInfo = null))
 }
diff --git a/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/InstructionViewTest.kt b/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/InstructionViewTest.kt
@@ -23,8 +23,10 @@ class InstructionViewTest {
                     text = "Hyde Street",
                     maneuverType = ManeuverType.TURN,
                     maneuverModifier = ManeuverModifier.LEFT,
-                    roundaboutExitDegrees = null),
+                    roundaboutExitDegrees = null,
+                    laneInfo = null),
             secondaryContent = null,
+            subContent = null,
             triggerDistanceBeforeManeuver = 42.0)
 
     paparazzi.snapshot {

diff --git a/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/ManeuverImageTest.kt b/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/ManeuverImageTest.kt
@@ -27,7 +27,8 @@ class ManeuverImageTest {
               text = "",
               maneuverType = ManeuverType.TURN,
               maneuverModifier = ManeuverModifier.RIGHT,
-              roundaboutExitDegrees = null))
+              roundaboutExitDegrees = null,
+              laneInfo = null))
     }
   }
 
@@ -39,7 +40,8 @@ class ManeuverImageTest {
               text = "",
               maneuverType = ManeuverType.FORK,
               maneuverModifier = ManeuverModifier.LEFT,
-              roundaboutExitDegrees = null))
+              roundaboutExitDegrees = null,
+              laneInfo = null))
     }
   }
 
@@ -51,7 +53,8 @@ class ManeuverImageTest {
               text = "",
               maneuverType = ManeuverType.FORK,
               maneuverModifier = ManeuverModifier.LEFT,
-              roundaboutExitDegrees = null),
+              roundaboutExitDegrees = null,
+              laneInfo = null),
           tint = Color.Magenta)
     }
   }

diff --git a/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/RTLInstructionViewTests.kt b/android/composeui/src/test/java/com/stadiamaps/ferrostar/views/RTLInstructionViewTests.kt
@@ -29,8 +29,10 @@ class RTLInstructionViewTests {
                     text = "ادمج يسارًا",
                     maneuverType = ManeuverType.TURN,
                     maneuverModifier = ManeuverModifier.LEFT,
-                    roundaboutExitDegrees = null),
+                    roundaboutExitDegrees = null,
+                    laneInfo = null),
             secondaryContent = null,
+            subContent = null,
             triggerDistanceBeforeManeuver = 42.0)
 
     paparazzi.snapshot {

diff --git a/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/FerrostarCoreTest.kt b/android/core/src/androidTest/java/com/stadiamaps/ferrostar/core/FerrostarCoreTest.kt
@@ -98,7 +98,8 @@ class FerrostarCoreTest {
           text = "Sail straight",
           maneuverType = ManeuverType.DEPART,
           maneuverModifier = ManeuverModifier.STRAIGHT,
-          roundaboutExitDegrees = null)
+          roundaboutExitDegrees = null,
+          laneInfo = null)
   private val mockRoute =
       Route(
           geometry = mockGeom,
@@ -117,6 +118,7 @@ class FerrostarCoreTest {
                               VisualInstruction(
                                   primaryContent = instructionContent,
                                   secondaryContent = null,
+                                  subContent = null,
                                   triggerDistanceBeforeManeuver = 42.0)),
                       spokenInstructions = listOf(),
                       duration = 0.0,

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
             )
         )