From dc164fd4962cd4af8580c727534c38c5e34b6bf2 Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Wed, 26 Feb 2014 15:56:17 +0100 Subject: [PATCH] removes now superfluous DragPanInteraction --- src/objectliterals.jsdoc | 10 -- src/ol/interaction/dragpan.exports | 1 - src/ol/interaction/dragpaninteraction.js | 146 ---------------------- src/ol/interaction/interactiondefaults.js | 9 -- 4 files changed, 166 deletions(-) delete mode 100644 src/ol/interaction/dragpan.exports delete mode 100644 src/ol/interaction/dragpaninteraction.js diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 1486f0c7f6..9a6b35247c 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -385,15 +385,6 @@ * default, the map's view's projection is used. */ -/** - * @typedef {Object} olx.interaction.DragPanOptions - * @property {ol.Kinetic|undefined} kinetic Kinetic inertia to apply to the pan. - * @property {ol.events.ConditionType|undefined} condition A conditional - * modifier (i.e. Shift key) that determines if the interaction is active - * or not, default is no modifiers. - * @todo stability experimental - */ - /** * @typedef {Object} olx.interaction.DragRotateOptions * @property {ol.events.ConditionType|undefined} condition A conditional @@ -435,7 +426,6 @@ * rotate is desired. Default is `true`. * @property {boolean|undefined} doubleClickZoom Whether double click zoom is * desired. Default is `true`. - * @property {boolean|undefined} dragPan Whether drag-pan is desired. Default is `true`. * @property {boolean|undefined} keyboard Whether keyboard interaction is * desired. Default is `true`. * @property {boolean|undefined} mouseWheelZoom Whether mousewheel zoom is diff --git a/src/ol/interaction/dragpan.exports b/src/ol/interaction/dragpan.exports deleted file mode 100644 index dbc71bf21a..0000000000 --- a/src/ol/interaction/dragpan.exports +++ /dev/null @@ -1 +0,0 @@ -@exportSymbol ol.interaction.DragPan diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js deleted file mode 100644 index 27c9521d6a..0000000000 --- a/src/ol/interaction/dragpaninteraction.js +++ /dev/null @@ -1,146 +0,0 @@ -// FIXME works for View2D only - -goog.provide('ol.interaction.DragPan'); - -goog.require('goog.asserts'); -goog.require('ol.Kinetic'); -goog.require('ol.PreRenderFunction'); -goog.require('ol.View2D'); -goog.require('ol.ViewHint'); -goog.require('ol.coordinate'); -goog.require('ol.events.ConditionType'); -goog.require('ol.events.condition'); -goog.require('ol.interaction.Drag'); - - - -/** - * Allows the user to pan the map by clickng and dragging. - * @constructor - * @extends {ol.interaction.Drag} - * @param {olx.interaction.DragPanOptions=} opt_options Options. - * @todo stability experimental - */ -ol.interaction.DragPan = function(opt_options) { - - goog.base(this); - - var options = goog.isDef(opt_options) ? opt_options : {}; - - /** - * @private - * @type {ol.events.ConditionType} - */ - this.condition_ = goog.isDef(options.condition) ? - options.condition : ol.events.condition.noModifierKeys; - - /** - * @private - * @type {ol.Kinetic|undefined} - */ - this.kinetic_ = options.kinetic; - - /** - * @private - * @type {?ol.PreRenderFunction} - */ - this.kineticPreRenderFn_ = null; - -}; -goog.inherits(ol.interaction.DragPan, ol.interaction.Drag); - - -/** - * @inheritDoc - */ -ol.interaction.DragPan.prototype.handleDrag = function(mapBrowserEvent) { - if (this.kinetic_) { - this.kinetic_.update( - mapBrowserEvent.browserEvent.clientX, - mapBrowserEvent.browserEvent.clientY); - } - var map = mapBrowserEvent.map; - // FIXME works for View2D only - var view = map.getView(); - goog.asserts.assertInstanceof(view, ol.View2D); - var view2DState = view.getView2DState(); - var newCenter = [ - -view2DState.resolution * this.deltaX, - view2DState.resolution * this.deltaY - ]; - ol.coordinate.rotate(newCenter, view2DState.rotation); - ol.coordinate.add(newCenter, this.startCenter); - newCenter = view.constrainCenter(newCenter); - map.render(); - view.setCenter(newCenter); -}; - - -/** - * @inheritDoc - */ -ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) { - - // FIXME works for View2D only - - var map = mapBrowserEvent.map; - var view = map.getView(); - view.setHint(ol.ViewHint.INTERACTING, -1); - - if (this.kinetic_ && this.kinetic_.end()) { - var view2D = view.getView2D(); - goog.asserts.assertInstanceof(view2D, ol.View2D); - var view2DState = view2D.getView2DState(); - var distance = this.kinetic_.getDistance(); - var angle = this.kinetic_.getAngle(); - this.kineticPreRenderFn_ = this.kinetic_.pan(view2DState.center); - map.beforeRender(this.kineticPreRenderFn_); - - var centerpx = map.getPixelFromCoordinate(view2DState.center); - var dest = map.getCoordinateFromPixel([ - centerpx[0] - distance * Math.cos(angle), - centerpx[1] - distance * Math.sin(angle) - ]); - dest = view2D.constrainCenter(dest); - view2D.setCenter(dest); - } - map.render(); -}; - - -/** - * @inheritDoc - */ -ol.interaction.DragPan.prototype.handleDragStart = function(mapBrowserEvent) { - var browserEvent = mapBrowserEvent.browserEvent; - if (browserEvent.isMouseActionButton() && this.condition_(mapBrowserEvent)) { - if (this.kinetic_) { - this.kinetic_.begin(); - this.kinetic_.update(browserEvent.clientX, browserEvent.clientY); - } - var map = mapBrowserEvent.map; - map.getView().setHint(ol.ViewHint.INTERACTING, 1); - map.render(); - return true; - } else { - return false; - } -}; - - -/** - * @inheritDoc - */ -ol.interaction.DragPan.prototype.handleDown = function(mapBrowserEvent) { - var map = mapBrowserEvent.map; - // FIXME works for View2D only - var view = map.getView(); - goog.asserts.assertInstanceof(view, ol.View2D); - goog.asserts.assert(!goog.isNull(mapBrowserEvent.frameState)); - if (!goog.isNull(this.kineticPreRenderFn_) && - map.removePreRenderFunction(this.kineticPreRenderFn_)) { - map.render(); - view.setCenter(mapBrowserEvent.frameState.view2DState.center); - this.kineticPreRenderFn_ = null; - } -}; diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js index e8af83a41a..52df9661d5 100644 --- a/src/ol/interaction/interactiondefaults.js +++ b/src/ol/interaction/interactiondefaults.js @@ -3,7 +3,6 @@ goog.provide('ol.interaction'); goog.require('ol.Collection'); goog.require('ol.Kinetic'); goog.require('ol.interaction.DoubleClickZoom'); -goog.require('ol.interaction.DragPan'); goog.require('ol.interaction.DragRotate'); goog.require('ol.interaction.DragZoom'); goog.require('ol.interaction.KeyboardPan'); @@ -73,14 +72,6 @@ ol.interaction.defaults = function(opt_options) { })); } - var dragPan = goog.isDef(options.dragPan) ? - options.dragPan : true; - if (dragPan) { - interactions.push(new ol.interaction.DragPan({ - kinetic: kinetic - })); - } - var keyboard = goog.isDef(options.keyboard) ? options.keyboard : true; if (keyboard) {