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

View / add a resolveConstraints method to end interactions

Browse Source 
This will help making sure that the view will come back to a "rested" state
once the interactions are over.

Interactions no longer need to handle the animation back to a rested state,
they simply call `endInteraction` with the desired duration and direction.
This commit is contained in:
Olivier Guyot
2019-01-14 17:10:55 +01:00
parent 1c5fd62e43
commit a6f65df8c4
8 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/rotationconstraint.js
+9 -12
View File
@@ -5,16 +5,15 @@ import {toRadians} from './math.js';
/**
* @typedef {function((number|undefined), number, boolean=): (number|undefined)} Type
* @typedef {function((number|undefined), boolean=): (number|undefined)} Type
*/
/**
* @param {number|undefined} rotation Rotation.
* @param {number} delta Delta.
* @return {number|undefined} Rotation.
*/
export function disable(rotation, delta) {
export function disable(rotation) {
if (rotation !== undefined) {
return 0;
} else {
@@ -25,12 +24,11 @@ export function disable(rotation, delta) {
/**
* @param {number|undefined} rotation Rotation.
* @param {number} delta Delta.
* @return {number|undefined} Rotation.
*/
export function none(rotation, delta) {
export function none(rotation) {
if (rotation !== undefined) {
return rotation + delta;
return rotation;
} else {
return undefined;
}
@@ -46,17 +44,16 @@ export function createSnapToN(n) {
return (
/**
* @param {number|undefined} rotation Rotation.
* @param {number} delta Delta.
* @param {boolean=} opt_isMoving True if an interaction or animation is in progress.
* @return {number|undefined} Rotation.
*/
function(rotation, delta, opt_isMoving) {
function(rotation, opt_isMoving) {
if (opt_isMoving) {
return rotation;
}
if (rotation !== undefined) {
rotation = Math.floor((rotation + delta) / theta + 0.5) * theta;
rotation = Math.floor(rotation / theta + 0.5) * theta;
return rotation;
} else {
return undefined;
@@ -77,16 +74,16 @@ export function createSnapToZero(opt_tolerance) {
* @param {number} delta Delta.
* @return {number|undefined} Rotation.
*/
function(rotation, delta, opt_isMoving) {
function(rotation, opt_isMoving) {
if (opt_isMoving) {
return rotation;
}
if (rotation !== undefined) {
if (Math.abs(rotation + delta) <= tolerance) {
if (Math.abs(rotation) <= tolerance) {
return 0;
} else {
return rotation + delta;
return rotation;
}
} else {
return undefined;