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

Revert "Merge pull request #9565 from dbrnz/v6.0.0-beta.7-branch"

Browse Source 
This reverts commit 35569a8427, reversing
changes made to 29a434314b.
This commit is contained in:
Andreas Hocevar
2020-02-14 11:46:57 +01:00
parent 0e9b43ed93
commit ea5c91e19e
2 changed files with 122 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/ol/interaction/MouseWheelZoom.js
View File

@@ -4,7 +4,17 @@
import {always, focus} from '../events/condition.js';
import EventType from '../events/EventType.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../has.js';
import Interaction from './Interaction.js';
import Interaction, {zoomByDelta} from './Interaction.js';
import {clamp} from '../math.js';
/**
* @enum {string}
*/
export const Mode = {
TRACKPAD: 'trackpad',
WHEEL: 'wheel'
};
/**
@@ -92,23 +102,35 @@ class MouseWheelZoom extends Interaction {
this.startTime_ = undefined;
/**
* Events separated by this delay will be considered separate
* @private
* @type {?}
*/
this.timeoutId_;
/**
* @private
* @type {Mode|undefined}
*/
this.mode_ = undefined;
/**
* Trackpad events separated by this delay will be considered separate
* interactions.
* @type {number}
*/
this.eventGap_ = 400;
this.trackpadEventGap_ = 400;
/**
* @type {?}
*/
this.timeoutId_;
this.trackpadTimeoutId_;
/**
* The number of delta values per zoom level
* @private
* @type {number}
*/
this.deltaPerZoom_ = 300;
this.trackpadDeltaPerZoom_ = 300;
}
@@ -130,7 +152,7 @@ class MouseWheelZoom extends Interaction {
* @private
*/
endInteraction_() {
this.timeoutId_ = undefined;
this.trackpadTimeoutId_ = undefined;
const view = this.getMap().getView();
view.endInteraction(undefined, this.lastDelta_ ? (this.lastDelta_ > 0 ? 1 : -1) : 0, this.lastAnchor_);
}
@@ -184,18 +206,53 @@ class MouseWheelZoom extends Interaction {
this.startTime_ = now;
}
if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) {
this.mode_ = Math.abs(delta) < 4 ?
Mode.TRACKPAD :
Mode.WHEEL;
}
if (this.mode_ === Mode.TRACKPAD) {
const view = map.getView();
if (this.timeoutId_) {
clearTimeout(this.timeoutId_);
if (this.trackpadTimeoutId_) {
clearTimeout(this.trackpadTimeoutId_);
} else {
view.beginInteraction();
}
this.timeoutId_ = setTimeout(this.endInteraction_.bind(this), this.eventGap_);
view.adjustZoom(-delta / this.deltaPerZoom_, this.lastAnchor_);
this.trackpadTimeoutId_ = setTimeout(this.endInteraction_.bind(this), this.trackpadEventGap_);
view.adjustZoom(-delta / this.trackpadDeltaPerZoom_, this.lastAnchor_);
this.startTime_ = now;
return false;
}
this.totalDelta_ += delta;
const timeLeft = Math.max(this.timeout_ - (now - this.startTime_), 0);
clearTimeout(this.timeoutId_);
this.timeoutId_ = setTimeout(this.handleWheelZoom_.bind(this, map), timeLeft);
return false;
}
/**
* @private
* @param {import("../PluggableMap.js").default} map Map.
*/
handleWheelZoom_(map) {
const view = map.getView();
if (view.getAnimating()) {
view.cancelAnimations();
}
const delta = clamp(this.totalDelta_, -this.maxDelta_, this.maxDelta_);
zoomByDelta(view, -delta, this.lastAnchor_, this.duration_);
this.mode_ = undefined;
this.totalDelta_ = 0;
this.lastAnchor_ = null;
this.startTime_ = undefined;
this.timeoutId_ = undefined;
}
/**
* Enable or disable using the mouse's location as an anchor when zooming
* @param {boolean} useAnchor true to zoom to the mouse's location, false

70
test/spec/ol/interaction/mousewheelzoom.test.js
View File

@@ -3,7 +3,7 @@ import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
import View from '../../../../src/ol/View.js';
import Event from '../../../../src/ol/events/Event.js';
import {DEVICE_PIXEL_RATIO, FIREFOX} from '../../../../src/ol/has.js';
import MouseWheelZoom from '../../../../src/ol/interaction/MouseWheelZoom.js';
import MouseWheelZoom, {Mode} from '../../../../src/ol/interaction/MouseWheelZoom.js';
describe('ol.interaction.MouseWheelZoom', function() {
@@ -32,13 +32,13 @@ describe('ol.interaction.MouseWheelZoom', function() {
describe('timeout duration', function() {
let clock;
beforeEach(function() {
sinon.spy(interaction, 'endInteraction_');
sinon.spy(interaction, 'handleWheelZoom_');
clock = sinon.useFakeTimers();
});
afterEach(function() {
clock.restore();
interaction.endInteraction_.restore();
interaction.handleWheelZoom_.restore();
});
it('works with the default value', function(done) {
@@ -49,12 +49,12 @@ describe('ol.interaction.MouseWheelZoom', function() {
});
map.handleMapBrowserEvent(event);
clock.tick(100);
// default timeout is 400 ms, not called yet
expect(interaction.endInteraction_.called).to.be(false);
clock.tick(50);
// default timeout is 80 ms, not called yet
expect(interaction.handleWheelZoom_.called).to.be(false);
clock.tick(300);
expect(interaction.endInteraction_.called).to.be(true);
clock.tick(30);
expect(interaction.handleWheelZoom_.called).to.be(true);
done();
});
@@ -63,15 +63,10 @@ describe('ol.interaction.MouseWheelZoom', function() {
describe('handleEvent()', function() {
let view;
beforeEach(function() {
view = map.getView();
});
if (FIREFOX) {
it('works on Firefox in DOM_DELTA_PIXEL mode (trackpad)', function(done) {
map.once('postrender', function() {
expect(interaction.lastDelta_).to.be(1);
expect(interaction.mode_).to.be(Mode.TRACKPAD);
done();
});
const event = new MapBrowserEvent('wheel', map, {
@@ -89,7 +84,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
if (!FIREFOX) {
it('works in DOM_DELTA_PIXEL mode (trackpad)', function(done) {
map.once('postrender', function() {
expect(interaction.lastDelta_).to.be(1);
expect(interaction.mode_).to.be(Mode.TRACKPAD);
done();
});
const event = new MapBrowserEvent('wheel', map, {
@@ -104,18 +99,29 @@ describe('ol.interaction.MouseWheelZoom', function() {
});
}
describe('spying on view.animateInternal()', function() {
let view;
beforeEach(function() {
view = map.getView();
sinon.spy(view, 'animateInternal');
});
afterEach(function() {
view.animateInternal.restore();
});
it('works in DOM_DELTA_LINE mode (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
const call = view.animateInternal.getCall(0);
expect(call.args[0].resolution).to.be(2);
expect(call.args[0].anchor).to.eql([0, 0]);
done();
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 7.5,
deltaY: 3.714599609375,
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
@@ -126,33 +132,15 @@ describe('ol.interaction.MouseWheelZoom', function() {
it('works on all browsers (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
const call = view.animateInternal.getCall(0);
expect(call.args[0].resolution).to.be(2);
expect(call.args[0].anchor).to.eql([0, 0]);
done();
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaY: 300, // trackpadDeltaPerZoom_
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
event.coordinate = [0, 0];
map.handleMapBrowserEvent(event);
});
it('works in DOM_DELTA_LINE mode (wheel)', function(done) {
map.once('postrender', function() {
expect(view.getResolution()).to.be(2);
expect(view.getCenter()).to.eql([0, 0]);
done();
});
const event = new MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 7.5, // trackpadDeltaPerZoom_ / 40
deltaY: 120,
target: map.getViewport(),
preventDefault: Event.prototype.preventDefault
});
@@ -164,3 +152,5 @@ describe('ol.interaction.MouseWheelZoom', function() {
});
});
});