Update andromeda

kylecorry31 · Oct 14, 2023 · c297458 · c297458
1 parent 6f5d935
commit c297458
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -128,7 +128,7 @@ dependencies {
     implementation("com.google.android.flexbox:flexbox:3.0.0")
 
     // Andromeda
-    val andromedaVersion = "8b6af451fa"
+    val andromedaVersion = "8157ced68e"
     implementation("com.github.kylecorry31.andromeda:core:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:fragments:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:forms:$andromedaVersion")

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/CustomGPS.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/CustomGPS.kt
@@ -10,6 +10,7 @@ import com.kylecorry.andromeda.location.IGPS
 import com.kylecorry.sol.math.RingBuffer
 import com.kylecorry.sol.math.SolMath.real
 import com.kylecorry.sol.time.Time.isInPast
+import com.kylecorry.sol.units.Bearing
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.sol.units.DistanceUnits
@@ -38,6 +39,8 @@ class CustomGPS(
 
     override val quality: Quality
         get() = _quality
+    override val rawBearing: Float?
+        get() = _rawBearing
 
     override val horizontalAccuracy: Float?
         get() = _horizontalAccuracy
@@ -55,12 +58,18 @@ class CustomGPS(
 
     override val speed: Speed
         get() = _speed
+    override val speedAccuracy: Float?
+        get() = _speedAccuracy
 
     override val time: Instant
         get() = _time
 
     override val altitude: Float
         get() = _altitude
+    override val bearing: Bearing?
+        get() = _bearing
+    override val bearingAccuracy: Float?
+        get() = _bearingAccuracy
 
     override val mslAltitude: Float?
         get() = _mslAltitude
@@ -92,6 +101,10 @@ class CustomGPS(
     private var _isTimedOut = false
     private var mslOffset = 0f
     private var geoidOffset = 0f
+    private var _rawBearing: Float? = null
+    private var _bearing: Bearing? = null
+    private var _bearingAccuracy: Float? = null
+    private var _speedAccuracy: Float? = null
 
     private val locationHistory = RingBuffer<Pair<ApproximateCoordinate, Instant>>(10)
 
@@ -119,6 +132,11 @@ class CustomGPS(
 
         _altitude = baseGPS.altitude - getGeoidOffset(_location)
 
+        _rawBearing = baseGPS.rawBearing
+        _bearing = baseGPS.bearing
+        _bearingAccuracy = baseGPS.bearingAccuracy
+        _speedAccuracy = baseGPS.speedAccuracy
+
 
         updateSpeed()
 

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/overrides/CachedGPS.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/overrides/CachedGPS.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.kylecorry.andromeda.core.sensors.AbstractSensor
 import com.kylecorry.andromeda.core.time.Timer
 import com.kylecorry.andromeda.location.IGPS
+import com.kylecorry.sol.units.Bearing
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.sol.units.Speed
@@ -23,6 +24,8 @@ class CachedGPS(context: Context, private val updateFrequency: Long = 20L) : Abs
         }
     override val speed: Speed
         get() = Speed(cache.getFloat(CustomGPS.LAST_SPEED) ?: 0.0f, DistanceUnits.Meters, TimeUnits.Seconds)
+    override val speedAccuracy: Float?
+        get() = null
     override val time: Instant
         get() = Instant.now()
     override val verticalAccuracy: Float?
@@ -35,8 +38,14 @@ class CachedGPS(context: Context, private val updateFrequency: Long = 20L) : Abs
         get() = true
     override val altitude: Float
         get() = cache.getFloat(CustomGPS.LAST_ALTITUDE) ?: userPrefs.altitudeOverride
+    override val bearing: Bearing?
+        get() = null
+    override val bearingAccuracy: Float?
+        get() = null
     override val mslAltitude: Float
         get() = altitude
+    override val rawBearing: Float?
+        get() = null
 
     private val cache by lazy { PreferencesSubsystem.getInstance(context).preferences }
     private val userPrefs by lazy { UserPreferences(context) }

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/overrides/OverrideGPS.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/sensors/overrides/OverrideGPS.kt
@@ -2,6 +2,7 @@ package com.kylecorry.trail_sense.shared.sensors.overrides
 
 import android.content.Context
 import com.kylecorry.andromeda.location.IGPS
+import com.kylecorry.sol.units.Bearing
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.DistanceUnits
 import com.kylecorry.sol.units.Speed
@@ -21,6 +22,8 @@ class OverrideGPS(context: Context, updateFrequency: Long = 20L) :
         get() = userPrefs.locationOverride
     override val speed: Speed
         get() = Speed(0f, DistanceUnits.Meters, TimeUnits.Seconds)
+    override val speedAccuracy: Float?
+        get() = null
     override val time: Instant
         get() = Instant.now()
     override val verticalAccuracy: Float?
@@ -33,6 +36,12 @@ class OverrideGPS(context: Context, updateFrequency: Long = 20L) :
         get() = true
     override val altitude: Float
         get() = userPrefs.altitudeOverride
+    override val bearing: Bearing?
+        get() = null
+    override val bearingAccuracy: Float?
+        get() = null
     override val mslAltitude: Float
         get() = altitude
+    override val rawBearing: Float?
+        get() = null
 }