Use 'managed' instead of 'unmanaged' in LayerState

This commit is contained in:
Andreas Hocevar
2015-06-11 18:34:20 +02:00
parent 07d5211e30
commit 817370a65b
7 changed files with 19 additions and 19 deletions

View File

@@ -163,7 +163,7 @@ ol.layer.Layer.prototype.setMap = function(map) {
this.mapPrecomposeKey_ = goog.events.listen(
map, ol.render.EventType.PRECOMPOSE, function(evt) {
var layerState = this.getLayerState();
layerState.unmanaged = true;
layerState.managed = false;
evt.frameState.layerStatesArray.push(layerState);
evt.frameState.layerStates[goog.getUid(this)] = layerState;
}, false, this);

View File

@@ -35,7 +35,7 @@ ol.layer.LayerProperty = {
* saturation: number,
* sourceState: ol.source.State,
* visible: boolean,
* unmanaged: boolean,
* managed: boolean,
* extent: (ol.Extent|undefined),
* maxResolution: number,
* minResolution: number}}
@@ -143,7 +143,7 @@ ol.layer.Base.prototype.getLayerState = function() {
saturation: Math.max(saturation, 0),
sourceState: sourceState,
visible: visible,
unmanaged: false,
managed: true,
extent: extent,
maxResolution: maxResolution,
minResolution: Math.max(minResolution, 0)

View File

@@ -78,8 +78,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
var extent = frameState.extent;
var pixelRatio = frameState.pixelRatio;
var skippedFeatureUids = layerState.unmanaged ?
{} : frameState.skippedFeatureUids;
var skippedFeatureUids = layerState.managed ?
frameState.skippedFeatureUids : {};
var viewState = frameState.viewState;
var projection = viewState.projection;
var rotation = viewState.rotation;

View File

@@ -142,7 +142,7 @@ ol.renderer.dom.VectorLayer.prototype.composeFrame =
context.globalAlpha = layerState.opacity;
replayGroup.replay(context, pixelRatio, transform, viewRotation,
layerState.unmanaged ? {} : frameState.skippedFeatureUids);
layerState.managed ? frameState.skippedFeatureUids : {});
this.dispatchEvent_(ol.render.EventType.RENDER, frameState, transform);
}

View File

@@ -84,7 +84,7 @@ ol.renderer.webgl.VectorLayer.prototype.composeFrame =
frameState.size, frameState.pixelRatio, layerState.opacity,
layerState.brightness, layerState.contrast, layerState.hue,
layerState.saturation,
layerState.unmanaged ? {} : frameState.skippedFeatureUids);
layerState.managed ? frameState.skippedFeatureUids : {});
}
};