Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added current moon/sun positions to the RadarScreen
Arty Bishopb166e896c261
diff --git a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.kt b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.ktindex 62f008b4..5dc4f19c 100644--- a/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.kt+++ b/core/domain/src/main/java/com/rtbishop/look4sat/core/domain/predict/CelestialComputer.kt@@ -114,7 +114,7 @@ object CelestialComputer {distance = 1.0 + ((obsSet[2] - ASTRONOMICAL_UNIT) / ASTRONOMICAL_UNIT),rangeRate = 1000.0 * obsSet[3],latitude = latLon[0].toDegrees(),- longitude = 360.0 - latLon[1].toDegrees(),+ longitude = latLon[1].toDegrees().let { if (it > 180.0) it - 360.0 else it },rightAscension = raDec[0].toDegrees(),declination = raDec[1].toDegrees())diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.ktindex dc016494..79604309 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt@@ -180,7 +180,9 @@ private fun RadarCard(uiState: RadarState, modifier: Modifier = Modifier) {azimElev = uiState.orientationValues,shouldShowSweep = uiState.shouldShowSweep,shouldUseCompass = uiState.shouldUseCompass,- modifier = Modifier.align(Alignment.Center)+ modifier = Modifier.align(Alignment.Center),+ sunPosition = uiState.sunPosition,+ moonPosition = uiState.moonPosition,)PositionOverlay(position)}diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.ktindex 21dcfa80..22702a18 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarState.kt@@ -18,6 +18,7 @@package com.rtbishop.look4sat.feature.radarimport com.rtbishop.look4sat.core.domain.model.SatRadio+import com.rtbishop.look4sat.core.domain.predict.CelestialComputerimport com.rtbishop.look4sat.core.domain.predict.OrbitalPassimport com.rtbishop.look4sat.core.domain.predict.OrbitalPos@@ -32,6 +33,8 @@ data class RadarState(val satTrack: List<OrbitalPos> = emptyList(),val shouldShowSweep: Boolean = false,val shouldUseCompass: Boolean = false,+ val sunPosition: CelestialComputer.SunPosition? = null,+ val moonPosition: CelestialComputer.MoonPosition? = null,val transmitters: List<SatRadio> = emptyList(),val selectedTransmitterUuid: String? = null,val selectedFrequency: Long? = nulldiff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarView.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarView.ktindex a3590beb..74772f18 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarView.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarView.kt@@ -32,6 +32,7 @@ import androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.geometry.Offset+import androidx.compose.ui.geometry.Sizeimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.Pathimport androidx.compose.ui.graphics.PathEffect@@ -44,14 +45,19 @@ import androidx.compose.ui.graphics.drawscope.Fillimport androidx.compose.ui.graphics.drawscope.Strokeimport androidx.compose.ui.graphics.drawscope.rotateimport androidx.compose.ui.graphics.drawscope.translate+import androidx.compose.ui.graphics.drawscope.withTransform+import androidx.compose.ui.graphics.painter.Painter+import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.text.TextMeasurerimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.drawTextimport androidx.compose.ui.text.rememberTextMeasurerimport androidx.compose.ui.unit.sp+import com.rtbishop.look4sat.core.domain.predict.CelestialComputerimport com.rtbishop.look4sat.core.domain.predict.OrbitalPosimport com.rtbishop.look4sat.core.domain.predict.PI_2import com.rtbishop.look4sat.core.domain.utility.toRadians+import com.rtbishop.look4sat.core.presentation.Rimport kotlin.math.cosimport kotlin.math.sin@@ -66,11 +72,14 @@ fun RadarViewCompose(azimElev: Pair<Float, Float>,shouldShowSweep: Boolean,shouldUseCompass: Boolean,- modifier: Modifier = Modifier+ modifier: Modifier = Modifier,+ sunPosition: CelestialComputer.SunPosition? = null,+ moonPosition: CelestialComputer.MoonPosition? = null,) {- val radarColor = MaterialTheme.colorScheme.secondary- val trackColor = MaterialTheme.colorScheme.primaryval aimColor = MaterialTheme.colorScheme.error+ val primaryColor = MaterialTheme.colorScheme.primary+ val radarColor = MaterialTheme.colorScheme.secondary+ val sunColor = MaterialTheme.colorScheme.primaryval animTransition = rememberInfiniteTransition(label = "animScale")val animScale by animTransition.animateFloat(initialValue = 16f,@@ -79,6 +88,8 @@ fun RadarViewCompose(label = "animScale")val measurer = rememberTextMeasurer()+ val sunPainter = painterResource(R.drawable.ic_sun)+ val moonPainter = painterResource(R.drawable.ic_moon)var sweepDegrees by remember { mutableFloatStateOf(0f) }var cachedRadius by remember { mutableFloatStateOf(0f) }var trackPath by remember { mutableStateOf(Path()) }@@ -92,13 +103,26 @@ fun RadarViewCompose(cachedRadius = radius}rotate(if (shouldUseCompass) -azimElev.first else 0f) {- if (shouldShowSweep) drawSweep(center, sweepDegrees, radius, trackColor)+ if (shouldShowSweep) drawSweep(center, sweepDegrees, radius, primaryColor)drawRadar(radius, radarColor)- drawElevationLabels(radius, trackColor, measurer)+ drawElevationLabels(radius, primaryColor, measurer)translate(center.x, center.y) {- drawTrack(trackPath, trackEffect, aimColor, trackColor)+ drawTrack(trackPath, trackEffect, aimColor, primaryColor)if (item.elevation > 0) {- drawPosition(item, radius, animScale, trackColor)+ drawPosition(item, radius, animScale, primaryColor)+ }+ sunPosition?.let { sun ->+ if (sun.elevation > 0) drawBodyIcon(sun.azimuth, sun.elevation, radius, sunColor, sunPainter, 52f)+ }+ moonPosition?.let { moon ->+ if (moon.elevation > 0) drawBodyIcon(+ moon.azimuth,+ moon.elevation,+ radius,+ radarColor,+ moonPainter,+ 52f+ )}if (shouldUseCompass) drawAim(azimElev.first, azimElev.second, radius, aimColor)}@@ -180,6 +204,27 @@ private fun createTrackEffect(trackPath: Path): PathEffect {return PathEffect.stampedPathEffect(shape, trackLength / 2f, trackLength / 4f, StampedPathEffectStyle.Rotate)}+private fun DrawScope.drawBodyIcon(+ azimDeg: Double,+ elevDeg: Double,+ radius: Float,+ color: Color,+ painter: Painter,+ iconSize: Float+) {+ val azimRad = azimDeg.toRadians()+ val elevRad = elevDeg.toRadians()+ val pos = sph2Cart(azimRad, elevRad, radius.toDouble())+ val half = iconSize / 2f+ withTransform({+ translate(pos.x - half, pos.y - half)+ }) {+ with(painter) {+ draw(Size(iconSize, iconSize), colorFilter = androidx.compose.ui.graphics.ColorFilter.tint(color))+ }+ }+}+private fun sph2Cart(azim: Double, elev: Double, r: Double): Offset {val radius = r * (PI_2 - elev) / PI_2return Offset(diff --git a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.ktindex 6ac250ea..5ab62b77 100644--- a/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt+++ b/feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarViewModel.kt@@ -23,6 +23,7 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.initializerimport androidx.lifecycle.viewmodel.viewModelFactoryimport com.rtbishop.look4sat.core.domain.model.SatRadio+import com.rtbishop.look4sat.core.domain.predict.CelestialComputerimport com.rtbishop.look4sat.core.domain.predict.OrbitalObjectimport com.rtbishop.look4sat.core.domain.predict.OrbitalPosimport com.rtbishop.look4sat.core.domain.repository.IContainerProvider@@ -101,9 +102,20 @@ class RadarViewModel(while (isActive) {val timeNow = System.currentTimeMillis()val pos = satelliteRepo.getPosition(satPass.orbitalObject, stationPos, timeNow)+ val sunPos = CelestialComputer.getSunPosition(stationPos, timeNow)+ val moonPos = CelestialComputer.getMoonPosition(stationPos, timeNow)val (time, isAos) = computeTimer(satPass.isDeepSpace, satPass.aosTime, satPass.losTime, timeNow)val isLos = !satPass.isDeepSpace && timeNow > satPass.losTime- _uiState.update { it.copy(currentTime = time, isTimeAos = isAos, isLos = isLos, orbitalPos = pos) }+ _uiState.update {+ it.copy(+ currentTime = time,+ isTimeAos = isAos,+ isLos = isLos,+ orbitalPos = pos,+ sunPosition = sunPos,+ moonPosition = moonPos+ )+ }processRadios(transmitters, satPass.orbitalObject, timeNow)sendPassData(pos)delay(1000)