Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Using native OSM LatLon clipping functions
Arty Bishop0c961005fc26
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.ktindex a59a9d0f..98c17bae 100644--- a/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/ui/mainScreen/MapViewModel.kt@@ -21,7 +21,6 @@ package com.rtbishop.look4sat.ui.mainScreenimport android.graphics.Colorimport android.graphics.Paint-import androidx.hilt.lifecycle.ViewModelInjectimport androidx.lifecycle.LiveDataimport androidx.lifecycle.MutableLiveDataimport androidx.lifecycle.ViewModel@@ -32,21 +31,25 @@ import com.rtbishop.look4sat.data.SatPassimport com.rtbishop.look4sat.data.SelectedSatimport com.rtbishop.look4sat.utility.PrefsManagerimport com.rtbishop.look4sat.utility.Utilities+import dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.delayimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContextimport org.osmdroid.util.GeoPoint+import org.osmdroid.views.MapViewimport org.osmdroid.views.overlay.FolderOverlayimport org.osmdroid.views.overlay.Overlayimport org.osmdroid.views.overlay.Polygonimport org.osmdroid.views.overlay.Polylineimport java.util.*+import javax.inject.Injectimport kotlin.math.powimport kotlin.math.sqrt-class MapViewModel @ViewModelInject constructor(val prefsManager: PrefsManager) : ViewModel() {-+@HiltViewModel+class MapViewModel @Inject constructor(val prefsManager: PrefsManager) : ViewModel() {+private val dateNow = Date()private val trackPaint = Paint().apply {strokeWidth = 2f@@ -183,14 +186,12 @@ class MapViewModel @ViewModelInject constructor(val prefsManager: PrefsManager)private fun getOsmPosition(lat: Double, lon: Double, inRadians: Boolean): Position {return if (inRadians) {- var osmLat = Math.toDegrees(lat)- var osmLon = Math.toDegrees(lon)- if (osmLat > 85.05) osmLat = 85.05 else if (osmLat < -85.05) osmLat = -85.05- if (osmLon > 180f) osmLon -= 360f+ val osmLat = MapView.getTileSystem().cleanLatitude(Math.toDegrees(lat))+ val osmLon = MapView.getTileSystem().cleanLongitude(Math.toDegrees(lon))Position(osmLat, osmLon)} else {- val osmLat = if (lat > 85.05) 85.05 else if (lat < -85.05) -85.05 else lat- val osmLon = if (lon > 180.0) lon - 360.0 else lon+ val osmLat = MapView.getTileSystem().cleanLatitude(lat)+ val osmLon = MapView.getTileSystem().cleanLongitude(lon)Position(osmLat, osmLon)}}