Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Fixed an old issue regarding satellite footprint rendering #36
Arty Bishop03323172ea33
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 870b38e9..998bbbdc 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -2,8 +2,9 @@<manifest xmlns:android="http://schemas.android.com/apk/res/android"package="com.rtbishop.look4sat">- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /><uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /><uses-permission android:name="android.permission.INTERNET" /><applicationdiff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.ktindex 33c6b47c..22ae0aa6 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt@@ -32,6 +32,7 @@ import androidx.navigation.fragment.navArgsimport com.rtbishop.look4sat.Rimport com.rtbishop.look4sat.databinding.FragmentMapBindingimport com.rtbishop.look4sat.domain.predict.GeoPos+import com.rtbishop.look4sat.domain.predict.SatPosimport com.rtbishop.look4sat.domain.predict.Satelliteimport dagger.hilt.android.AndroidEntryPointimport org.osmdroid.config.Configuration@@ -41,7 +42,6 @@ import org.osmdroid.views.CustomZoomButtonsControllerimport org.osmdroid.views.MapViewimport org.osmdroid.views.overlay.FolderOverlayimport org.osmdroid.views.overlay.Marker-import org.osmdroid.views.overlay.Polygonimport org.osmdroid.views.overlay.Polyline@AndroidEntryPoint@@ -59,8 +59,9 @@ class MapFragment : Fragment(R.layout.fragment_map) {strokeJoin = Paint.Join.ROUND}private val footprintPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {+ strokeWidth = 2fstyle = Paint.Style.FILL_AND_STROKE- color = Color.parseColor("#26FFE082")+ color = Color.parseColor("#FFE082")}private lateinit var binding: FragmentMapBinding@@ -124,7 +125,7 @@ class MapFragment : Fragment(R.layout.fragment_map) {posMap.entries.forEach {Marker(mapView).apply {setInfoWindow(null)- textLabelFontSize = 24+ textLabelFontSize = 28textLabelBackgroundColor = Color.TRANSPARENTtextLabelForegroundColor =ContextCompat.getColor(requireContext(), R.color.accent)@@ -164,13 +165,17 @@ class MapFragment : Fragment(R.layout.fragment_map) {binding.mapView.overlays[1] = trackOverlay}- private fun handleFootprint(satFootprint: List<GeoPos>) {- val footprintPoints = satFootprint.map { GeoPoint(it.latitude, it.longitude) }- val footprintOverlay = Polygon().apply {- fillPaint.set(footprintPaint)+ private fun handleFootprint(satPos: SatPos) {+ val center = GeoPoint(Math.toDegrees(satPos.latitude), Math.toDegrees(satPos.longitude))+ val radiusM = satPos.getRangeCircleRadiusKm() * 1000+ val footprintPoints = mutableListOf<GeoPoint>()+ for (i in 0..720) {+ footprintPoints.add(center.destinationPoint(radiusM, i.toDouble()))+ }+ val footprintOverlay = Polyline().apply {outlinePaint.set(footprintPaint)try {- this.points = footprintPoints+ setPoints(footprintPoints)} catch (exception: IllegalArgumentException) {println(exception.stackTraceToString())}@@ -180,8 +185,8 @@ class MapFragment : Fragment(R.layout.fragment_map) {private fun handleMapData(mapData: MapData) {binding.apply {- mapDataName.text =- String.format(getString(R.string.pat_osm_idName), mapData.catNum, mapData.name)+ mapTitle.text = mapData.name+ mapDataId.text = String.format(getString(R.string.map_sat_id), mapData.catNum)mapDataQth.text = String.format(getString(R.string.map_qth), mapData.qthLoc)mapDataAlt.text = String.format(getString(R.string.pat_altitude), mapData.altitude)mapDataDst.text = String.format(getString(R.string.pat_distance), mapData.range)diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.ktindex e5b282ed..6b9ab4c0 100644--- a/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt@@ -23,6 +23,7 @@ import com.rtbishop.look4sat.domain.ISettingsimport com.rtbishop.look4sat.domain.QthConverterimport com.rtbishop.look4sat.domain.predict.GeoPosimport com.rtbishop.look4sat.domain.predict.Predictor+import com.rtbishop.look4sat.domain.predict.SatPosimport com.rtbishop.look4sat.domain.predict.Satelliteimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.*@@ -53,8 +54,8 @@ class MapViewModel @Inject constructor(private val _track = MutableLiveData<List<List<GeoPos>>>()val track: LiveData<List<List<GeoPos>>> = _track- private val _footprint = MutableLiveData<List<GeoPos>>()- val footprint: LiveData<List<GeoPos>> = _footprint+ private val _footprint = MutableLiveData<SatPos>()+ val footprint: LiveData<SatPos> = _footprintprivate val _mapData = MutableLiveData<MapData>()val mapData: LiveData<MapData> = this._mapData@@ -151,12 +152,7 @@ class MapViewModel @Inject constructor(private suspend fun getSatFootprint(satellite: Satellite, pos: GeoPos, date: Date) {val satPos = predictor.getSatPos(satellite, pos, date.time)- val satFootprint = satPos.getRangeCircle().map { rangePos ->- val osmLat = clipLat(rangePos.latitude)- val osmLon = clipLon(rangePos.longitude)- GeoPos(osmLat, osmLon)- }- _footprint.postValue(satFootprint)+ _footprint.postValue(satPos)}private suspend fun getSatData(satellite: Satellite, pos: GeoPos, date: Date) {diff --git a/app/src/main/res/layout/fragment_entries.xml b/app/src/main/res/layout/fragment_entries.xmlindex 331afbbd..8173b5eb 100644--- a/app/src/main/res/layout/fragment_entries.xml+++ b/app/src/main/res/layout/fragment_entries.xml@@ -18,11 +18,13 @@<EditTextandroid:id="@+id/entries_search"style="@style/ToolbarTitle"- android:inputType="text"+ android:layout_width="match_parent"+ android:layout_height="match_parent"android:layout_marginStart="52dp"android:layout_marginTop="4dp"android:layout_marginEnd="52dp"android:layout_marginBottom="4dp"+ android:inputType="text"android:hint="@string/entries_search_hint"android:importantForAutofill="no" />diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xmlindex 7a3c2708..857d4001 100644--- a/app/src/main/res/layout/fragment_map.xml+++ b/app/src/main/res/layout/fragment_map.xml@@ -22,6 +22,12 @@<TextViewandroid:id="@+id/map_title"style="@style/ToolbarTitle"+ android:layout_width="match_parent"+ android:layout_height="match_parent"+ android:layout_marginStart="52dp"+ android:layout_marginTop="4dp"+ android:layout_marginEnd="52dp"+ android:layout_marginBottom="4dp"android:text="@string/map_title" /></androidx.cardview.widget.CardView>@@ -86,7 +92,7 @@style="@style/WorldMapText"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginStart="8dp"+ android:layout_marginStart="10dp"android:layout_marginTop="6dp"android:text="@string/pat_osm_lat"app:layout_constraintStart_toStartOf="parent"@@ -119,7 +125,7 @@style="@style/WorldMapText"android:layout_width="wrap_content"android:layout_height="wrap_content"- android:layout_marginEnd="8dp"+ android:layout_marginEnd="10dp"android:text="@string/pat_altitude"app:layout_constraintBaseline_toBaselineOf="@+id/map_data_lat"app:layout_constraintEnd_toEndOf="parent" />@@ -172,7 +178,7 @@app:layout_constraintTop_toTopOf="@+id/map_coordinator" /><TextView- android:id="@+id/map_data_name"+ android:id="@+id/map_data_id"style="@style/WorldMapText"android:layout_width="0dp"android:layout_height="wrap_content"@@ -181,7 +187,7 @@android:ellipsize="end"android:gravity="center_horizontal"android:maxLines="1"- android:text="@string/pat_osm_idName"+ android:text="@string/map_sat_id"app:layout_constraintBaseline_toBaselineOf="@+id/map_prev_btn"app:layout_constraintEnd_toStartOf="@+id/map_next_btn"app:layout_constraintStart_toEndOf="@+id/map_prev_btn" />diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex f762042d..bc9b94bc 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -63,6 +63,8 @@<string name="map_title">Карта Мира</string><string name="map_qth">QTH Локатор: %s</string><string name="map_coverage">Покрытие: %.0fкм</string>+ <string name="map_sat_id">Id: %d</string>+ <string name="map_sat_name">%s</string><string name="radar_az_text">Азим.</string><string name="radar_az_value">%.1f°</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex 4a42bf73..5def0cdd 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -74,6 +74,8 @@<string name="map_title">World Map</string><string name="map_qth">QTH Locator: %s</string><string name="map_coverage">Coverage: %.0f km</string>+ <string name="map_sat_id">Id: %d</string>+ <string name="map_sat_name">%s</string><string name="map_copyright" translatable="false">Wikimedia maps | Map data © OpenStreetMap contributors</string><string name="radar_az_text">Azimuth</string>diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xmlindex b6701ce1..1056313f 100644--- a/app/src/main/res/values/styles.xml+++ b/app/src/main/res/values/styles.xml@@ -57,6 +57,8 @@<item name="android:layout_gravity">center</item><item name="android:background">@color/transparent</item><item name="android:gravity">center</item>+ <item name="android:maxLines">1</item>+ <item name="android:ellipsize">end</item><item name="android:includeFontPadding">false</item><item name="android:textColor">@color/accent</item><item name="android:textColorHint">@color/accent</item>diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt b/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.ktindex e6006c63..0d338910 100644--- a/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt+++ b/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt@@ -51,7 +51,6 @@ data class SatPos(fun getRangeCircle(): List<GeoPos> {val positions = mutableListOf<GeoPos>()val beta = acos(earthRadiusKm / (earthRadiusKm + altitude))-// val radiusKm = earthRadiusKm * acos(earthRadiusKm / (earthRadiusKm + altitude))var tempAzimuth = 0while (tempAzimuth < 360) {val azimuth = tempAzimuth / 360.0 * 2.0 * Math.PI@@ -80,4 +79,8 @@ data class SatPos(}return positions}++ fun getRangeCircleRadiusKm(): Double {+ return earthRadiusKm * acos(earthRadiusKm / (earthRadiusKm + altitude))+ }}