diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index ff7ac4fca..2f988541a 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -10,6 +10,8 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ### 🐞 Bug fixes +* Fix regression in CameraUpdateFactory#zoomOut ([#1035](https://github.com/maplibre/maplibre-gl-native/pull/1035)) + ### ⛵ Dependencies ## 10.0.2 - February 23, 2023 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.kt index 3c7a00132..e3fc13436 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.kt @@ -7,7 +7,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.geometry.LatLngBounds import com.mapbox.mapboxsdk.maps.MapboxMap import timber.log.Timber -import java.lang.Double.min +import java.lang.Double.max import java.util.Arrays /** @@ -448,7 +448,7 @@ object CameraUpdateFactory { return when (type) { ZOOM_IN -> currentZoomArg + 1 ZOOM_OUT -> { - min(currentZoomArg - 1, 0.0) + max(currentZoomArg - 1, 0.0) } ZOOM_TO -> zoom diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.kt index 0c7881617..4672ccd5d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.kt @@ -630,6 +630,7 @@ class OfflineManager private constructor(context: Context) { * @return the single instance of offline manager */ @Synchronized + @JvmStatic fun getInstance(context: Context): OfflineManager { if (instance == null) { instance = OfflineManager(context)