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

Complete animations at target values

Browse Source
This commit is contained in:
Tim Schaub
2017-02-17 11:17:17 -07:00
parent 61404d5bd8
commit 9bd48d06c3
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/view.js
View File

@@ -323,18 +323,20 @@ ol.View.prototype.updateAnimations_ = function() {
var y = y0 + progress * (y1 - y0);
this.set(ol.ViewProperty.CENTER, [x, y]);
}
if (animation.sourceResolution) {
var resolution = animation.sourceResolution +
progress * (animation.targetResolution - animation.sourceResolution);
if (animation.sourceResolution && animation.targetResolution) {
var resolution = progress === 1 ?
animation.targetResolution :
animation.sourceResolution + progress * (animation.targetResolution - animation.sourceResolution);
if (animation.anchor) {
this.set(ol.ViewProperty.CENTER,
this.calculateCenterZoom(resolution, animation.anchor));
}
this.set(ol.ViewProperty.RESOLUTION, resolution);
}
if (animation.sourceRotation !== undefined) {
var rotation = animation.sourceRotation +
progress * (animation.targetRotation - animation.sourceRotation);
if (animation.sourceRotation !== undefined && animation.targetRotation !== undefined) {
var rotation = progress === 1 ?
animation.targetRotation :
animation.sourceRotation + progress * (animation.targetRotation - animation.sourceRotation);
if (animation.anchor) {
this.set(ol.ViewProperty.CENTER,
this.calculateCenterRotate(rotation, animation.anchor));

24
test/spec/ol/view.test.js
View File

@@ -406,6 +406,26 @@ describe('ol.View', function() {
});
});
it('avoids going under minResolution', function(done) {
var maxZoom = 14;
var view = new ol.View({
center: [0, 0],
zoom: 0,
maxZoom: maxZoom
});
var minResolution = view.getMinResolution();
view.animate({
resolution: minResolution,
duration: 10
}, function(complete) {
expect(complete).to.be(true);
expect(view.getResolution()).to.be(minResolution);
expect(view.getZoom()).to.be(maxZoom);
done();
});
});
it('calls a callback when animation completes', function(done) {
var view = new ol.View({
center: [0, 0],
@@ -558,7 +578,7 @@ describe('ol.View', function() {
duration: 25
}, function() {
expect(calls).to.be(1);
expect(view.getZoom()).to.roughlyEqual(2, 1e-8);
expect(view.getZoom()).to.be(2);
expect(view.getAnimating()).to.be(false);
done();
});
@@ -599,7 +619,7 @@ describe('ol.View', function() {
duration: 25
}, function() {
++calls;
expect(view.getResolution()).to.roughlyEqual(2, 1e-8);
expect(view.getResolution()).to.be(2);
onAnimateEnd();
});