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

Merge pull request #5809 from fredj/reuse_layerState

Browse Source 
Reuse ol.LayerState object
This commit is contained in:
Frédéric Junod
2016-08-31 16:53:38 +02:00
committed by GitHub
parent 3b6f1f99bc 5583a09889
commit 784c19a9b3
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ol/layer/base.js
View File

@@ -54,6 +54,16 @@ ol.layer.Base = function(options) {
options.minResolution !== undefined ? options.minResolution : 0; options.minResolution !== undefined ? options.minResolution : 0;
this.setProperties(properties); this.setProperties(properties);
/**
* @type {ol.LayerState}
* @private
*/
this.state_ = /** @type {ol.LayerState} */ ({
layer: /** @type {ol.layer.Layer} */ (this),
managed: true
});
}; };
ol.inherits(ol.layer.Base, ol.Object); ol.inherits(ol.layer.Base, ol.Object);
@@ -62,24 +72,15 @@ ol.inherits(ol.layer.Base, ol.Object);
* @return {ol.LayerState} Layer state. * @return {ol.LayerState} Layer state.
*/ */
ol.layer.Base.prototype.getLayerState = function() { ol.layer.Base.prototype.getLayerState = function() {
var opacity = this.getOpacity(); this.state_.opacity = ol.math.clamp(this.getOpacity(), 0, 1);
var sourceState = this.getSourceState(); this.state_.sourceState = this.getSourceState();
var visible = this.getVisible(); this.state_.visible = this.getVisible();
var extent = this.getExtent(); this.state_.extent = this.getExtent();
var zIndex = this.getZIndex(); this.state_.zIndex = this.getZIndex();
var maxResolution = this.getMaxResolution(); this.state_.maxResolution = this.getMaxResolution();
var minResolution = this.getMinResolution(); this.state_.minResolution = Math.max(this.getMinResolution(), 0);
return {
layer: /** @type {ol.layer.Layer} */ (this), return this.state_;
opacity: ol.math.clamp(opacity, 0, 1),
sourceState: sourceState,
visible: visible,
managed: true,
extent: extent,
zIndex: zIndex,
maxResolution: maxResolution,
minResolution: Math.max(minResolution, 0)
};
}; };