Merge branch “feature-ors”

Author: Pygmalion69

app/src/main/java/org/nitri/opentopo/ors/Directions.kt

@@ -4,10 +4,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okhttp3.ResponseBody
 import org.nitri.ors.api.OpenRouteServiceApi
 import org.nitri.ors.repository.RouteRepository
-import retrofit2.Response
 
 class Directions(val api: OpenRouteServiceApi, private val profile: String) {
 
@@ -16,9 +14,8 @@ class Directions(val api: OpenRouteServiceApi, private val profile: String) {
     fun getRouteGpx(coordinates: List<List<Double>>, language: String, result: RouteGpResult) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val response : Response<ResponseBody> = repository.getRouteGpx(coordinates, language, profile)
+                val gpxXml = repository.getRouteGpx(coordinates, language, profile)
                 withContext(Dispatchers.Main) {
-                    val gpxXml = response.body()?.string() ?: ""
                     if (gpxXml.isNotBlank()) {
                         result.onSuccess(gpxXml)
                     } else {

ors-client/src/androidTest/java/org/nitri/ors/RouteRepositoryInstrumentedTest.kt

@@ -44,12 +44,10 @@ class RouteRepositoryInstrumentedTest {
         val start = Pair(8.681495, 49.41461)
         val end = Pair(8.687872, 49.420318)
 
-        val response: Response<ResponseBody> = repository.getRouteGpx(start, end,"driving-car")
-
-        val gpxXml = response.body()?.string()
+        val gpxXml = repository.getRouteGpx(start, end,"driving-car")
 
         assertNotNull("GPX response body should not be null", gpxXml)
-        assert(gpxXml!!.contains("<gpx")) { "Response does not appear to be valid GPX" }
+        assert(gpxXml.contains("<gpx")) { "Response does not appear to be valid GPX" }
     }
 
     @Test

ors-client/src/main/java/org/nitri/ors/repository/RouteRepository.kt

@@ -1,11 +1,9 @@
 package org.nitri.ors.repository
 
-import okhttp3.ResponseBody
 import org.nitri.ors.api.OpenRouteServiceApi
 import org.nitri.ors.model.route.GeoJsonRouteResponse
 import org.nitri.ors.model.route.RouteRequest
 import org.nitri.ors.model.route.RouteResponse
-import retrofit2.Response
 
 class RouteRepository(private val api: OpenRouteServiceApi) {
     suspend fun getRoute(start: Pair<Double, Double>, end: Pair<Double, Double>, profile: String): RouteResponse {
@@ -16,17 +14,17 @@ class RouteRepository(private val api: OpenRouteServiceApi) {
         return api.getRoute(profile, request)
     }
 
-    suspend fun getRouteGpx(start: Pair<Double, Double>, end: Pair<Double, Double>, profile: String): Response<ResponseBody> {
+    suspend fun getRouteGpx(start: Pair<Double, Double>, end: Pair<Double, Double>, profile: String): String {
         val request = RouteRequest(coordinates = listOf(
             listOf(start.first, start.second),
             listOf(end.first, end.second)
         ))
-        return api.getRouteGpx(profile, request)
+        return api.getRouteGpx(profile, request).body()?.string() ?: ""
     }
 
-    suspend fun getRouteGpx(coordinates: List<List<Double>>, language: String, profile: String): Response<ResponseBody> {
+    suspend fun getRouteGpx(coordinates: List<List<Double>>, language: String, profile: String): String {
         val request = RouteRequest(coordinates = coordinates, language = language)
-        return api.getRouteGpx(profile, request)
+        return api.getRouteGpx(profile, request).body()?.string() ?: ""
     }
 
     suspend fun getRouteGeoJson(start: Pair<Double, Double>, end: Pair<Double, Double>, profile: String): GeoJsonRouteResponse {