Merge pull request #214 from stadiamaps/feat/common/polyline-index

Added nearest coordinate index for polyline
stadiamaps · Sep 3, 2024 · ceefeea · ceefeea
2 parents 3dd8b15 + 69345d8
commit ceefeea
Show file tree

Hide file tree

Showing 22 changed files with 330 additions and 87 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -23,17 +23,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stadiamaps/maplibre-swiftui-dsl-playground",
       "state" : {
-        "revision" : "02f5a62009bc991a9dc59011785c83c347d7eea6",
-        "version" : "0.0.23"
+        "revision" : "a789bbee505a1344a87d9a5f999455ed55acdcde",
+        "version" : "0.0.28"
       }
     },
     {
       "identity" : "mockable",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Kolos65/Mockable.git",
       "state" : {
-        "revision" : "81ccaead99a3c038c09345caa2888ae74b644ee9",
-        "version" : "0.0.9"
+        "revision" : "da977ecb20974c4b1cf185f5fd38771b2d4674fb",
+        "version" : "0.0.10"
       }
     },
     {

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.9.1"
+    let releaseTag = "0.10.0"
     let releaseChecksum = "d06ba13bd12262b91ecec20a80c96649a8507a43b2d041086ca04c6bcee2ba2f"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",

diff --git a/android/build.gradle b/android/build.gradle
@@ -12,5 +12,5 @@ plugins {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.9.2"
+    version = "0.10.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
@@ -33,6 +33,7 @@ fun NavigationState.Companion.pedestrianExample(): NavigationState {
   return NavigationState(
       tripState =
           TripState.Navigating(
+              currentStepGeometryIndex = 0u,
               snappedUserLocation = UserLocation.pedestrianExample(),
               remainingSteps = listOf(),
               remainingWaypoints = listOf(),

diff --git a/...emoApp/Ferrostar Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...emoApp/Ferrostar Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
       "state" : {
-        "revision" : "cf66f087af489ebc091c03cbd4f38d0540135871",
-        "version" : "6.5.3"
+        "revision" : "abe762f1e19e03a4c6943d2aad92c219da384b29",
+        "version" : "6.5.4"
       }
     },
     {
@@ -24,23 +24,23 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/stadiamaps/maplibre-swiftui-dsl-playground",
       "state" : {
-        "revision" : "02f5a62009bc991a9dc59011785c83c347d7eea6",
-        "version" : "0.0.23"
+        "revision" : "a789bbee505a1344a87d9a5f999455ed55acdcde",
+        "version" : "0.0.28"
       }
     },
     {
       "identity" : "mockable",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Kolos65/Mockable.git",
       "state" : {
-        "revision" : "81ccaead99a3c038c09345caa2888ae74b644ee9",
-        "version" : "0.0.9"
+        "revision" : "da977ecb20974c4b1cf185f5fd38771b2d4674fb",
+        "version" : "0.0.10"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
         "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
         "version" : "509.1.1"

diff --git a/apple/Sources/FerrostarCore/FerrostarCore.swift b/apple/Sources/FerrostarCore/FerrostarCore.swift
@@ -274,6 +274,7 @@ public protocol FerrostarCoreDelegate: AnyObject {
 
             switch newState {
             case let .navigating(
+                currentStepGeometryIndex: _,
                 snappedUserLocation: _,
                 remainingSteps: _,
                 remainingWaypoints: remainingWaypoints,

diff --git a/apple/Sources/FerrostarCore/Mock/MockNavigationState.swift b/apple/Sources/FerrostarCore/Mock/MockNavigationState.swift
@@ -5,6 +5,7 @@ import Foundation
 public extension NavigationState {
     static let pedestrianExample = NavigationState(
         tripState: .navigating(
+            currentStepGeometryIndex: 0,
             snappedUserLocation: UserLocation(
                 latitude: samplePedestrianWaypoints.first!.lat,
                 longitude: samplePedestrianWaypoints.first!.lng,
@@ -36,6 +37,7 @@ public extension NavigationState {
 
         return NavigationState(
             tripState: .navigating(
+                currentStepGeometryIndex: 0,
                 snappedUserLocation: UserLocation(
                     coordinates: samplePedestrianWaypoints.first!,
                     horizontalAccuracy: 10,

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/DynamicallyOrientingNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/DynamicallyOrientingNavigationView.swift
@@ -134,7 +134,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .imperial
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 
@@ -153,7 +153,7 @@ public struct DynamicallyOrientingNavigationView: View, CustomizableNavigatingIn
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .metric
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/LandscapeNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/LandscapeNavigationView.swift
@@ -103,7 +103,7 @@ public struct LandscapeNavigationView: View {
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .imperial
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 
@@ -124,7 +124,7 @@ public struct LandscapeNavigationView: View {
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .metric
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/NavigationMapView.swift b/apple/Sources/FerrostarMapLibreUI/Views/NavigationMapView.swift
@@ -83,7 +83,7 @@ public struct NavigationMapView: View {
     }
 
     private func updateCameraIfNeeded() {
-        if case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = navigationState?.tripState,
+        if case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = navigationState?.tripState,
            // There is no reason to push an update if the coordinate and heading are the same.
            // That's all that gets displayed, so it's all that MapLibre should care about.
            locationManager.lastLocation.coordinate != userLocation.coordinates
@@ -98,7 +98,7 @@ public struct NavigationMapView: View {
     // TODO: Make map URL configurable but gitignored
     let state = NavigationState.modifiedPedestrianExample(droppingNWaypoints: 4)
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/Overylays/LandscapeNavigationOverlayView.swift b/apple/Sources/FerrostarMapLibreUI/Views/Overylays/LandscapeNavigationOverlayView.swift
@@ -47,7 +47,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
     var body: some View {
         HStack {
             VStack {
-                if case let .navigating(_, _, _, progress: progress, _, visualInstruction: visualInstruction,
+                if case let .navigating(_, _, _, _, progress: progress, _, visualInstruction: visualInstruction,
                                         _) = navigationState?.tripState,
                     let visualInstruction
                 {
@@ -61,7 +61,7 @@ struct LandscapeNavigationOverlayView: View, CustomizableNavigatingInnerGridView
 
                 Spacer()
 
-                if case let .navigating(_, _, _, progress: progress, _, _, _) = navigationState?.tripState {
+                if case let .navigating(_, _, _, _, progress: progress, _, _, _) = navigationState?.tripState {
                     ArrivalView(
                         progress: progress,
                         onTapExit: onTapExit

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/Overylays/PortraitNavigationOverlayView.swift b/apple/Sources/FerrostarMapLibreUI/Views/Overylays/PortraitNavigationOverlayView.swift
@@ -46,7 +46,7 @@ struct PortraitNavigationOverlayView: View, CustomizableNavigatingInnerGridView
 
     var body: some View {
         VStack {
-            if case let .navigating(_, _, _, progress: progress, _, visualInstruction: visualInstruction,
+            if case let .navigating(_, _, _, _, progress: progress, _, visualInstruction: visualInstruction,
                                     _) = navigationState?.tripState,
                 let visualInstruction
             {
@@ -81,7 +81,7 @@ struct PortraitNavigationOverlayView: View, CustomizableNavigatingInnerGridView
             }
             .padding(.horizontal, 16)
 
-            if case let .navigating(_, _, _, progress: progress, _, _, _) = navigationState?.tripState {
+            if case let .navigating(_, _, _, _, progress: progress, _, _, _) = navigationState?.tripState {
                 ArrivalView(
                     progress: progress,
                     onTapExit: onTapExit

diff --git a/apple/Sources/FerrostarMapLibreUI/Views/PortraitNavigationView.swift b/apple/Sources/FerrostarMapLibreUI/Views/PortraitNavigationView.swift
@@ -104,7 +104,7 @@ public struct PortraitNavigationView: View, CustomizableNavigatingInnerGridView
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .imperial
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }
 
@@ -124,7 +124,7 @@ public struct PortraitNavigationView: View, CustomizableNavigatingInnerGridView
     formatter.locale = Locale(identifier: "en-US")
     formatter.units = .metric
 
-    guard case let .navigating(snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
+    guard case let .navigating(_, snappedUserLocation: userLocation, _, _, _, _, _, _) = state.tripState else {
         return EmptyView()
     }