diff --git a/drawRouteCompose/build.gradle.kts b/drawRouteCompose/build.gradle.kts index c9cae35..7a977d2 100644 --- a/drawRouteCompose/build.gradle.kts +++ b/drawRouteCompose/build.gradle.kts @@ -82,7 +82,7 @@ publishing { register("release") { groupId = "com.github.saeedrznr" artifactId = "DrawRouteOnMap" - version = "0.0.3" + version = "0.0.4" afterEvaluate { from(components["release"]) diff --git a/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/ApiService.kt b/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/ApiService.kt index 14c5b11..d3f6268 100644 --- a/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/ApiService.kt +++ b/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/ApiService.kt @@ -23,14 +23,14 @@ class ApiService : ViewModel() { val routes: LiveData>> get() = _routes - fun getRoutes(key: String, origin: LatLng, destination: LatLng) { + fun getRoutes(key: String, origin: LatLng, destination: LatLng,alternatives: Boolean) { val TAG = "drawgooglemaproute-request_response:" viewModelScope.launch { try { val request = Api.invoke().getRoute( "${origin.latitude},${origin.longitude}", "${destination.latitude},${destination.longitude}", - key + key,alternatives ) val data = CoroutineScope(Dispatchers.IO).async { if (request.isSuccessful) { @@ -63,14 +63,14 @@ class ApiService : ViewModel() { suspend fun getRoute( @Query("origin") origin: String, @Query("destination") destination: String, - @Query("key") key: String + @Query("key") key: String, + @Query("alternatives") alternatives:Boolean ): Response companion object { private val retrofit by lazy { Retrofit.Builder() .baseUrl("https://maps.googleapis.com/maps/api/directions/") - //.addConverterFactory(MoshiConverterFactory.create()) .build() } diff --git a/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/DrawRoutes.kt b/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/DrawRoutes.kt index 7be19aa..3a6457a 100644 --- a/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/DrawRoutes.kt +++ b/drawRouteCompose/src/main/java/com/starcoder/drawroutecompose/DrawRoutes.kt @@ -36,12 +36,13 @@ fun DrawRoutes( originTitle: String = "", destinationTitle: String = "", originSnippet: String? = null, - destinationSnippet: String? = null + destinationSnippet: String? = null, + alternatives:Boolean=false ) { val routesColors = colors ?: listOf(Color.Blue, Color.Red, Color.Green, Color.Magenta) val apiService: ApiService = viewModel() val routes by apiService.routes.observeAsState() - apiService.getRoutes(key, origin, destination) + apiService.getRoutes(key, origin, destination,alternatives) val desMarkerState = rememberMarkerState(position = destination) val begMarkerState = rememberMarkerState(position = origin) desMarkerState.showInfoWindow()