fix(ETA): Code review update (1c0dfef3) · Commits · e / os / Murena Maps

cardinal-android/app/src/main/java/earth/maps/cardinal/routing/RoutingOptions.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ data class PedestrianRoutingOptions(
		override val costingType: String = "pedestrian",

		// Walking speed
		val walkingSpeed: Double? = 4.2, // km/h
		val walkingSpeed: Double? = WALKING_SPEED, // km/h

		// Path preferences (factors)
		val walkwayFactor: Double? = null,
		@@ -231,4 +231,8 @@ data class PedestrianRoutingOptions(

		// Accessibility options
		val type: PedestrianType? = null
		) : RoutingOptions()
		) : RoutingOptions() {
		companion object {
		const val WALKING_SPEED = 4.2
		}
		}

cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt

+5 −11

Original line number	Diff line number	Diff line
		@@ -36,11 +36,9 @@ import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.ExperimentalLayoutApi
		import androidx.compose.foundation.layout.PaddingValues
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.WindowInsets
		import androidx.compose.foundation.layout.defaultMinSize
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.isImeVisible
		import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.safeContent
		@@ -112,7 +110,6 @@ import earth.maps.cardinal.routing.RouteRepository
		import earth.maps.cardinal.ui.directions.DirectionsScreen
		import earth.maps.cardinal.ui.directions.DirectionsViewModel
		import earth.maps.cardinal.ui.directions.RouteDisplayHandler
		import earth.maps.cardinal.ui.navigation.TurnByTurnNavigationScreen
		import earth.maps.cardinal.ui.home.HomeScreen
		import earth.maps.cardinal.ui.home.HomeViewModel
		import earth.maps.cardinal.ui.home.NearbyScreenContent
		@@ -121,6 +118,7 @@ import earth.maps.cardinal.ui.home.OfflineAreasScreen
		import earth.maps.cardinal.ui.home.OfflineAreasViewModel
		import earth.maps.cardinal.ui.home.TransitScreenContent
		import earth.maps.cardinal.ui.home.TransitScreenViewModel
		import earth.maps.cardinal.ui.navigation.TurnByTurnNavigationScreen
		import earth.maps.cardinal.ui.place.PlaceCardScreen
		import earth.maps.cardinal.ui.place.PlaceCardViewModel
		import earth.maps.cardinal.ui.saved.ManagePlacesScreen
		@@ -1112,14 +1110,10 @@ private fun TurnByTurnRoute(
		}
		}

		val routingMode = routingModeJson?.let { modeString ->
		try {
		RoutingMode.entries.find { it.value.equals(modeString, ignoreCase = true) }
		?: RoutingMode.AUTO
		} catch (_: Exception) {
		RoutingMode.AUTO
		}
		} ?: RoutingMode.AUTO
		val routingMode = runCatching {
		RoutingMode.entries.find { it.value.equals(routingModeJson, ignoreCase = true) } ?: RoutingMode.AUTO
		}.getOrElse { RoutingMode.AUTO }


		port?.let { port ->
		TurnByTurnNavigationScreen(