v3.1.4 - Fixed leap year bug, various other minor fixes

base/src/main/java/com/rtbishop/look4sat/domain/data/IRemoteDataSource.kt

@@ -21,7 +21,7 @@ import java.io.InputStream
 
 interface IRemoteDataSource {
 
-    val radioApi: String get() = "https://db.satnogs.org/api/transmitters/?format=json"
+    val radioApi: String get() = "https://db.satnogs.org/api/transmitters/?format=json&status=active"
 
     suspend fun getDataStream(url: String): InputStream?
 }

base/src/main/java/com/rtbishop/look4sat/utility/DataParser.kt

@@ -19,48 +19,46 @@ package com.rtbishop.look4sat.utility
 
 import com.rtbishop.look4sat.domain.model.SatRadio
 import com.rtbishop.look4sat.domain.predict.OrbitalData
+import java.io.InputStream
+import kotlin.math.pow
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
 import org.json.JSONObject
-import java.io.InputStream
-import kotlin.math.pow
 
 class DataParser(private val defaultDispatcher: CoroutineDispatcher) {
 
-    suspend fun parseCSVStream(csvStream: InputStream): List<OrbitalData> =
-        withContext(defaultDispatcher) {
-            val parsedItems = mutableListOf<OrbitalData>()
-            csvStream.bufferedReader().useLines { lines ->
-                lines.forEachIndexed { index, line ->
-                    if (index != 0) {
-                        val values = line.split(",")
-                        parseCSV(values)?.let { tle -> parsedItems.add(tle) }
-                    }
+    suspend fun parseCSVStream(csvStream: InputStream): List<OrbitalData> = withContext(defaultDispatcher) {
+        val parsedItems = mutableListOf<OrbitalData>()
+        csvStream.bufferedReader().useLines { lines ->
+            lines.forEachIndexed { index, line ->
+                if (index != 0) {
+                    val values = line.split(",")
+                    parseCSV(values)?.let { tle -> parsedItems.add(tle) }
                 }
             }
-            return@withContext parsedItems
         }
+        return@withContext parsedItems
+    }
 
-    suspend fun parseTLEStream(tleStream: InputStream): List<OrbitalData> =
-        withContext(defaultDispatcher) {
-            val tleStrings = mutableListOf(String(), String(), String())
-            val parsedItems = mutableListOf<OrbitalData>()
-            var lineIndex = 0
-            tleStream.bufferedReader().forEachLine { line ->
-                tleStrings[lineIndex] = line
-                if (lineIndex < 2) {
-                    lineIndex++
-                } else {
-                    val isLineOneValid = tleStrings[1].substring(0, 1) == "1"
-                    val isLineTwoValid = tleStrings[2].substring(0, 1) == "2"
-                    if (!isLineOneValid && !isLineTwoValid) return@forEachLine
-                    parseTLE(tleStrings)?.let { tle -> parsedItems.add(tle) }
-                    lineIndex = 0
-                }
+    suspend fun parseTLEStream(tleStream: InputStream): List<OrbitalData> = withContext(defaultDispatcher) {
+        val tleStrings = mutableListOf(String(), String(), String())
+        val parsedItems = mutableListOf<OrbitalData>()
+        var lineIndex = 0
+        tleStream.bufferedReader().forEachLine { line ->
+            tleStrings[lineIndex] = line
+            if (lineIndex < 2) {
+                lineIndex++
+            } else {
+                val isLineOneValid = tleStrings[1].substring(0, 1) == "1"
+                val isLineTwoValid = tleStrings[2].substring(0, 1) == "2"
+                if (!isLineOneValid && !isLineTwoValid) return@forEachLine
+                parseTLE(tleStrings)?.let { tle -> parsedItems.add(tle) }
+                lineIndex = 0
             }
-            return@withContext parsedItems
         }
+        return@withContext parsedItems
+    }
 
     suspend fun parseJSONStream(jsonStream: InputStream): List<SatRadio> {
         return withContext(defaultDispatcher) {
@@ -78,6 +76,10 @@ class DataParser(private val defaultDispatcher: CoroutineDispatcher) {
         }
     }
 
+    fun isLeapYear(year: Int): Boolean {
+        return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)
+    }
+
     private fun parseCSV(values: List<String>): OrbitalData? {
         try {
             val name = values[0]
@@ -120,8 +122,8 @@ class DataParser(private val defaultDispatcher: CoroutineDispatcher) {
             val argper: Double = tle[2].substring(34, 42).toDouble()
             val meanan: Double = tle[2].substring(43, 51).toDouble()
             val catnum: Int = tle[1].substring(2, 7).trim().toInt()
-            val bstar: Double = 1.0e-5 * tle[1].substring(53, 59).toDouble() /
-                    10.0.pow(tle[1].substring(60, 61).toDouble())
+            val bstar: Double =
+                1.0e-5 * tle[1].substring(53, 59).toDouble() / 10.0.pow(tle[1].substring(60, 61).toDouble())
             return OrbitalData(name, epoch, meanmo, eccn, incl, raan, argper, meanan, catnum, bstar)
         } catch (exception: Exception) {
             return null
@@ -153,8 +155,10 @@ class DataParser(private val defaultDispatcher: CoroutineDispatcher) {
         val daysArray = arrayOf(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
         var dayOfYear = dayOfMonth
         // If leap year increment Feb days
-        if (((year / 4 == 0) && (year / 100 != 0)) || (year / 400 == 0)) daysArray[1]++
-        for (i in 0 until month - 1) { dayOfYear += daysArray[i] }
+        if (isLeapYear(year)) daysArray[1]++
+        for (i in 0 until month - 1) {
+            dayOfYear += daysArray[i]
+        }
         return dayOfYear
     }
 }

base/src/main/java/com/rtbishop/look4sat/utility/DataReporter.kt

@@ -17,13 +17,13 @@
  */
 package com.rtbishop.look4sat.utility
 
+import java.net.InetSocketAddress
+import java.nio.ByteBuffer
+import java.nio.channels.SocketChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.launch
-import java.net.InetSocketAddress
-import java.nio.ByteBuffer
-import java.nio.channels.SocketChannel
 
 class DataReporter(private val reporterScope: CoroutineScope) {
 
@@ -56,7 +56,7 @@ class DataReporter(private val reporterScope: CoroutineScope) {
                 if (rotationSocketChannel == null) {
                     rotationSocketChannel = SocketChannel.open(InetSocketAddress(server, port))
                 } else {
-                    val buffer = ByteBuffer.wrap("\\set_pos $azimuth $elevation\n".toByteArray())
+                    val buffer = ByteBuffer.wrap("\\P $azimuth $elevation\n".toByteArray())
                     rotationSocketChannel?.write(buffer)
                 }
             }.onFailure { error ->