Use route repository

Author: Pygmalion69

app/src/main/java/org/nitri/opentopo/MapFragment.kt

@@ -894,8 +894,8 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
 
     override fun onLocationChanged(location: Location) {
 
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Location: ${location.latitude}, ${location.longitude}, mapRotation: $mapRotation")
+        //if (BuildConfig.DEBUG)
+        //   Log.d(TAG, "Location: ${location.latitude}, ${location.longitude}, mapRotation: $mapRotation")
 
         requireActivity().runOnUiThread {
             locationViewModel?.currentLocation?.postValue(location)

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

@@ -7,15 +7,17 @@ import kotlinx.coroutines.withContext
 import okhttp3.ResponseBody
 import org.nitri.ors.api.OpenRouteServiceApi
 import org.nitri.ors.model.route.RouteRequest
+import org.nitri.ors.repository.RouteRepository
 import retrofit2.Response
 
 class Directions(val api: OpenRouteServiceApi, private val profile: String) {
 
+    val repository = RouteRepository(api)
+
     fun getRouteGpx(coordinates: List<List<Double>>, language: String, result: RouteGpResult) {
         CoroutineScope(Dispatchers.IO).launch {
-            val request = RouteRequest(coordinates = coordinates, language = language)
             try {
-                val response : Response<ResponseBody> = api.getRouteGpx(profile, request)
+                val response : Response<ResponseBody> = repository.getRouteGpx(coordinates, language, profile)
                 withContext(Dispatchers.Main) {
                     val gpxXml = response.body()?.string() ?: ""
                     if (gpxXml.isNotBlank()) {

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

@@ -10,6 +10,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.nitri.ors.client.OpenRouteServiceClient
 import org.nitri.ors.model.route.RouteRequest
+import org.nitri.ors.repository.RouteRepository
 import retrofit2.Response
 
 @RunWith(AndroidJUnit4::class)
@@ -19,16 +20,13 @@ class RouteRepositoryGpxInstrumentedTest {
     fun testFetchGpxRoute_successful() = runBlocking {
         val context = ApplicationProvider.getApplicationContext<Context>()
         val apiKey = context.getString(R.string.ors_api_key)
-        val api = OpenRouteServiceClient.create(apiKey, context)
+        val client = OpenRouteServiceClient.create(apiKey, context)
+        val repository = RouteRepository(client)
 
-        val request = RouteRequest(
-            coordinates = listOf(
-                listOf(8.681495, 49.41461),
-                listOf(8.687872, 49.420318)
-            )
-        )
+        val start = Pair(8.681495, 49.41461)
+        val end = Pair(8.687872, 49.420318)
 
-        val response: Response<ResponseBody> = api.getRouteGpx("driving-car", request)
+        val response: Response<ResponseBody> = repository.getRouteGpx(start, end,"driving-car")
 
         val gpxXml = response.body()?.string()
 

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

@@ -1,8 +1,11 @@
 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 {
@@ -12,4 +15,25 @@ 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> {
+        val request = RouteRequest(coordinates = listOf(
+            listOf(start.first, start.second),
+            listOf(end.first, end.second)
+        ))
+        return api.getRouteGpx(profile, request)
+    }
+
+    suspend fun getRouteGpx(coordinates: List<List<Double>>, language: String, profile: String): Response<ResponseBody> {
+        val request = RouteRequest(coordinates = coordinates, language = language)
+        return api.getRouteGpx(profile, request)
+    }
+
+    suspend fun getRouteGeoJson(start: Pair<Double, Double>, end: Pair<Double, Double>, profile: String): GeoJsonRouteResponse {
+        val request = RouteRequest(coordinates = listOf(
+            listOf(start.first, start.second),
+            listOf(end.first, end.second)
+        ))
+        return api.getRouteGeoJson(profile, request)
+    }
 }