Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
Added GeoConverter.kt and various minor fixes
Arty Bishopc4ecdb7a7890
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xmlindex 1bcd7b01..fa667c0c 100644--- a/app/src/main/AndroidManifest.xml+++ b/app/src/main/AndroidManifest.xml@@ -9,6 +9,7 @@android:name=".MainApplication"android:allowBackup="false"android:dataExtractionRules="@xml/data_extraction_rules"+ android:enableOnBackInvokedCallback="true"android:fullBackupContent="@xml/backup_rules"android:icon="@mipmap/ic_launcher"android:label="@string/app_name"@@ -16,7 +17,7 @@android:roundIcon="@mipmap/ic_launcher_round"android:supportsRtl="true"android:theme="@style/Theme.Look4Sat.Main"- tools:targetApi="31">+ tools:targetApi="33"><activityandroid:name=".MainActivity"diff --git a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt b/app/src/main/java/com/rtbishop/look4sat/MainContainer.ktindex d5ab8064..c2c0bf52 100644--- a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt+++ b/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt@@ -11,7 +11,6 @@ import com.rtbishop.look4sat.data.database.MainDatabaseimport com.rtbishop.look4sat.data.framework.BluetoothReporterimport com.rtbishop.look4sat.data.framework.NetworkReporterimport com.rtbishop.look4sat.data.framework.SettingsRepo-import com.rtbishop.look4sat.data.repository.DataParserimport com.rtbishop.look4sat.data.repository.DatabaseRepoimport com.rtbishop.look4sat.data.repository.SatelliteRepoimport com.rtbishop.look4sat.data.repository.SelectionRepo@@ -22,20 +21,25 @@ import com.rtbishop.look4sat.domain.repository.IDatabaseRepoimport com.rtbishop.look4sat.domain.repository.ISatelliteRepoimport com.rtbishop.look4sat.domain.repository.ISelectionRepoimport com.rtbishop.look4sat.domain.repository.ISettingsRepo+import com.rtbishop.look4sat.domain.source.IDataSourceimport com.rtbishop.look4sat.domain.source.ISensorSource+import com.rtbishop.look4sat.domain.utility.DataParserimport kotlinx.coroutines.CoroutineExceptionHandlerimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.SupervisorJob+import okhttp3.Cacheimport okhttp3.OkHttpClientimport org.osmdroid.config.Configurationclass MainContainer(private val context: Context) {- private val database = Room.databaseBuilder(context, MainDatabase::class.java, "Look4SatDb")- .addMigrations(MIGRATION_1_2).fallbackToDestructiveMigration().build()+ private val database =+ Room.databaseBuilder(context, MainDatabase::class.java, "Look4SatDb").addMigrations(MIGRATION_1_2)+ .fallbackToDestructiveMigration().build()private val localStorage = LocalStorage(database.storageDao())private val mainHandler = CoroutineExceptionHandler { _, error -> println("Look4Sat: $error") }+ private val remoteSource = provideRemoteSource()val mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)val settingsRepo = provideSettingsRepo()val databaseRepo = provideDatabaseRepo()@@ -57,11 +61,15 @@ class MainContainer(private val context: Context) {return SensorSource(sensorManager, sensor)}+ private fun provideRemoteSource(): IDataSource {+ val cache = Cache(context.cacheDir, 1000 * 1000 * 10L)+ val httpClient = OkHttpClient.Builder().cache(cache).build()+ return DataSource(context.contentResolver, httpClient, Dispatchers.IO)+ }+private fun provideDatabaseRepo(): IDatabaseRepo {- val httpClient = OkHttpClient.Builder().build()val dataParser = DataParser(Dispatchers.Default)- val dataSource = DataSource(context.contentResolver, httpClient, Dispatchers.IO)- return DatabaseRepo(Dispatchers.Default, dataParser, dataSource, localStorage, settingsRepo)+ return DatabaseRepo(Dispatchers.Default, dataParser, remoteSource, localStorage, settingsRepo)}private fun provideSatelliteRepo(): ISatelliteRepo {diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt b/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.ktindex 4a343a78..3068e24d 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt+++ b/data/src/main/java/com/rtbishop/look4sat/data/repository/DatabaseRepo.kt@@ -24,6 +24,7 @@ import com.rtbishop.look4sat.domain.repository.IDatabaseRepoimport com.rtbishop.look4sat.domain.repository.ISettingsRepoimport com.rtbishop.look4sat.domain.source.IDataSourceimport com.rtbishop.look4sat.domain.source.ILocalStorage+import com.rtbishop.look4sat.domain.utility.DataParserimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.asyncimport kotlinx.coroutines.withContextdiff --git a/data/src/test/java/com/rtbishop/look4sat/data/ExampleUnitTest.kt b/data/src/test/java/com/rtbishop/look4sat/data/ExampleUnitTest.ktnew file mode 100644index 00000000..ced6c914--- /dev/null+++ b/data/src/test/java/com/rtbishop/look4sat/data/ExampleUnitTest.kt@@ -0,0 +1,12 @@+package com.rtbishop.look4sat.data++import org.junit.Assert+import org.junit.Test++class ExampleUnitTest {++ @Test+ fun addition_isCorrect() {+ Assert.assertEquals(4, 2 + 2)+ }+}diff --git a/domain/build.gradle.kts b/domain/build.gradle.ktsindex 3736e48f..1e4b7f46 100644--- a/domain/build.gradle.kts+++ b/domain/build.gradle.kts@@ -8,6 +8,7 @@ kotlin {dependencies {implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")+ implementation("org.json:json:20230618")testImplementation("junit:junit:4.13.2")testImplementation("io.mockk:mockk:1.13.5")diff --git a/data/src/main/java/com/rtbishop/look4sat/data/repository/DataParser.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/DataParser.ktsimilarity index 99%rename from data/src/main/java/com/rtbishop/look4sat/data/repository/DataParser.ktrename to domain/src/main/java/com/rtbishop/look4sat/domain/utility/DataParser.ktindex fa825fad..61fbc83d 100644--- a/data/src/main/java/com/rtbishop/look4sat/data/repository/DataParser.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/DataParser.kt@@ -15,7 +15,7 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data.repository+package com.rtbishop.look4sat.domain.utilityimport com.rtbishop.look4sat.domain.model.SatRadioimport com.rtbishop.look4sat.domain.predict.OrbitalDatadiff --git a/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.ktindex c40fc2e4..0bd63eac 100644--- a/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt@@ -17,8 +17,6 @@*/package com.rtbishop.look4sat.domain.utility-import com.rtbishop.look4sat.domain.predict.DEG2RAD-import com.rtbishop.look4sat.domain.predict.RAD2DEGimport java.util.concurrent.TimeUnitfun Long.toTimerString(): String {@@ -41,10 +39,6 @@ fun Double.round(decimals: Int): Double {return kotlin.math.round(this * multiplier) / multiplier}-fun Double.toDegrees(): Double = this * RAD2DEG--fun Double.toRadians(): Double = this * DEG2RAD-//fun String.getHash(type: String = "SHA-256"): String {// val hexChars = "0123456789ABCDEF"// val bytes = MessageDigest.getInstance(type).digest(this.toByteArray())@@ -63,12 +57,12 @@ fun Double.toRadians(): Double = this * DEG2RAD// return pattern.matcher(this).matches()//}-fun String.isValidIPv4(): Boolean {- val ip4 = "^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])(\\.(?!\$)|\$)){4}\$"- return this.matches(ip4.toRegex())-}+//fun String.isValidIPv4(): Boolean {+// val ip4 = "^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])(\\.(?!\$)|\$)){4}\$"+// return this.matches(ip4.toRegex())+//}-fun String.isValidPort(): Boolean {- val port = "([1-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])"- return this.matches(port.toRegex()) && this.toInt() in 1024..65535-}+//fun String.isValidPort(): Boolean {+// val port = "([1-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])"+// return this.matches(port.toRegex()) && this.toInt() in 1024..65535+//}diff --git a/domain/src/main/java/com/rtbishop/look4sat/domain/utility/GeoConverter.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/GeoConverter.ktnew file mode 100644index 00000000..5b136204--- /dev/null+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/GeoConverter.kt@@ -0,0 +1,50 @@+package com.rtbishop.look4sat.domain.utility++import com.rtbishop.look4sat.domain.predict.DEG2RAD+import com.rtbishop.look4sat.domain.predict.PI+import com.rtbishop.look4sat.domain.predict.RAD2DEG+import kotlin.math.ln+import kotlin.math.max+import kotlin.math.min+import kotlin.math.sin++private const val MIN_LATITUDE = -85.05112877980658+private const val MAX_LATITUDE = 85.05112877980658+private const val MIN_LONGITUDE = -180.0+private const val MAX_LONGITUDE = 180.0++fun Double.toDegrees(): Double = this * RAD2DEG++fun Double.toRadians(): Double = this * DEG2RAD++fun Double.latToY01(): Double {+ val sinus = sin(clipLat(this) * PI / MAX_LONGITUDE)+ return 0.5 - ln((1 + sinus) / (1 - sinus)) / (4 * PI)+}++fun Double.lonToX01(): Double {+ return (clipLon(this) - MIN_LONGITUDE) / (MAX_LONGITUDE - MIN_LONGITUDE)+}++//fun Double.y01ToLat(): Double {+// return 90 - 360 * atan(exp((this - 0.5) * 2 * PI)) / PI+//}++//fun Double.x01ToLon(): Double {+// return MIN_LONGITUDE + (MAX_LONGITUDE - MIN_LONGITUDE) * this+//}++private fun clipLat(latitude: Double): Double {+ return clip(latitude, MIN_LATITUDE, MAX_LATITUDE)+}++private fun clipLon(longitude: Double): Double {+ var result = longitude+ while (result < MIN_LONGITUDE) result += 360.0+ while (result > MAX_LONGITUDE) result -= 360.0+ return clip(result, MIN_LONGITUDE, MAX_LONGITUDE)+}++private fun clip(currentValue: Double, minValue: Double, maxValue: Double): Double {+ return min(max(currentValue, minValue), maxValue)+}diff --git a/data/src/test/java/com/rtbishop/look4sat/data/DataParserTest.kt b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.ktsimilarity index 69%rename from data/src/test/java/com/rtbishop/look4sat/data/DataParserTest.ktrename to domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.ktindex 74ffb14b..15338746 100644--- a/data/src/test/java/com/rtbishop/look4sat/data/DataParserTest.kt+++ b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.kt@@ -15,9 +15,9 @@* You should have received a copy of the GNU General Public License* along with this program. If not, see <https://www.gnu.org/licenses/>.*/-package com.rtbishop.look4sat.data+package com.rtbishop.look4sat.domain-import com.rtbishop.look4sat.data.repository.DataParser+import com.rtbishop.look4sat.domain.utility.DataParserimport kotlinx.coroutines.ExperimentalCoroutinesApiimport kotlinx.coroutines.test.StandardTestDispatcherimport kotlinx.coroutines.test.runTest@@ -49,12 +49,12 @@ class DataParserTest {1 25544U 98067A 21320.51955234 .00001288 00000+0 31985-4 0 99902 25544 51.6447 309.4881 0004694 203.6966 299.8876 15.48582035312205""".trimIndent().byteInputStream()-// private val validJSONStream = """-// [{"uuid":"UzPz4gcsNBPKPKAFPmer7g","description":"Upper side band (drifting)","alive":true,"type":"Transmitter","uplink_low":null,"uplink_high":null,"uplink_drift":null,"downlink_low":136658500,"downlink_high":null,"downlink_drift":null,"mode":"USB","mode_id":9,"uplink_mode":null,"invert":false,"baud":null,"sat_id":"SCHX-0895-2361-9925-0309","norad_cat_id":965,"status":"active","updated":"2019-04-18T05:39:53.343316Z","citation":"CITATION NEEDED - https://xkcd.com/285/","service":"Unknown","coordination":"","coordination_url":""}]-// """.trimIndent().byteInputStream()-// private val invalidJSONStream = """-// [{"description":"Upper side band (drifting)","alive":true,"type":"Transmitter","uplink_low":null,"uplink_high":null,"uplink_drift":null,"downlink_low":136658500,"downlink_high":null,"downlink_drift":null,"mode":"USB","mode_id":9,"uplink_mode":null,"invert":false,"baud":null,"sat_id":"SCHX-0895-2361-9925-0309","norad_cat_id":965,"status":"active","updated":"2019-04-18T05:39:53.343316Z","citation":"CITATION NEEDED - https://xkcd.com/285/","service":"Unknown","coordination":"","coordination_url":""}]-// """.trimIndent().byteInputStream()+ private val validJSONStream = """+ [{"uuid":"UzPz4gcsNBPKPKAFPmer7g","description":"Upper side band (drifting)","alive":true,"type":"Transmitter","uplink_low":null,"uplink_high":null,"uplink_drift":null,"downlink_low":136658500,"downlink_high":null,"downlink_drift":null,"mode":"USB","mode_id":9,"uplink_mode":null,"invert":false,"baud":null,"sat_id":"SCHX-0895-2361-9925-0309","norad_cat_id":965,"status":"active","updated":"2019-04-18T05:39:53.343316Z","citation":"CITATION NEEDED - https://xkcd.com/285/","service":"Unknown","coordination":"","coordination_url":""}]+ """.trimIndent().byteInputStream()+ private val invalidJSONStream = """+ [{"description":"Upper side band (drifting)","alive":true,"type":"Transmitter","uplink_low":null,"uplink_high":null,"uplink_drift":null,"downlink_low":136658500,"downlink_high":null,"downlink_drift":null,"mode":"USB","mode_id":9,"uplink_mode":null,"invert":false,"baud":null,"sat_id":"SCHX-0895-2361-9925-0309","norad_cat_id":965,"status":"active","updated":"2019-04-18T05:39:53.343316Z","citation":"CITATION NEEDED - https://xkcd.com/285/","service":"Unknown","coordination":"","coordination_url":""}]+ """.trimIndent().byteInputStream()@Testfun `Given valid CSV stream returns valid data`() = runTest(testDispatcher) {@@ -87,15 +87,15 @@ class DataParserTest {assert(csvResult == tleResult)}-// @Test-// fun `Given valid JSON stream returns valid data`() = runTest(testDispatcher) {-// val parsedList = dataParser.parseJSONStream(validJSONStream)-// assert(parsedList[0].downlink == 136658500L)-// }-//-// @Test-// fun `Given invalid JSON stream returns empty list`() = runTest(testDispatcher) {-// val parsedList = dataParser.parseJSONStream(invalidJSONStream)-// assert(parsedList.isEmpty())-// }+ @Test+ fun `Given valid JSON stream returns valid data`() = runTest(testDispatcher) {+ val parsedList = dataParser.parseJSONStream(validJSONStream)+ assert(parsedList[0].downlink == 136658500L)+ }++ @Test+ fun `Given invalid JSON stream returns empty list`() = runTest(testDispatcher) {+ val parsedList = dataParser.parseJSONStream(invalidJSONStream)+ assert(parsedList.isEmpty())+ }}