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

fix: revert zoomToNodes removal

Browse source 
revert https://github.com/meshtastic/Meshtastic-Android/pull/647/commits/4412a5d5aa6752c9bc1c71084c8570f6efea0df1
This commit is contained in:
andrekir 2023-07-08 07:11:08 -03:00 • committed by Andre K
parent 37762f300b
commit 2c6b35dbdf
2 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
View file

@ -50,11 +50,13 @@ import com.geeksville.mesh.ui.map.components.DownloadButton
import com.geeksville.mesh.ui.map.components.EditWaypointDialog
import com.geeksville.mesh.ui.map.components.MapStyleButton
import com.geeksville.mesh.util.SqlTileWriterExt
import com.geeksville.mesh.util.requiredZoomLevel
import com.geeksville.mesh.util.formatAgo
import com.geeksville.mesh.waypoint
import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.hilt.android.AndroidEntryPoint
import org.osmdroid.api.IMapController
import org.osmdroid.config.Configuration
import org.osmdroid.events.MapEventsReceiver
import org.osmdroid.events.MapListener
@ -111,6 +113,7 @@ fun MapView(model: UIViewModel = viewModel()) {
// constants
val defaultMinZoom = 1.5
val defaultMaxZoom = 18.0
val defaultZoomSpeed = 3000L
val prefsName = "org.geeksville.osm.prefs"
val mapStyleId = "map_style_id"
val nodeLayer = 1
@ -432,6 +435,16 @@ fun MapView(model: UIViewModel = viewModel()) {
// }
// }
fun zoomToNodes(controller: IMapController) {
if (nodeMarkers.isNotEmpty()) {
val box = BoundingBox.fromGeoPoints(nodeMarkers.map { it.position })
val center = GeoPoint(box.centerLatitude, box.centerLongitude)
val maximumZoomLevel = map.tileProvider.tileSource.maximumZoomLevel.toDouble()
val finalZoomLevel = minOf(box.requiredZoomLevel() * 0.8, maximumZoomLevel)
controller.animateTo(center, finalZoomLevel, defaultZoomSpeed)
} else controller.zoomIn()
}
fun loadOnlineTileSourceBase(): ITileSource {
val id = mPrefs.getInt(mapStyleId, 1)
debug("mapStyleId from prefs: $id")
@ -577,10 +590,7 @@ fun MapView(model: UIViewModel = viewModel()) {
map.apply {
setTileSource(loadOnlineTileSourceBase())
defaultMapSettings()
if (nodeMarkers.isNotEmpty()) zoomToBoundingBox(
BoundingBox.fromGeoPoints(nodeMarkers.map { it.position }),
false
) else controller.zoomIn()
zoomToNodes(controller)
}
},
modifier = Modifier.fillMaxSize(),

18
app/src/main/java/com/geeksville/mesh/util/LocationUtils.kt
View file

@ -5,10 +5,13 @@ import com.geeksville.mesh.Position
import mil.nga.grid.features.Point
import mil.nga.mgrs.MGRS
import mil.nga.mgrs.utm.UTM
import org.osmdroid.util.BoundingBox
import org.osmdroid.util.GeoPoint
import kotlin.math.abs
import kotlin.math.acos
import kotlin.math.atan2
import kotlin.math.cos
import kotlin.math.log2
import kotlin.math.sin
/*******************************************************************************
@ -233,3 +236,18 @@ fun bearing(
fun radToBearing(rad: Double): Double {
return (Math.toDegrees(rad) + 360) % 360
}
/**
* Calculates the zoom level required to fit the entire [BoundingBox] inside the map view.
* @return The zoom level as a Double value.
*/
fun BoundingBox.requiredZoomLevel(): Double {
val topLeft = GeoPoint(this.latNorth, this.lonWest)
val bottomRight = GeoPoint(this.latSouth, this.lonEast)
val latLonWidth = topLeft.distanceToAsDouble(GeoPoint(topLeft.latitude, bottomRight.longitude))
val latLonHeight = topLeft.distanceToAsDouble(GeoPoint(bottomRight.latitude, topLeft.longitude))
val requiredLatZoom = log2(360.0 / (latLonHeight / 111320))
val requiredLonZoom = log2(360.0 / (latLonWidth / 111320))
return maxOf(requiredLatZoom, requiredLonZoom)
}