meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: Update osmdroid-android to 6.1.20 and adjust map view (#1922)

Browse source
This commit is contained in:
James Rich 2025-05-23 12:47:46 -05:00 • committed by GitHub
parent 03a9b34190
commit 4545777b8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
View file

@ -30,9 +30,9 @@ import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.LocalLifecycleOwner
import com.geeksville.mesh.BuildConfig
import com.geeksville.mesh.android.BuildUtils.errormsg
import com.geeksville.mesh.util.requiredZoomLevel
@ -67,13 +67,18 @@ const val MAP_STYLE_ID = "map_style_id"
private const val MinZoomLevel = 1.5
private const val MaxZoomLevel = 20.0
private const val DefaultZoomLevel = 15.0
@Composable
internal fun rememberMapViewWithLifecycle(
box: BoundingBox,
tileSource: ITileSource = TileSourceFactory.DEFAULT_TILE_SOURCE,
): MapView {
val zoom = box.requiredZoomLevel()
val zoom = if (box.requiredZoomLevel().isFinite()) {
box.requiredZoomLevel()
} else {
DefaultZoomLevel
}
val center = GeoPoint(box.centerLatitude, box.centerLongitude)
return rememberMapViewWithLifecycle(zoom, center, tileSource)
}
@ -108,7 +113,7 @@ internal fun rememberMapViewWithLifecycle(
minZoomLevel = MinZoomLevel
maxZoomLevel = MaxZoomLevel
// Disables default +/- button for zooming
zoomController.setVisibility(CustomZoomButtonsController.Visibility.NEVER)
zoomController.setVisibility(CustomZoomButtonsController.Visibility.SHOW_AND_FADEOUT)
controller.setZoom(savedZoom)
controller.setCenter(savedCenter)

2
gradle/libs.versions.toml
View file

@ -36,7 +36,7 @@ navigation = "2.9.0"
okhttp = "4.12.0"
org-eclipse-paho-client-mqttv3 = "1.2.5"
osmbonuspack = "6.9.0"
osmdroid-android = "6.1.14"
osmdroid-android = "6.1.20"
protobuf-gradle-plugin = "0.9.5"
protobuf-kotlin = "4.31.0"
retrofit = "3.0.0"