From 2dff59a4d487a2638150327310f1478f69069fbc Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 22 Apr 2013 16:11:22 +0200
Subject: [PATCH] Configure ol.interaction.TouchPan with options

---
 src/objectliterals.jsdoc                  | 5 +++++
 src/ol/interaction/interactiondefaults.js | 5 +++--
 src/ol/interaction/touchpaninteraction.js | 8 +++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 5deb9d3ef9..a66bc2a5a8 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -224,6 +224,11 @@
  * @property {number|undefined} delta Delta.
  */
 
+/**
+ * @typedef {Object} ol.interaction.TouchPanOptions
+ * @property {ol.Kinetic|undefined} kinetic Kinetic.
+ */
+
 /**
  * @typedef {Object} ol.layer.LayerOptions
  * @property {number|undefined} brightness Brightness.
diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js
index b086eee1f9..bc77efbaf4 100644
--- a/src/ol/interaction/interactiondefaults.js
+++ b/src/ol/interaction/interactiondefaults.js
@@ -44,8 +44,9 @@ ol.interaction.defaults = function(opt_options, opt_interactions) {
   var touchPan = goog.isDef(options.touchPan) ?
       options.touchPan : true;
   if (touchPan) {
-    interactions.push(new ol.interaction.TouchPan(
-        new ol.Kinetic(-0.005, 0.05, 100)));
+    interactions.push(new ol.interaction.TouchPan({
+      kinetic: new ol.Kinetic(-0.005, 0.05, 100)
+    }));
   }
 
   var touchRotate = goog.isDef(options.touchRotate) ?
diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js
index 8bd3ef35d3..08b8740ec4 100644
--- a/src/ol/interaction/touchpaninteraction.js
+++ b/src/ol/interaction/touchpaninteraction.js
@@ -15,17 +15,19 @@ goog.require('ol.interaction.Touch');
 /**
  * @constructor
  * @extends {ol.interaction.Touch}
- * @param {ol.Kinetic=} opt_kinetic Kinetic object.
+ * @param {ol.interaction.TouchPanOptions=} opt_options Options.
  */
-ol.interaction.TouchPan = function(opt_kinetic) {
+ol.interaction.TouchPan = function(opt_options) {
 
   goog.base(this);
 
+  var options = goog.isDef(opt_options) ? opt_options : {};
+
   /**
    * @private
    * @type {ol.Kinetic|undefined}
    */
-  this.kinetic_ = opt_kinetic;
+  this.kinetic_ = options.kinetic;
 
   /**
    * @private