Skip to content

Commit 391d168

Browse files
committed
Fix Export API
1 parent 17d5913 commit 391d168

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
/captures
88
.externalNativeBuild
99
/ors-client/build
10+
.aider*

ors-client/src/main/java/org/nitri/ors/api/OpenRouteServiceApi.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ package org.nitri.ors.api
22

33
import okhttp3.RequestBody
44
import okhttp3.ResponseBody
5+
import org.nitri.ors.model.export.ExportRequest
6+
import org.nitri.ors.model.export.ExportResponse
7+
import org.nitri.ors.model.export.TopoJsonExportResponse
58
import org.nitri.ors.model.route.GeoJsonRouteResponse
69
import org.nitri.ors.model.route.GpxResponse
710
import org.nitri.ors.model.route.RouteRequest
@@ -51,20 +54,20 @@ interface OpenRouteServiceApi {
5154
@POST("v2/export/{profile}")
5255
suspend fun export(
5356
@Path("profile") profile: String,
54-
@Body body: RequestBody
55-
): Response<ResponseBody>
57+
@Body request: ExportRequest
58+
): ExportResponse
5659

5760
@POST("v2/export/{profile}/json")
5861
suspend fun exportJson(
5962
@Path("profile") profile: String,
60-
@Body body: RequestBody
61-
): Response<ResponseBody>
63+
@Body request: ExportRequest
64+
): ExportResponse
6265

6366
@POST("v2/export/{profile}/topojson")
6467
suspend fun exportTopoJson(
6568
@Path("profile") profile: String,
66-
@Body body: RequestBody
67-
): Response<ResponseBody>
69+
@Body request: ExportRequest
70+
): TopoJsonExportResponse
6871

6972

7073
}

ors-client/src/main/java/org/nitri/ors/model/export/ExportRequest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ import kotlinx.serialization.Serializable
55
@Serializable
66
data class ExportRequest(
77
val boundingBox: List<Double>, // [minLon, minLat, maxLon, maxLat]
8-
val profile: String
8+
val profile: String,
9+
val geometry: Boolean? = null
910
)

ors-client/src/main/java/org/nitri/ors/model/export/TopoJsonExportResponse.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.nitri.ors.model.export
22

3+
import kotlinx.serialization.Serializable
4+
import kotlinx.serialization.json.JsonElement
35

46
@Serializable
57
data class TopoJsonExportResponse(
68
val type: String,
7-
val objects: Map<String, Any>,
8-
val arcs: List<List<List<Int>>>,
9+
val objects: Map<String, JsonElement> = emptyMap(), // or JsonObject
10+
val arcs: List<List<List<Int>>> = emptyList(),
911
val transform: Transform
1012
)
1113

ors-client/src/main/java/org/nitri/ors/model/route/RouteRequest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.nitri.ors.model.route
22

3-
import kotlinx.serialization.SerialName
43
import kotlinx.serialization.Serializable
54

65
@Serializable

0 commit comments

Comments
 (0)