diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-10-31 13:18:41 -0700 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2017-10-31 15:30:48 -0700 |
commit | 03d3aee6fc3a36e3b98b4692a33179dddeb50032 (patch) | |
tree | 7e724a8a3f98cc644841ad457d67330562e476d6 | |
parent | 9aa2c197cad27efa2be26c50ff1e185860a270a5 (diff) | |
download | qtlocation-mapboxgl-03d3aee6fc3a36e3b98b4692a33179dddeb50032.tar.gz |
[android] - rework ease interactions to take in account possitve duration requirement
2 files changed, 5 insertions, 10 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 7988a466be..6bf8342efb 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 @@ -150,12 +150,8 @@ public final class MapboxMap { trackingSettings.onRestoreInstanceState(savedInstanceState); if (cameraPosition != null) { - easeCamera(CameraUpdateFactory.newCameraPosition( - new CameraPosition.Builder(cameraPosition).build()), - 0, - false, - null, - !trackingSettings.isLocationTrackingDisabled() + moveCamera(CameraUpdateFactory.newCameraPosition( + new CameraPosition.Builder(cameraPosition).build()) ); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java index 983ba2550f..ac91746a2a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java @@ -49,6 +49,7 @@ import timber.log.Timber; * <p> * Use {@link MyLocationViewSettings} to manipulate the state of this view. * </p> + * * @deprecated use location layer plugin from * https://github.com/mapbox/mapbox-plugins-android/tree/master/plugins/locationlayer instead. */ @@ -639,8 +640,7 @@ public class MyLocationView extends View { if (location != null) { if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) { // center map directly - mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(new LatLng(location)), 0, false /*linear interpolator*/, - null, true); + mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(new LatLng(location))); } else { // do not use interpolated location from tracking mode latLng = null; @@ -1022,8 +1022,7 @@ public class MyLocationView extends View { mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(builder.build()), animationDuration, false, null, true); } else { - mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(builder.build()), 0, false, null, - true); + mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(builder.build())); } } |