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

Add consistency for pointer event handlers

Browse Source 
Now all are private static functions.
This commit is contained in:
Andreas Hocevar
2015-03-27 13:44:04 +01:00
committed by Alexandre Dubé
parent b34d7ce6cc
commit 056c3ad23e
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/snapinteraction.js
+21 -19
View File
@@ -48,9 +48,9 @@ goog.require('ol.structs.RBush');
ol.interaction.Snap = function(opt_options) { ol.interaction.Snap = function(opt_options) {
goog.base(this, { goog.base(this, {
handleEvent: this.handleEvent_, handleEvent: ol.interaction.Snap.handleEvent_,
handleDownEvent: goog.functions.TRUE, handleDownEvent: goog.functions.TRUE,
handleUpEvent: ol.interaction.Snap.handleUpEvent handleUpEvent: ol.interaction.Snap.handleUpEvent_
}); });
var options = goog.isDef(opt_options) ? opt_options : {}; var options = goog.isDef(opt_options) ? opt_options : {};
@@ -209,22 +209,6 @@ ol.interaction.Snap.prototype.getFeatures_ = function() {
}; };
/**
* Handle all pointer events events.
* @param {ol.MapBrowserEvent} evt A move event.
* @return {boolean} Pass the event to other interactions.
* @private
*/
ol.interaction.Snap.prototype.handleEvent_ = function(evt) {
var result = this.snapTo(evt.pixel, evt.coordinate, evt.map);
if (result.snapped) {
evt.coordinate = result.vertex;
evt.pixel = result.vertexPixel;
}
return ol.interaction.Pointer.handleEvent.call(this, evt);
};
/** /**
* @param {ol.source.VectorEvent|ol.CollectionEvent} evt Event. * @param {ol.source.VectorEvent|ol.CollectionEvent} evt Event.
* @private * @private
@@ -572,12 +556,30 @@ ol.interaction.Snap.ResultType;
ol.interaction.Snap.SegmentDataType; ol.interaction.Snap.SegmentDataType;
/**
* Handle all pointer events events.
* @param {ol.MapBrowserEvent} evt A move event.
* @return {boolean} Pass the event to other interactions.
* @this {ol.interaction.Snap}
* @private
*/
ol.interaction.Snap.handleEvent_ = function(evt) {
var result = this.snapTo(evt.pixel, evt.coordinate, evt.map);
if (result.snapped) {
evt.coordinate = result.vertex;
evt.pixel = result.vertexPixel;
}
return ol.interaction.Pointer.handleEvent.call(this, evt);
};
/** /**
* @param {ol.MapBrowserPointerEvent} evt Event. * @param {ol.MapBrowserPointerEvent} evt Event.
* @return {boolean} Stop drag sequence? * @return {boolean} Stop drag sequence?
* @this {ol.interaction.Snap} * @this {ol.interaction.Snap}
* @private
*/ */
ol.interaction.Snap.handleUpEvent = function(evt) { ol.interaction.Snap.handleUpEvent_ = function(evt) {
goog.array.forEach(goog.object.getValues(this.pendingFeatures_), goog.array.forEach(goog.object.getValues(this.pendingFeatures_),
this.updateFeature_, this); this.updateFeature_, this);
this.pendingFeatures_ = {}; this.pendingFeatures_ = {};