summaryrefslogtreecommitdiff
path: root/android-app/app/src/main/kotlin/org
diff options
context:
space:
mode:
authorClaude <noreply@anthropic.com>2026-05-28 07:10:29 +0000
committerClaude <noreply@anthropic.com>2026-05-28 07:10:29 +0000
commitd25fbc7664133bedab51b3da61581ef42c69ab8d (patch)
treecbd11896643ad86b5b53e37ee36ca48f7f312ce5 /android-app/app/src/main/kotlin/org
parent8136908f9b733ac0b5ad3e3b79bd27cb8c5628e9 (diff)
parentc498b33300d260bbe64bec49de9ef78d9a322a6d (diff)
Merge claude/whats-next-0XCO3: tech debt items 1, 2, 5
- Deleted com.example.androidapp ghost package (18 stale source files) - Fixed tide model package declarations and HarmonicTideCalculator imports - Symlinked test-runner TackDetector to android-app canonical source - Fixed forecast to use current wall-clock hour slot instead of app-start hour https://claude.ai/code/session_01KXYBuAHZkvv63DeUG6XaZD
Diffstat (limited to 'android-app/app/src/main/kotlin/org')
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/data/model/TideConstituent.kt2
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/data/model/TidePrediction.kt2
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/data/model/TideStation.kt2
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/tide/HarmonicTideCalculator.kt4
-rw-r--r--android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt5
5 files changed, 9 insertions, 6 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideConstituent.kt b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideConstituent.kt
index deb73d6..34a502c 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideConstituent.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideConstituent.kt
@@ -1,4 +1,4 @@
-package com.example.androidapp.data.model
+package org.terst.nav.data.model
/** A single harmonic tidal constituent used in harmonic tide prediction. */
data class TideConstituent(
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TidePrediction.kt b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TidePrediction.kt
index 51eea44..f6c2b72 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TidePrediction.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TidePrediction.kt
@@ -1,4 +1,4 @@
-package com.example.androidapp.data.model
+package org.terst.nav.data.model
/** A predicted tide height at a specific point in time. */
data class TidePrediction(
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideStation.kt b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideStation.kt
index c9f96a6..4e1238e 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideStation.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/data/model/TideStation.kt
@@ -1,4 +1,4 @@
-package com.example.androidapp.data.model
+package org.terst.nav.data.model
/** A tide station with harmonic constituents for offline tide prediction. */
data class TideStation(
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/tide/HarmonicTideCalculator.kt b/android-app/app/src/main/kotlin/org/terst/nav/tide/HarmonicTideCalculator.kt
index b1e5652..f0c0ab2 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/tide/HarmonicTideCalculator.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/tide/HarmonicTideCalculator.kt
@@ -1,7 +1,7 @@
package org.terst.nav.tide
-import com.example.androidapp.data.model.TidePrediction
-import com.example.androidapp.data.model.TideStation
+import org.terst.nav.data.model.TidePrediction
+import org.terst.nav.data.model.TideStation
import kotlin.math.cos
/**
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt b/android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt
index 361c8dd..33366f9 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt
@@ -237,7 +237,10 @@ class MainViewModel(
lastLat = lat; lastLon = lon; lastSog = sogKnots; lastCog = cogDeg
_currentPosition.value = lat to lon
val conditions = _marineConditions.value
- val forecast = _forecast.value.firstOrNull()
+ val nowHourPrefix = java.time.Instant.ofEpochMilli(System.currentTimeMillis())
+ .toString().substring(0, 13) // "2024-01-15T14" — matches Open-Meteo hourly slots
+ val forecast = _forecast.value.find { it.timeIso.startsWith(nowHourPrefix) }
+ ?: _forecast.value.firstOrNull()
val windDirDeg = conditions?.windDirDeg ?: forecast?.windDirDeg
val twa = windDirDeg?.let { ((it - cogDeg + 360.0) % 360.0) }
val point = TrackPoint(