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

Refactor constraints static methods to module functions

Browse Source
This commit is contained in:
Björn Harrtell
2018-02-14 18:21:56 +01:00
parent 18fa8ddc58
commit 208ca098f2
9 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/DragRotate.js
+2 -2
View File
@@ -2,7 +2,7 @@
* @module ol/interaction/DragRotate
*/
import {inherits} from '../index.js';
import RotationConstraint from '../RotationConstraint.js';
import {disable} from '../rotationconstraint.js';
import ViewHint from '../ViewHint.js';
import {altShiftKeysOnly, mouseOnly, mouseActionButton} from '../events/condition.js';
import {FALSE} from '../functions.js';
@@ -65,7 +65,7 @@ function handleDragEvent(mapBrowserEvent) {
const map = mapBrowserEvent.map;
const view = map.getView();
if (view.getConstraints().rotation === RotationConstraint.disable) {
if (view.getConstraints().rotation === disable) {
return;
}
const size = map.getSize();
src/ol/interaction/DragRotateAndZoom.js
+2 -2
View File
@@ -2,7 +2,7 @@
* @module ol/interaction/DragRotateAndZoom
*/
import {inherits} from '../index.js';
import RotationConstraint from '../RotationConstraint.js';
import {disable} from '../rotationconstraint.js';
import ViewHint from '../ViewHint.js';
import {shiftKeyOnly, mouseOnly} from '../events/condition.js';
import Interaction from '../interaction/Interaction.js';
@@ -85,7 +85,7 @@ function handleDragEvent(mapBrowserEvent) {
const theta = Math.atan2(deltaY, deltaX);
const magnitude = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
const view = map.getView();
if (view.getConstraints().rotation !== RotationConstraint.disable && this.lastAngle_ !== undefined) {
if (view.getConstraints().rotation !== disable && this.lastAngle_ !== undefined) {
const angleDelta = theta - this.lastAngle_;
Interaction.rotateWithoutConstraints(
view, view.getRotation() - angleDelta);
src/ol/interaction/PinchRotate.js
+2 -2
View File
@@ -6,7 +6,7 @@ import ViewHint from '../ViewHint.js';
import {FALSE} from '../functions.js';
import Interaction from '../interaction/Interaction.js';
import PointerInteraction from '../interaction/Pointer.js';
import RotationConstraint from '../RotationConstraint.js';
import {disable} from '../rotationconstraint.js';
/**
* @classdesc
@@ -97,7 +97,7 @@ function handleDragEvent(mapBrowserEvent) {
const map = mapBrowserEvent.map;
const view = map.getView();
if (view.getConstraints().rotation === RotationConstraint.disable) {
if (view.getConstraints().rotation === disable) {
return;
}