Skip to content

Commit 5fbb313

Browse files
committed
Add missing altitude values
1 parent c4dafae commit 5fbb313

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

app/src/main/java/org/maplibre/navigation/android/example/GraphHopperNavigationActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class GraphHopperNavigationActivity :
145145
}
146146

147147
override fun onMapClick(point: LatLng): Boolean {
148-
destination = Position(point.longitude, point.latitude)
148+
destination = Position(point.longitude, point.latitude, point.altitude)
149149

150150
mapLibreMap.addMarker(MarkerOptions().position(point))
151151
binding.clearPoints.visibility = View.VISIBLE
@@ -167,7 +167,7 @@ class GraphHopperNavigationActivity :
167167
return
168168
}
169169

170-
val origin = Position(userLocation.longitude, userLocation.latitude)
170+
val origin = Position(userLocation.longitude, userLocation.latitude, userLocation.altitude)
171171
if (distance(origin, destination).inMeters < 50) {
172172
Timber.d("calculateRoute: distance < 50 m")
173173
binding.startRouteButton.visibility = View.GONE

app/src/main/java/org/maplibre/navigation/android/example/ValhallaNavigationActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ValhallaNavigationActivity :
7575
.shouldSimulateRoute(simulateRoute)
7676
.initialMapCameraPosition(
7777
CameraPosition.Builder()
78-
.target(LatLng(userLocation.latitude, userLocation.longitude)).build()
78+
.target(LatLng(userLocation.latitude, userLocation.longitude, userLocation.altitude)).build()
7979
)
8080
.lightThemeResId(R.style.TestNavigationViewLight)
8181
.darkThemeResId(R.style.TestNavigationViewDark)
@@ -142,7 +142,7 @@ class ValhallaNavigationActivity :
142142
}
143143

144144
override fun onMapClick(point: LatLng): Boolean {
145-
destination = Position(longitude = point.longitude, latitude = point.latitude)
145+
destination = Position(longitude = point.longitude, latitude = point.latitude, altitude = point.altitude)
146146

147147
mapLibreMap.addMarker(MarkerOptions().position(point))
148148
binding.clearPoints.visibility = View.VISIBLE
@@ -164,7 +164,7 @@ class ValhallaNavigationActivity :
164164
return
165165
}
166166

167-
val origin = Position(longitude = userLocation.longitude, latitude = userLocation.latitude)
167+
val origin = Position(longitude = userLocation.longitude, latitude = userLocation.latitude, userLocation.altitude)
168168
if (distance(origin, destination).inMeters < 50) {
169169
Timber.d("calculateRoute: distance < 50 m")
170170
binding.startRouteButton.visibility = View.GONE

maplibre-navigation-core/src/commonMain/kotlin/org/maplibre/navigation/core/offroute/OffRouteDetector.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ open class OffRouteDetector(
3131
var callback: OffRouteCallback? = null
3232
) : OffRoute {
3333

34-
private var lastReroutePoint: Point? = null
34+
private var lastReroutePoint: Position? = null
3535
private val distancesAwayFromManeuver = RingBuffer<Int>(3)
3636

3737
/**
@@ -82,6 +82,7 @@ open class OffRouteDetector(
8282
val currentPoint = Position(
8383
longitude = location.longitude,
8484
latitude = location.latitude,
85+
altitude = location.altitude,
8586
)
8687
val isOffRoute = checkOffRouteRadius(location, routeProgress, options, currentPoint)
8788

@@ -134,10 +135,10 @@ open class OffRouteDetector(
134135
*/
135136
private fun validOffRoute(location: Location, options: MapLibreNavigationOptions): Boolean {
136137
return lastReroutePoint?.let { lastReroutePoint ->
137-
val currentPoint = Point(
138+
val currentPoint = Position(
138139
longitude = location.longitude,
139140
latitude = location.latitude,
140-
location.altitude
141+
altitude = location.altitude
141142
)
142143

143144
// Check if minimum amount of distance has been passed since last reroute
@@ -199,8 +200,11 @@ open class OffRouteDetector(
199200
}
200201

201202
private fun updateLastReroutePoint(location: Location) {
202-
lastReroutePoint =
203-
Point(longitude = location.longitude, latitude = location.latitude, location.altitude)
203+
lastReroutePoint = Position(
204+
longitude = location.longitude,
205+
latitude = location.latitude,
206+
altitude = location.altitude
207+
)
204208
}
205209

206210
/**

0 commit comments

Comments
 (0)