From 5f75104e33ae8d5bc6c5b88e32cf6f4ab853eb28 Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Fri, 7 Mar 2014 09:32:03 +0100 Subject: [PATCH] Remove DragInteraction --- src/ol/interaction/draginteraction.js | 145 ------------------ .../dragrotateandzoominteraction.js | 1 - src/ol/interaction/dragrotateinteraction.js | 1 - 3 files changed, 147 deletions(-) delete mode 100644 src/ol/interaction/draginteraction.js diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js deleted file mode 100644 index 1ed4480374..0000000000 --- a/src/ol/interaction/draginteraction.js +++ /dev/null @@ -1,145 +0,0 @@ -goog.provide('ol.interaction.Drag'); - -goog.require('goog.asserts'); -goog.require('goog.events.BrowserEvent'); -goog.require('goog.functions'); -goog.require('ol.Coordinate'); -goog.require('ol.MapBrowserEvent'); -goog.require('ol.MapBrowserEvent.EventType'); -goog.require('ol.interaction.Interaction'); - - - -/** - * Base class for interactions that drag the map. - * @constructor - * @extends {ol.interaction.Interaction} - */ -ol.interaction.Drag = function() { - - goog.base(this); - - /** - * @private - * @type {boolean} - */ - this.dragging_ = false; - - /** - * @type {number} - */ - this.startX = 0; - - /** - * @type {number} - */ - this.startY = 0; - - /** - * @type {number} - */ - this.deltaX = 0; - - /** - * @type {number} - */ - this.deltaY = 0; - - /** - * @type {ol.Coordinate} - */ - this.startCenter = null; - - /** - * @type {ol.Coordinate} - */ - this.startCoordinate = null; - -}; -goog.inherits(ol.interaction.Drag, ol.interaction.Interaction); - - -/** - * @return {boolean} Whether we're dragging. - */ -ol.interaction.Drag.prototype.getDragging = function() { - return this.dragging_; -}; - - -/** - * @param {ol.MapBrowserEvent} mapBrowserEvent Event. - * @protected - */ -ol.interaction.Drag.prototype.handleDrag = goog.nullFunction; - - -/** - * @param {ol.MapBrowserEvent} mapBrowserEvent Event. - * @protected - */ -ol.interaction.Drag.prototype.handleDragEnd = goog.nullFunction; - - -/** - * @param {ol.MapBrowserEvent} mapBrowserEvent Event. - * @protected - * @return {boolean} Capture dragging. - */ -ol.interaction.Drag.prototype.handleDragStart = goog.functions.FALSE; - - -/** - * @param {ol.MapBrowserEvent} mapBrowserEvent Event. - * @protected - */ -ol.interaction.Drag.prototype.handleDown = goog.nullFunction; - - -/** - * @inheritDoc - */ -ol.interaction.Drag.prototype.handleMapBrowserEvent = - function(mapBrowserEvent) { - var map = mapBrowserEvent.map; - if (!map.isDef()) { - return true; - } - var stopEvent = false; - var view = map.getView(); - var browserEvent = mapBrowserEvent.browserEvent; - if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DOWN) { - goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); - this.handleDown(mapBrowserEvent); - } - if (this.dragging_) { - if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAG) { - goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); - this.deltaX = browserEvent.clientX - this.startX; - this.deltaY = browserEvent.clientY - this.startY; - this.handleDrag(mapBrowserEvent); - } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGEND) { - goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); - this.deltaX = browserEvent.clientX - this.startX; - this.deltaY = browserEvent.clientY - this.startY; - this.dragging_ = false; - this.handleDragEnd(mapBrowserEvent); - } - } else if (mapBrowserEvent.type == ol.MapBrowserEvent.EventType.DRAGSTART) { - goog.asserts.assertInstanceof(browserEvent, goog.events.BrowserEvent); - var view2DState = view.getView2D().getView2DState(); - this.startX = browserEvent.clientX; - this.startY = browserEvent.clientY; - this.deltaX = 0; - this.deltaY = 0; - this.startCenter = view2DState.center; - this.startCoordinate = mapBrowserEvent.coordinate; - var handled = this.handleDragStart(mapBrowserEvent); - if (handled) { - this.dragging_ = true; - mapBrowserEvent.preventDefault(); - stopEvent = true; - } - } - return !stopEvent; -}; diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index 4f1a0e26c4..84bbc4927a 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -7,7 +7,6 @@ goog.require('goog.math.Vec2'); goog.require('ol.ViewHint'); goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); -goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer'); diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 91c4123e7e..a9304e3ccd 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -4,7 +4,6 @@ goog.require('goog.asserts'); goog.require('ol.ViewHint'); goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); -goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.Pointer');