diff --git a/src/ol/base/map.js b/src/ol/base/map.js index 9c07fa3917..26e1febc0e 100644 --- a/src/ol/base/map.js +++ b/src/ol/base/map.js @@ -195,6 +195,16 @@ ol.Map = function( goog.inherits(ol.Map, ol.Object); +/** + * @private + */ +ol.Map.prototype.animate_ = function() { + goog.asserts.assert(!this.animating_); + goog.fx.anim.registerAnimation(this.animation_); + this.animating_ = true; +}; + + /** * @return {boolean} Can rotate. */ @@ -225,6 +235,13 @@ ol.Map.prototype.fitUserExtent = function(userExtent) { }; +/** + */ +ol.Map.prototype.freezeRendering = function() { + ++this.freezeRenderingCount_; +}; + + /** * @return {ol.Color|undefined} Background color. */ @@ -531,6 +548,21 @@ ol.Map.prototype.recalculateTransforms_ = function() { }; +/** + */ +ol.Map.prototype.render = function() { + if (!this.animating_) { + if (this.freezeRenderingCount_ === 0) { + if (this.renderer_.render()) { + this.animate_(); + } + } else { + this.dirty_ = true; + } + } +}; + + /** * @param {ol.Color} backgroundColor Background color. */ @@ -662,29 +694,18 @@ goog.exportProperty( /** */ -ol.Map.prototype.render = function() { - if (!this.animating_) { - if (this.freezeRenderingCount_ === 0) { +ol.Map.prototype.unfreezeRendering = function() { + goog.asserts.assert(this.freezeRenderingCount_ > 0); + if (--this.freezeRenderingCount_ === 0) { + if (!this.animating_ && this.dirty_) { if (this.renderer_.render()) { this.animate_(); } - } else { - this.dirty_ = true; } } }; -/** - * @private - */ -ol.Map.prototype.animate_ = function() { - goog.asserts.assert(!this.animating_); - goog.fx.anim.registerAnimation(this.animation_); - this.animating_ = true; -}; - - /** * @param {function(this: T)} f Function. * @param {T=} opt_obj Object. @@ -700,27 +721,6 @@ ol.Map.prototype.withFrozenRendering = function(f, opt_obj) { }; -/** - */ -ol.Map.prototype.freezeRendering = function() { - ++this.freezeRenderingCount_; -}; - - -/** - */ -ol.Map.prototype.unfreezeRendering = function() { - goog.asserts.assert(this.freezeRenderingCount_ > 0); - if (--this.freezeRenderingCount_ === 0) { - if (!this.animating_ && this.dirty_) { - if (this.renderer_.render()) { - this.animate_(); - } - } - } -}; - - /** * @constructor