From a9b163fadcf24d7e9754044e10789f42969c7638 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 11 Sep 2015 11:34:04 +1000
Subject: Call cancelTransitions when setting map position, zoom level, or
 direction. Fixes # 2296

---
 .../src/main/java/com/mapbox/mapboxgl/views/MapView.java            | 6 ++++++
 1 file changed, 6 insertions(+)

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);
     }
 
-- 
cgit v1.2.1