From 02107256c71ffe55893e618a47b97e5920862720 Mon Sep 17 00:00:00 2001 From: Dimitris Date: Fri, 15 May 2026 10:17:21 +0200 Subject: [PATCH] Remove close action --- app/build.gradle.kts | 4 +- .../navigation/car/NavigationSession.kt | 5 +- .../kouros/navigation/car/SurfaceRenderer.kt | 5 +- .../com/kouros/navigation/car/map/MapView.kt | 65 ++++++++++--------- .../navigation/car/screen/NavigationScreen.kt | 14 ++-- .../com/kouros/navigation/utils/GeoUtils.kt | 2 +- .../navigation/utils/NavigationUtils.kt | 1 - 7 files changed, 49 insertions(+), 47 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0affcf1..c1b5e53 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,8 @@ android { applicationId = "com.kouros.navigation" minSdk = 33 targetSdk = 37 - versionCode = 111 - versionName = "0.3.0.111" + versionCode = 112 + versionName = "0.3.0.112" base.archivesName = "navi-$versionName" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt b/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt index ce86ce8..4be8ec4 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt @@ -404,7 +404,7 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa screenManager.popToRoot() screenManager.pushForResult( SearchScreen(carContext, surfaceRenderer, navigationViewModel, mutableListOf()) - ) { result -> + ) { _ -> // Handle search result if needed } } @@ -807,7 +807,7 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa val bearingRoute = surfaceRenderer.lastLocation.bearingPositive(location) val bearingSpeedCamera = try { camera.tags.direction.toFloat() - } catch (e: Exception) { + } catch (_: Exception) { 0F } if (camera.distance < 80) { @@ -825,7 +825,6 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa private fun checkRoute(location: Location) { val distance = location.distanceTo(lastRouteCheckLocation) if (distance > checkDistance(routeModel)) { - Log.d(TAG, "CheckRoute $distance ${checkDistance(routeModel)}") if (lastRouteCheckLocation.latitude != 0.0) { val destination = location( routeModel.navState.destination.longitude, diff --git a/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt b/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt index 4a27058..0a01133 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt @@ -46,7 +46,10 @@ import org.maplibre.compose.camera.CameraState import org.maplibre.compose.style.BaseStyle import org.maplibre.spatialk.geojson.Position import java.time.LocalDateTime -import kotlin.math.* +import kotlin.math.PI +import kotlin.math.cos +import kotlin.math.pow +import kotlin.math.sin /** diff --git 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 index e915450..c8d0ea8 100644 --- 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,6 @@ package com.kouros.navigation.car.map import android.location.Location -import android.util.Log import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -130,37 +129,15 @@ fun MapLibre( TrafficLayer(traffic!!) RouteLayer(route) StartEndLayer(route) - //RouteLayerPoint(route ) + // change also createLineStringCollection in GeoUtils + // Uncomment StartEndLayer + // RouteLayerPoint(route ) } SpeedCameraLayer(speedCameras) } } } -@Composable -fun StartEndLayer(routeData: String?) { - if (!routeData.isNullOrEmpty()) { - val end = createPointCollection(routeData) - val routes = rememberGeoJsonSource(GeoJsonData.JsonString(end)) - val img = image(painterResource(R.drawable.sports_score_48px), drawAsSdf = true) - SymbolLayer( - id = "end-layer", - source = routes, - iconColor = const(Color.Black), - iconImage = img, - iconSize = - interpolate( - type = exponential(2.0f), - input = zoom(), - 5 to const(2.0f), - 10 to const(2.0f), - 15 to const(3.0f), - 20 to const(4.0f), - ), - ) - } -} - @Composable fun RouteLayer(routeData: String?) { if (!routeData.isNullOrEmpty()) { @@ -204,6 +181,30 @@ fun TrafficLayer(trafficData: Map) { } } +@Composable +fun StartEndLayer(routeData: String?) { + if (!routeData.isNullOrEmpty()) { + val end = createPointCollection(routeData) + val routes = rememberGeoJsonSource(GeoJsonData.JsonString(end)) + val img = image(painterResource(R.drawable.sports_score_48px), drawAsSdf = true) + SymbolLayer( + id = "end-layer", + source = routes, + iconColor = const(Color.Black), + iconImage = img, + iconSize = + interpolate( + type = exponential(2.0f), + input = zoom(), + 5 to const(2.0f), + 10 to const(2.0f), + 15 to const(3.0f), + 20 to const(4.0f), + ), + ) + } +} + @Composable private fun ClosedLayer(entry: Map.Entry) { val routes = rememberGeoJsonSource(GeoJsonData.JsonString(entry.value)) @@ -291,9 +292,9 @@ private fun routeLineWidth(base: Dp, isCasing: Boolean = false): Expression>): String { - // return createPointCollection(lineCoordinates, "Route") + //return createPointCollection(lineCoordinates, "Route") val lineString = buildLineString { lineCoordinates.forEach { add( diff --git a/common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt b/common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt index de1106b..7085d82 100644 --- a/common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt +++ b/common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt @@ -153,7 +153,6 @@ fun duration( lastLocationUpdate: LocalDateTime ): Duration { if (viewStyle == ViewStyle.PREVIEW || - viewStyle == ViewStyle.PAN_VIEW || viewStyle == ViewStyle.AMENITY_VIEW) { return 100.milliseconds }