Let people zoom a lot with the button
This commit is contained in:
@@ -106,6 +106,9 @@ ol.control.Zoom.prototype.zoomByDelta_ = function(delta) {
|
|||||||
if (currentResolution) {
|
if (currentResolution) {
|
||||||
var newResolution = view.constrainResolution(currentResolution, delta);
|
var newResolution = view.constrainResolution(currentResolution, delta);
|
||||||
if (this.duration_ > 0) {
|
if (this.duration_ > 0) {
|
||||||
|
if (view.getAnimating()) {
|
||||||
|
view.cancelAnimations();
|
||||||
|
}
|
||||||
view.animate({
|
view.animate({
|
||||||
resolution: newResolution,
|
resolution: newResolution,
|
||||||
duration: this.duration_,
|
duration: this.duration_,
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ ol.View.prototype.getAnimating = function() {
|
|||||||
/**
|
/**
|
||||||
* Cancel any ongoing animations.
|
* Cancel any ongoing animations.
|
||||||
*/
|
*/
|
||||||
ol.View.prototype.cancelAnimations_ = function() {
|
ol.View.prototype.cancelAnimations = function() {
|
||||||
for (var i = 0, ii = this.animations_.length; i < ii; ++i) {
|
for (var i = 0, ii = this.animations_.length; i < ii; ++i) {
|
||||||
var series = this.animations_[i];
|
var series = this.animations_[i];
|
||||||
if (series[0].callback) {
|
if (series[0].callback) {
|
||||||
@@ -809,7 +809,7 @@ ol.View.prototype.rotate = function(rotation, opt_anchor) {
|
|||||||
ol.View.prototype.setCenter = function(center) {
|
ol.View.prototype.setCenter = function(center) {
|
||||||
this.set(ol.View.Property.CENTER, center);
|
this.set(ol.View.Property.CENTER, center);
|
||||||
if (this.getAnimating()) {
|
if (this.getAnimating()) {
|
||||||
this.cancelAnimations_();
|
this.cancelAnimations();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -838,7 +838,7 @@ ol.View.prototype.setHint = function(hint, delta) {
|
|||||||
ol.View.prototype.setResolution = function(resolution) {
|
ol.View.prototype.setResolution = function(resolution) {
|
||||||
this.set(ol.View.Property.RESOLUTION, resolution);
|
this.set(ol.View.Property.RESOLUTION, resolution);
|
||||||
if (this.getAnimating()) {
|
if (this.getAnimating()) {
|
||||||
this.cancelAnimations_();
|
this.cancelAnimations();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -852,7 +852,7 @@ ol.View.prototype.setResolution = function(resolution) {
|
|||||||
ol.View.prototype.setRotation = function(rotation) {
|
ol.View.prototype.setRotation = function(rotation) {
|
||||||
this.set(ol.View.Property.ROTATION, rotation);
|
this.set(ol.View.Property.ROTATION, rotation);
|
||||||
if (this.getAnimating()) {
|
if (this.getAnimating()) {
|
||||||
this.cancelAnimations_();
|
this.cancelAnimations();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user