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: calculate download BoundingBox based on zoom factor

Browse source 
instead of calling `setZoom()` before/after `MapView.boundingBox` which can get out of sync and cause inconsistencies in the tile count.
fixes #670
This commit is contained in:
andrekir 2023-07-27 05:56:59 -03:00
parent 094af7c380
commit 49617d2e19
2 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ import com.geeksville.mesh.util.EnableWakeLock
import com.geeksville.mesh.util.SqlTileWriterExt
import com.geeksville.mesh.util.requiredZoomLevel
import com.geeksville.mesh.util.formatAgo
import com.geeksville.mesh.util.zoomIn
import com.geeksville.mesh.waypoint
import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
import com.google.android.material.dialog.MaterialAlertDialogBuilder
@ -461,21 +462,21 @@ fun MapView(model: UIViewModel = viewModel()) {
*/
fun generateBoxOverlay(zoomLevel: Double) = map.apply {
overlayManager = CustomOverlayManager(TilesOverlay(tileProvider, context))
val zoomFactor = 1.3 // zoom difference between view and download area polygon
controller.setZoom(zoomLevel - zoomFactor)
setMultiTouchControls(false)
// furthest back
zoomLevelMax = zoomLevelHighest // FIXME zoomLevel
// furthest in min should be > than max
zoomLevelMin = map.tileProvider.tileSource.maximumZoomLevel.toDouble()
controller.setZoom(zoomLevel)
downloadRegionBoundingBox = map.boundingBox
zoomLevelMin = tileProvider.tileSource.maximumZoomLevel.toDouble()
downloadRegionBoundingBox = boundingBox.zoomIn(zoomFactor)
val polygon = Polygon().apply {
points = Polygon.pointsAsRect(downloadRegionBoundingBox).map {
GeoPoint(it.latitude, it.longitude)
}
}
overlayManager.add(polygon)
controller.setZoom(zoomLevel - 1.0)
val tileCount: Int = CacheManager(map).possibleTilesInArea(
val tileCount: Int = CacheManager(this).possibleTilesInArea(
downloadRegionBoundingBox,
zoomLevelMax.toInt(),
zoomLevelMin.toInt()