summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-09-11 11:34:04 +1000
committerLeith Bade <leith@mapbox.com>2015-09-11 11:34:04 +1000
commita9b163fadcf24d7e9754044e10789f42969c7638 (patch)
tree17a5df2f0d0317a4b19e3b4f2627c9823a56f8dd
parentf9f43fd1506b9bc7d45ffd55fb788ff7672a45b5 (diff)
downloadqtlocation-mapboxgl-a9b163fadcf24d7e9754044e10789f42969c7638.tar.gz
Call cancelTransitions when setting map position, zoom level, or direction.
Fixes # 2296
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index 6642681413..614ccdb11e 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -628,6 +628,7 @@ public class MapView extends FrameLayout implements LocationListener {
public void setCenterCoordinate(LatLng centerCoordinate, boolean animated) {
long duration = animated ? ANIMATION_DURATION : 0;
+ mNativeMapView.cancelTransitions();
mNativeMapView.setLatLng(centerCoordinate, duration);
}
@@ -638,6 +639,7 @@ public class MapView extends FrameLayout implements LocationListener {
public void setCenterCoordinate(LatLngZoom centerCoordinate,
boolean animated) {
long duration = animated ? ANIMATION_DURATION : 0;
+ mNativeMapView.cancelTransitions();
mNativeMapView.setLatLngZoom(centerCoordinate, duration);
}
@@ -660,14 +662,17 @@ public class MapView extends FrameLayout implements LocationListener {
public void setDirection(double direction, boolean animated) {
long duration = animated ? ANIMATION_DURATION : 0;
+ mNativeMapView.cancelTransitions();
mNativeMapView.setBearing(-direction, duration);
}
public void resetPosition() {
+ mNativeMapView.cancelTransitions();
mNativeMapView.resetPosition();
}
public void resetNorth() {
+ mNativeMapView.cancelTransitions();
mNativeMapView.resetNorth();
}
@@ -681,6 +686,7 @@ public class MapView extends FrameLayout implements LocationListener {
public void setZoomLevel(double zoomLevel, boolean animated) {
long duration = animated ? ANIMATION_DURATION : 0;
+ mNativeMapView.cancelTransitions();
mNativeMapView.setZoom(zoomLevel, duration);
}