More realistic GPS simulation with consistent lateral offset (#323)

* More realistic GPS simulation with consistent lateral offset * remove commented code * Apply suggestions from code review * JS and Android API fixes * Update typos.yml * Use rand * Android runner tweaks; try switching to larger runners --------- Co-authored-by: Ian Wagner <[email protected]> Co-authored-by: Ian Wagner <[email protected]>
stadiamaps · Oct 31, 2024 · 649a68c · 649a68c
1 parent 4b883ae
commit 649a68c
Show file tree

Hide file tree

Showing 14 changed files with 1,482 additions and 737 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-android-build
       cancel-in-progress: true
@@ -53,7 +53,7 @@ jobs:
 
   test:
 
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-android-test
       cancel-in-progress: true
@@ -99,7 +99,7 @@ jobs:
 
   verify-snapshots:
 
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-android-snapshots
       cancel-in-progress: true

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
@@ -16,4 +16,4 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Run typos
-      uses: crate-ci/typos@v1.26.0
+      uses: crate-ci/typos@master
diff --git a/android/core/src/main/java/com/stadiamaps/ferrostar/core/Location.kt b/android/core/src/main/java/com/stadiamaps/ferrostar/core/Location.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.launch
 import uniffi.ferrostar.CourseOverGround
 import uniffi.ferrostar.GeographicCoordinate
 import uniffi.ferrostar.Heading
+import uniffi.ferrostar.LocationBias
 import uniffi.ferrostar.LocationSimulationState
 import uniffi.ferrostar.Route
 import uniffi.ferrostar.Speed
@@ -168,8 +169,8 @@ class SimulatedLocationProvider : LocationProvider {
     }
   }
 
-  fun setSimulatedRoute(route: Route) {
-    simulationState = locationSimulationFromRoute(route, resampleDistance = 10.0)
+  fun setSimulatedRoute(route: Route, bias: LocationBias = LocationBias.None) {
+    simulationState = locationSimulationFromRoute(route, resampleDistance = 10.0, bias)
     lastLocation = simulationState?.currentLocation
 
     if (listeners.isNotEmpty() && simulationJob?.isActive != true) {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/apple/Sources/FerrostarCore/Location.swift b/apple/Sources/FerrostarCore/Location.swift
@@ -156,8 +156,16 @@ public class SimulatedLocationProvider: LocationProviding, ObservableObject {
         lastLocation = location
     }
 
-    public func setSimulatedRoute(_ route: Route, resampleDistance: Double = 10) throws {
-        simulationState = try locationSimulationFromRoute(route: route, resampleDistance: resampleDistance)
+    public func setSimulatedRoute(
+        _ route: Route,
+        resampleDistance: Double = 10,
+        bias: LocationBias = .none
+    ) throws {
+        simulationState = try locationSimulationFromRoute(
+            route: route,
+            resampleDistance: resampleDistance,
+            bias: bias
+        )
         lastLocation = simulationState?.currentLocation
     }
 

diff --git a/apple/Sources/UniFFI/ferrostar.swift b/apple/Sources/UniFFI/ferrostar.swift
diff --git a/common/Cargo.lock b/common/Cargo.lock
diff --git a/common/ferrostar/Cargo.toml b/common/ferrostar/Cargo.toml
@@ -30,6 +30,7 @@ wasm_js = [
 [dependencies]
 geo = "0.29.0"
 polyline = "0.11.0"
+rand = "0.8.5"
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = { version = "1.0.128", default-features = false }
 serde-wasm-bindgen = { version = "0.6.5", optional = true }