kouros/navigation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pan Mode

Browse Source
This commit is contained in:
Dimitris
2026-04-24 12:24:53 +02:00
parent 0fa625d785
commit 17e68de017
18 changed files with 242 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/car/src/androidTest/java/com/kouros/navigation/car/OverpassTest.kt
+1 -3
View File
@@ -14,8 +14,6 @@ import org.junit.Test
class OverpassTest {
val location = Location(LocationManager.GPS_PROVIDER)
@Test
fun `maxSpeed Schmalkaldener 30 `() {
val curLocation = location(11.582495, 48.186863)
@@ -31,7 +29,7 @@ class OverpassTest {
@Test
fun `maxSpeed Isarring 50 `() {
val curLocation = location(11.5989114, 48.1694783)
executeSpeedTest( curLocation, "Isarring", listOf("B2R"), 190, 50)
executeSpeedTest( curLocation, "Isarring", listOf("B2R"), 190, 60)
}
@Test
common/car/src/main/java/com/kouros/navigation/car/DeviceLocationManager.kt
+5 -2
View File
@@ -12,10 +12,13 @@ import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import com.kouros.data.BuildConfig
import com.kouros.navigation.data.Constants.a22
import com.kouros.navigation.data.Constants.a9
import com.kouros.navigation.data.Constants.a94
import com.kouros.navigation.data.Constants.homeHohenwaldeck
import com.kouros.navigation.data.Constants.homeVogelhart
import com.kouros.navigation.data.Constants.ioannina
import com.kouros.navigation.data.Constants.isarring
import com.kouros.navigation.data.Constants.subislawa
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
@@ -104,8 +107,8 @@ class DeviceLocationManager(
val lastLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
if (lastLocation != null) {
if (setIndividualLocation) {
onInitialLocation(homeVogelhart)
onLocationUpdate(homeVogelhart)
onInitialLocation(a22)
onLocationUpdate(a22)
} else {
onInitialLocation(lastLocation)
onLocationUpdate(lastLocation)
common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt
+41 -36
View File
@@ -54,6 +54,7 @@ import com.kouros.navigation.repository.SettingsRepository
import com.kouros.navigation.utils.GeoUtils
import com.kouros.navigation.utils.GeoUtils.snapLocation
import com.kouros.navigation.utils.NavigationUtils.getViewModel
import com.kouros.navigation.utils.bearingPositive
import com.kouros.navigation.utils.getSettingsRepository
import com.kouros.navigation.utils.getSettingsViewModel
import com.kouros.navigation.utils.location
@@ -464,23 +465,25 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
*/
private fun handleNavigationLocation(location: Location) {
val startTime = System.currentTimeMillis()
routeModel.updateLocation(location, navigationViewModel)
val snappedLocation = snapLocation(location, routeModel.route.maneuverLocations())
routeModel.updateLocation(location, navigationViewModel) // 30 ms
val snappedLocation = snapLocation(location, routeModel.route.maneuverLocations()) // 160 ms
val streetName = routeModel.currentStep().street
if (checkLocationDeviation(location, snappedLocation, streetName)) {
if (checkLocationDeviation(location, snappedLocation, streetName)) { // 1 ms
if (routeModel.navState.arrived) return
if (guidanceAudio == 1) {
handleGuidanceAudio()
}
val currentDate = LocalDateTime.now(ZoneOffset.UTC)
checkTraffic(currentDate, snappedLocation)
updateSpeedCamera(snappedLocation)
checkRoute(currentDate, snappedLocation)
updateNavigationScreen()
checkTraffic(currentDate, snappedLocation) // 0 ms
updateSpeedCamera(snappedLocation) // 0 ms
checkRoute(currentDate, snappedLocation) // 0 ms
updateNavigationScreen() // 660 ms
val endTime = System.currentTimeMillis() - startTime
// Log.d(TAG, "updateNavigationScreen: $endTime")
checkArrival()
}
val endTime = System.currentTimeMillis() - startTime
Log.d(TAG, "handleNavigationLocation: $endTime")
}
/**
@@ -498,9 +501,9 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
distance < MAXIMAL_SNAP_CORRECTION -> {
surfaceRenderer.updateLocation(snappedLocation, streetName)
}
else -> {
surfaceRenderer.updateLocation(location, streetName)
}
}
return true
@@ -516,15 +519,14 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
return
}
val currentStep = routeModel.route.currentStep()
val stepData = routeModel.currentStep()
val stepData = routeModel.currentStep() // 121 ms
navigationScreen.updateTrip(
navigationScreen.updateTrip( // 277 ms
isNavigating = routeModel.isNavigating(),
isRerouting = false,
hasArrived = routeModel.isArrival(),
destinationTravelEstimate = routeModel.getTravelEstimateTrip(carContext),
stepTravelEstimate = routeModel.getTravelEstimateStep(carContext),
destinationTravelEstimate = routeModel.getTravelEstimateTrip(carContext), // 60 ms
stepTravelEstimate = routeModel.getTravelEstimateStep(carContext), // 60 ms
destinations = mutableListOf(routeModel.getDestination()),
steps = routeModel.getSteps(carContext),
stepRemainingDistance = routeModel.getDistance(),
@@ -539,7 +541,7 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
* Updates the trip information and notifies the listener with a new Trip object.
* This includes destination name, address, travel estimate, and loading status.
*/
updateTrip(routeModel.getTrip(carContext))
updateTrip(routeModel.getTrip(carContext)) // 230 ms
}
/**
@@ -594,6 +596,7 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
lastCameraSearch = 0
surfaceRenderer.viewStyle = ViewStyle.VIEW
navigationScreen.navigationType = NavigationType.VIEW
navigationScreen.invalidate()
}
override fun updateTrip(trip: Trip) {
@@ -781,26 +784,28 @@ class NavigationSession : CarSession(), NavigationListener, NavigationObserverCa
private fun updateDistance(
location: Location,
) {
val updatedCameras = mutableListOf<Elements>()
speedCameras.forEach {
val plLocation =
location(longitude = it.lon, latitude = it.lat)
val distance = plLocation.distanceTo(location)
it.distance = distance.toDouble()
updatedCameras.add(it)
}
val sortedList = updatedCameras.sortedWith(compareBy { it.distance })
val camera = sortedList.firstOrNull() ?: return
val bearingRoute = surfaceRenderer.lastLocation.bearingTo(location)
val bearingSpeedCamera = try {
camera.tags.direction.toFloat()
} catch (e: Exception) {
0F
}
if (camera.distance < 80 && (System.currentTimeMillis() - lastAlert > 5000)) {
if ((bearingSpeedCamera - bearingRoute.absoluteValue).absoluteValue < 15.0) {
routeModel.showSpeedCamera(carContext, camera.distance, camera.tags.maxspeed)
lastAlert = System.currentTimeMillis()
synchronized(this) {
val updatedCameras = mutableListOf<Elements>()
speedCameras.forEach {
val plLocation =
location(longitude = it.lon, latitude = it.lat)
val distance = plLocation.distanceTo(location)
it.distance = distance.toDouble()
updatedCameras.add(it)
}
val sortedList = updatedCameras.sortedWith(compareBy { it.distance })
val camera = sortedList.firstOrNull() ?: return
val bearingRoute = surfaceRenderer.lastLocation.bearingPositive(location)
val bearingSpeedCamera = try {
camera.tags.direction.toFloat()
} catch (e: Exception) {
0F
}
if (camera.distance < 80 && (System.currentTimeMillis() - lastAlert > 10000)) {
if ((bearingSpeedCamera - bearingRoute).absoluteValue < 15.0) {
routeModel.showSpeedCamera(carContext, camera.distance, camera.tags.maxspeed)
lastAlert = System.currentTimeMillis()
}
}
}
}
common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt
+35 -9
View File
@@ -34,7 +34,7 @@ import com.kouros.navigation.data.Constants.TILT
import com.kouros.navigation.data.DarkMode
import com.kouros.navigation.data.ViewStyle
import com.kouros.navigation.model.BaseStyleModel
import com.kouros.navigation.utils.bearing
import com.kouros.navigation.utils.bearingPositive
import com.kouros.navigation.utils.calculateTilt
import com.kouros.navigation.utils.calculateZoom
import com.kouros.navigation.utils.duration
@@ -46,6 +46,7 @@ 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.*
/**
@@ -225,15 +226,40 @@ class SurfaceRenderer(
*/
override fun onScroll(distanceX: Float, distanceY: Float) {
synchronized(this@SurfaceRenderer) {
val currentCamera = cameraPosition.value ?: return@synchronized
val zoom = currentCamera.zoom
val bearing = currentCamera.bearing
// MapLibre typically uses 512px tiles.
// At zoom level z, the world (360 degrees) is 512 * 2^z pixels wide.
val pixelsPerDegreeLon = (512.0 * 2.0.pow(zoom)) / 360.0
// Latitude correction: In Mercator, the vertical scale is stretched by 1/cos(lat).
val latRad = lastLocation.latitude * PI / 180.0
val pixelsPerDegreeLat = pixelsPerDegreeLon / cos(latRad)
// Rotation compensation (bearing is degrees clockwise from North)
val bearingRad = bearing * PI / 180.0
val cosB = cos(bearingRad)
val sinB = sin(bearingRad)
// Rotate screen-space scroll to map-space scroll
val rotatedDx = distanceX * cosB - distanceY * sinB
val rotatedDy = distanceX * sinB + distanceY * cosB
viewStyle = ViewStyle.PAN_VIEW
if (distanceX != 0.0F) {
lastLocation.longitude += (distanceX / 1000) / cameraPosition.value!!.zoom
}
if (distanceY != 0.0F) {
lastLocation.latitude += (distanceY / 1000) / cameraPosition.value!!.zoom
}
// Update location based on rotated scroll distances and calculated factors
lastLocation.longitude += (rotatedDx / pixelsPerDegreeLon)
lastLocation.latitude -= (rotatedDy / pixelsPerDegreeLat)
val pos = Position(lastLocation.longitude, lastLocation.latitude)
updateCameraPosition( target = pos)
updateCameraPosition(
bearing = bearing,
zoom = zoom,
target = pos,
tilt = tilt
)
navigationSession.invalidateNavigationScreen()
}
}
@@ -374,7 +400,7 @@ class SurfaceRenderer(
if (location.hasBearing()) {
location.bearing.toDouble()
} else {
bearing(
bearingPositive(
lastLocation,
location,
cameraPosition.value!!.bearing
common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt
+2 -2
View File
@@ -330,7 +330,7 @@ fun DrawNavigationImages(
if (speed != null) {
CurrentSpeed(width, height, speed, maxSpeed)
}
if (speed != null && maxSpeed > 0) { // && (speed * 3.6) > maxSpeed) {
if (speed != null && maxSpeed > 0) {
MaxSpeed(width, height, maxSpeed, speed)
}
//DebugInfo(width, height, lat!!)
@@ -507,7 +507,7 @@ private fun MaxSpeed(
val textLayoutSpeed = remember(speed) {
textMeasurerSpeed.measure(speed, styleSpeed)
}
val signColor = if (curSpeed * 3.6 > maxSpeed) {
val signColor = if (curSpeed * 3.6 > (maxSpeed + 3)) {
Color.Red
} else {
Color.Green
common/car/src/main/java/com/kouros/navigation/car/navigation/Simulation.kt
+2 -2
View File
@@ -56,14 +56,14 @@ class Simulation {
longitude = point[0]
bearing = curBearing
speedAccuracyMetersPerSecond = 1.0f // ~1 m/s
speed = 10.0f
speed = 9.0f
time = System.currentTimeMillis()
elapsedRealtimeNanos = SystemClock.elapsedRealtimeNanos()
}
// Update your app's state as if a real GPS update occurred
updateLocation(fakeLocation)
// Wait before moving to the next point (e.g., every 1 second)
delay(1000)
delay(500)
lastLocation = fakeLocation
}
}
common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt
+4 -7
View File
@@ -100,7 +100,6 @@ open class NavigationScreen(
repository.tripSuggestionFlow.asLiveData().observe(this, Observer {
navigationViewModel.recentPlaces.observe(this, observerRecentPlaces)
//navigationViewModel.recentPlacesFlow(carContext, surfaceRenderer.lastLocation ).asLiveData().observe(this, ::test)
tripSuggestion = it
})
repository.alternativeRoutesFlow.asLiveData().observe(this, Observer {
@@ -142,10 +141,10 @@ open class NavigationScreen(
createAction(
carContext,
R.drawable.ic_close_white_24dp,
0,
{ stopNavigation() })
0
) { stopNavigation() }
)
return NavigationTemplate.Builder()
val navigationTemplate = NavigationTemplate.Builder()
.setNavigationInfo(
getRoutingInfo()
)
@@ -167,6 +166,7 @@ open class NavigationScreen(
)
.setBackgroundColor(backGroundColor)
.build()
return navigationTemplate
}
/**
@@ -490,8 +490,6 @@ open class NavigationScreen(
}
}
/**
* Updates navigation state with the current location, checks for arrival, and traffic updates.
*/
@@ -523,7 +521,6 @@ open class NavigationScreen(
this.junctionImage = junctionImage
this.backGroundColor = backGroundColor
this.message = message
navigationType = NavigationType.NAVIGATION
invalidate()
}
common/data/src/main/java/com/kouros/navigation/data/Data.kt
+3 -1
View File
@@ -128,8 +128,10 @@ object Constants {
val ioannina = location( 20.826237, 39.690174)
val subislawa = location(18.570808, 54.420647)
val a94 = location(11.872097,48.163449)
val a9 = location(11.621556, 48.204402,)
val a22 = location(10.845749, 45.602507)
val isarring = location( 11.609696, 48.155116)
const val NEXT_STEP_THRESHOLD = 500.0
const val MAXIMAL_SNAP_CORRECTION = 50.0
common/data/src/main/java/com/kouros/navigation/data/overpass/Overpass.kt
+75 -76
View File
@@ -11,59 +11,59 @@ import java.net.URL
class Overpass {
private val gson = GsonBuilder().serializeNulls().create()
var overpassUrl = if (BuildConfig.DEBUG)
"http://192.168.1.37/api/interpreter"
else
"https://kouros-online.de/api/interpreter"
val destination = "[!destination][highway!=\"motorway_link\"]"
fun getSpeedLimit(radius: Float, linestring: String, street: String, roadNumbers: List<String>): List<Elements> {
val streetName = if (street.length > 10) {
street.substring(0, 10)
} else {
street
}
val name = if (streetName.isEmpty()) {
""
} else {
"[name~\"^${streetName}\"]"
val wayAround = "way[maxspeed](around:$radius,$linestring)"
val searchClauses = mutableListOf<String>()
// 1. Search by street name (fuzzy match with first 10 characters)
val streetPrefix = street.take(10)
if (streetPrefix.isNotEmpty()) {
searchClauses.add("$wayAround[name~\"^$streetPrefix\"]")
}
val regex = Regex("""\d+|\D+""")
val search = "way[maxspeed](around:$radius,$linestring)$name[!destination][highway!=\"motorway_link\"]"
var waySearch = search
for ((index, r) in roadNumbers.withIndex()) {
val result = regex.findAll(r).map { it.groupValues.first() }.toList()
if (index > 0) {
waySearch = waySearch.plus(";").plus(search)
}
var refValue = result.first().trim().plus(" ")
for (res in result.subList(1, result.size)) {
refValue = refValue.plus(res)
}
// International reference starts with "E"
waySearch = if (r.first().toString() == "E") {
waySearch.plus("[int_ref~\"${refValue}\"]")
} else {
waySearch.plus("[ref~\"${refValue}\"]")
// 2. Search by road numbers (ref or int_ref)
val partRegex = Regex("""\d+|\D+""")
roadNumbers.forEach { number ->
val parts = partRegex.findAll(number).map { it.value.trim() }.filter { it.isNotEmpty() }.toList()
if (parts.isNotEmpty()) {
// Construct ref value: e.g., "A1" -> "A 1", "E30" -> "E 30"
val refValue = if (parts.size > 1) "${parts[0]} ${parts.drop(1).joinToString("")}" else parts[0]
val tag = if (number.startsWith("E", ignoreCase = true)) "int_ref" else "ref"
searchClauses.add("$wayAround$destination[$tag~\"$refValue\"]")
}
}
val httpURLConnection = URL(overpassUrl).openConnection() as HttpURLConnection
httpURLConnection.requestMethod = "POST"
httpURLConnection.setRequestProperty(
"Accept",
"application/json"
)
httpURLConnection.setDoOutput(true);
// define search query
// 3. Fallback to searching everything if no specific filters were added
if (searchClauses.isEmpty()) {
searchClauses.add(wayAround)
}
val searchQuery = """
|[out:json];
|(
| $waySearch;
|);
|out body geom;
|[out:json];
|(
| ${searchClauses.joinToString(";")};
|);
|out body geom;
""".trimMargin()
return overpassApi(httpURLConnection, searchQuery)
Log.d("OverpassApi", "Overpass Query: $searchQuery")
val connection = (URL(overpassUrl).openConnection() as HttpURLConnection).apply {
requestMethod = "POST"
setRequestProperty("Accept", "application/json")
doOutput = true
}
return overpassApi(connection, searchQuery)
}
@@ -74,51 +74,50 @@ class Overpass {
radius: Double
): List<Elements> {
val boundingBox = getBoundingBox(location.latitude, location.longitude, radius)
val httpURLConnection = URL(overpassUrl).openConnection() as HttpURLConnection
httpURLConnection.requestMethod = "POST"
// node["highway"="speed_camera"]
// node[amenity=$category]
httpURLConnection.setDoOutput(true);
httpURLConnection.setRequestProperty(
"Accept",
"application/json"
)
// define search query
val searchQuery = """
|[out:json];
|(
| node[$type=$category]
| ($boundingBox);
|);
|(._;>;);
|out body geom;
|[out:json];
|(
| node[$type=$category]
| ($boundingBox);
|);
|(._;>;);
|out body geom;
""".trimMargin()
return overpassApi(httpURLConnection, searchQuery)
val connection = (URL(overpassUrl).openConnection() as HttpURLConnection).apply {
requestMethod = "POST"
setRequestProperty("Accept", "application/json")
doOutput = true
}
return overpassApi(connection, searchQuery)
}
fun overpassApi(httpURLConnection: HttpURLConnection, searchQuery: String): List<Elements> {
try {
val outputStreamWriter = OutputStreamWriter(httpURLConnection.outputStream)
outputStreamWriter.write(searchQuery)
outputStreamWriter.flush()
// Check if the connection is successful
httpURLConnection.requestMethod = "POST"
val responseCode = httpURLConnection.responseCode
private fun overpassApi(connection: HttpURLConnection, searchQuery: String): List<Elements> {
return try {
connection.outputStream.use { os ->
OutputStreamWriter(os).use { writer ->
writer.write(searchQuery)
writer.flush()
}
}
val responseCode = connection.responseCode
if (responseCode == HttpURLConnection.HTTP_OK) {
val response = httpURLConnection.inputStream.bufferedReader()
.use { it.readText() } // defaults to UTF-8
val response = connection.inputStream.bufferedReader().use { it.readText() }
if (response.startsWith("<?xml")) {
Log.w("OverpassApi", "Received XML instead of JSON")
return emptyList()
}
val gson = GsonBuilder().serializeNulls().create()
val overpass = gson.fromJson(response, Amenity::class.java)
return overpass.elements
gson.fromJson(response, Amenity::class.java).elements
} else {
Log.e("OverpassApi", responseCode.toString())
Log.e("OverpassApi", "Error code: $responseCode")
emptyList()
}
} catch (e: Exception) {
Log.e("OverpassApi", e.toString())
Log.e("OverpassApi", "Exception in Overpass API call", e)
emptyList()
}
return emptyList()
}
}
}
common/data/src/main/java/com/kouros/navigation/data/tomtom/Instruction.kt
+1 -1
View File
@@ -11,7 +11,7 @@ data class Instruction(
val point: Point,
val pointIndex: Int,
val possibleCombineWithNext: Boolean,
val roadNumbers: List<String>,
val roadNumbers: List<String> = emptyList(),
val routeOffsetInMeters: Int,
val signpostText: String,
val street: String? = "",
common/data/src/main/java/com/kouros/navigation/data/tomtom/TomTomRepository.kt
+3 -2
View File
@@ -23,7 +23,7 @@ private const val tomtomFields =
val useLocal = BuildConfig.DEBUG
val useLocalTraffic = BuildConfig.DEBUG
val useLocalTraffic = BuildConfig.DEBUG
class TomTomRepository : NavigationRepository() {
override fun getRoute(
@@ -40,7 +40,8 @@ class TomTomRepository : NavigationRepository() {
}
if (useLocal) {
return fetchUrl(
"http://192.168.1.37/tomtom_routing.json",
//"http://192.168.1.37/tomtom_routing.json",
"http://192.168.1.37/verona.json",
false
)
}
common/data/src/main/java/com/kouros/navigation/model/NavigationViewModel.kt
+38 -33
View File
@@ -2,7 +2,6 @@ package com.kouros.navigation.model
import android.content.Context
import android.location.Location
import android.util.Log
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.runtime.toMutableStateList
@@ -22,6 +21,7 @@ import com.kouros.navigation.data.nominatim.SearchResult
import com.kouros.navigation.data.overpass.ElementSearch
import com.kouros.navigation.data.overpass.Elements
import com.kouros.navigation.data.overpass.Overpass
import com.kouros.navigation.utils.bearingPositive
import com.kouros.navigation.utils.countryCodeSpeedLimit
import com.kouros.navigation.utils.getSettingsRepository
import com.kouros.navigation.utils.location
@@ -390,18 +390,20 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
* Posts sorted results to speedCameras LiveData.
*/
fun getSpeedCameras(location: Location, radius: Double) {
viewModelScope.launch(Dispatchers.IO) {
val amenities = Overpass().getAmenities("highway", "speed_camera", location, radius)
val distAmenities = mutableListOf<Elements>()
amenities.forEach {
val plLocation =
location(longitude = it.lon, latitude = it.lat)
val distance = plLocation.distanceTo(location)
it.distance = distance.toDouble()
distAmenities.add(it)
synchronized(this) {
viewModelScope.launch(Dispatchers.IO) {
val amenities = Overpass().getAmenities("highway", "speed_camera", location, radius)
val distAmenities = mutableListOf<Elements>()
amenities.forEach {
val plLocation =
location(longitude = it.lon, latitude = it.lat)
val distance = plLocation.distanceTo(location)
it.distance = distance.toDouble()
distAmenities.add(it)
}
val sortedList = distAmenities.sortedWith(compareBy { it.distance })
speedCameras.postValue(sortedList)
}
val sortedList = distAmenities.sortedWith(compareBy { it.distance })
speedCameras.postValue(sortedList)
}
}
@@ -415,7 +417,9 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
countryCode: String,
) {
viewModelScope.launch(Dispatchers.IO) {
maxSpeed.postValue(calculateSpeedLimit(location, routeBearing, countryCode))
synchronized(this) {
maxSpeed.postValue(calculateSpeedLimit(location, routeBearing, countryCode))
}
}
}
@@ -428,31 +432,30 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
val search = mutableListOf<ElementSearch>()
speedElements.filter { it.type == "way"}.forEach {
var streetBearingSum = 0F
var streetBearingAvg = 0F
var distance = 0F
var maxDistance = 1000F
var geometryFirstLocation = location(0.0, 0.0)
var geometryLastLocation = location(0.0, 0.0)
for ((geoIndex, geo) in it.geometry.withIndex()) {
if (geoIndex == 0) {
geometryFirstLocation= location(geo.lon, geo.lat)
}
if (geoIndex == it.geometry.size-1) {
geometryLastLocation = location(geo.lon, geo.lat)
}
val geometryLocation = location(geo.lon, geo.lat)
distance = geometryLocation.distanceTo(location)
if (distance < maxDistance) {
maxDistance = distance
}
if (geoIndex > 0) {
val prevLocation =
location(it.geometry[geoIndex - 1].lon, it.geometry[geoIndex - 1].lat)
val streetBearing = prevLocation.bearingTo(geometryLocation).absoluteValue
streetBearingSum = (streetBearingSum + streetBearing)
streetBearingAvg = streetBearingSum / geoIndex
}
}
val bearing = calculateBearing(it, streetBearingAvg, routeBearing)
if (bearing < SPEED_BEARING_DEVIATION) {
val streetBearing = geometryFirstLocation.bearingPositive(geometryLastLocation)
if (isBearingValid(it, streetBearing, routeBearing)) {
search.add(
ElementSearch(
it,
maxDistance.toDouble(),
streetBearingAvg.absoluteValue
streetBearing.absoluteValue
)
)
}
@@ -460,7 +463,6 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
val result = search.sortedWith(compareBy<ElementSearch> { it.distance }.thenByDescending { it.bearing })
if (result.isNotEmpty()) {
element = result.first().element
//Log.d("NavigationViewModel", "Distance: ${result.first().distance} Bearing: ${result.first().bearing} RouteBearing $routeBearing")
speed = if (element.tags.maxspeed == "none" && element.tags.highway == "motorway") {
countryCodeSpeedLimit(countryCode)
} else {
@@ -470,11 +472,11 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
return speed
}
private fun calculateBearing(element: Elements, streetBearingAvg : Float, routeBearing: Float) : Float {
private fun isBearingValid(element: Elements, streetBearing : Float, routeBearing: Float) : Boolean {
return if (element.tags.oneway.isNotEmpty()) {
(streetBearingAvg - routeBearing.absoluteValue).absoluteValue
(streetBearing - routeBearing.absoluteValue) < SPEED_BEARING_DEVIATION
} else {
0F
true
}
}
@@ -488,10 +490,13 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
roadNumbers: List<String>
) {
viewModelScope.launch(Dispatchers.IO) {
val lineString = "${location.latitude},${location.longitude}"
val elements = Overpass().getSpeedLimit(SPEED_UPDATE_DISTANCE, lineString, street, roadNumbers)
speedElements.clear()
speedElements.addAll(elements)
synchronized(this) {
val lineString = "${location.latitude},${location.longitude}"
val elements =
Overpass().getSpeedLimit(SPEED_UPDATE_DISTANCE, lineString, street, roadNumbers)
speedElements.clear()
speedElements.addAll(elements)
}
}
}
common/data/src/main/java/com/kouros/navigation/model/RouteModel.kt
+2
View File
@@ -1,10 +1,12 @@
package com.kouros.navigation.model
import android.location.Location
import android.util.Log
import androidx.car.app.connection.CarConnection.CONNECTION_TYPE_NATIVE
import androidx.car.app.connection.CarConnection.CONNECTION_TYPE_PROJECTION
import androidx.car.app.navigation.model.Maneuver
import com.kouros.navigation.data.Constants.NEXT_STEP_THRESHOLD
import com.kouros.navigation.data.Constants.TAG
import com.kouros.navigation.data.NavigationState
import com.kouros.navigation.data.Route
import com.kouros.navigation.data.StepData
common/data/src/main/java/com/kouros/navigation/utils/GeoUtils.kt
+2
View File
@@ -1,6 +1,8 @@
package com.kouros.navigation.utils
import android.location.Location
import android.util.Log
import com.kouros.navigation.data.Constants.TAG
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put
import org.maplibre.geojson.FeatureCollection
common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt
+6 -3
View File
@@ -108,13 +108,12 @@ fun calculateTilt(viewStyle: ViewStyle, newZoom: Double, tilt: Double): Double =
return 0.0
}
fun bearing(fromLocation: Location, toLocation: Location, oldBearing: Double): Double {
fun bearingPositive(fromLocation: Location, toLocation: Location, oldBearing: Double): Double {
val distance = fromLocation.distanceTo(toLocation)
if (distance < 1.0) {
return oldBearing
}
val bearing = fromLocation.bearingTo(toLocation).toInt().toDouble()
return bearing
return fromLocation.bearingPositive(toLocation).toInt().toDouble()
}
fun location(longitude: Double, latitude: Double): Location {
@@ -124,6 +123,10 @@ fun location(longitude: Double, latitude: Double): Location {
return location
}
fun Location.bearingPositive(locationTo: Location): Float {
return (this.bearingTo (locationTo) + 360) % 360
}
fun formatDateTime(time: Long): String {
val dateFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
val dateTime = LocalDateTime.ofEpochSecond(time / 1000, 0, ZoneOffset.UTC)