Osrm

2025-12-30 16:11:30 +01:00
parent 45c8bb5ccc
commit 9f356bd728
24 changed files with 139 additions and 34 deletions
--- a/common/car/src/main/AndroidManifest.xml
+++ b/common/car/src/main/AndroidManifest.xml
@@ -33,7 +33,8 @@
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
    <uses-permission android:name="androidx.car.app.ACCESS_SURFACE" />

-    <application android:requestLegacyExternalStorage="true">
+    <application android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true">
        <meta-data
            android:name="androidx.car.app.minCarApiLevel"
            android:value="1" />
--- a/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt
@@ -157,6 +157,7 @@ class NavigationSession : Session(), NavigationScreen.Listener {
            carContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
        val location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
        if (location != null) {
+            navigationViewModel.loadRecentPlace(location = location, carContext)
            updateLocation(location)
            locationManager.requestLocationUpdates(
                LocationManager.GPS_PROVIDER,
--- a/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt
@@ -192,7 +192,7 @@ class SurfaceRenderer(
        val cameraDuration =
            duration(viewStyle == ViewStyle.PREVIEW, position!!.bearing, lastBearing)
        val currentSpeed: Float? by speed.observeAsState()
-        if (viewStyle == ViewStyle.VIEW) {
+        if (viewStyle == ViewStyle.VIEW || viewStyle == ViewStyle.PAN_VIEW) {
            DrawNavigationImages(
                paddingValues,
                currentSpeed,
--- a/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
@@ -1,7 +1,8 @@
 package com.kouros.navigation.car.map

-import android.location.Location
 import android.content.Context
+import android.content.res.AssetFileDescriptor
+import android.location.Location
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
@@ -33,9 +34,9 @@ import com.kouros.navigation.data.Constants.SHOW_THREED_BUILDING
 import com.kouros.navigation.data.NavigationColor
 import com.kouros.navigation.data.RouteColor
 import com.kouros.navigation.data.SpeedColor
+import com.kouros.navigation.model.BaseStyleModel
 import com.kouros.navigation.utils.NavigationUtils.getBooleanKeyValue
 import com.kouros.navigation.utils.NavigationUtils.getIntKeyValue
-import com.kouros.navigation.utils.location
 import org.maplibre.compose.camera.CameraPosition
 import org.maplibre.compose.camera.CameraState
 import org.maplibre.compose.camera.rememberCameraState
@@ -92,6 +93,8 @@ fun MapLibre(
    viewStyle: ViewStyle,
    speedCameras: String? = ""
 ) {
+
+    //val baseStyle = BaseStyleModel().readStyle(context)
    MaplibreMap(
        options = MapOptions(
            ornamentOptions =
@@ -115,6 +118,7 @@ fun MapLibre(
        //Puck(cameraState, lastLocation)
    }
 }
+
@Composable
 fun RouteLayer(routeData: String?) {
    if (routeData != null && routeData.isNotEmpty()) {
@@ -191,6 +195,7 @@ fun SpeedCameraLayer(speedCameras: String?) {
        )
    }
 }
+
@Composable
 fun BuildingLayer(tiles: Source) {
    Anchor.Replace("building-3d") {
@@ -369,6 +374,7 @@ private fun MaxSpeed(
@Composable
 fun DarkMode(context: Context, baseStyle: MutableState<BaseStyle.Uri>) {
    val darkMode = getIntKeyValue(context, Constants.DARK_MODE_SETTINGS)
+
    if (darkMode == 0) {
        baseStyle.value = BaseStyle.Uri(Constants.STYLE)
    }
@@ -385,7 +391,11 @@ fun DarkMode(context: Context, baseStyle: MutableState<BaseStyle.Uri>) {

 fun getPaddingValues(height: Int, viewStyle: ViewStyle): PaddingValues {
    return when (viewStyle) {
-        ViewStyle.VIEW -> PaddingValues(start = 50.dp, top = distanceFromTop(height).dp)
+        ViewStyle.VIEW, ViewStyle.PAN_VIEW -> PaddingValues(
+            start = 50.dp,
+            top = distanceFromTop(height).dp
+        )
+
        ViewStyle.PREVIEW -> PaddingValues(start = 150.dp, bottom = 0.dp)
        else -> PaddingValues(start = 250.dp, bottom = 0.dp)
    }
--- a/common/car/src/main/java/com/kouros/navigation/car/navigation/RouteCarModel.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/navigation/RouteCarModel.kt
@@ -29,6 +29,8 @@ import androidx.car.app.model.CarIcon
 import androidx.car.app.model.CarText
 import androidx.car.app.model.DateTimeWithZone
 import androidx.car.app.model.Distance
+import androidx.car.app.navigation.model.Lane
+import androidx.car.app.navigation.model.LaneDirection
 import androidx.car.app.navigation.model.Maneuver
 import androidx.car.app.navigation.model.Step
 import androidx.car.app.navigation.model.TravelEstimate
@@ -46,6 +48,13 @@ class RouteCarModel() : RouteModel() {
        val stepData = currentStep()
        val currentStepCueWithImage: SpannableString =
            createString(stepData.instruction)
+
+
+        val straightNormal =
+            Lane.Builder()
+                .addDirection(LaneDirection.create(LaneDirection.SHAPE_STRAIGHT, false))
+                .build()
+
        val step =
            Step.Builder(currentStepCueWithImage)
                .setManeuver(
@@ -54,12 +63,17 @@ class RouteCarModel() : RouteModel() {
                        .build()
                )
                .setRoad(routeState.destination.street!!)
-                .build()
-        return step
+        stepData.lane.forEach {
+            if (it.indications.isNotEmpty() ) {
+                step.setLanesImage(createCarIcon(carContext, R.drawable.lanes))
+                step.addLane(straightNormal)
+            }
+        }
+        return step.build()
    }

    /** Returns the next [Step] with information such as the cue text and images.  */
-    fun nextStep(carContext: CarContext): Step? {
+    fun nextStep(carContext: CarContext): Step {
        val stepData = nextStep()
        val currentStepCueWithImage: SpannableString =
            createString(stepData.instruction)
--- a/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
+++ b/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
@@ -11,11 +11,12 @@ import androidx.car.app.model.Action.FLAG_DEFAULT
 import androidx.car.app.model.ActionStrip
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
-import androidx.car.app.model.CarText
 import androidx.car.app.model.Distance
 import androidx.car.app.model.Header
 import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.Template
+import androidx.car.app.navigation.model.Lane
+import androidx.car.app.navigation.model.LaneDirection
 import androidx.car.app.navigation.model.Maneuver
 import androidx.car.app.navigation.model.MapWithContentTemplate
 import androidx.car.app.navigation.model.MessageInfo
@@ -29,13 +30,11 @@ import com.kouros.navigation.car.ViewStyle
 import com.kouros.navigation.car.navigation.RouteCarModel
 import com.kouros.navigation.data.Constants
 import com.kouros.navigation.data.Constants.DESTINATION_ARRIVAL_DISTANCE
-import com.kouros.navigation.data.NavigationRepository
 import com.kouros.navigation.data.Place
 import com.kouros.navigation.data.nominatim.SearchResult
 import com.kouros.navigation.data.overpass.Elements
 import com.kouros.navigation.model.ViewModel
 import com.kouros.navigation.utils.GeoUtils
-import com.kouros.navigation.utils.bearing
 import com.kouros.navigation.utils.location
 import kotlin.math.absoluteValue

@@ -102,13 +101,12 @@ class NavigationScreen(
            coordinates.add(listOf(it.lon!!, it.lat!!))
        }
        val speedData = GeoUtils.createPointCollection(coordinates, "radar")
-        surfaceRenderer.speedCamerasData.value =speedData
+        surfaceRenderer.speedCamerasData.value = speedData
    }

    init {
        viewModel.route.observe(this, observer)
        viewModel.recentPlace.observe(this, recentObserver)
-        viewModel.loadRecentPlace(location = surfaceRenderer.lastLocation)
        viewModel.placeLocation.observe(this, placeObserver)
        viewModel.speedCameras.observe(this, speedObserver)
    }
@@ -369,6 +367,7 @@ class NavigationScreen(
                    .build()
            ).setOnClickListener {
                surfaceRenderer.handleScale(1)
+                invalidate()
            }
            .build()
    }
@@ -385,6 +384,7 @@ class NavigationScreen(
                    .build()
            ).setOnClickListener {
                surfaceRenderer.handleScale(-1)
+                invalidate()
            }
            .build()
    }
@@ -401,6 +401,7 @@ class NavigationScreen(
                    .build()
            ).setOnClickListener {
                surfaceRenderer.viewStyle = ViewStyle.VIEW
+                invalidate()
            }
            .build()
    }
--- a/common/car/src/test/java/com/kouros/navigation/car/UnitTest.kt
+++ b/common/car/src/test/java/com/kouros/navigation/car/UnitTest.kt
@@ -6,6 +6,7 @@ import com.kouros.navigation.data.Constants.home2Location
 import com.kouros.navigation.data.Constants.homeLocation
 import com.kouros.navigation.data.NavigationRepository
 import com.kouros.navigation.data.SearchFilter
+import com.kouros.navigation.data.valhalla.ValhallaRepository
 import com.kouros.navigation.model.RouteModel
 import com.kouros.navigation.model.ViewModel
 import org.junit.Test
@@ -16,7 +17,7 @@ import org.junit.Test
 */
 class ViewModelTest {

-    val repo = NavigationRepository()
+    val repo = ValhallaRepository()
    val viewModel = ViewModel(repo)
    val model = RouteModel()

@@ -33,6 +34,6 @@ class ViewModelTest {
        toLocation.longitude = home2Location.longitude

        val route = repo.getRoute(fromLocation, toLocation, SearchFilter())
-        model.startNavigation(route)
+        //model.startNavigation(route)
    }
 }