Replace the original API for retrieving the ISS's position (#506)

Author: Carrione

README.md

@@ -15,7 +15,7 @@
 
 The people data comes from [The Space Devs API](https://thespacedevs.com/llapi) (names, bios and images of the people
 currently in space) and the position of the International Space Station from the
-[Open Notify ISS-Now API](http://open-notify.org/Open-Notify-API/ISS-Location-Now/), both served through this
+[Where the ISS at? API](https://wheretheiss.at/w/developer), both served through this
 project's own small Ktor backend (see `backend` module below).
 
 The project is included as sample in the official [Kotlin Multiplatform docs](https://kotlinlang.org/docs/multiplatform-samples.html) and also the [Google Dev Library](https://devlibrary.withgoogle.com/products/android)

backend/src/jvmMain/kotlin/Server.kt

@@ -1,7 +1,7 @@
 import dev.johnoreilly.common.di.initKoin
 import dev.johnoreilly.common.remote.Assignment
 import dev.johnoreilly.common.remote.AstroResult
-import dev.johnoreilly.common.remote.IssResponse
+import dev.johnoreilly.common.remote.IssPosition
 import dev.johnoreilly.common.remote.PeopleInSpaceApi
 import io.ktor.http.*
 import io.ktor.openapi.OpenApiInfo
@@ -68,7 +68,7 @@ fun main() {
                 summary = "Get the position of the ISS"
                 responses {
                     HttpStatusCode.OK {
-                        schema = jsonSchema<IssResponse>()
+                        schema = jsonSchema<IssPosition>()
                     }
                 }
             }

common/src/commonMain/kotlin/dev/johnoreilly/common/remote/PeopleInSpaceApi.kt

@@ -20,15 +20,13 @@ data class Assignment(
 )
 
 @Serializable
-data class IssPosition(val latitude: Double, val longitude: Double, val timestamp: Long  = -1)
-
-@Serializable
-data class IssResponse(val message: String, val iss_position: IssPosition, val timestamp: Long)
+data class IssPosition(val latitude: Double, val longitude: Double)
 
 @Single
 class PeopleInSpaceApi(private val client: HttpClient) : KoinComponent {
     var baseUrl = "https://people-in-space-proxy.ew.r.appspot.com"
+    var baseIssPositionUrl = "https://api.wheretheiss.at"
 
     suspend fun fetchPeople() = client.get("$baseUrl/astros.json").body<AstroResult>()
-    suspend fun fetchISSPosition() = client.get("$baseUrl/iss-now.json").body<IssResponse>()
+    suspend fun fetchISSPosition() = client.get("$baseIssPositionUrl/v1/satellites/25544").body<IssPosition>()
 }

common/src/commonMain/kotlin/dev/johnoreilly/common/repository/PeopleInSpaceRepository.kt

@@ -99,7 +99,7 @@ class PeopleInSpaceRepository(
         return flow {
             while (true) {
                 try {
-                    val position = peopleInSpaceApi.fetchISSPosition().iss_position
+                    val position = peopleInSpaceApi.fetchISSPosition()
                     if (currentCoroutineContext().isActive) {
                         emit(position)
                     }

common/src/commonMain/kotlin/dev/johnoreilly/common/ui/ISSPositionContent.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dev.johnoreilly.common.viewmodel.ISSPositionViewModel
+import dev.johnoreilly.common.util.round
 
 @Composable
 fun ISSPositionContent(viewModel: ISSPositionViewModel) {
@@ -54,15 +55,15 @@ fun ISSPositionContent(viewModel: ISSPositionViewModel) {
                 ) {
                     CoordinateDisplay(
                         label = "Latitude",
-                        value = position.latitude.toString(),
+                        value = position.latitude.round(4).toString(),
                         modifier = Modifier.weight(1f)
                     )
 
                     Spacer(Modifier.width(16.dp))
 
                     CoordinateDisplay(
                         label = "Longitude",
-                        value = position.longitude.toString(),
+                        value = position.longitude.round(4).toString(),
                         modifier = Modifier.weight(1f)
                     )
                 }

common/src/commonMain/kotlin/dev/johnoreilly/common/util/Formatting.kt

@@ -0,0 +1,9 @@
+package dev.johnoreilly.common.util
+
+import kotlin.math.round
+
+fun Double.round(decimals: Int): Double {
+    var multiplier = 1.0
+    repeat(decimals) { multiplier *= 10 }
+    return round(this * multiplier) / multiplier
+}