From c6df48e42444f590731a279bcbff50895b8ae41a Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 7 Oct 2013 15:46:57 +0200
Subject: [PATCH] Add zoomDuration option to interaction defaults

---
 src/objectliterals.jsdoc                  |  1 +
 src/ol/interaction/interactiondefaults.js | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 797bd1e942..ccad654bec 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -293,6 +293,7 @@
  * @property {boolean|undefined} touchRotate Whether touch rotate is desired.
  * @property {boolean|undefined} touchZoom Whether touch zoom is desired.
  * @property {number|undefined} zoomDelta Zoom delta.
+ * @property {number|undefined} zoomDuration Zoom duration.
  */
 
 /**
diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js
index 541d378459..27a2010b62 100644
--- a/src/ol/interaction/interactiondefaults.js
+++ b/src/ol/interaction/interactiondefaults.js
@@ -45,7 +45,8 @@ ol.interaction.defaults = function(opt_options) {
       options.doubleClickZoom : true;
   if (doubleClickZoom) {
     interactions.push(new ol.interaction.DoubleClickZoom({
-      delta: options.zoomDelta
+      delta: options.zoomDelta,
+      duration: options.zoomDuration
     }));
   }
 
@@ -66,7 +67,9 @@ ol.interaction.defaults = function(opt_options) {
   var touchZoom = goog.isDef(options.touchZoom) ?
       options.touchZoom : true;
   if (touchZoom) {
-    interactions.push(new ol.interaction.TouchZoom());
+    interactions.push(new ol.interaction.TouchZoom({
+      duration: options.zoomDuration
+    }));
   }
 
   var dragPan = goog.isDef(options.dragPan) ?
@@ -82,14 +85,17 @@ ol.interaction.defaults = function(opt_options) {
   if (keyboard) {
     interactions.push(new ol.interaction.KeyboardPan());
     interactions.push(new ol.interaction.KeyboardZoom({
-      delta: options.zoomDelta
+      delta: options.zoomDelta,
+      duration: options.zoomDuration
     }));
   }
 
   var mouseWheelZoom = goog.isDef(options.mouseWheelZoom) ?
       options.mouseWheelZoom : true;
   if (mouseWheelZoom) {
-    interactions.push(new ol.interaction.MouseWheelZoom());
+    interactions.push(new ol.interaction.MouseWheelZoom({
+      duration: options.zoomDuration
+    }));
   }
 
   var shiftDragZoom = goog.isDef(options.shiftDragZoom) ?