Merge branch “feature-ors”

Author: Pygmalion69

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

@@ -45,15 +45,16 @@ import org.nitri.opentopo.viewmodel.GpxViewModel
 import org.nitri.opentopo.nearby.NearbyFragment
 import org.nitri.opentopo.nearby.entity.NearbyItem
 import org.nitri.opentopo.util.Utils
-import org.nitri.ors.api.OpenRouteServiceApi
-import org.nitri.ors.client.OpenRouteServiceClient
 import org.osmdroid.util.GeoPoint
 import androidx.core.net.toUri
+import org.nitri.ors.DefaultOrsClient
+import org.nitri.ors.Ors
+import org.nitri.ors.OrsClient
 
 open class BaseMainActivity : AppCompatActivity(), MapFragment.OnFragmentInteractionListener,
     GpxDetailFragment.OnFragmentInteractionListener, NearbyFragment.OnFragmentInteractionListener {
     private val parser = GPXParser()
-    private var openRouteServiceApi: OpenRouteServiceApi? = null
+    private var orsClient: OrsClient? = null
     private var geoPointFromIntent: GeoPointDto? = null
     private var gpxUriString: String? = null
     private var gpxUri: Uri? = null
@@ -83,7 +84,7 @@ open class BaseMainActivity : AppCompatActivity(), MapFragment.OnFragmentInterac
 
     private val orsApiKeyChangesReceiver = object: BroadcastReceiver() {
         override fun onReceive(p0: Context?, intent: Intent?) {
-           createOrsApi()
+           createOrsClient()
         }
     }
 
@@ -95,8 +96,8 @@ open class BaseMainActivity : AppCompatActivity(), MapFragment.OnFragmentInterac
         // NOP
     }
 
-    override fun getOpenRouteServiceApi(): OpenRouteServiceApi? {
-        return openRouteServiceApi
+    override fun getOpenRouteServiceClient(): OrsClient? {
+        return orsClient
     }
 
     private lateinit var sharedPreferences: SharedPreferences
@@ -182,13 +183,13 @@ open class BaseMainActivity : AppCompatActivity(), MapFragment.OnFragmentInterac
 //            Log.d("ORS", "Distance: ${result.routes.firstOrNull()?.summary?.distance} m")
 //        }
 
-        createOrsApi()
+        createOrsClient()
     }
 
-    private fun createOrsApi() {
+    private fun createOrsClient() {
         val apiKey = sharedPreferences.getString(PREF_ORS_API_KEY, "")
         if (apiKey?.isNotEmpty() == true) {
-            openRouteServiceApi = OpenRouteServiceClient.create(apiKey, this@BaseMainActivity)
+            orsClient = Ors.create(apiKey, applicationContext)
         }
     }
 

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

@@ -52,7 +52,7 @@ import org.nitri.opentopo.util.OrientationSensor
 import org.nitri.opentopo.util.Utils
 import org.nitri.opentopo.viewmodel.LocationViewModel
 import org.nitri.opentopo.viewmodel.MarkerViewModel
-import org.nitri.ors.api.OpenRouteServiceApi
+import org.nitri.ors.OrsClient
 import org.osmdroid.config.Configuration
 import org.osmdroid.events.DelayedMapListener
 import org.osmdroid.events.MapEventsReceiver
@@ -398,10 +398,10 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
         }
         val locale =  Resources.getSystem().configuration.locales.get(0)
         val language = locale.toLanguageTag().lowercase()
-        listener?.getOpenRouteServiceApi()?.let { api ->
+        listener?.getOpenRouteServiceClient()?.let { client ->
             val profile = sharedPreferences.getString(PREF_ORS_PROFILE, "driving-car")
             profile?.let {
-                val directions = Directions(api, it)
+                val directions = Directions(client, it)
                 directions.getRouteGpx(coordinates, language, object : Directions.RouteGpResult {
                     override fun onSuccess(gpx: String) {
                         Log.d(TAG, "GPX: $gpx")
@@ -1060,9 +1060,9 @@ class MapFragment : Fragment(), LocationListener, PopupMenu.OnMenuItemClickListe
         fun showPrivacyOptionsForm()
 
         /**
-         * Get the ORS API if available
+         * Get the ORS client if available
          */
-        fun getOpenRouteServiceApi(): OpenRouteServiceApi?
+        fun getOpenRouteServiceClient(): OrsClient?
 
         /**
          * Parse GPX string

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

@@ -4,17 +4,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.nitri.ors.api.OpenRouteServiceApi
-import org.nitri.ors.repository.RouteRepository
+import org.nitri.ors.OrsClient
+import org.nitri.ors.helper.RouteHelper
 
-class Directions(val api: OpenRouteServiceApi, private val profile: String) {
+class Directions(val client: OrsClient, private val profile: String) {
 
-    val repository = RouteRepository(api)
+    val routeHelper = RouteHelper()
 
     fun getRouteGpx(coordinates: List<List<Double>>, language: String, result: RouteGpResult) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val gpxXml = repository.getRouteGpx(coordinates, language, profile)
+                val gpxXml = with(routeHelper) { client.getRouteGpx(coordinates, language, profile) }
                 withContext(Dispatchers.Main) {
                     if (gpxXml.isNotBlank()) {
                         result.onSuccess(gpxXml)

ors-client/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 android {
     namespace = "org.nitri.ors"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 24
@@ -42,6 +42,8 @@ android {
     lint {
         targetSdk = 35
     }
+
+    publishing { singleVariant("release") { withSourcesJar() } }
 }
 
 dependencies {

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

@@ -0,0 +1,65 @@
+package org.nitri.ors
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.serialization.json.buildJsonArray
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.nitri.ors.domain.elevation.ElevationLineRequestBuilderJ
+import org.nitri.ors.domain.elevation.ElevationPointRequestBuilderJ
+import org.nitri.ors.domain.elevation.ElevationFormats
+import org.nitri.ors.domain.elevation.elevationLineRequest
+import org.nitri.ors.domain.elevation.elevationPointRequest
+
+@RunWith(AndroidJUnit4::class)
+class ElevationDslInstrumentedTest {
+
+    @Test
+    fun dsl_buildsElevationLine_polyline() {
+        val req = elevationLineRequest {
+            polyline(8.681495 to 49.41461, 8.687872 to 49.420318)
+            formatOut = ElevationFormats.GEOJSON
+        }
+        assertEquals(ElevationFormats.POLYLINE, req.formatIn)
+        assertEquals(ElevationFormats.GEOJSON, req.formatOut)
+    }
+
+    @Test
+    fun dsl_requires_geometry_for_elevationLine() {
+        assertThrows(IllegalArgumentException::class.java) {
+            elevationLineRequest { formatIn = ElevationFormats.POLYLINE }
+        }
+    }
+
+    @Test
+    fun dsl_buildsElevationPoint_point() {
+        val req = elevationPointRequest {
+            point(8.681495, 49.41461)
+            formatIn = "point"
+            formatOut = "geojson"
+        }
+        assertEquals("geojson", req.formatOut)
+        assertEquals("point", req.formatIn)
+    }
+
+    @Test
+    fun javaBuilder_buildsElevationLine_polyline() {
+        val req = ElevationLineRequestBuilderJ()
+            .polyline(listOf(listOf(8.0,48.0), listOf(9.0,49.0)))
+            .formatOut(ElevationFormats.GEOJSON)
+            .build()
+        assertEquals(ElevationFormats.POLYLINE, req.formatIn)
+    }
+
+    @Test
+    fun javaBuilder_buildsElevationPoint_point() {
+        val req = ElevationPointRequestBuilderJ()
+            .point(8.0, 48.0)
+            .formatOut("geojson")
+            .build()
+        assertEquals("geojson", req.formatOut)
+    }
+}

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

@@ -9,28 +9,28 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.nitri.ors.client.OpenRouteServiceClient
-import org.nitri.ors.repository.ElevationRepository
+import org.nitri.ors.helper.ElevationHelper
 
 @RunWith(AndroidJUnit4::class)
 class ElevationInstrumentedTest {
 
-    private fun createRepository(context: Context): ElevationRepository {
+    private fun create(context: Context): Pair<DefaultOrsClient, ElevationHelper> {
         val apiKey = context.getString(R.string.ors_api_key)
-        val api = OpenRouteServiceClient.create(apiKey, context)
-        return ElevationRepository(api)
+        val client = DefaultOrsClient(apiKey, context)
+        val helper = ElevationHelper()
+        return client to helper
     }
 
     @Test
     fun testElevation_point_successful() = runBlocking {
         val context = ApplicationProvider.getApplicationContext<Context>()
-        val repository = createRepository(context)
+        val (client, helper) = create(context)
 
         // A point near Heidelberg, Germany
         val lon = 8.681495
         val lat = 49.41461
 
-        val response = repository.getElevationPoint(lon = lon, lat = lat)
+        val response = with(helper) { client.getElevationPoint(lon = lon, lat = lat) }
 
         assertNotNull("Elevation point response should not be null", response)
         assertNotNull("Geometry should not be null", response.geometry)
@@ -49,15 +49,15 @@ class ElevationInstrumentedTest {
     @Test
     fun testElevation_line_successful() = runBlocking {
         val context = ApplicationProvider.getApplicationContext<Context>()
-        val repository = createRepository(context)
+        val (client, helper) = create(context)
 
         // A short line segment around Heidelberg
         val coordinates = listOf(
             listOf(8.681495, 49.41461),
             listOf(8.687872, 49.420318)
         )
 
-        val response = repository.getElevationLine(coordinates = coordinates)
+        val response = with(helper) { client.getElevationLine(coordinates = coordinates) }
 
         assertNotNull("Elevation line response should not be null", response)
         assertEquals("Geometry type should be LineString", "LineString", response.geometry.type)

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

@@ -0,0 +1,42 @@
+package org.nitri.ors
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.nitri.ors.domain.export.ExportRequestBuilderJ
+import org.nitri.ors.domain.export.exportRequest
+
+@RunWith(AndroidJUnit4::class)
+class ExportDslInstrumentedTest {
+
+    @Test
+    fun dsl_buildsExportRequest_andValidates() {
+        val req = exportRequest {
+            bbox(8.681495, 49.41461, 8.686507, 49.41943)
+            id("test-id")
+            geometry(true)
+        }
+        assertEquals("test-id", req.id)
+        assertEquals(listOf(listOf(8.681495,49.41461), listOf(8.686507,49.41943)), req.bbox)
+    }
+
+    @Test
+    fun dsl_requires_bbox() {
+        assertThrows(IllegalArgumentException::class.java) {
+            exportRequest { geometry(false) }
+        }
+    }
+
+    @Test
+    fun javaBuilder_buildsExportRequest_andValidates() {
+        val req = ExportRequestBuilderJ()
+            .bbox(8.0, 48.0, 9.0, 49.0)
+            .id("jid")
+            .geometry(null)
+            .build()
+        assertEquals("jid", req.id)
+        assertEquals(listOf(listOf(8.0,48.0), listOf(9.0,49.0)), req.bbox)
+    }
+}

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

@@ -0,0 +1,75 @@
+package org.nitri.ors
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.nitri.ors.helper.ExportHelper
+
+@RunWith(AndroidJUnit4::class)
+class ExportInstrumentedTest {
+
+    private fun create(context: Context): Pair<DefaultOrsClient, ExportHelper>  {
+        val apiKey = context.getString(R.string.ors_api_key)
+        val client = DefaultOrsClient(apiKey, context)
+        val helper = ExportHelper()
+        return client to helper
+    }
+
+    @Test
+    fun testExport_successful() = runBlocking {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val (client, helper) = create(context)
+
+        // Bounding box around Heidelberg, Germany
+        val bbox = listOf(
+            listOf(8.681495, 49.41461),   // minLon, minLat
+            listOf(8.686507, 49.41943)    // maxLon, maxLat
+        )
+
+        val response = with(helper) { client.export(bbox = bbox, profile = Profile.DRIVING_CAR) }
+
+        assertNotNull("Export response should not be null", response)
+        // Basic sanity checks on structure
+        assertTrue("Points list should not be empty", response.nodes.isNotEmpty())
+        assertTrue("Edges list should not be empty", response.edges.isNotEmpty())
+    }
+
+    // Exceeds rate limit
+//    @Test
+//    fun testExportJson_successful() = runBlocking {
+//        val context = ApplicationProvider.getApplicationContext<Context>()
+//
+//        val (client, helper) = create(context)
+//        val bbox = listOf(
+//            listOf(8.681495, 49.41461),
+//            listOf(8.686507, 49.41943)
+//        )
+//
+//        val response = with(helper) { client.exportJson(bbox = bbox, profile = "driving-car") }
+//
+//        assertNotNull("JSON Export response should not be null", response)
+//        assertTrue("Points list should not be empty", response.nodes.isNotEmpty())
+//    }
+
+    // Exceeds rate limit
+//    @Test
+//    fun testExportTopoJson_successful() = runBlocking {
+//        val context = ApplicationProvider.getApplicationContext<Context>()
+//        val (client, helper) = create(context)
+//
+//        val bbox = listOf(
+//            listOf(8.681495, 49.41461),
+//            listOf(8.686507, 49.41943)
+//        )
+//
+//        val topo = with(helper) { client.exportTopoJson(bbox = bbox, profile = "driving-car") }
+//
+//        assertNotNull("TopoJSON Export response should not be null", topo)
+//        assertTrue("Type should be present", topo.type.isNotBlank())
+//    }
+}