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

Set interacting hint during trackpad scroll

Browse Source
This commit is contained in:
Tim Schaub
2016-11-13 10:25:45 -07:00
parent 5b85f8ecc9
commit 0ac620c817
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ol/interaction/mousewheelzoom.js
View File

@@ -1,6 +1,7 @@
goog.provide('ol.interaction.MouseWheelZoom'); goog.provide('ol.interaction.MouseWheelZoom');
goog.require('ol'); goog.require('ol');
goog.require('ol.View');
goog.require('ol.easing'); goog.require('ol.easing');
goog.require('ol.events.EventType'); goog.require('ol.events.EventType');
goog.require('ol.has'); goog.require('ol.has');
@@ -73,6 +74,18 @@ ol.interaction.MouseWheelZoom = function(opt_options) {
*/ */
this.mode_ = undefined; this.mode_ = undefined;
/**
* Trackpad events separated by this delay will be considered separate
* interactions.
* @type {number}
*/
this.trackpadEventGap_ = 400;
/**
* @type {number|undefined}
*/
this.trackpadTimeoutId_ = undefined;
/** /**
* The number of delta values per zoom level * The number of delta values per zoom level
* @private * @private
@@ -143,7 +156,7 @@ ol.interaction.MouseWheelZoom.handleEvent = function(mapBrowserEvent) {
this.startTime_ = now; this.startTime_ = now;
} }
if (!this.mode_ || now - this.startTime_ > 400) { if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) {
this.mode_ = Math.abs(delta) < 4 ? this.mode_ = Math.abs(delta) < 4 ?
ol.interaction.MouseWheelZoom.Mode.TRACKPAD : ol.interaction.MouseWheelZoom.Mode.TRACKPAD :
ol.interaction.MouseWheelZoom.Mode.WHEEL; ol.interaction.MouseWheelZoom.Mode.WHEEL;
@@ -151,6 +164,12 @@ ol.interaction.MouseWheelZoom.handleEvent = function(mapBrowserEvent) {
if (this.mode_ === ol.interaction.MouseWheelZoom.Mode.TRACKPAD) { if (this.mode_ === ol.interaction.MouseWheelZoom.Mode.TRACKPAD) {
var view = map.getView(); var view = map.getView();
if (this.trackpadTimeoutId_) {
clearTimeout(this.trackpadTimeoutId_);
} else {
view.setHint(ol.View.Hint.INTERACTING, 1);
}
this.trackpadTimeoutId_ = setTimeout(this.decrementInteractingHint_.bind(this), this.trackpadEventGap_);
var resolution = view.getResolution() * Math.pow(2, delta / this.trackpadDeltaPerZoom_); var resolution = view.getResolution() * Math.pow(2, delta / this.trackpadDeltaPerZoom_);
var minResolution = view.getMinResolution(); var minResolution = view.getMinResolution();
var maxResolution = view.getMaxResolution(); var maxResolution = view.getMaxResolution();
@@ -197,6 +216,17 @@ ol.interaction.MouseWheelZoom.handleEvent = function(mapBrowserEvent) {
}; };
/**
* @private
*/
ol.interaction.MouseWheelZoom.prototype.decrementInteractingHint_ = function() {
this.trackpadTimeoutId_ = undefined;
var view = this.getMap().getView();
view.setHint(ol.View.Hint.INTERACTING, -1);
view.changed(); // notify listeners of the hint change
};
/** /**
* @private * @private
* @param {ol.Map} map Map. * @param {ol.Map} map Map.