Changes to RadarFragment's satellite data views

core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt

@@ -25,8 +25,8 @@ data class SatPos(
     var latitude: Double = 0.0,
     var longitude: Double = 0.0,
     var altitude: Double = 0.0,
-    var range: Double = 0.0,
-    var rangeRate: Double = 0.0,
+    var distance: Double = 0.0,
+    var distanceRate: Double = 0.0,
     var theta: Double = 0.0,
     var time: Long = 0L
 ) {
@@ -34,11 +34,11 @@ data class SatPos(
     private val speedOfLight = 2.99792458E8
 
     fun getDownlinkFreq(freq: Long): Long {
-        return (freq.toDouble() * (speedOfLight - this.rangeRate * 1000.0) / speedOfLight).toLong()
+        return (freq.toDouble() * (speedOfLight - distanceRate * 1000.0) / speedOfLight).toLong()
     }
 
     fun getUplinkFreq(freq: Long): Long {
-        return (freq.toDouble() * (speedOfLight + this.rangeRate * 1000.0) / speedOfLight).toLong()
+        return (freq.toDouble() * (speedOfLight + distanceRate * 1000.0) / speedOfLight).toLong()
     }
 
     fun getOrbitalVelocity(): Double {
@@ -50,7 +50,7 @@ data class SatPos(
 
     fun getRangeCircle(): List<GeoPos> {
         val positions = mutableListOf<GeoPos>()
-        val beta = acos(earthRadiusKm / (earthRadiusKm + this.altitude))
+        val beta = acos(earthRadiusKm / (earthRadiusKm + altitude))
 //        val radiusKm = earthRadiusKm * acos(earthRadiusKm / (earthRadiusKm + altitude))
         var tempAzimuth = 0
         while (tempAzimuth < 360) {

core/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt

@@ -146,8 +146,8 @@ abstract class Satellite(val data: OrbitalData) {
         if (azim < 0.0) azim += twoPi
         satPos.azimuth = azim
         satPos.elevation = asin(topZ / range.w)
-        satPos.range = range.w
-        satPos.rangeRate = dot(range, rgvel) / range.w
+        satPos.distance = range.w
+        satPos.distanceRate = dot(range, rgvel) / range.w
     }
 
     // Returns the ECI position and velocity of the observer