From 817370a65be8a18caaa7ef31995e7e7ed13364cd Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Thu, 11 Jun 2015 18:34:20 +0200 Subject: [PATCH] Use 'managed' instead of 'unmanaged' in LayerState --- src/ol/layer/layer.js | 2 +- src/ol/layer/layerbase.js | 4 ++-- .../renderer/canvas/canvasvectorlayerrenderer.js | 4 ++-- src/ol/renderer/dom/domvectorlayerrenderer.js | 2 +- src/ol/renderer/webgl/webglvectorlayerrenderer.js | 2 +- test/spec/ol/layer/layer.test.js | 10 +++++----- test/spec/ol/layer/layergroup.test.js | 14 +++++++------- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 13f3a565ed..bca941790f 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -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); diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 7e916ac2bf..3211763cb8 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -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) diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index e9a1c4b5b2..d796e7d74a 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -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; diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/domvectorlayerrenderer.js index a59873f645..db613d3034 100644 --- a/src/ol/renderer/dom/domvectorlayerrenderer.js +++ b/src/ol/renderer/dom/domvectorlayerrenderer.js @@ -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); } diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index 6195623530..1099114a4a 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -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 : {}); } }; diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 8b3801d780..3b0acfb108 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() { opacity: 1, saturation: 1, visible: true, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, @@ -108,7 +108,7 @@ describe('ol.layer.Layer', function() { opacity: 0.5, saturation: 5, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: 500, @@ -202,7 +202,7 @@ describe('ol.layer.Layer', function() { opacity: 0.3, saturation: 0.3, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: 500, @@ -225,7 +225,7 @@ describe('ol.layer.Layer', function() { opacity: 0, saturation: 0, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, @@ -246,7 +246,7 @@ describe('ol.layer.Layer', function() { opacity: 1, saturation: 42, visible: true, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/layergroup.test.js index 3a5b4d16a5..061fda329f 100644 --- a/test/spec/ol/layer/layergroup.test.js +++ b/test/spec/ol/layer/layergroup.test.js @@ -51,7 +51,7 @@ describe('ol.layer.Group', function() { opacity: 1, saturation: 1, visible: true, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, @@ -180,7 +180,7 @@ describe('ol.layer.Group', function() { opacity: 0.5, saturation: 5, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: 500, @@ -232,7 +232,7 @@ describe('ol.layer.Group', function() { opacity: 0.5, saturation: 5, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: groupExtent, maxResolution: 500, @@ -278,7 +278,7 @@ describe('ol.layer.Group', function() { opacity: 0.3, saturation: 0.3, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: groupExtent, maxResolution: 500, @@ -301,7 +301,7 @@ describe('ol.layer.Group', function() { opacity: 0, saturation: 0, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, @@ -322,7 +322,7 @@ describe('ol.layer.Group', function() { opacity: 1, saturation: 42, visible: true, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: Infinity, @@ -497,7 +497,7 @@ describe('ol.layer.Group', function() { opacity: 0.25, saturation: 25, visible: false, - unmanaged: false, + managed: true, sourceState: ol.source.State.READY, extent: undefined, maxResolution: 150,