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

Support anchor for rotation animations

Browse Source
This commit is contained in:
Tim Schaub
2016-11-05 20:49:15 -06:00
parent c95aa39dde
commit 3acfe79c78
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/animation.js
View File

@@ -72,7 +72,7 @@ document.getElementById('rotate-right').addEventListener('click', function() {
document.getElementById('rotate-around-rome').addEventListener('click', function() { document.getElementById('rotate-around-rome').addEventListener('click', function() {
view.animate({ view.animate({
rotation: view.getRotation() + 2 * Math.PI, rotation: view.getRotation() + 2 * Math.PI,
rotationAnchor: rome anchor: rome
}); });
}); });

12
src/ol/view.js
View File

@@ -313,15 +313,13 @@ ol.View.prototype.updateAnimations_ = function() {
this.set(ol.View.Property.RESOLUTION, resolution); this.set(ol.View.Property.RESOLUTION, resolution);
} }
if (animation.sourceRotation !== undefined) { if (animation.sourceRotation !== undefined) {
var rotationDelta = progress * (animation.targetRotation - animation.sourceRotation); var rotation = animation.sourceRotation +
this.set(ol.View.Property.ROTATION, animation.sourceRotation + rotationDelta); progress * (animation.targetRotation - animation.sourceRotation);
if (animation.anchor) { if (animation.anchor) {
var center = this.getCenter().slice(); this.set(ol.View.Property.CENTER,
ol.coordinate.sub(center, animation.anchor); this.calculateCenterRotate(rotation, animation.anchor));
ol.coordinate.rotate(center, rotationDelta);
ol.coordinate.add(center, animation.anchor);
this.set(ol.View.Property.CENTER, center);
} }
this.set(ol.View.Property.ROTATION, rotation);
} }
more = true; more = true;
} }