From 291766c48debad3f585a55be874576f2fb8e9ebb Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Thu, 10 Nov 2016 10:20:47 -0700
Subject: [PATCH] Let people zoom a lot with the button

---
 src/ol/control/zoom.js | 3 +++
 src/ol/view.js         | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ol/control/zoom.js b/src/ol/control/zoom.js
index 390578d332..a72e5c5eb9 100644
--- a/src/ol/control/zoom.js
+++ b/src/ol/control/zoom.js
@@ -106,6 +106,9 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
   if (currentResolution) {
     var newResolution = view.constrainResolution(currentResolution, delta);
     if (this.duration_ > 0) {
+      if (view.getAnimating()) {
+        view.cancelAnimations();
+      }
       view.animate({
         resolution: newResolution,
         duration: this.duration_,
diff --git a/src/ol/view.js b/src/ol/view.js
index d99c613a15..e2efd2bd0b 100644
--- a/src/ol/view.js
+++ b/src/ol/view.js
@@ -271,7 +271,7 @@ ol.View.prototype.getAnimating = function() {
 /**
  * Cancel any ongoing animations.
  */
-ol.View.prototype.cancelAnimations_ = function() {
+ol.View.prototype.cancelAnimations = function() {
   for (var i = 0, ii = this.animations_.length; i < ii; ++i) {
     var series = this.animations_[i];
     if (series[0].callback) {
@@ -809,7 +809,7 @@ ol.View.prototype.rotate = function(rotation, opt_anchor) {
 ol.View.prototype.setCenter = function(center) {
   this.set(ol.View.Property.CENTER, center);
   if (this.getAnimating()) {
-    this.cancelAnimations_();
+    this.cancelAnimations();
   }
 };
 
@@ -838,7 +838,7 @@ ol.View.prototype.setHint = function(hint, delta) {
 ol.View.prototype.setResolution = function(resolution) {
   this.set(ol.View.Property.RESOLUTION, resolution);
   if (this.getAnimating()) {
-    this.cancelAnimations_();
+    this.cancelAnimations();
   }
 };
 
@@ -852,7 +852,7 @@ ol.View.prototype.setResolution = function(resolution) {
 ol.View.prototype.setRotation = function(rotation) {
   this.set(ol.View.Property.ROTATION, rotation);
   if (this.getAnimating()) {
-    this.cancelAnimations_();
+    this.cancelAnimations();
   }
 };