Autocomplete search for Android Demo App

Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
       "state" : {
-        "revision" : "e409318144091c3ee9ad551b202e1c36695f8086",
-        "version" : "6.7.0"
+        "revision" : "f23db791d7b6f0329e3c6788d8e4152c24c52b6b",
+        "version" : "6.7.1"
       }
     },
     {

android/README.md

@@ -5,7 +5,7 @@ This directory tree contains the Gradle workspace for Ferrostar on Android.
 * `composeui` - Jetpack Compose UI elements which are not tightly coupled to any particular map renderer.
 * `core` - The core module is where all the "business logic", location management, and other core functionality lives.
 * `demo-app` - A minimal demonstration app.
-* `google-play-services` - Optional functionality that depends on Google Play Services (like a fused location client wrapper). This is a separate module so that apps are able to "de-Google" if necessary.
+* `google-play-services` - Optional functionality that depends on Google Play Services (like the a fused location client wrapper). This is a separate module so that apps are able to "de-Google" if necessary.
 * `maplibreui` - Map-related user interface components built with MapLibre.
 
 ## Running the demo app

android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/maneuver/ManeuverImage.kt

@@ -47,11 +47,22 @@ fun ManeuverImage(content: VisualInstructionContent, tint: Color = LocalContentC
 
 @Preview
 @Composable
-fun ManeuverImagePreview() {
+fun ManeuverImageLeftTurnPreview() {
   ManeuverImage(
       VisualInstructionContent(
           text = "",
           maneuverType = ManeuverType.TURN,
           maneuverModifier = ManeuverModifier.LEFT,
           roundaboutExitDegrees = null))
 }
+
+@Preview
+@Composable
+fun ManeuverImageContinueUturnPreview() {
+  ManeuverImage(
+      VisualInstructionContent(
+          text = "",
+          maneuverType = ManeuverType.CONTINUE,
+          maneuverModifier = ManeuverModifier.U_TURN,
+          roundaboutExitDegrees = null))
+}

android/core/src/main/java/com/stadiamaps/ferrostar/core/Location.kt

@@ -78,13 +78,21 @@ class AndroidSystemLocationProvider(context: Context) : LocationProvider {
       android.util.Log.d(TAG, "Already registered; skipping")
       return
     }
-    val androidListener = LocationListener { listener.onLocationUpdated(it.toUserLocation()) }
+    val androidListener = LocationListener {
+      val userLocation = it.toUserLocation()
+      lastLocation = userLocation
+      listener.onLocationUpdated(userLocation)
+    }
     listeners[listener] = androidListener
 
     val handler = Handler(Looper.getMainLooper())
 
     executor.execute {
       handler.post {
+        val last = locationManager.getLastKnownLocation(getBestProvider())
+        if (last != null) {
+          androidListener.onLocationChanged(last)
+        }
         locationManager.requestLocationUpdates(getBestProvider(), 100L, 5.0f, androidListener)
       }
     }

android/core/src/main/java/com/stadiamaps/ferrostar/core/NavigationViewModel.kt

@@ -6,11 +6,15 @@ import androidx.lifecycle.viewModelScope
 import com.stadiamaps.ferrostar.core.extensions.deviation
 import com.stadiamaps.ferrostar.core.extensions.progress
 import com.stadiamaps.ferrostar.core.extensions.visualInstruction
+import java.util.concurrent.Executors
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import uniffi.ferrostar.GeographicCoordinate
+import uniffi.ferrostar.Heading
 import uniffi.ferrostar.RouteDeviation
 import uniffi.ferrostar.SpokenInstruction
 import uniffi.ferrostar.TripProgress
@@ -31,7 +35,7 @@ data class NavigationUiState(
      */
     val heading: Float?,
     /** The geometry of the full route. */
-    val routeGeometry: List<GeographicCoordinate>,
+    val routeGeometry: List<GeographicCoordinate>?,
     /** Visual instructions which should be displayed based on the user's current progress. */
     val visualInstruction: VisualInstruction?,
     /**
@@ -76,6 +80,59 @@ interface NavigationViewModel {
   fun toggleMute()
 
   fun stopNavigation()
+
+  fun isNavigating(): Boolean = uiState.value.progress != null
+}
+
+class IdleNavigationViewModel(locationProvider: LocationProvider) :
+    ViewModel(), NavigationViewModel {
+  private val locationStateFlow = MutableStateFlow(locationProvider.lastLocation)
+  private val executor = Executors.newSingleThreadScheduledExecutor()
+
+  init {
+    locationProvider.addListener(
+        object : LocationUpdateListener {
+          override fun onLocationUpdated(location: UserLocation) {
+            locationStateFlow.update { location }
+          }
+
+          override fun onHeadingUpdated(heading: Heading) {
+            // TODO: Heading
+          }
+        },
+        executor)
+  }
+
+  override val uiState =
+      locationStateFlow
+          .map { userLocation ->
+            // TODO: Heading
+            NavigationUiState(userLocation, null, null, null, null, null, null, false, null, null)
+          }
+          .stateIn(
+              scope = viewModelScope,
+              started = SharingStarted.WhileSubscribed(),
+              // TODO: Heading
+              initialValue =
+                  NavigationUiState(
+                      locationProvider.lastLocation,
+                      null,
+                      null,
+                      null,
+                      null,
+                      null,
+                      null,
+                      false,
+                      null,
+                      null))
+
+  override fun toggleMute() {
+    // Do nothing
+  }
+
+  override fun stopNavigation() {
+    // Do nothing
+  }
 }
 
 class DefaultNavigationViewModel(

android/demo-app/build.gradle

@@ -13,7 +13,7 @@ android {
     defaultConfig {
         applicationId "com.stadiamaps.ferrostar.demo"
         minSdk 26
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -64,11 +64,16 @@ dependencies {
     implementation project(':core')
     implementation project(':composeui')
     implementation project(':maplibreui')
+    implementation project(':google-play-services')
 
     implementation libs.maplibre.compose
 
-    implementation(platform(libs.okhttp.bom))
-    implementation(libs.okhttp.core)
+    implementation platform(libs.okhttp.bom)
+    implementation libs.okhttp.core
+
+    implementation libs.play.services.location
+
+    implementation libs.stadiamaps.autocomplete.search
 
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.junit

android/demo-app/src/main/java/com/stadiamaps/ferrostar/AppModule.kt

@@ -8,10 +8,11 @@ import com.stadiamaps.ferrostar.core.AlternativeRouteProcessor
 import com.stadiamaps.ferrostar.core.AndroidTtsObserver
 import com.stadiamaps.ferrostar.core.CorrectiveAction
 import com.stadiamaps.ferrostar.core.FerrostarCore
+import com.stadiamaps.ferrostar.core.LocationProvider
 import com.stadiamaps.ferrostar.core.RouteDeviationHandler
-import com.stadiamaps.ferrostar.core.SimulatedLocationProvider
 import com.stadiamaps.ferrostar.core.service.FerrostarForegroundServiceManager
 import com.stadiamaps.ferrostar.core.service.ForegroundServiceManager
+import com.stadiamaps.ferrostar.googleplayservices.FusedLocationProvider
 import java.net.URL
 import java.time.Duration
 import okhttp3.OkHttpClient
@@ -56,7 +57,10 @@ object AppModule {
     appContext = context
   }
 
-  val locationProvider: SimulatedLocationProvider by lazy { SimulatedLocationProvider() }
+  val locationProvider: LocationProvider by lazy {
+    // TODO: Make this configurable?
+    FusedLocationProvider(appContext)
+  }
   private val httpClient: OkHttpClient by lazy {
     OkHttpClient.Builder().callTimeout(Duration.ofSeconds(15)).build()
   }
@@ -65,11 +69,12 @@ object AppModule {
     FerrostarForegroundServiceManager(appContext, DefaultForegroundNotificationBuilder(appContext))
   }
 
+  // TODO: This is hard-coded for golf cart routing; change to something else before merging
   val ferrostarCore: FerrostarCore by lazy {
     val core =
         FerrostarCore(
             valhallaEndpointURL = valhallaEndpointUrl,
-            profile = "bicycle",
+            profile = "low_speed_vehicle",
             httpClient = httpClient,
             locationProvider = locationProvider,
             foregroundServiceManager = foregroundServiceManager,
@@ -79,7 +84,16 @@ object AppModule {
                         minimumHorizontalAccuracy = 25U, automaticAdvanceDistance = 10U),
                     RouteDeviationTracking.StaticThreshold(15U, 25.0),
                     CourseFiltering.SNAP_TO_ROUTE),
-            options = mapOf("costingOptions" to mapOf("bicycle" to mapOf("use_roads" to 0.2))))
+            options =
+                mapOf(
+                    "costingOptions" to
+                        mapOf(
+                            "low_speed_vehicle" to
+                                mapOf(
+                                    "vehicle_type" to "golf_cart",
+                                    "top_speed" to 32 // 24kph ~= 15mph
+                                    )),
+                    "units" to "miles"))
 
     // Not all navigation apps will require this sort of extra configuration.
     // In fact, we hope that most don't!
@@ -93,13 +107,7 @@ object AppModule {
       Log.i(TAG, "Received alternate route(s): $routes")
       if (routes.isNotEmpty()) {
         // NB: Use `replaceRoute` for cases like this!
-        it.replaceRoute(
-            routes.first(),
-            NavigationControllerConfig(
-                StepAdvanceMode.RelativeLineStringDistance(
-                    minimumHorizontalAccuracy = 25U, automaticAdvanceDistance = 10U),
-                RouteDeviationTracking.StaticThreshold(25U, 10.0),
-                CourseFiltering.SNAP_TO_ROUTE))
+        it.replaceRoute(routes.first())
       }
     }