diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index 7ef6119efc..5b42560c59 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -6,7 +6,7 @@ import LineString from '../src/ol/geom/LineString.js'; import Point from '../src/ol/geom/Point.js'; import Polygon from '../src/ol/geom/Polygon.js'; import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js'; +import PointerInteraction from '../src/ol/interaction/Pointer.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import TileJSON from '../src/ol/source/TileJSON.js'; @@ -29,7 +29,7 @@ var app = {}; */ app.Drag = function() { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: app.Drag.prototype.handleDownEvent, handleDragEvent: app.Drag.prototype.handleDragEvent, handleMoveEvent: app.Drag.prototype.handleMoveEvent, @@ -61,7 +61,7 @@ app.Drag = function() { this.previousCursor_ = undefined; }; -inherits(app.Drag, _ol_interaction_Pointer_); +inherits(app.Drag, PointerInteraction); /** diff --git a/src/ol/interaction/DragBox.js b/src/ol/interaction/DragBox.js index 8329066293..2e2b569bfd 100644 --- a/src/ol/interaction/DragBox.js +++ b/src/ol/interaction/DragBox.js @@ -5,7 +5,7 @@ import Event from '../events/Event.js'; import {inherits, nullFunction} from '../index.js'; import _ol_events_condition_ from '../events/condition.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; import _ol_render_Box_ from '../render/Box.js'; /** @@ -27,7 +27,7 @@ import _ol_render_Box_ from '../render/Box.js'; */ var DragBox = function(opt_options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: DragBox.handleDownEvent_, handleDragEvent: DragBox.handleDragEvent_, handleUpEvent: DragBox.handleUpEvent_ @@ -68,7 +68,7 @@ var DragBox = function(opt_options) { options.boxEndCondition : DragBox.defaultBoxEndCondition; }; -inherits(DragBox, _ol_interaction_Pointer_); +inherits(DragBox, PointerInteraction); /** diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index 97220cc018..bd7e433847 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -7,7 +7,7 @@ import _ol_coordinate_ from '../coordinate.js'; import {easeOut} from '../easing.js'; import _ol_events_condition_ from '../events/condition.js'; import {FALSE} from '../functions.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; /** * @classdesc @@ -20,7 +20,7 @@ import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; */ var DragPan = function(opt_options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: DragPan.handleDownEvent_, handleDragEvent: DragPan.handleDragEvent_, handleUpEvent: DragPan.handleUpEvent_ @@ -59,7 +59,7 @@ var DragPan = function(opt_options) { }; -inherits(DragPan, _ol_interaction_Pointer_); +inherits(DragPan, PointerInteraction); /** @@ -70,7 +70,7 @@ inherits(DragPan, _ol_interaction_Pointer_); DragPan.handleDragEvent_ = function(mapBrowserEvent) { var targetPointers = this.targetPointers; var centroid = - _ol_interaction_Pointer_.centroid(targetPointers); + PointerInteraction.centroid(targetPointers); if (targetPointers.length == this.lastPointersCount_) { if (this.kinetic_) { this.kinetic_.update(centroid[0], centroid[1]); diff --git a/src/ol/interaction/DragRotate.js b/src/ol/interaction/DragRotate.js index 5b78c1d761..87facda506 100644 --- a/src/ol/interaction/DragRotate.js +++ b/src/ol/interaction/DragRotate.js @@ -7,7 +7,7 @@ import ViewHint from '../ViewHint.js'; import _ol_events_condition_ from '../events/condition.js'; import {FALSE} from '../functions.js'; import Interaction from '../interaction/Interaction.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; /** * @classdesc @@ -26,7 +26,7 @@ var DragRotate = function(opt_options) { var options = opt_options ? opt_options : {}; - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: DragRotate.handleDownEvent_, handleDragEvent: DragRotate.handleDragEvent_, handleUpEvent: DragRotate.handleUpEvent_ @@ -52,7 +52,7 @@ var DragRotate = function(opt_options) { this.duration_ = options.duration !== undefined ? options.duration : 250; }; -inherits(DragRotate, _ol_interaction_Pointer_); +inherits(DragRotate, PointerInteraction); /** diff --git a/src/ol/interaction/DragRotateAndZoom.js b/src/ol/interaction/DragRotateAndZoom.js index 8846fd5dfc..757cdef2a9 100644 --- a/src/ol/interaction/DragRotateAndZoom.js +++ b/src/ol/interaction/DragRotateAndZoom.js @@ -6,7 +6,7 @@ import RotationConstraint from '../RotationConstraint.js'; import ViewHint from '../ViewHint.js'; import _ol_events_condition_ from '../events/condition.js'; import Interaction from '../interaction/Interaction.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; /** * @classdesc @@ -27,7 +27,7 @@ var DragRotateAndZoom = function(opt_options) { var options = opt_options ? opt_options : {}; - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: DragRotateAndZoom.handleDownEvent_, handleDragEvent: DragRotateAndZoom.handleDragEvent_, handleUpEvent: DragRotateAndZoom.handleUpEvent_ @@ -66,7 +66,7 @@ var DragRotateAndZoom = function(opt_options) { }; -inherits(DragRotateAndZoom, _ol_interaction_Pointer_); +inherits(DragRotateAndZoom, PointerInteraction); /** diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index c6f739446f..b7d4633eb9 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -20,7 +20,7 @@ import MultiPolygon from '../geom/MultiPolygon.js'; import Point from '../geom/Point.js'; import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js'; import DrawEventType from '../interaction/DrawEventType.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; import InteractionProperty from '../interaction/Property.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; @@ -38,7 +38,7 @@ import _ol_style_Style_ from '../style/Style.js'; */ var Draw = function(options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: Draw.handleDownEvent_, handleEvent: Draw.handleEvent, handleUpEvent: Draw.handleUpEvent_ @@ -290,7 +290,7 @@ var Draw = function(options) { }; -inherits(Draw, _ol_interaction_Pointer_); +inherits(Draw, PointerInteraction); /** @@ -308,7 +308,7 @@ Draw.getDefaultStyleFunction = function() { * @inheritDoc */ Draw.prototype.setMap = function(map) { - _ol_interaction_Pointer_.prototype.setMap.call(this, map); + PointerInteraction.prototype.setMap.call(this, map); this.updateState_(); }; @@ -337,7 +337,7 @@ Draw.handleEvent = function(event) { } else if (event.type === MapBrowserEventType.DBLCLICK) { pass = false; } - return _ol_interaction_Pointer_.handleEvent.call(this, event) && pass; + return PointerInteraction.handleEvent.call(this, event) && pass; }; diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js index 16a829c766..fefef6dc7d 100644 --- a/src/ol/interaction/Extent.js +++ b/src/ol/interaction/Extent.js @@ -12,7 +12,7 @@ import GeometryType from '../geom/GeometryType.js'; import Point from '../geom/Point.js'; import {fromExtent as polygonFromExtent} from '../geom/Polygon.js'; import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; import _ol_style_Style_ from '../style/Style.js'; @@ -81,7 +81,7 @@ var _ol_interaction_Extent_ = function(opt_options) { } /* Inherit ol.interaction.Pointer */ - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: _ol_interaction_Extent_.handleDownEvent_, handleDragEvent: _ol_interaction_Extent_.handleDragEvent_, handleEvent: _ol_interaction_Extent_.handleEvent_, @@ -123,7 +123,7 @@ var _ol_interaction_Extent_ = function(opt_options) { } }; -inherits(_ol_interaction_Extent_, _ol_interaction_Pointer_); +inherits(_ol_interaction_Extent_, PointerInteraction); /** * @param {ol.MapBrowserEvent} mapBrowserEvent Event. @@ -140,7 +140,7 @@ _ol_interaction_Extent_.handleEvent_ = function(mapBrowserEvent) { this.handlePointerMove_(mapBrowserEvent); } //call pointer to determine up/down/drag - _ol_interaction_Pointer_.handleEvent.call(this, mapBrowserEvent); + PointerInteraction.handleEvent.call(this, mapBrowserEvent); //return false to stop propagation return false; }; @@ -416,7 +416,7 @@ _ol_interaction_Extent_.prototype.createOrUpdatePointerFeature_ = function(verte _ol_interaction_Extent_.prototype.setMap = function(map) { this.extentOverlay_.setMap(map); this.vertexOverlay_.setMap(map); - _ol_interaction_Pointer_.prototype.setMap.call(this, map); + PointerInteraction.prototype.setMap.call(this, map); }; /** diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 821d64e8c2..74c941e92a 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -17,7 +17,7 @@ import {boundingExtent, buffer, createOrUpdateFromCoordinate} from '../extent.js import GeometryType from '../geom/GeometryType.js'; import Point from '../geom/Point.js'; import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; import VectorEventType from '../source/VectorEventType.js'; @@ -45,7 +45,7 @@ import _ol_style_Style_ from '../style/Style.js'; */ var _ol_interaction_Modify_ = function(options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: _ol_interaction_Modify_.handleDownEvent_, handleDragEvent: _ol_interaction_Modify_.handleDragEvent_, handleEvent: _ol_interaction_Modify_.handleEvent, @@ -227,7 +227,7 @@ var _ol_interaction_Modify_ = function(options) { }; -inherits(_ol_interaction_Modify_, _ol_interaction_Pointer_); +inherits(_ol_interaction_Modify_, PointerInteraction); /** @@ -321,7 +321,7 @@ _ol_interaction_Modify_.prototype.setActive = function(active) { this.overlay_.getSource().removeFeature(this.vertexFeature_); this.vertexFeature_ = null; } - _ol_interaction_Pointer_.prototype.setActive.call(this, active); + PointerInteraction.prototype.setActive.call(this, active); }; @@ -330,7 +330,7 @@ _ol_interaction_Modify_.prototype.setActive = function(active) { */ _ol_interaction_Modify_.prototype.setMap = function(map) { this.overlay_.setMap(map); - _ol_interaction_Pointer_.prototype.setMap.call(this, map); + PointerInteraction.prototype.setMap.call(this, map); }; @@ -823,7 +823,7 @@ _ol_interaction_Modify_.handleEvent = function(mapBrowserEvent) { this.ignoreNextSingleClick_ = false; } - return _ol_interaction_Pointer_.handleEvent.call(this, mapBrowserEvent) && + return PointerInteraction.handleEvent.call(this, mapBrowserEvent) && !handled; }; diff --git a/src/ol/interaction/PinchRotate.js b/src/ol/interaction/PinchRotate.js index bfa8f3b177..e9ae3c6c48 100644 --- a/src/ol/interaction/PinchRotate.js +++ b/src/ol/interaction/PinchRotate.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; import Interaction from '../interaction/Interaction.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; import RotationConstraint from '../RotationConstraint.js'; /** @@ -20,7 +20,7 @@ import RotationConstraint from '../RotationConstraint.js'; */ var PinchRotate = function(opt_options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: PinchRotate.handleDownEvent_, handleDragEvent: PinchRotate.handleDragEvent_, handleUpEvent: PinchRotate.handleUpEvent_ @@ -66,7 +66,7 @@ var PinchRotate = function(opt_options) { }; -inherits(PinchRotate, _ol_interaction_Pointer_); +inherits(PinchRotate, PointerInteraction); /** @@ -106,7 +106,7 @@ PinchRotate.handleDragEvent_ = function(mapBrowserEvent) { // FIXME: should be the intersection point between the lines: // touch0,touch1 and previousTouch0,previousTouch1 var viewportPosition = map.getViewport().getBoundingClientRect(); - var centroid = _ol_interaction_Pointer_.centroid(this.targetPointers); + var centroid = PointerInteraction.centroid(this.targetPointers); centroid[0] -= viewportPosition.left; centroid[1] -= viewportPosition.top; this.anchor_ = map.getCoordinateFromPixel(centroid); diff --git a/src/ol/interaction/PinchZoom.js b/src/ol/interaction/PinchZoom.js index edb6c080c1..9d75905918 100644 --- a/src/ol/interaction/PinchZoom.js +++ b/src/ol/interaction/PinchZoom.js @@ -5,7 +5,7 @@ import {inherits} from '../index.js'; import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; import Interaction from '../interaction/Interaction.js'; -import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; +import PointerInteraction from '../interaction/Pointer.js'; /** * @classdesc @@ -19,7 +19,7 @@ import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; */ var PinchZoom = function(opt_options) { - _ol_interaction_Pointer_.call(this, { + PointerInteraction.call(this, { handleDownEvent: PinchZoom.handleDownEvent_, handleDragEvent: PinchZoom.handleDragEvent_, handleUpEvent: PinchZoom.handleUpEvent_ @@ -59,7 +59,7 @@ var PinchZoom = function(opt_options) { }; -inherits(PinchZoom, _ol_interaction_Pointer_); +inherits(PinchZoom, PointerInteraction); /** @@ -104,7 +104,7 @@ PinchZoom.handleDragEvent_ = function(mapBrowserEvent) { // scale anchor point. var viewportPosition = map.getViewport().getBoundingClientRect(); - var centroid = _ol_interaction_Pointer_.centroid(this.targetPointers); + var centroid = PointerInteraction.centroid(this.targetPointers); centroid[0] -= viewportPosition.left; centroid[1] -= viewportPosition.top; this.anchor_ = map.getCoordinateFromPixel(centroid); diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index a26586c5e0..12782bd0bb 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -23,12 +23,12 @@ import _ol_obj_ from '../obj.js'; * @extends {ol.interaction.Interaction} * @api */ -var _ol_interaction_Pointer_ = function(opt_options) { +var PointerInteraction = function(opt_options) { var options = opt_options ? opt_options : {}; var handleEvent = options.handleEvent ? - options.handleEvent : _ol_interaction_Pointer_.handleEvent; + options.handleEvent : PointerInteraction.handleEvent; Interaction.call(this, { handleEvent: handleEvent @@ -39,28 +39,28 @@ var _ol_interaction_Pointer_ = function(opt_options) { * @private */ this.handleDownEvent_ = options.handleDownEvent ? - options.handleDownEvent : _ol_interaction_Pointer_.handleDownEvent; + options.handleDownEvent : PointerInteraction.handleDownEvent; /** * @type {function(ol.MapBrowserPointerEvent)} * @private */ this.handleDragEvent_ = options.handleDragEvent ? - options.handleDragEvent : _ol_interaction_Pointer_.handleDragEvent; + options.handleDragEvent : PointerInteraction.handleDragEvent; /** * @type {function(ol.MapBrowserPointerEvent)} * @private */ this.handleMoveEvent_ = options.handleMoveEvent ? - options.handleMoveEvent : _ol_interaction_Pointer_.handleMoveEvent; + options.handleMoveEvent : PointerInteraction.handleMoveEvent; /** * @type {function(ol.MapBrowserPointerEvent):boolean} * @private */ this.handleUpEvent_ = options.handleUpEvent ? - options.handleUpEvent : _ol_interaction_Pointer_.handleUpEvent; + options.handleUpEvent : PointerInteraction.handleUpEvent; /** * @type {boolean} @@ -82,14 +82,14 @@ var _ol_interaction_Pointer_ = function(opt_options) { }; -inherits(_ol_interaction_Pointer_, Interaction); +inherits(PointerInteraction, Interaction); /** * @param {Array.