ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_MapBrowserPointEvent_ to MapBrowserPointerEvent

Browse Source
This commit is contained in:
Marc Jansen
2017-12-15 09:46:07 +01:00
committed by Frederic Junod
parent 039bde29cc
commit ec64789940
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ol/MapBrowserEventHandler.js
View File

@@ -4,7 +4,7 @@
import {inherits} from './index.js'; import {inherits} from './index.js';
import _ol_has_ from './has.js'; import _ol_has_ from './has.js';
import MapBrowserEventType from './MapBrowserEventType.js'; import MapBrowserEventType from './MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from './MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
import _ol_events_ from './events.js'; import _ol_events_ from './events.js';
import _ol_events_EventTarget_ from './events/EventTarget.js'; import _ol_events_EventTarget_ from './events/EventTarget.js';
import _ol_pointer_EventType_ from './pointer/EventType.js'; import _ol_pointer_EventType_ from './pointer/EventType.js';
@@ -118,21 +118,21 @@ inherits(_ol_MapBrowserEventHandler_, _ol_events_EventTarget_);
* @private * @private
*/ */
_ol_MapBrowserEventHandler_.prototype.emulateClick_ = function(pointerEvent) { _ol_MapBrowserEventHandler_.prototype.emulateClick_ = function(pointerEvent) {
var newEvent = new _ol_MapBrowserPointerEvent_( var newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.CLICK, this.map_, pointerEvent); MapBrowserEventType.CLICK, this.map_, pointerEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
if (this.clickTimeoutId_ !== 0) { if (this.clickTimeoutId_ !== 0) {
// double-click // double-click
clearTimeout(this.clickTimeoutId_); clearTimeout(this.clickTimeoutId_);
this.clickTimeoutId_ = 0; this.clickTimeoutId_ = 0;
newEvent = new _ol_MapBrowserPointerEvent_( newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.DBLCLICK, this.map_, pointerEvent); MapBrowserEventType.DBLCLICK, this.map_, pointerEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
} else { } else {
// click // click
this.clickTimeoutId_ = setTimeout(function() { this.clickTimeoutId_ = setTimeout(function() {
this.clickTimeoutId_ = 0; this.clickTimeoutId_ = 0;
var newEvent = new _ol_MapBrowserPointerEvent_( var newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.SINGLECLICK, this.map_, pointerEvent); MapBrowserEventType.SINGLECLICK, this.map_, pointerEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
}.bind(this), 250); }.bind(this), 250);
@@ -165,7 +165,7 @@ _ol_MapBrowserEventHandler_.prototype.updateActivePointers_ = function(pointerEv
*/ */
_ol_MapBrowserEventHandler_.prototype.handlePointerUp_ = function(pointerEvent) { _ol_MapBrowserEventHandler_.prototype.handlePointerUp_ = function(pointerEvent) {
this.updateActivePointers_(pointerEvent); this.updateActivePointers_(pointerEvent);
var newEvent = new _ol_MapBrowserPointerEvent_( var newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.POINTERUP, this.map_, pointerEvent); MapBrowserEventType.POINTERUP, this.map_, pointerEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
@@ -206,7 +206,7 @@ _ol_MapBrowserEventHandler_.prototype.isMouseActionButton_ = function(pointerEve
*/ */
_ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent) { _ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent) {
this.updateActivePointers_(pointerEvent); this.updateActivePointers_(pointerEvent);
var newEvent = new _ol_MapBrowserPointerEvent_( var newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.POINTERDOWN, this.map_, pointerEvent); MapBrowserEventType.POINTERDOWN, this.map_, pointerEvent);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
@@ -258,7 +258,7 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerMove_ = function(pointerEvent
// moved a significant distance. // moved a significant distance.
if (this.isMoving_(pointerEvent)) { if (this.isMoving_(pointerEvent)) {
this.dragging_ = true; this.dragging_ = true;
var newEvent = new _ol_MapBrowserPointerEvent_( var newEvent = new MapBrowserPointerEvent(
MapBrowserEventType.POINTERDRAG, this.map_, pointerEvent, MapBrowserEventType.POINTERDRAG, this.map_, pointerEvent,
this.dragging_); this.dragging_);
this.dispatchEvent(newEvent); this.dispatchEvent(newEvent);
@@ -280,7 +280,7 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerMove_ = function(pointerEvent
*/ */
_ol_MapBrowserEventHandler_.prototype.relayEvent_ = function(pointerEvent) { _ol_MapBrowserEventHandler_.prototype.relayEvent_ = function(pointerEvent) {
var dragging = !!(this.down_ && this.isMoving_(pointerEvent)); var dragging = !!(this.down_ && this.isMoving_(pointerEvent));
this.dispatchEvent(new _ol_MapBrowserPointerEvent_( this.dispatchEvent(new MapBrowserPointerEvent(
pointerEvent.type, this.map_, pointerEvent, dragging)); pointerEvent.type, this.map_, pointerEvent, dragging));
}; };

6
src/ol/MapBrowserPointerEvent.js
View File

@@ -13,7 +13,7 @@ import MapBrowserEvent from './MapBrowserEvent.js';
* @param {boolean=} opt_dragging Is the map currently being dragged? * @param {boolean=} opt_dragging Is the map currently being dragged?
* @param {?olx.FrameState=} opt_frameState Frame state. * @param {?olx.FrameState=} opt_frameState Frame state.
*/ */
var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging, var MapBrowserPointerEvent = function(type, map, pointerEvent, opt_dragging,
opt_frameState) { opt_frameState) {
MapBrowserEvent.call(this, type, map, pointerEvent.originalEvent, opt_dragging, MapBrowserEvent.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
@@ -27,5 +27,5 @@ var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging
}; };
inherits(_ol_MapBrowserPointerEvent_, MapBrowserEvent); inherits(MapBrowserPointerEvent, MapBrowserEvent);
export default _ol_MapBrowserPointerEvent_; export default MapBrowserPointerEvent;

4
src/ol/interaction/Extent.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserEventType from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
import _ol_coordinate_ from '../coordinate.js'; import _ol_coordinate_ from '../coordinate.js';
import Event from '../events/Event.js'; import Event from '../events/Event.js';
import {boundingExtent, getArea} from '../extent.js'; import {boundingExtent, getArea} from '../extent.js';
@@ -132,7 +132,7 @@ inherits(_ol_interaction_Extent_, _ol_interaction_Pointer_);
* @private * @private
*/ */
_ol_interaction_Extent_.handleEvent_ = function(mapBrowserEvent) { _ol_interaction_Extent_.handleEvent_ = function(mapBrowserEvent) {
if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) { if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
return true; return true;
} }
//display pointer (if not dragging) //display pointer (if not dragging)

4
src/ol/interaction/Modify.js
View File

@@ -6,7 +6,7 @@ import _ol_Collection_ from '../Collection.js';
import _ol_CollectionEventType_ from '../CollectionEventType.js'; import _ol_CollectionEventType_ from '../CollectionEventType.js';
import _ol_Feature_ from '../Feature.js'; import _ol_Feature_ from '../Feature.js';
import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserEventType from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
import _ol_array_ from '../array.js'; import _ol_array_ from '../array.js';
import _ol_coordinate_ from '../coordinate.js'; import _ol_coordinate_ from '../coordinate.js';
import _ol_events_ from '../events.js'; import _ol_events_ from '../events.js';
@@ -799,7 +799,7 @@ _ol_interaction_Modify_.handleUpEvent_ = function(evt) {
* @api * @api
*/ */
_ol_interaction_Modify_.handleEvent = function(mapBrowserEvent) { _ol_interaction_Modify_.handleEvent = function(mapBrowserEvent) {
if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) { if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
return true; return true;
} }
this.lastPointerEvent_ = mapBrowserEvent; this.lastPointerEvent_ = mapBrowserEvent;

4
src/ol/interaction/Pointer.js
View File

@@ -4,7 +4,7 @@
import {inherits, nullFunction} from '../index.js'; import {inherits, nullFunction} from '../index.js';
import {FALSE} from '../functions.js'; import {FALSE} from '../functions.js';
import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserEventType from '../MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
import _ol_interaction_Interaction_ from '../interaction/Interaction.js'; import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
import _ol_obj_ from '../obj.js'; import _ol_obj_ from '../obj.js';
@@ -178,7 +178,7 @@ _ol_interaction_Pointer_.handleMoveEvent = nullFunction;
* @api * @api
*/ */
_ol_interaction_Pointer_.handleEvent = function(mapBrowserEvent) { _ol_interaction_Pointer_.handleEvent = function(mapBrowserEvent) {
if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) { if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
return true; return true;
} }

6
test/spec/ol/interaction/dragrotateandzoom.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import _ol_interaction_DragRotateAndZoom_ from '../../../../src/ol/interaction/DragRotateAndZoom.js'; import _ol_interaction_DragRotateAndZoom_ from '../../../../src/ol/interaction/DragRotateAndZoom.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js'; import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -58,7 +58,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
}); });
it('does not rotate when rotation is disabled on the view', function() { it('does not rotate when rotation is disabled on the view', function() {
var event = new _ol_MapBrowserPointerEvent_('pointermove', map, var event = new MapBrowserPointerEvent('pointermove', map,
new _ol_pointer_PointerEvent_('pointermove', {clientX: 20, clientY: 10}, {pointerType: 'mouse'}), new _ol_pointer_PointerEvent_('pointermove', {clientX: 20, clientY: 10}, {pointerType: 'mouse'}),
true); true);
interaction.lastAngle_ = Math.PI; interaction.lastAngle_ = Math.PI;
@@ -72,7 +72,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
resolution: 1, resolution: 1,
enableRotation: false enableRotation: false
})); }));
event = new _ol_MapBrowserPointerEvent_('pointermove', map, event = new MapBrowserPointerEvent('pointermove', map,
new _ol_pointer_PointerEvent_('pointermove', {clientX: 24, clientY: 16}, {pointerType: 'mouse'}), new _ol_pointer_PointerEvent_('pointermove', {clientX: 24, clientY: 16}, {pointerType: 'mouse'}),
true); true);
interaction.handleDragEvent_(event); interaction.handleDragEvent_(event);

4
test/spec/ol/interaction/draw.test.js
View File

@@ -1,6 +1,6 @@
import _ol_Feature_ from '../../../../src/ol/Feature.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import _ol_array_ from '../../../../src/ol/array.js'; import _ol_array_ from '../../../../src/ol/array.js';
import _ol_events_ from '../../../../src/ol/events.js'; import _ol_events_ from '../../../../src/ol/events.js';
@@ -73,7 +73,7 @@ describe('ol.interaction.Draw', function() {
clientY: position.top + y + height / 2, clientY: position.top + y + height / 2,
shiftKey: shiftKey shiftKey: shiftKey
}); });
map.handleMapBrowserEvent(new _ol_MapBrowserPointerEvent_(type, map, event)); map.handleMapBrowserEvent(new MapBrowserPointerEvent(type, map, event));
} }
describe('constructor', function() { describe('constructor', function() {

4
test/spec/ol/interaction/extent.test.js
View File

@@ -1,5 +1,5 @@
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import _ol_interaction_Extent_ from '../../../../src/ol/interaction/Extent.js'; import _ol_interaction_Extent_ from '../../../../src/ol/interaction/Extent.js';
import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js'; import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
@@ -57,7 +57,7 @@ describe('ol.interaction.Extent', function() {
clientY: position.top - y + height / 2, clientY: position.top - y + height / 2,
shiftKey: shiftKey shiftKey: shiftKey
}); });
var event = new _ol_MapBrowserPointerEvent_(type, map, pointerEvent); var event = new MapBrowserPointerEvent(type, map, pointerEvent);
event.pointerEvent.pointerId = 1; event.pointerEvent.pointerId = 1;
map.handleMapBrowserEvent(event); map.handleMapBrowserEvent(event);
} }

4
test/spec/ol/interaction/modify.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Collection_ from '../../../../src/ol/Collection.js';
import _ol_Feature_ from '../../../../src/ol/Feature.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import _ol_events_ from '../../../../src/ol/events.js'; import _ol_events_ from '../../../../src/ol/events.js';
import _ol_events_condition_ from '../../../../src/ol/events/condition.js'; import _ol_events_condition_ from '../../../../src/ol/events/condition.js';
@@ -91,7 +91,7 @@ describe('ol.interaction.Modify', function() {
button: button, button: button,
isPrimary: true isPrimary: true
}); });
var event = new _ol_MapBrowserPointerEvent_(type, map, pointerEvent); var event = new MapBrowserPointerEvent(type, map, pointerEvent);
event.pointerEvent.pointerId = 1; event.pointerEvent.pointerId = 1;
map.handleMapBrowserEvent(event); map.handleMapBrowserEvent(event);
} }

4
test/spec/ol/interaction/select.test.js
View File

@@ -2,7 +2,7 @@ import _ol_Collection_ from '../../../../src/ol/Collection.js';
import _ol_Feature_ from '../../../../src/ol/Feature.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import MapBrowserEventType from '../../../../src/ol/MapBrowserEventType.js'; import MapBrowserEventType from '../../../../src/ol/MapBrowserEventType.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import Polygon from '../../../../src/ol/geom/Polygon.js'; import Polygon from '../../../../src/ol/geom/Polygon.js';
import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js'; import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -97,7 +97,7 @@ describe('ol.interaction.Select', function() {
clientY: position.top + y + height / 2, clientY: position.top + y + height / 2,
shiftKey: shiftKey shiftKey: shiftKey
}); });
map.handleMapBrowserEvent(new _ol_MapBrowserPointerEvent_(type, map, event)); map.handleMapBrowserEvent(new MapBrowserPointerEvent(type, map, event));
} }
describe('constructor', function() { describe('constructor', function() {

4
test/spec/ol/interaction/translate.test.js
View File

@@ -1,7 +1,7 @@
import _ol_Collection_ from '../../../../src/ol/Collection.js'; import _ol_Collection_ from '../../../../src/ol/Collection.js';
import _ol_Feature_ from '../../../../src/ol/Feature.js'; import _ol_Feature_ from '../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../src/ol/Map.js'; import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js'; import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import _ol_View_ from '../../../../src/ol/View.js'; import _ol_View_ from '../../../../src/ol/View.js';
import Point from '../../../../src/ol/geom/Point.js'; import Point from '../../../../src/ol/geom/Point.js';
import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js'; import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js';
@@ -66,7 +66,7 @@ describe('ol.interaction.Translate', function() {
// calculated in case body has top < 0 (test runner with small window) // calculated in case body has top < 0 (test runner with small window)
var position = viewport.getBoundingClientRect(); var position = viewport.getBoundingClientRect();
var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
var event = new _ol_MapBrowserPointerEvent_(type, map, var event = new MapBrowserPointerEvent(type, map,
new _ol_pointer_PointerEvent_(type, { new _ol_pointer_PointerEvent_(type, {
clientX: position.left + x + width / 2, clientX: position.left + x + width / 2,
clientY: position.top + y + height / 2, clientY: position.top + y + height / 2,