diff options
Diffstat (limited to 'android-app/app/src/main')
| -rw-r--r-- | android-app/app/src/main/kotlin/org/terst/nav/tripreport/PreTripReportGenerator.kt | 2 | ||||
| -rw-r--r-- | android-app/app/src/main/kotlin/org/terst/nav/ui/MainViewModel.kt | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/tripreport/PreTripReportGenerator.kt b/android-app/app/src/main/kotlin/org/terst/nav/tripreport/PreTripReportGenerator.kt index 2840d76..563c62e 100644 --- a/android-app/app/src/main/kotlin/org/terst/nav/tripreport/PreTripReportGenerator.kt +++ b/android-app/app/src/main/kotlin/org/terst/nav/tripreport/PreTripReportGenerator.kt @@ -217,7 +217,7 @@ class PreTripReportGenerator { else -> 0.60 // dead run } val windFactor = when { - twsKt < 5 -> 0.30 + twsKt < 5 -> 0.24 twsKt < 10 -> 0.65 twsKt < 15 -> 0.85 twsKt < 22 -> 1.00 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 288fef4..f8d17dd 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 @@ -55,7 +55,8 @@ sealed class UiState { class MainViewModel( private val repository: WeatherRepository = WeatherRepository.create(), - var featureFlags: FeatureFlags? = null + var featureFlags: FeatureFlags? = null, + private val trackRepository: TrackRepository = NavApplication.trackRepository ) : ViewModel() { private val _uiState = MutableStateFlow<UiState>(UiState.Loading) @@ -97,13 +98,17 @@ class MainViewModel( private val aisRepository = AisRepository() - private val trackRepository = NavApplication.trackRepository - val vesselRepository get() = NavApplication.vesselRepository private val _isLoadingTracks = MutableStateFlow(true) val isLoadingTracks: StateFlow<Boolean> = _isLoadingTracks.asStateFlow() + private val _pastTracks = MutableStateFlow<List<List<TrackPoint>>>(emptyList()) + val pastTracks: StateFlow<List<List<TrackPoint>>> = _pastTracks.asStateFlow() + + private val _savedTracks = MutableStateFlow<List<SavedTrack>>(emptyList()) + val savedTracks: StateFlow<List<SavedTrack>> = _savedTracks.asStateFlow() + init { viewModelScope.launch { // Fast path: serve list from Room immediately (no GPX parse) @@ -155,15 +160,9 @@ class MainViewModel( private val _trackStats = MutableStateFlow<TrackStats?>(null) val trackStats: StateFlow<TrackStats?> = _trackStats.asStateFlow() - private val _pastTracks = MutableStateFlow<List<List<TrackPoint>>>(emptyList()) - val pastTracks: StateFlow<List<List<TrackPoint>>> = _pastTracks.asStateFlow() - private val _trackSummary = MutableSharedFlow<TrackSummary>(replay = 0) val trackSummary: SharedFlow<TrackSummary> = _trackSummary.asSharedFlow() - private val _savedTracks = MutableStateFlow<List<SavedTrack>>(emptyList()) - val savedTracks: StateFlow<List<SavedTrack>> = _savedTracks.asStateFlow() - private val _selectedTrack = MutableStateFlow<SavedTrack?>(null) val selectedTrack: StateFlow<SavedTrack?> = _selectedTrack.asStateFlow() |