Auto Drive Simulation

app/build.gradle.kts

@@ -13,8 +13,8 @@ android {
         applicationId = "com.kouros.navigation"
         minSdk = 33
         targetSdk = 36
-        versionCode = 60
-        versionName = "0.2.0.60"
+        versionCode = 61
+        versionName = "0.2.0.61"
         base.archivesName = "navi-$versionName"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/kouros/navigation/model/Simulation.kt

@@ -1,6 +1,7 @@
 package com.kouros.navigation.model
 
 import android.content.Context
+import androidx.lifecycle.lifecycleScope
 import com.kouros.data.R
 import com.kouros.navigation.MainApplication.Companion.navigationViewModel
 import com.kouros.navigation.utils.location
@@ -9,18 +10,20 @@ import io.ticofab.androidgpxparser.parser.domain.Gpx
 import io.ticofab.androidgpxparser.parser.domain.TrackSegment
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.joda.time.DateTime
 import kotlin.collections.forEach
 
+var simulationJob: Job? = null
 fun simulate(routeModel: RouteModel, mock: MockLocation) {
-    CoroutineScope(Dispatchers.IO).launch {
+    simulationJob?.cancel()
+    simulationJob = CoroutineScope(Dispatchers.IO).launch {
         var lastLocation = location(0.0, 0.0)
         for ((index, waypoint) in routeModel.curRoute.waypoints.withIndex()) {
             val curLocation = location(waypoint[0], waypoint[1])
             if (routeModel.isNavigating()) {
-                val deviation = 0.0
                 if (index in 0..routeModel.curRoute.waypoints.size) {
                     val bearing = lastLocation.bearingTo(curLocation)
                     mock.setMockLocation(waypoint[1], waypoint[0], bearing)

app/src/main/java/com/kouros/navigation/ui/MainActivity.kt

@@ -13,36 +13,30 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.RequiresPermission
-import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.BottomSheetScaffold
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Text
 import androidx.compose.material3.rememberBottomSheetScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableDoubleStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
@@ -52,7 +46,6 @@ import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.LocationServices
 import com.kouros.data.R
 import com.kouros.navigation.MainApplication.Companion.navigationViewModel
-import com.kouros.navigation.data.Constants
 import com.kouros.navigation.data.Constants.DESTINATION_ARRIVAL_DISTANCE
 import com.kouros.navigation.data.Constants.TILT
 import com.kouros.navigation.data.Constants.homeVogelhart
@@ -63,6 +56,7 @@ import com.kouros.navigation.model.RouteModel
 import com.kouros.navigation.model.SimulationType
 import com.kouros.navigation.model.gpx
 import com.kouros.navigation.model.simulate
+import com.kouros.navigation.model.simulationJob
 import com.kouros.navigation.model.test
 import com.kouros.navigation.model.testSingle
 import com.kouros.navigation.ui.app.AppViewModel
@@ -92,6 +86,7 @@ class MainActivity : ComponentActivity() {
     val routeModel = RouteModel()
     var tilt = TILT
     val useMock = false
+
     val type = SimulationType.SIMULATE
     val stepData: MutableLiveData<StepData> by lazy {
         MutableLiveData()
@@ -108,11 +103,8 @@ class MainActivity : ComponentActivity() {
             val routingEngine = runBlocking { repository.routingEngineFlow.first() }
             routeModel.navState = routeModel.navState.copy(routingEngine = routingEngine)
             routeModel.startNavigation(newRoute)
-            if (routeModel.hasLegs()) {
-                getSettingsViewModel(applicationContext).onLastRouteChanged(newRoute)
-            }
             routeData.value = routeModel.curRoute.routeGeoJson
-            checkMock()
+         //   checkMock()
         }
     }
 
@@ -143,6 +135,13 @@ class MainActivity : ComponentActivity() {
     private lateinit var mock: MockLocation
     private var loadRecentPlaces = false
 
+    override fun onDestroy() {
+        if (simulationJob != null) {
+            simulationJob?.cancel()
+        }
+        super.onDestroy()
+    }
+
     @RequiresPermission(allOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION])
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -371,6 +370,7 @@ class MainActivity : ComponentActivity() {
         routeModel.stopNavigation()
         getSettingsViewModel(applicationContext).onLastRouteChanged("")
         if (useMock) {
+            simulationJob?.cancel()
             mock.setMockLocation(latitude, longitude, 0F)
         }
         routeData.value = ""