Added satellite visibility and phase to MapFragment.kt #62

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapData.kt

@@ -28,5 +28,7 @@ data class MapData(
     val altitude: Double,
     val velocity: Double,
     val qthLoc: String,
-    val osmPos: GeoPos
+    val osmPos: GeoPos,
+    val phase: Double,
+    val eclipsed: Boolean
 )

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapFragment.kt

@@ -208,6 +208,14 @@ class MapFragment : Fragment(R.layout.fragment_map) {
                 String.format(getString(R.string.map_latitude), mapData.osmPos.lat)
             mapDataLon.text =
                 String.format(getString(R.string.map_longitude), mapData.osmPos.lon)
+            mapDataPhase.text = String.format(getString(R.string.map_phase), mapData.phase)
+            if (mapData.eclipsed) {
+                val eclipsed = getString(R.string.map_eclipsed)
+                mapDataVisibility.text = String.format(getString(R.string.map_visibility), eclipsed)
+            } else {
+                val visible = getString(R.string.map_visible)
+                mapDataVisibility.text = String.format(getString(R.string.map_visibility), visible)
+            }
         }
         binding.mapView.invalidate()
     }

app/src/main/java/com/rtbishop/look4sat/presentation/mapScreen/MapViewModel.kt

@@ -162,9 +162,11 @@ class MapViewModel @Inject constructor(
         val osmLon = clipLon(satPos.longitude.toDegrees())
         val osmPos = GeoPos(osmLat, osmLon)
         val qthLoc = QthConverter.positionToQth(osmPos.lat, osmPos.lon) ?: "-- --"
+        val phase = satPos.phase.toDegrees()
+        val visibility = satPos.eclipsed
         val satData = MapData(
             satellite, satellite.data.catnum, satellite.data.name, satPos.distance,
-            satPos.altitude, satPos.getOrbitalVelocity(), qthLoc, osmPos
+            satPos.altitude, satPos.getOrbitalVelocity(), qthLoc, osmPos, phase, visibility
         )
         _mapData.postValue(satData)
     }