diff options
Diffstat (limited to 'android-app/app/src/main/kotlin/org')
5 files changed, 15 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 f664aa9..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 @@ -124,6 +124,7 @@ class MainViewModel( fun onSafDirectorySelected(treeUri: Uri) { trackRepository.initSafDirectory(treeUri) _safState.value = trackRepository.safState() + NavApplication.logbookRepository.reload() viewModelScope.launch { reloadPastTracks() } } @@ -236,10 +237,18 @@ 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( lat = lat, lon = lon, sogKnots = sogKnots, cogDeg = cogDeg, + windSpeedKnots = conditions?.windSpeedKt ?: forecast?.windKt, + windAngleDeg = twa, + isTrueWind = twa != null, airTempC = forecast?.tempC, waveHeightM = conditions?.waveHeightM, currentSpeedKts = conditions?.currentSpeedKt, |