kscience/maps-kt
8
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 1 Wiki Activity

Fix zoom

Browse Source
This commit is contained in:
Alexander Nozik 2022-07-13 16:01:08 +03:00
parent b95885694d
commit a1151ebb62
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/commonMain/kotlin/centre/sciprog/maps/MapViewPoint.kt
View File

@ -35,13 +35,16 @@ fun MapViewPoint.move(delta: GeodeticMapCoordinates): MapViewPoint {
return MapViewPoint(newCoordinates, zoom) return MapViewPoint(newCoordinates, zoom)
} }
fun MapViewPoint.zoom(zoomDelta: Double): MapViewPoint = copy(zoom = (zoom + zoomDelta).coerceIn(2.0, 18.0)) fun MapViewPoint.zoom(
zoomDelta: Double,
fun MapViewPoint.zoom(zoomDelta: Double, invariant: GeodeticMapCoordinates): MapViewPoint { invariant: GeodeticMapCoordinates = focus,
val difScale = 2.0.pow(-zoomDelta) ): MapViewPoint = if (invariant == focus) {
copy(zoom = (zoom + zoomDelta).coerceIn(2.0, 18.0))
} else {
val difScale = (1 - 2.0.pow(-zoomDelta))
val newCenter = GeodeticMapCoordinates.ofRadians( val newCenter = GeodeticMapCoordinates.ofRadians(
focus.latitude + (invariant.latitude - focus.latitude) * difScale, focus.latitude + (invariant.latitude - focus.latitude) * difScale,
focus.longitude + (invariant.longitude - focus.longitude) * difScale focus.longitude + (invariant.longitude - focus.longitude) * difScale
) )
return MapViewPoint(newCenter, (zoom + zoomDelta).coerceIn(2.0, 18.0)) MapViewPoint(newCenter, (zoom + zoomDelta).coerceIn(2.0, 18.0))
} }