Satellite tracker and pass predictor for Android, inspired by Gpredict
Kotlin amsatcelestrakgpsham-radiohamlibhamradiokotlinnasaradiosatellitesatellite-datasatellite-positionsatellite-predictionsatellitessatnogssdrspacespacexstarlink
v1.2.4 - Fixed the always-out-of-range satellite pass calculation bug, translation fixes
Arty Bishop273f1b79643c
diff --git a/app/build.gradle b/app/build.gradleindex 1df47446..0277fc74 100644--- a/app/build.gradle+++ b/app/build.gradle@@ -30,8 +30,8 @@ android {applicationId "com.rtbishop.look4sat"minSdkVersion 21targetSdkVersion 29- versionCode 5- versionName '1.2.2'+ versionCode 6+ versionName '1.2.4'}buildTypes {release {diff --git a/app/src/main/java/com/rtbishop/look4sat/predict4kotlin/PassPredictor.kt b/app/src/main/java/com/rtbishop/look4sat/predict4kotlin/PassPredictor.ktindex 2a166cc7..a16c9d9e 100644--- a/app/src/main/java/com/rtbishop/look4sat/predict4kotlin/PassPredictor.kt+++ b/app/src/main/java/com/rtbishop/look4sat/predict4kotlin/PassPredictor.kt@@ -96,6 +96,7 @@ class PassPredictor(private val tle: TLE, private val qth: GroundStationPositionfun getPasses(start: Date, hoursAhead: Int, windBack: Boolean): List<SatPassTime> {iterationCount = 0+ val satellite = SatelliteFactory.createSatellite(tle)val passes: MutableList<SatPassTime> = ArrayList()val trackEndDate = Date(start.time + hoursAhead * 60L * 60L * 1000L)var trackStartDate = start@@ -103,17 +104,19 @@ class PassPredictor(private val tle: TLE, private val qth: GroundStationPositionvar lastAOS: Datevar count = 0- if (tle.isDeepspace) {- passes.add(nextGeoSatPass(start))- } else {- do {- if (count > 0) windBackTime = false- val pass = nextSatPass(trackStartDate, windBackTime)- lastAOS = pass.startTime- passes.add(pass)- trackStartDate = Date(pass.endTime.time + threeQuarterOrbitMinutes() * 60L * 1000L)- count++- } while (lastAOS < trackEndDate)+ if (satellite.willBeSeen(qth)) {+ if (tle.isDeepspace) passes.add(nextGeoSatPass(start))+ else {+ do {+ if (count > 0) windBackTime = false+ val pass = nextSatPass(trackStartDate, windBackTime)+ lastAOS = pass.startTime+ passes.add(pass)+ trackStartDate =+ Date(pass.endTime.time + threeQuarterOrbitMinutes() * 60L * 1000L)+ count+++ } while (lastAOS < trackEndDate)+ }}return passesdiff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 14dead40..5b949664 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -18,7 +18,6 @@--><resources>- <string name="app_name">Look4Sat</string><string name="app_version">Версия: %s</string><string name="drawer_lat_text">Широта:</string>@@ -34,7 +33,6 @@<string name="exit_app">Выход</string><string name="menu_pass_list">Список пролетов</string>- <string name="menu_polar_view">Полярная система координат</string><string name="menu_map_view">Карта мира</string><string name="menu_settings">Настройки</string><string name="menu_about">О приложении</string>@@ -62,8 +60,8 @@<string name="pref_refresh_rate_input_error">Введите значение между 250мс и 10000мс</string><string name="no_mode">Модуляция: нет</string>- <string name="no_uplink">Исходящий: нет</string>- <string name="no_downlink">Входящий: нет</string>+ <string name="no_uplink">Восходящая: нет</string>+ <string name="no_downlink">Нисходящая: нет</string><string name="no_selected_sat">Не выбраны спутники</string><string name="no_trans">Не найдены трансиверы для этого спутника</string>@@ -89,15 +87,15 @@<string name="pat_elevation">Элевация: %.1f°</string><string name="pat_latitude">Широта: %.1f°</string><string name="pat_longitude">Долгота: %.1f°</string>- <string name="pat_range">Расст.: %.0f км</string>+ <string name="pat_range">Дист.: %.0f км</string><string name="pat_altitude">Высота: %.0f км</string><string name="trans_mode">Модуляция: %s</string><string name="trans_inverted">Инверсия: %s</string>- <string name="trans_up_low">Исходящий: %.4f MHz</string>- <string name="trans_up_lowHigh">Исходящий: %.4f - %.4f MHz</string>- <string name="trans_down_low">Входящий: %.4f MHz</string>- <string name="trans_down_lowHigh">Входящий: %.4f - %.4f MHz</string>+ <string name="trans_up_low">Восходящая: %.4f MHz</string>+ <string name="trans_up_lowHigh">Восходящая: %.4f - %.4f MHz</string>+ <string name="trans_down_low">Нисходящая: %.4f MHz</string>+ <string name="trans_down_lowHigh">Нисходящая: %.4f - %.4f MHz</string><string name="info_swipe_text">Проведите по экрану вниз, чтобы обновить список пролетовдля выбранных спутников</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex ffac2dc7..a1537bc0 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -18,7 +18,7 @@--><resources>- <string name="app_name">Look4Sat</string>+ <string name="app_name" translatable="false">Look4Sat</string><string name="app_version">Version: %s</string><string name="drawer_title" translatable="false">L∞k \n4Sat</string>@@ -36,7 +36,7 @@<string name="exit_app">Exit</string><string name="menu_pass_list">List of Passes</string>- <string name="menu_polar_view">Polar View</string>+ <string name="menu_polar_view" translatable="false">Polar View</string><string name="menu_map_view">World Map View</string><string name="menu_settings">Settings</string><string name="menu_about">About the App</string>diff --git a/release-apk/app-release_v1.2.apk b/release-apk/app-release_v1.2.apkdeleted file mode 100644index 55e980f7..00000000Binary files a/release-apk/app-release_v1.2.apk and /dev/null differ