diff --git a/src/ol/interaction/dragboxinteraction.js b/src/ol/interaction/dragboxinteraction.js index 763c8fecd8..930942e7d4 100644 --- a/src/ol/interaction/dragboxinteraction.js +++ b/src/ol/interaction/dragboxinteraction.js @@ -8,7 +8,7 @@ goog.require('goog.asserts'); goog.require('goog.events.Event'); goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); -goog.require('ol.interaction.PointerInteraction'); +goog.require('ol.interaction.Pointer'); goog.require('ol.render.Box'); @@ -69,7 +69,7 @@ goog.inherits(ol.DragBoxEvent, goog.events.Event); * This interaction is only supported for mouse devices. * * @constructor - * @extends {ol.interaction.PointerInteraction} + * @extends {ol.interaction.Pointer} * @param {olx.interaction.DragBoxOptions=} opt_options Options. * @todo stability experimental */ @@ -105,7 +105,7 @@ ol.interaction.DragBox = function(opt_options) { options.condition : ol.events.condition.always; }; -goog.inherits(ol.interaction.DragBox, ol.interaction.PointerInteraction); +goog.inherits(ol.interaction.DragBox, ol.interaction.Pointer); /** diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index ddb1fb12f4..64deae58a8 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -9,7 +9,7 @@ goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.PointerInteraction'); +goog.require('ol.interaction.Pointer'); /** @@ -26,7 +26,7 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400; * * This interaction is not included in the default interactions. * @constructor - * @extends {ol.interaction.PointerInteraction} + * @extends {ol.interaction.Pointer} * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options. * @todo stability experimental */ @@ -63,7 +63,7 @@ ol.interaction.DragRotateAndZoom = function(opt_options) { }; goog.inherits(ol.interaction.DragRotateAndZoom, - ol.interaction.PointerInteraction); + ol.interaction.Pointer); /** diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index f42e2cd4ac..deb0a056b9 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -6,7 +6,7 @@ goog.require('ol.events.ConditionType'); goog.require('ol.events.condition'); goog.require('ol.interaction.Drag'); goog.require('ol.interaction.Interaction'); -goog.require('ol.interaction.PointerInteraction'); +goog.require('ol.interaction.Pointer'); /** @@ -24,7 +24,7 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250; * This interaction is only supported for mouse devices. * * @constructor - * @extends {ol.interaction.PointerInteraction} + * @extends {ol.interaction.Pointer} * @param {olx.interaction.DragRotateOptions=} opt_options Options. */ ol.interaction.DragRotate = function(opt_options) { @@ -47,7 +47,7 @@ ol.interaction.DragRotate = function(opt_options) { this.lastAngle_ = undefined; }; -goog.inherits(ol.interaction.DragRotate, ol.interaction.PointerInteraction); +goog.inherits(ol.interaction.DragRotate, ol.interaction.Pointer); /** diff --git a/src/ol/interaction/paninteraction.js b/src/ol/interaction/paninteraction.js index 6e8bef622b..f4d01eadaf 100644 --- a/src/ol/interaction/paninteraction.js +++ b/src/ol/interaction/paninteraction.js @@ -8,14 +8,14 @@ goog.require('ol.PreRenderFunction'); goog.require('ol.View2D'); goog.require('ol.coordinate'); goog.require('ol.events.condition'); -goog.require('ol.interaction.PointerInteraction'); +goog.require('ol.interaction.Pointer'); /** * Allows the user to pan the map by dragging the map. * @constructor - * @extends {ol.interaction.PointerInteraction} + * @extends {ol.interaction.Pointer} * @param {olx.interaction.PanOptions=} opt_options Options. * @todo stability experimental */ @@ -56,7 +56,7 @@ ol.interaction.Pan = function(opt_options) { this.noKinetic_ = false; }; -goog.inherits(ol.interaction.Pan, ol.interaction.PointerInteraction); +goog.inherits(ol.interaction.Pan, ol.interaction.Pointer); /** @@ -65,7 +65,7 @@ goog.inherits(ol.interaction.Pan, ol.interaction.PointerInteraction); ol.interaction.Pan.prototype.handlePointerDrag = function(mapBrowserEvent) { goog.asserts.assert(this.targetPointers.length >= 1); var centroid = - ol.interaction.PointerInteraction.centroid(this.targetPointers); + ol.interaction.Pointer.centroid(this.targetPointers); if (!goog.isNull(this.lastCentroid)) { if (this.kinetic_) { this.kinetic_.update(centroid[0], centroid[1]); diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index 724cdeae26..ffb2d050d6 100644 --- a/src/ol/interaction/pointerinteraction.js +++ b/src/ol/interaction/pointerinteraction.js @@ -1,4 +1,4 @@ -goog.provide('ol.interaction.PointerInteraction'); +goog.provide('ol.interaction.Pointer'); goog.require('goog.asserts'); goog.require('goog.functions'); @@ -17,7 +17,7 @@ goog.require('ol.interaction.Interaction'); * @constructor * @extends {ol.interaction.Interaction} */ -ol.interaction.PointerInteraction = function() { +ol.interaction.Pointer = function() { goog.base(this); @@ -40,14 +40,14 @@ ol.interaction.PointerInteraction = function() { this.targetPointers = []; }; -goog.inherits(ol.interaction.PointerInteraction, ol.interaction.Interaction); +goog.inherits(ol.interaction.Pointer, ol.interaction.Interaction); /** * @param {Array.