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

Stopover and Legs, ManeuverType

Browse Source
This commit is contained in:
Dimitris
2026-04-01 16:24:51 +02:00
parent 6838ad09c4
commit 52f8dec2e6
28 changed files with 208 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/data/src/main/java/com/kouros/navigation/data/Color.kt
+1 -1
View File
@@ -6,7 +6,7 @@ val NavigationColorLight = Color(0xFF17A119)
val NavigationColorDark = Color(0xFF4EDE10)
val RouteColor = Color(0xFF05692D)
val RouteColor = Color(0xFF195D02)
val SpeedColor = Color(0xFF262525)
common/data/src/main/java/com/kouros/navigation/data/Data.kt
+11 -2
View File
@@ -17,9 +17,11 @@
package com.kouros.navigation.data
import android.net.Uri
import com.google.gson.annotations.Expose
import com.kouros.navigation.data.route.Lane
import com.kouros.navigation.utils.location
import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient
data class Category(
val id: String,
@@ -27,6 +29,7 @@ data class Category(
)
data class Places(
val places: List<Place>,
)
@@ -41,11 +44,15 @@ data class Place(
var postalCode: String = "",
var city: String = "",
var street: String = "",
@Transient
var distance: Float = 0F,
//var avatar: Uri? = null,
var lastDate: Long = 0,
@Transient
var routeIndex: Int = 0,
@Transient
var route: String = "",
@Transient
var stopOver: Boolean = false,
)
@@ -113,8 +120,6 @@ object Constants {
const val CHARGING_STATION: String ="charging_station"
val categories = listOf("Tankstelle", "Apotheke", "Ladestationen")
/** The initial location to use as an anchor for searches. */
val homeVogelhart = location(11.5793748, 48.185749)
val homeHohenwaldeck = location( 11.594322, 48.1164817)
@@ -158,6 +163,10 @@ enum class RouteEngine {
VALHALLA, OSRM, TOMTOM
}
enum class DarkMode {
LIGHT, DARK, USE_CAR
}
enum class EngineType {
COMBUSTION, ELECTRIC
}
common/data/src/main/java/com/kouros/navigation/data/route/Maneuver.kt
+55 -55
View File
@@ -3,67 +3,67 @@ package com.kouros.navigation.data.route
import android.location.Location
data class Maneuver(
val bearingBefore : Int = 0,
val bearingAfter : Int = 0,
val bearingBefore: Int = 0,
val bearingAfter: Int = 0,
val type: Int = 0,
val waypoints: List<List<Double>>,
val location: Location,
val exit: Int = 0,
val street: String = "",
val message: String = "",
val pointIndex : Int = 0,
val pointIndex: Int = 0,
)
enum class ManeuverType {
TYPE_UNKNOWN,
TYPE_DEPART,
TYPE_NAME_CHANGE,
TYPE_KEEP_LEFT,
TYPE_KEEP_RIGHT,
TYPE_TURN_SLIGHT_LEFT,
TYPE_TURN_SLIGHT_RIGHT,
TYPE_TURN_NORMAL_LEFT,
TYPE_TURN_NORMAL_RIGHT,
TYPE_TURN_SHARP_LEFT,
TYPE_TURN_SHARP_RIGHT,
TYPE_U_TURN_LEFT,
TYPE_U_TURN_RIGHT,
TYPE_ON_RAMP_SLIGHT_LEFT,
TYPE_ON_RAMP_SLIGHT_RIGHT,
TYPE_ON_RAMP_NORMAL_LEFT,
TYPE_ON_RAMP_NORMAL_RIGHT,
TYPE_ON_RAMP_SHARP_LEFT,
TYPE_ON_RAMP_SHARP_RIGHT,
TYPE_ON_RAMP_U_TURN_LEFT,
TYPE_ON_RAMP_U_TURN_RIGHT,
TYPE_OFF_RAMP_SLIGHT_LEFT,
TYPE_OFF_RAMP_SLIGHT_RIGHT,
TYPE_OFF_RAMP_NORMAL_LEFT,
TYPE_OFF_RAMP_NORMAL_RIGHT,
TYPE_FORK_LEFT,
TYPE_FORK_RIGHT,
TYPE_MERGE_LEFT,
TYPE_MERGE_RIGHT,
TYPE_MERGE_SIDE_UNSPECIFIED,
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW,
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW_WITH_ANGLE,
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW,
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE,
TYPE_STRAIGHT,
TYPE_FERRY_BOAT,
TYPE_FERRY_TRAIN,
TYPE_DESTINATION,
TYPE_DESTINATION_STRAIGHT,
TYPE_DESTINATION_LEFT,
TYPE_DESTINATION_RIGHT,
TYPE_ROUNDABOUT_ENTER_CW,
TYPE_ROUNDABOUT_EXIT_CW,
TYPE_ROUNDABOUT_ENTER_CCW,
TYPE_ROUNDABOUT_EXIT_CCW,
TYPE_FERRY_BOAT_LEFT,
TYPE_FERRY_BOAT_RIGHT,
TYPE_FERRY_TRAIN_LEFT,
TYPE_FERRY_TRAIN_RIGHT,
TYPE_WAYPOINT_RIGHT,
TYPE_WAYPOINT_LEFT
enum class ManeuverType(val value: Int) {
TYPE_UNKNOWN(0),
TYPE_DEPART(1),
TYPE_NAME_CHANGE(2),
TYPE_KEEP_LEFT(3),
TYPE_KEEP_RIGHT(4),
TYPE_TURN_SLIGHT_LEFT(5),
TYPE_TURN_SLIGHT_RIGHT(6),
TYPE_TURN_NORMAL_LEFT(7),
TYPE_TURN_NORMAL_RIGHT(8),
TYPE_TURN_SHARP_LEFT(9),
TYPE_TURN_SHARP_RIGHT(10),
TYPE_U_TURN_LEFT(11),
TYPE_U_TURN_RIGHT(12),
TYPE_ON_RAMP_SLIGHT_LEFT(13),
TYPE_ON_RAMP_SLIGHT_RIGHT(14),
TYPE_ON_RAMP_NORMAL_LEFT(15),
TYPE_ON_RAMP_NORMAL_RIGHT(16),
TYPE_ON_RAMP_SHARP_LEFT(17),
TYPE_ON_RAMP_SHARP_RIGHT(18),
TYPE_ON_RAMP_U_TURN_LEFT(19),
TYPE_ON_RAMP_U_TURN_RIGHT(20),
TYPE_OFF_RAMP_SLIGHT_LEFT(21),
TYPE_OFF_RAMP_SLIGHT_RIGHT(22),
TYPE_OFF_RAMP_NORMAL_LEFT(23),
TYPE_OFF_RAMP_NORMAL_RIGHT(24),
TYPE_FORK_LEFT(25),
TYPE_FORK_RIGHT(26),
TYPE_MERGE_LEFT(27),
TYPE_MERGE_RIGHT(28),
TYPE_MERGE_SIDE_UNSPECIFIED (29),
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW (32),
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CW_WITH_ANGLE(33),
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW(34),
TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW_WITH_ANGLE(35),
TYPE_STRAIGHT(36),
TYPE_FERRY_BOAT (37),
TYPE_FERRY_TRAIN (38),
TYPE_DESTINATION (39),
TYPE_DESTINATION_STRAIGHT (40),
TYPE_DESTINATION_LEFT(41),
TYPE_DESTINATION_RIGHT(42),
TYPE_ROUNDABOUT_ENTER_CW(43),
TYPE_ROUNDABOUT_EXIT_CW(44),
TYPE_ROUNDABOUT_ENTER_CCW(45),
TYPE_ROUNDABOUT_EXIT_CCW(46),
TYPE_FERRY_BOAT_LEFT(47),
TYPE_FERRY_BOAT_RIGHT(48),
TYPE_FERRY_TRAIN_LEFT(49),
TYPE_FERRY_TRAIN_RIGHT(50),
TYPE_WAYPOINT_RIGHT(51),
TYPE_WAYPOINT_LEFT(52),
}
common/data/src/main/java/com/kouros/navigation/data/tomtom/Cause.kt
-5
View File
@@ -1,5 +0,0 @@
package com.kouros.navigation.data.tomtom
data class Cause(
val mainCauseCode: Int
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/Events.kt
-10
View File
@@ -1,10 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Events (
@SerializedName("description" ) var description : String? = null
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/Features.kt
-12
View File
@@ -1,12 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Features (
@SerializedName("type" ) var type : String? = null,
@SerializedName("properties" ) var properties : Properties? = Properties(),
@SerializedName("geometry" ) var geometry : Geometry? = Geometry()
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/Geometry.kt
-11
View File
@@ -1,11 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Geometry (
@SerializedName("type" ) var type : String? = null,
@SerializedName("coordinates" ) var coordinates : List<List<Double>> = arrayListOf()
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/Incidents.kt
-12
View File
@@ -1,12 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Incidents (
@SerializedName("type" ) var type : String? = null,
@SerializedName("properties" ) var properties : Properties? = Properties(),
@SerializedName("geometry" ) var geometry : Geometry? = Geometry()
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/Properties.kt
-11
View File
@@ -1,11 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Properties (
@SerializedName("iconCategory" ) var iconCategory : Int? = null,
@SerializedName("events" ) var events : ArrayList<Events> = arrayListOf()
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/TomTomRepository.kt
+2 -2
View File
@@ -21,9 +21,9 @@ const val tomtomTrafficUrl = "https://api.tomtom.com/traffic/services/5/incident
private const val tomtomFields =
"{incidents{type,geometry{type,coordinates},properties{iconCategory,events{description}}}}"
val useLocal = BuildConfig.DEBUG
val useLocal = BuildConfig.DEBUG
val useLocalTraffic = BuildConfig.DEBUG
val useLocalTraffic = BuildConfig.DEBUG
class TomTomRepository : NavigationRepository() {
common/data/src/main/java/com/kouros/navigation/data/tomtom/TomTomRoute.kt
+19 -19
View File
@@ -142,79 +142,79 @@ class TomTomRoute {
var newType = 0
when (type) {
"DEPART" -> {
newType = ManeuverType.TYPE_DEPART.ordinal
newType = ManeuverType.TYPE_DEPART.value
}
"ARRIVE" -> {
newType = ManeuverType.TYPE_DESTINATION.ordinal
newType = ManeuverType.TYPE_DESTINATION.value
}
"ARRIVE_LEFT" -> {
newType = ManeuverType.TYPE_DESTINATION_LEFT.ordinal
newType = ManeuverType.TYPE_DESTINATION_LEFT.value
}
"ARRIVE_RIGHT" -> {
newType = ManeuverType.TYPE_DESTINATION_RIGHT.ordinal
newType = ManeuverType.TYPE_DESTINATION_RIGHT.value
}
"STRAIGHT", "FOLLOW" -> {
newType = ManeuverType.TYPE_STRAIGHT.ordinal
newType = ManeuverType.TYPE_STRAIGHT.value
}
"KEEP_RIGHT" -> {
newType = ManeuverType.TYPE_KEEP_RIGHT.ordinal
newType = ManeuverType.TYPE_KEEP_RIGHT.value
}
"BEAR_RIGHT" -> {
newType = ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal
newType = ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value
}
"BEAR_LEFT" -> {
newType = ManeuverType.TYPE_TURN_SLIGHT_LEFT.ordinal
newType = ManeuverType.TYPE_TURN_SLIGHT_LEFT.value
}
"KEEP_LEFT" -> {
newType = ManeuverType.TYPE_KEEP_LEFT.ordinal
newType = ManeuverType.TYPE_KEEP_LEFT.value
}
"TURN_LEFT" -> {
newType = ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal
newType = ManeuverType.TYPE_TURN_NORMAL_LEFT.value
}
"TURN_RIGHT" -> {
newType = ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal
newType = ManeuverType.TYPE_TURN_NORMAL_RIGHT.value
}
"SHARP_LEFT" -> {
newType = ManeuverType.TYPE_TURN_SHARP_LEFT.ordinal
newType = ManeuverType.TYPE_TURN_SHARP_LEFT.value
}
"SHARP_RIGHT" -> {
newType = ManeuverType.TYPE_TURN_SHARP_RIGHT.ordinal
newType = ManeuverType.TYPE_TURN_SHARP_RIGHT.value
}
"ROUNDABOUT_RIGHT", "ROUNDABOUT_CROSS" -> {
newType = ManeuverType.TYPE_ROUNDABOUT_ENTER_CCW.ordinal
newType = ManeuverType.TYPE_ROUNDABOUT_ENTER_CCW.value
}
"ROUNDABOUT_LEFT" -> {
newType = ManeuverType.TYPE_ROUNDABOUT_ENTER_CW.ordinal
newType = ManeuverType.TYPE_ROUNDABOUT_ENTER_CW.value
}
"MAKE_UTURN", "TRY_MAKE_UTURN" -> {
newType = ManeuverType.TYPE_U_TURN_LEFT.ordinal
newType = ManeuverType.TYPE_U_TURN_LEFT.value
}
"ENTER_MOTORWAY" -> {
newType = ManeuverType.TYPE_MERGE_LEFT.ordinal
newType = ManeuverType.TYPE_MERGE_LEFT.value
}
"TAKE_EXIT" -> {
newType = ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal
newType = ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value
}
"WAYPOINT_RIGHT" -> {
newType = ManeuverType.TYPE_WAYPOINT_RIGHT.ordinal
newType = ManeuverType.TYPE_WAYPOINT_RIGHT.value
}
}
return newType
common/data/src/main/java/com/kouros/navigation/data/tomtom/Traffic.kt
-12
View File
@@ -1,12 +0,0 @@
package com.kouros.navigation.data.tomtom
import com.google.gson.annotations.SerializedName
data class Traffic (
//@SerializedName("incidents" ) var incidents : ArrayList<Incidents> = arrayListOf()
@SerializedName("type" ) var type : String = "",
@SerializedName("features" ) var features : ArrayList<Features> = arrayListOf()
)
common/data/src/main/java/com/kouros/navigation/data/tomtom/TrafficData.kt
-6
View File
@@ -1,6 +0,0 @@
package com.kouros.navigation.data.tomtom
data class TrafficData (
var traffic : Traffic ,
var trafficData: String = ""
)
common/data/src/main/java/com/kouros/navigation/model/IconMapper.kt
+46 -46
View File
@@ -19,64 +19,64 @@ class IconMapper {
fun maneuverIcon(routeManeuverType: Int): Int {
var currentTurnIcon = R.drawable.ic_turn_name_change
when (routeManeuverType) {
ManeuverType.TYPE_STRAIGHT.ordinal -> {
ManeuverType.TYPE_STRAIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_name_change
}
ManeuverType.TYPE_DESTINATION.ordinal,
ManeuverType.TYPE_DESTINATION_RIGHT.ordinal,
ManeuverType.TYPE_DESTINATION_LEFT.ordinal,
ManeuverType.TYPE_DESTINATION_STRAIGHT.ordinal
ManeuverType.TYPE_DESTINATION.value,
ManeuverType.TYPE_DESTINATION_RIGHT.value,
ManeuverType.TYPE_DESTINATION_LEFT.value,
ManeuverType.TYPE_DESTINATION_STRAIGHT.value
-> {
currentTurnIcon = R.drawable.ic_turn_destination
}
ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal -> {
ManeuverType.TYPE_TURN_NORMAL_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_normal_right
}
ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal -> {
ManeuverType.TYPE_TURN_NORMAL_LEFT.value -> {
currentTurnIcon = R.drawable.ic_turn_normal_left
}
ManeuverType.TYPE_OFF_RAMP_SLIGHT_RIGHT.ordinal -> {
ManeuverType.TYPE_OFF_RAMP_SLIGHT_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_slight_right
}
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal -> {
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_slight_right
}
ManeuverType.TYPE_KEEP_RIGHT.ordinal -> {
ManeuverType.TYPE_KEEP_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_name_change
}
ManeuverType.TYPE_KEEP_LEFT.ordinal -> {
ManeuverType.TYPE_KEEP_LEFT.value -> {
currentTurnIcon = R.drawable.ic_turn_name_change
}
ManeuverType.TYPE_ROUNDABOUT_ENTER_CCW.ordinal -> {
ManeuverType.TYPE_ROUNDABOUT_ENTER_CCW.value -> {
currentTurnIcon = R.drawable.ic_roundabout_ccw
}
ManeuverType.TYPE_ROUNDABOUT_EXIT_CCW.ordinal -> {
ManeuverType.TYPE_ROUNDABOUT_EXIT_CCW.value -> {
currentTurnIcon = R.drawable.ic_roundabout_ccw
}
ManeuverType.TYPE_U_TURN_LEFT.ordinal -> {
ManeuverType.TYPE_U_TURN_LEFT.value -> {
currentTurnIcon = R.drawable.ic_turn_u_turn_left
}
ManeuverType.TYPE_U_TURN_RIGHT.ordinal -> {
ManeuverType.TYPE_U_TURN_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_u_turn_right
}
ManeuverType.TYPE_MERGE_LEFT.ordinal -> {
ManeuverType.TYPE_MERGE_LEFT.value -> {
currentTurnIcon = R.drawable.ic_turn_merge_symmetrical
}
ManeuverType.TYPE_WAYPOINT_RIGHT.ordinal -> {
ManeuverType.TYPE_WAYPOINT_RIGHT.value -> {
currentTurnIcon = R.drawable.ic_turn_destination
}
}
@@ -87,8 +87,8 @@ class IconMapper {
val laneDirection = when (direction.lowercase(Locale.getDefault())) {
"left_straight" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal -> LaneDirection.SHAPE_NORMAL_LEFT
ManeuverType.TYPE_STRAIGHT.ordinal -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_TURN_NORMAL_LEFT.value -> LaneDirection.SHAPE_NORMAL_LEFT
ManeuverType.TYPE_STRAIGHT.value -> LaneDirection.SHAPE_STRAIGHT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -96,7 +96,7 @@ class IconMapper {
"left" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal -> LaneDirection.SHAPE_NORMAL_LEFT
ManeuverType.TYPE_TURN_NORMAL_LEFT.value -> LaneDirection.SHAPE_NORMAL_LEFT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -104,9 +104,9 @@ class IconMapper {
"straight" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_STRAIGHT.ordinal -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_KEEP_LEFT.ordinal -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_KEEP_RIGHT.ordinal -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_STRAIGHT.value -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_KEEP_LEFT.value -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_KEEP_RIGHT.value -> LaneDirection.SHAPE_STRAIGHT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -114,7 +114,7 @@ class IconMapper {
"right" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal -> LaneDirection.SHAPE_NORMAL_RIGHT
ManeuverType.TYPE_TURN_NORMAL_RIGHT.value -> LaneDirection.SHAPE_NORMAL_RIGHT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -122,8 +122,8 @@ class IconMapper {
"right_straight" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal -> LaneDirection.SHAPE_NORMAL_RIGHT
ManeuverType.TYPE_STRAIGHT.ordinal -> LaneDirection.SHAPE_STRAIGHT
ManeuverType.TYPE_TURN_NORMAL_RIGHT.value -> LaneDirection.SHAPE_NORMAL_RIGHT
ManeuverType.TYPE_STRAIGHT.value -> LaneDirection.SHAPE_STRAIGHT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -131,8 +131,8 @@ class IconMapper {
"left_slight", "slight_left" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal -> LaneDirection.SHAPE_SLIGHT_LEFT
ManeuverType.TYPE_KEEP_LEFT.ordinal -> LaneDirection.SHAPE_SLIGHT_LEFT
ManeuverType.TYPE_TURN_NORMAL_LEFT.value -> LaneDirection.SHAPE_SLIGHT_LEFT
ManeuverType.TYPE_KEEP_LEFT.value -> LaneDirection.SHAPE_SLIGHT_LEFT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -140,8 +140,8 @@ class IconMapper {
"right_slight", "slight_right" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal -> LaneDirection.SHAPE_NORMAL_RIGHT
ManeuverType.TYPE_KEEP_RIGHT.ordinal -> LaneDirection.SHAPE_SLIGHT_RIGHT
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value -> LaneDirection.SHAPE_NORMAL_RIGHT
ManeuverType.TYPE_KEEP_RIGHT.value -> LaneDirection.SHAPE_SLIGHT_RIGHT
else
-> LaneDirection.SHAPE_UNKNOWN
}
@@ -213,8 +213,8 @@ class IconMapper {
return when (direction) {
"left_straight" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal -> "left_o_straight_x"
ManeuverType.TYPE_STRAIGHT.ordinal -> "left_x_straight_o"
ManeuverType.TYPE_TURN_NORMAL_LEFT.value -> "left_o_straight_x"
ManeuverType.TYPE_STRAIGHT.value -> "left_x_straight_o"
else
-> "left_x_straight_x"
}
@@ -222,29 +222,29 @@ class IconMapper {
"right_straight" -> {
when (stepData.currentManeuverType) {
ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal -> "right_x_straight_x"
ManeuverType.TYPE_STRAIGHT.ordinal -> "right_x_straight_o"
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal -> "right_o_straight_o"
ManeuverType.TYPE_TURN_NORMAL_RIGHT.value -> "right_x_straight_x"
ManeuverType.TYPE_STRAIGHT.value -> "right_x_straight_o"
ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value -> "right_o_straight_o"
else
-> "right_x_straight_x"
}
}
"right" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal) "${direction}_o" else "${direction}_x"
"left" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal) "${direction}_o" else "${direction}_x"
"straight" -> if (stepData.currentManeuverType == ManeuverType.TYPE_STRAIGHT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_LEFT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_RIGHT.ordinal
"right" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_RIGHT.value) "${direction}_o" else "${direction}_x"
"left" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_LEFT.value) "${direction}_o" else "${direction}_x"
"straight" -> if (stepData.currentManeuverType == ManeuverType.TYPE_STRAIGHT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_LEFT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_RIGHT.value
) "${direction}_o" else "${direction}_x"
"right_slight", "slight_right" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_SLIGHT_RIGHT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_RIGHT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_RIGHT.ordinal
"right_slight", "slight_right" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_SLIGHT_RIGHT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_RIGHT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_RIGHT.value
) "slight_right_o" else "slight_right_x"
"left_slight", "slight_left" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_SLIGHT_LEFT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_LEFT.ordinal
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_LEFT.ordinal
"left_slight", "slight_left" -> if (stepData.currentManeuverType == ManeuverType.TYPE_TURN_SLIGHT_LEFT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_TURN_NORMAL_LEFT.value
|| stepData.currentManeuverType == ManeuverType.TYPE_KEEP_LEFT.value
) "slight_left_o" else "slight_left_x"
else -> {
common/data/src/main/java/com/kouros/navigation/model/NavigationViewModel.kt
+9 -10
View File
@@ -3,7 +3,6 @@ package com.kouros.navigation.model
//import com.kouros.navigation.data.Preferences.boxStore
import android.content.Context
import android.location.Location
import android.util.Log
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.runtime.toMutableStateList
import androidx.lifecycle.MutableLiveData
@@ -27,6 +26,7 @@ import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.maplibre.geojson.FeatureCollection
import java.lang.reflect.Modifier
import java.time.LocalDateTime
import java.time.ZoneOffset
@@ -101,6 +101,7 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
MutableLiveData()
}
val gson: com.google.gson.Gson = GsonBuilder().create()
/**
* Loads all recent places from Preferences and calculates distances.
@@ -111,14 +112,14 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
try {
val settingsRepository = getSettingsRepository(context)
val rp = settingsRepository.recentPlacesFlow.first()
val gson = GsonBuilder().serializeNulls().create()
val places = gson.fromJson(rp, Places::class.java)
val pl = mutableListOf<Place>()
var id: Long = 0
if (rp.isNotEmpty()) {
for (place in places.places) {
if (place.category.equals(Constants.RECENT)
|| place.category.equals(Constants.FAVORITES)) {
if (place.category == Constants.RECENT
|| place.category == Constants.FAVORITES
) {
val plLocation = location(place.longitude, place.latitude)
if (place.latitude != 0.0) {
val distance =
@@ -289,7 +290,6 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
var sortedList: List<SearchResult>
viewModelScope.launch(Dispatchers.IO) {
val placesJson = repository.searchPlaces(search, location)
val gson = GsonBuilder().serializeNulls().create()
val places = gson.fromJson(placesJson, Search::class.java)
val distPlaces = mutableListOf<SearchResult>()
places.forEach {
@@ -314,7 +314,6 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
viewModelScope.launch(Dispatchers.IO) {
val placesJson = repository.searchPlaces(search, location)
if (placesJson.isNotEmpty()) {
val gson = GsonBuilder().serializeNulls().create()
val places = gson.fromJson(placesJson, Search::class.java)
val distPlaces = mutableListOf<SearchResult>()
places.forEach {
@@ -434,7 +433,6 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
viewModelScope.launch(Dispatchers.IO) {
try {
val places = mutableListOf<Place>()
val gson = GsonBuilder().serializeNulls().create()
val settingsRepository = getSettingsRepository(context)
val rp = settingsRepository.recentPlacesFlow.first()
var id: Long = 0
@@ -444,6 +442,7 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
for (curPlace in recentPlaces) {
if (curPlace.name != place.name || curPlace.category != place.category) {
curPlace.id = id
curPlace.route = ""
places.add(curPlace)
id += 1
}
@@ -451,6 +450,7 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
}
val current = LocalDateTime.now(ZoneOffset.UTC)
place.lastDate = current.atZone(ZoneOffset.UTC).toEpochSecond()
place.route = ""
places.add(place)
settingsRepository.setRecentPlaces(gson.toJson(Places(places)))
} catch (e: Exception) {
@@ -473,7 +473,6 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
fun deletePlace(context: Context, place: Place) {
viewModelScope.launch(Dispatchers.IO) {
try {
val gson = GsonBuilder().serializeNulls().create()
val settingsRepository = getSettingsRepository(context)
val rp = settingsRepository.recentPlacesFlow.first()
val places = mutableListOf<Place>()
@@ -482,6 +481,7 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
gson.fromJson(rp, Places::class.java).places.sortedBy { it.lastDate }
for (curPlace in rPlaces) {
if (curPlace.name != place.name || curPlace.category != place.category) {
curPlace.route = ""
places.add(curPlace)
}
}
@@ -511,12 +511,11 @@ class NavigationViewModel(private val repository: NavigationRepository) : ViewMo
* Loads recent places as Compose SnapshotStateList.
* @return SnapshotStateList of recent places
*/
fun loadRecentPlace(context: Context): SnapshotStateList<Place?> {
fun loadRecentPlaces(context: Context): SnapshotStateList<Place?> {
val pl = mutableListOf<Place>()
val settingsRepository = getSettingsRepository(context)
val rp = runBlocking { settingsRepository.recentPlacesFlow.first() }
if (rp.isNotEmpty()) {
val gson = GsonBuilder().serializeNulls().create()
val recentPlaces = gson.fromJson(rp, Places::class.java).places.sortedBy { it.lastDate }
for (place in recentPlaces) {
if (place.category == Constants.RECENT) {
common/data/src/main/java/com/kouros/navigation/repository/SettingsRepository.kt
+1
View File
@@ -1,5 +1,6 @@
package com.kouros.navigation.repository
import android.util.Log
import com.kouros.navigation.data.datastore.DataStoreManager
import kotlinx.coroutines.flow.Flow
common/data/src/main/java/com/kouros/navigation/utils/NavigationUtils.kt
+1 -1
View File
@@ -147,7 +147,7 @@ fun duration(
if (updateDuration.toMillis().absoluteValue < 1000) {
2.seconds
} else {
((updateDuration!!.toMillis().absoluteValue * 1.2).toDuration(DurationUnit.MILLISECONDS))
((updateDuration!!.toMillis().absoluteValue * 1.8).toDuration(DurationUnit.MILLISECONDS))
}
}
return cameraDuration