Use 'managed' instead of 'unmanaged' in LayerState
This commit is contained in:
@@ -163,7 +163,7 @@ ol.layer.Layer.prototype.setMap = function(map) {
|
|||||||
this.mapPrecomposeKey_ = goog.events.listen(
|
this.mapPrecomposeKey_ = goog.events.listen(
|
||||||
map, ol.render.EventType.PRECOMPOSE, function(evt) {
|
map, ol.render.EventType.PRECOMPOSE, function(evt) {
|
||||||
var layerState = this.getLayerState();
|
var layerState = this.getLayerState();
|
||||||
layerState.unmanaged = true;
|
layerState.managed = false;
|
||||||
evt.frameState.layerStatesArray.push(layerState);
|
evt.frameState.layerStatesArray.push(layerState);
|
||||||
evt.frameState.layerStates[goog.getUid(this)] = layerState;
|
evt.frameState.layerStates[goog.getUid(this)] = layerState;
|
||||||
}, false, this);
|
}, false, this);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ ol.layer.LayerProperty = {
|
|||||||
* saturation: number,
|
* saturation: number,
|
||||||
* sourceState: ol.source.State,
|
* sourceState: ol.source.State,
|
||||||
* visible: boolean,
|
* visible: boolean,
|
||||||
* unmanaged: boolean,
|
* managed: boolean,
|
||||||
* extent: (ol.Extent|undefined),
|
* extent: (ol.Extent|undefined),
|
||||||
* maxResolution: number,
|
* maxResolution: number,
|
||||||
* minResolution: number}}
|
* minResolution: number}}
|
||||||
@@ -143,7 +143,7 @@ ol.layer.Base.prototype.getLayerState = function() {
|
|||||||
saturation: Math.max(saturation, 0),
|
saturation: Math.max(saturation, 0),
|
||||||
sourceState: sourceState,
|
sourceState: sourceState,
|
||||||
visible: visible,
|
visible: visible,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
extent: extent,
|
extent: extent,
|
||||||
maxResolution: maxResolution,
|
maxResolution: maxResolution,
|
||||||
minResolution: Math.max(minResolution, 0)
|
minResolution: Math.max(minResolution, 0)
|
||||||
|
|||||||
@@ -78,8 +78,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
|
|||||||
|
|
||||||
var extent = frameState.extent;
|
var extent = frameState.extent;
|
||||||
var pixelRatio = frameState.pixelRatio;
|
var pixelRatio = frameState.pixelRatio;
|
||||||
var skippedFeatureUids = layerState.unmanaged ?
|
var skippedFeatureUids = layerState.managed ?
|
||||||
{} : frameState.skippedFeatureUids;
|
frameState.skippedFeatureUids : {};
|
||||||
var viewState = frameState.viewState;
|
var viewState = frameState.viewState;
|
||||||
var projection = viewState.projection;
|
var projection = viewState.projection;
|
||||||
var rotation = viewState.rotation;
|
var rotation = viewState.rotation;
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ ol.renderer.dom.VectorLayer.prototype.composeFrame =
|
|||||||
|
|
||||||
context.globalAlpha = layerState.opacity;
|
context.globalAlpha = layerState.opacity;
|
||||||
replayGroup.replay(context, pixelRatio, transform, viewRotation,
|
replayGroup.replay(context, pixelRatio, transform, viewRotation,
|
||||||
layerState.unmanaged ? {} : frameState.skippedFeatureUids);
|
layerState.managed ? frameState.skippedFeatureUids : {});
|
||||||
|
|
||||||
this.dispatchEvent_(ol.render.EventType.RENDER, frameState, transform);
|
this.dispatchEvent_(ol.render.EventType.RENDER, frameState, transform);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ ol.renderer.webgl.VectorLayer.prototype.composeFrame =
|
|||||||
frameState.size, frameState.pixelRatio, layerState.opacity,
|
frameState.size, frameState.pixelRatio, layerState.opacity,
|
||||||
layerState.brightness, layerState.contrast, layerState.hue,
|
layerState.brightness, layerState.contrast, layerState.hue,
|
||||||
layerState.saturation,
|
layerState.saturation,
|
||||||
layerState.unmanaged ? {} : frameState.skippedFeatureUids);
|
layerState.managed ? frameState.skippedFeatureUids : {});
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() {
|
|||||||
opacity: 1,
|
opacity: 1,
|
||||||
saturation: 1,
|
saturation: 1,
|
||||||
visible: true,
|
visible: true,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
@@ -108,7 +108,7 @@ describe('ol.layer.Layer', function() {
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
saturation: 5,
|
saturation: 5,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: 500,
|
maxResolution: 500,
|
||||||
@@ -202,7 +202,7 @@ describe('ol.layer.Layer', function() {
|
|||||||
opacity: 0.3,
|
opacity: 0.3,
|
||||||
saturation: 0.3,
|
saturation: 0.3,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: 500,
|
maxResolution: 500,
|
||||||
@@ -225,7 +225,7 @@ describe('ol.layer.Layer', function() {
|
|||||||
opacity: 0,
|
opacity: 0,
|
||||||
saturation: 0,
|
saturation: 0,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
@@ -246,7 +246,7 @@ describe('ol.layer.Layer', function() {
|
|||||||
opacity: 1,
|
opacity: 1,
|
||||||
saturation: 42,
|
saturation: 42,
|
||||||
visible: true,
|
visible: true,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 1,
|
opacity: 1,
|
||||||
saturation: 1,
|
saturation: 1,
|
||||||
visible: true,
|
visible: true,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
@@ -180,7 +180,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
saturation: 5,
|
saturation: 5,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: 500,
|
maxResolution: 500,
|
||||||
@@ -232,7 +232,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
saturation: 5,
|
saturation: 5,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: groupExtent,
|
extent: groupExtent,
|
||||||
maxResolution: 500,
|
maxResolution: 500,
|
||||||
@@ -278,7 +278,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 0.3,
|
opacity: 0.3,
|
||||||
saturation: 0.3,
|
saturation: 0.3,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: groupExtent,
|
extent: groupExtent,
|
||||||
maxResolution: 500,
|
maxResolution: 500,
|
||||||
@@ -301,7 +301,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 0,
|
opacity: 0,
|
||||||
saturation: 0,
|
saturation: 0,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
@@ -322,7 +322,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 1,
|
opacity: 1,
|
||||||
saturation: 42,
|
saturation: 42,
|
||||||
visible: true,
|
visible: true,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: Infinity,
|
maxResolution: Infinity,
|
||||||
@@ -497,7 +497,7 @@ describe('ol.layer.Group', function() {
|
|||||||
opacity: 0.25,
|
opacity: 0.25,
|
||||||
saturation: 25,
|
saturation: 25,
|
||||||
visible: false,
|
visible: false,
|
||||||
unmanaged: false,
|
managed: true,
|
||||||
sourceState: ol.source.State.READY,
|
sourceState: ol.source.State.READY,
|
||||||
extent: undefined,
|
extent: undefined,
|
||||||
maxResolution: 150,
|
maxResolution: 150,
|
||||||
|
|||||||
Reference in New Issue
Block a user