diff --git a/src/objectliterals.exports b/src/objectliterals.exports index 6d62578b1d..22ccfac852 100644 --- a/src/objectliterals.exports +++ b/src/objectliterals.exports @@ -74,13 +74,15 @@ @exportObjectLiteralProperty ol.interaction.DefaultOptions.doubleClickZoom boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.dragPan boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.keyboard boolean|undefined -@exportObjectLiteralProperty ol.interaction.DefaultOptions.keyboardPanOffset number|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.mouseWheelZoom boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.shiftDragZoom boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.touchPan boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.touchRotate boolean|undefined @exportObjectLiteralProperty ol.interaction.DefaultOptions.touchZoom boolean|undefined +@exportObjectLiteral ol.interaction.KeyboardPanOptions +@exportObjectLiteralProperty ol.interaction.KeyboardPanOptions.pixelDelta number|undefined + @exportObjectLiteral ol.interaction.KeyboardZoomOptions @exportObjectLiteralProperty ol.interaction.KeyboardZoomOptions.delta number|undefined diff --git a/src/ol/interaction/defaults.js b/src/ol/interaction/defaults.js index e776f9e1d0..c016b690bf 100644 --- a/src/ol/interaction/defaults.js +++ b/src/ol/interaction/defaults.js @@ -72,10 +72,8 @@ ol.interaction.defaults = function(opt_options, opt_interactions) { var keyboard = goog.isDef(options.keyboard) ? options.keyboard : true; - var keyboardPanOffset = goog.isDef(options.keyboardPanOffset) ? - options.keyboardPanOffset : 80; if (keyboard) { - interactions.push(new ol.interaction.KeyboardPan(keyboardPanOffset)); + interactions.push(new ol.interaction.KeyboardPan()); interactions.push(new ol.interaction.KeyboardZoom()); } diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index f45a139e4e..fee94fcfbf 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -13,17 +13,19 @@ goog.require('ol.interaction.Interaction'); /** * @constructor * @extends {ol.interaction.Interaction} - * @param {number} pixelDelta Pixel delta. + * @param {ol.interaction.KeyboardPanOptions=} opt_options Options. */ -ol.interaction.KeyboardPan = function(pixelDelta) { +ol.interaction.KeyboardPan = function(opt_options) { goog.base(this); + var options = goog.isDef(opt_options) ? opt_options : {}; + /** * @private * @type {number} */ - this.pixelDelta_ = pixelDelta; + this.delta_ = goog.isDef(options.delta) ? options.delta : 128; }; goog.inherits(ol.interaction.KeyboardPan, ol.interaction.Interaction); @@ -48,7 +50,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent = goog.asserts.assert(view instanceof ol.View2D); var resolution = view.getResolution(); var delta; - var mapUnitsDelta = resolution * this.pixelDelta_; + var mapUnitsDelta = resolution * this.delta_; if (keyCode == goog.events.KeyCodes.DOWN) { delta = new ol.Coordinate(0, -mapUnitsDelta); } else if (keyCode == goog.events.KeyCodes.LEFT) {