ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Configure ol.interaction.DragPan with options

Browse Source
This commit is contained in:
Tom Payne
2013-04-22 16:05:24 +02:00
parent 3b9699fbc8
commit a36b4a0466
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/objectliterals.jsdoc
View File

@@ -170,6 +170,12 @@
* click. * click.
*/ */
/**
* @typedef {Object} ol.interaction.DragPanOptions
* @property {ol.Kinetic|undefined} kinetic Kinetic.
* @property {ol.interaction.ConditionType|undefined} condition Conditon.
*/
/** /**
* @typedef {Object} ol.interaction.DragRotateOptions * @typedef {Object} ol.interaction.DragRotateOptions
* @property {ol.interaction.ConditionType|undefined} condition Condition. * @property {ol.interaction.ConditionType|undefined} condition Condition.

13
src/ol/interaction/dragpaninteraction.js
View File

@@ -11,30 +11,33 @@ goog.require('ol.ViewHint');
goog.require('ol.coordinate'); goog.require('ol.coordinate');
goog.require('ol.interaction.ConditionType'); goog.require('ol.interaction.ConditionType');
goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Drag');
goog.require('ol.interaction.condition');
/** /**
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.ConditionType} condition Condition. * @param {ol.interaction.DragPanOptions=} opt_options Options.
* @param {ol.Kinetic=} opt_kinetic Kinetic object.
*/ */
ol.interaction.DragPan = function(condition, opt_kinetic) { ol.interaction.DragPan = function(opt_options) {
goog.base(this); goog.base(this);
var options = goog.isDef(opt_options) ? opt_options : {};
/** /**
* @private * @private
* @type {ol.interaction.ConditionType} * @type {ol.interaction.ConditionType}
*/ */
this.condition_ = condition; this.condition_ = goog.isDef(options.condition) ?
options.condition : ol.interaction.condition.noModifierKeys;
/** /**
* @private * @private
* @type {ol.Kinetic|undefined} * @type {ol.Kinetic|undefined}
*/ */
this.kinetic_ = opt_kinetic; this.kinetic_ = options.kinetic;
/** /**
* @private * @private

7
src/ol/interaction/interactiondefaults.js
View File

@@ -13,7 +13,6 @@ goog.require('ol.interaction.MouseWheelZoom');
goog.require('ol.interaction.TouchPan'); goog.require('ol.interaction.TouchPan');
goog.require('ol.interaction.TouchRotate'); goog.require('ol.interaction.TouchRotate');
goog.require('ol.interaction.TouchZoom'); goog.require('ol.interaction.TouchZoom');
goog.require('ol.interaction.condition');
/** /**
@@ -64,9 +63,9 @@ ol.interaction.defaults = function(opt_options, opt_interactions) {
var dragPan = goog.isDef(options.dragPan) ? var dragPan = goog.isDef(options.dragPan) ?
options.dragPan : true; options.dragPan : true;
if (dragPan) { if (dragPan) {
interactions.push( interactions.push(new ol.interaction.DragPan({
new ol.interaction.DragPan(ol.interaction.condition.noModifierKeys, kinetic: new ol.Kinetic(-0.005, 0.05, 100)
new ol.Kinetic(-0.005, 0.05, 100))); }));
} }
var keyboard = goog.isDef(options.keyboard) ? var keyboard = goog.isDef(options.keyboard) ?