Animate from the current resolution

This commit is contained in:
Tim Schaub
2014-10-12 18:31:17 -06:00
parent 164407bc83
commit d45283c55e
+6 -6
View File
@@ -178,18 +178,18 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
ol.control.ZoomSlider.prototype.handleContainerClick_ = function(browserEvent) { ol.control.ZoomSlider.prototype.handleContainerClick_ = function(browserEvent) {
var map = this.getMap(); var map = this.getMap();
var view = map.getView(); var view = map.getView();
var resolution;
var amountDragged = this.amountDragged_(browserEvent.offsetX, var amountDragged = this.amountDragged_(browserEvent.offsetX,
browserEvent.offsetY); browserEvent.offsetY);
resolution = this.resolutionForAmount_(amountDragged); var currentResolution = view.getResolution();
goog.asserts.assert(goog.isDef(resolution)); goog.asserts.assert(goog.isDef(currentResolution));
map.beforeRender(ol.animation.zoom({ map.beforeRender(ol.animation.zoom({
resolution: resolution, resolution: currentResolution,
duration: ol.ZOOMSLIDER_ANIMATION_DURATION, duration: ol.ZOOMSLIDER_ANIMATION_DURATION,
easing: ol.easing.easeOut easing: ol.easing.easeOut
})); }));
resolution = view.constrainResolution(resolution); var resolution = this.resolutionForAmount_(amountDragged);
view.setResolution(resolution); goog.asserts.assert(goog.isDef(resolution));
view.setResolution(view.constrainResolution(resolution));
}; };