From 25770e7ef496a44b019d14d0932645472a563b91 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Thu, 10 Nov 2016 06:25:03 -0700
Subject: [PATCH] Only zoom if not zooming

---
 src/ol/interaction/mousewheelzoom.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ol/interaction/mousewheelzoom.js b/src/ol/interaction/mousewheelzoom.js
index 19f18dd13a..59f2971fb4 100644
--- a/src/ol/interaction/mousewheelzoom.js
+++ b/src/ol/interaction/mousewheelzoom.js
@@ -133,13 +133,14 @@ ol.interaction.MouseWheelZoom.handleEvent = function(mapBrowserEvent) {
  * @param {ol.Map} map Map.
  */
 ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
-  var maxDelta = ol.MOUSEWHEELZOOM_MAXDELTA;
-  var delta = ol.math.clamp(this.delta_, -maxDelta, maxDelta);
-
   var view = map.getView();
 
-  ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,
-      this.duration_);
+  if (!view.getAnimating()) {
+    var maxDelta = ol.MOUSEWHEELZOOM_MAXDELTA;
+    var delta = ol.math.clamp(this.delta_, -maxDelta, maxDelta);
+    ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,
+        this.duration_);
+  }
 
   this.delta_ = 0;
   this.lastAnchor_ = null;