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

Support anchor for resolution animations

Browse Source
This commit is contained in:
Tim Schaub
2016-11-05 20:41:40 -06:00
parent 8529a74063
commit c95aa39dde
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
externs/olx.js
View File

@@ -667,7 +667,7 @@ olx.ViewOptions.prototype.zoomFactor;
* zoom: (number|undefined),
* resolution: (number|undefined),
* rotation: (number|undefined),
* rotationAnchor: (ol.Coordinate|undefined),
* anchor: (ol.Coordinate|undefined),
* duration: (number|undefined),
* easing: (function(number):number|undefined)
* }}
@@ -710,11 +710,11 @@ olx.AnimationOptions.prototype.rotation;
/**
* The rotation anchor of the view during the animation.
* Optional anchor to remained fixed during a rotation or resolution animation.
* @type {ol.Coordinate|undefined}
* @api
*/
olx.AnimationOptions.prototype.rotationAnchor;
olx.AnimationOptions.prototype.anchor;
/**

24
src/ol/interaction/interaction.js
View File

@@ -208,26 +208,20 @@ ol.interaction.Interaction.zoomWithoutConstraints = function(map, view, resoluti
var currentResolution = view.getResolution();
var currentCenter = view.getCenter();
if (currentResolution !== undefined && currentCenter &&
resolution !== currentResolution &&
opt_duration && opt_duration > 0) {
map.beforeRender(ol.animation.zoom({
resolution: currentResolution,
resolution !== currentResolution && opt_duration) {
view.animate({
resolution: resolution,
anchor: opt_anchor,
duration: opt_duration,
easing: ol.easing.easeOut
}));
});
} else {
if (opt_anchor) {
map.beforeRender(ol.animation.pan({
source: currentCenter,
duration: opt_duration,
easing: ol.easing.easeOut
}));
var center = view.calculateCenterZoom(resolution, opt_anchor);
view.setCenter(center);
}
view.setResolution(resolution);
}
if (opt_anchor) {
var center = view.calculateCenterZoom(resolution, opt_anchor);
view.setCenter(center);
}
view.setResolution(resolution);
}
};

17
src/ol/view.js
View File

@@ -203,6 +203,7 @@ ol.View.prototype.animate = function(var_args) {
var animation = /** @type {ol.ViewAnimation} */ ({
start: start,
done: false,
anchor: options.anchor,
duration: options.duration || 1000,
easing: options.easing || ol.easing.inAndOut
});
@@ -227,7 +228,6 @@ ol.View.prototype.animate = function(var_args) {
if (options.rotation !== undefined) {
animation.sourceRotation = rotation;
animation.targetRotation = options.rotation;
animation.rotationAnchor = options.rotationAnchor;
rotation = animation.targetRotation;
}
@@ -304,17 +304,22 @@ ol.View.prototype.updateAnimations_ = function() {
this.set(ol.View.Property.CENTER, [x, y]);
}
if (animation.sourceResolution) {
var resolutionDelta = progress * (animation.targetResolution - animation.sourceResolution);
this.set(ol.View.Property.RESOLUTION, animation.sourceResolution + resolutionDelta);
var resolution = animation.sourceResolution +
progress * (animation.targetResolution - animation.sourceResolution);
if (animation.anchor) {
this.set(ol.View.Property.CENTER,
this.calculateCenterZoom(resolution, animation.anchor));
}
this.set(ol.View.Property.RESOLUTION, resolution);
}
if (animation.sourceRotation !== undefined) {
var rotationDelta = progress * (animation.targetRotation - animation.sourceRotation);
this.set(ol.View.Property.ROTATION, animation.sourceRotation + rotationDelta);
if (animation.rotationAnchor) {
if (animation.anchor) {
var center = this.getCenter().slice();
ol.coordinate.sub(center, animation.rotationAnchor);
ol.coordinate.sub(center, animation.anchor);
ol.coordinate.rotate(center, rotationDelta);
ol.coordinate.add(center, animation.rotationAnchor);
ol.coordinate.add(center, animation.anchor);
this.set(ol.View.Property.CENTER, center);
}
}