diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-11-11 18:13:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-11 18:13:25 +0100 |
commit | 720a0256f50442e50d12e3b251dc6cb9dcc7f484 (patch) | |
tree | ddedad585149377eb195b909c5f355ab6d6df9f6 /platform | |
parent | 1beb28e75bc70dba9c4a79d87da79cbb51ed19db (diff) | |
download | qtlocation-mapboxgl-720a0256f50442e50d12e3b251dc6cb9dcc7f484.tar.gz |
Default Style Camera on Android (#7019)
* [core] - do not set camera mutated to true when calling Map::getLatLng
* [android] - correctly check if a Map is created without a camera position
Diffstat (limited to 'platform')
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java index fe6792a0a1..070d17bca2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java @@ -16,6 +16,8 @@ import static com.mapbox.mapboxsdk.utils.MathUtils.convertNativeBearing; */ public final class CameraPosition implements Parcelable { + public static final CameraPosition DEFAULT = new CameraPosition(new LatLng(), 0, 0, 0); + public static final Parcelable.Creator<CameraPosition> CREATOR = new Parcelable.Creator<CameraPosition>() { public CameraPosition createFromParcel(Parcel in) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 47f53fd5b5..97e86199fa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -263,7 +263,7 @@ public class MapView extends FrameLayout { mapboxMap.setDebugActive(options.getDebugActive()); CameraPosition position = options.getCamera(); - if (position != null) { + if (!position.equals(CameraPosition.DEFAULT)) { mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(position)); myLocationView.setTilt(position.tilt); } |