diff options
author | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-04-24 11:31:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-24 11:31:29 +0200 |
commit | eb39c80604935deb666907f90ddc31f50865f828 (patch) | |
tree | 4357b4baf82b088cab6ed9aa270b4a10e1a60056 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | |
parent | c5625f988a37b6876c4ef5fc8d9de295ee28ed44 (diff) | |
download | qtlocation-mapboxgl-eb39c80604935deb666907f90ddc31f50865f828.tar.gz |
[android] - unwrap LatLngBounds for the shortest path when passing to core (#11759)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 5e36dd0f78..745485e2d2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -1540,7 +1540,12 @@ public final class MapboxMap { * @param latLngBounds the bounds to constrain the map with */ public void setLatLngBoundsForCameraTarget(@Nullable LatLngBounds latLngBounds) { - nativeMapView.setLatLngBounds(latLngBounds); + if (latLngBounds == null) { + nativeMapView.setLatLngBounds(latLngBounds); + } else { + //unwrapping the bounds to generate the right convex hull in core + nativeMapView.setLatLngBounds(latLngBounds.unwrapBounds()); + } } /** @@ -1550,9 +1555,9 @@ public final class MapboxMap { * @param padding the padding to apply to the bounds * @return the camera position that fits the bounds and padding */ - public CameraPosition getCameraForLatLngBounds(@Nullable LatLngBounds latLngBounds, int[] padding) { - // get padded camera position from LatLngBounds - return nativeMapView.getCameraForLatLngBounds(latLngBounds, padding); + public CameraPosition getCameraForLatLngBounds(@NonNull LatLngBounds latLngBounds, int[] padding) { + // get padded camera position from LatLngBounds, unwrapping the bounds to generate the right convex hull in core + return nativeMapView.getCameraForLatLngBounds(latLngBounds.unwrapBounds(), padding); } /** |