diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-12 10:56:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 10:56:38 +0200 |
commit | e0b025ab4df1104f52f1057c69a35609be1be2c6 (patch) | |
tree | c6e3ff7da7860abe99dc3e3ddacb993cb704a15b /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera | |
parent | 2726f9b8aefd1e3e10baa38a10f37599f61638b0 (diff) | |
download | qtlocation-mapboxgl-e0b025ab4df1104f52f1057c69a35609be1be2c6.tar.gz |
[android] - correct android to core conversion of camera options. (#6660)
* [android] - correct android to core conversion of camera options.
* fix MarkerView tilting, tilt is already in degrees
* same fix for MyLocationView
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera')
2 files changed, 11 insertions, 20 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 c6c64cfa65..f65d012c49 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 @@ -171,10 +171,10 @@ public final class CameraPosition implements Parcelable { public Builder(CameraUpdateFactory.CameraPositionUpdate update) { super(); if (update != null) { - this.bearing = update.getBearing(); - this.target = update.getTarget(); - this.tilt = update.getTilt(); - this.zoom = update.getZoom(); + bearing(update.getBearing()); + target(update.getTarget()); + tilt(update.getTilt()); + zoom(update.getZoom()); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java index 73e67270ae..b12dea6437 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java @@ -185,7 +185,7 @@ public final class CameraUpdateFactory { CameraPosition previousPosition = mapboxMap.getCameraPosition(); if (target == null) { return new CameraPosition.Builder() - .tilt(Math.toDegrees(tilt)) + .tilt(tilt) .zoom(zoom) .bearing(bearing) .target(previousPosition.target) @@ -302,21 +302,12 @@ public final class CameraUpdateFactory { LatLng latLng = projection.fromScreenLocation(targetPoint); CameraPosition previousPosition = mapboxMap.getCameraPosition(); - if (latLng != null) { - return new CameraPosition.Builder() - .target(latLng) - .zoom(previousPosition.zoom) - .tilt(previousPosition.tilt) - .bearing(previousPosition.bearing) - .build(); - } else { - return new CameraPosition.Builder() - .tilt(Math.toDegrees(previousPosition.tilt)) - .zoom(previousPosition.zoom) - .bearing(previousPosition.bearing) - .target(previousPosition.target) - .build(); - } + return new CameraPosition.Builder() + .target(latLng != null ? latLng : previousPosition.target) + .zoom(previousPosition.zoom) + .tilt(previousPosition.tilt) + .bearing(previousPosition.bearing) + .build(); } } |