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

No trackpad mode for constrained resolutions

Browse Source
This commit is contained in:
Andreas Hocevar
2020-02-16 10:05:32 +01:00
parent 5150378983
commit d93073f8d0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/View.js
View File

@@ -793,6 +793,13 @@ class View extends BaseObject {
return this.constraints_; return this.constraints_;
} }
/**
* @return {boolean} Resolution constraint is set
*/
getConstrainResolution() {
return this.options_.constrainResolution;
}
/** /**
* @param {Array<number>=} opt_hints Destination array. * @param {Array<number>=} opt_hints Destination array.
* @return {Array<number>} Hint. * @return {Array<number>} Hint.

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

@@ -212,8 +212,8 @@ class MouseWheelZoom extends Interaction {
Mode.WHEEL; Mode.WHEEL;
} }
if (this.mode_ === Mode.TRACKPAD) { const view = map.getView();
const view = map.getView(); if (this.mode_ === Mode.TRACKPAD && !view.getConstrainResolution()) {
if (this.trackpadTimeoutId_) { if (this.trackpadTimeoutId_) {
clearTimeout(this.trackpadTimeoutId_); clearTimeout(this.trackpadTimeoutId_);
} else { } else {
@@ -248,9 +248,7 @@ class MouseWheelZoom extends Interaction {
view.cancelAnimations(); view.cancelAnimations();
} }
let delta = -clamp(this.totalDelta_, -this.maxDelta_ * this.deltaPerZoom_, this.maxDelta_ * this.deltaPerZoom_) / this.deltaPerZoom_; let delta = -clamp(this.totalDelta_, -this.maxDelta_ * this.deltaPerZoom_, this.maxDelta_ * this.deltaPerZoom_) / this.deltaPerZoom_;
const currentZoom = view.getZoom(); if (view.getConstrainResolution()) {
const newZoom = view.getConstrainedZoom(currentZoom + delta);
if (currentZoom === newZoom) {
// view has a zoom constraint, zoom by 1 // view has a zoom constraint, zoom by 1
delta = delta ? delta > 0 ? 1 : -1 : 0; delta = delta ? delta > 0 ? 1 : -1 : 0;
} }