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

Fix layer zIndex test with falsy values

Browse Source
This commit is contained in:
Frederic Junod
2019-10-31 15:58:35 +01:00
parent c23d59e3a8
commit b8c70bcbe7
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/Base.js
+2 -1
View File
@@ -108,11 +108,12 @@ class BaseLayer extends BaseObject {
managed: opt_managed === undefined ? true : opt_managed, managed: opt_managed === undefined ? true : opt_managed,
hasOverlay: false hasOverlay: false
}); });
const zIndex = this.getZIndex();
state.opacity = clamp(Math.round(this.getOpacity() * 100) / 100, 0, 1); state.opacity = clamp(Math.round(this.getOpacity() * 100) / 100, 0, 1);
state.sourceState = this.getSourceState(); state.sourceState = this.getSourceState();
state.visible = this.getVisible(); state.visible = this.getVisible();
state.extent = this.getExtent(); state.extent = this.getExtent();
state.zIndex = this.getZIndex() || (state.managed === false ? Infinity : 0); state.zIndex = zIndex !== undefined ? zIndex : (state.managed === false ? Infinity : 0);
state.maxResolution = this.getMaxResolution(); state.maxResolution = this.getMaxResolution();
state.minResolution = Math.max(this.getMinResolution(), 0); state.minResolution = Math.max(this.getMinResolution(), 0);
state.minZoom = this.getMinZoom(); state.minZoom = this.getMinZoom();
test/spec/ol/layer/layer.test.js
+6 -4
View File
@@ -650,10 +650,12 @@ describe('ol.layer.Layer', function() {
}); });
it('respects the configured zIndex', function() { it('respects the configured zIndex', function() {
layer.setZIndex(42); [-5, 0, 42].forEach(index => {
map.dispatchEvent(new RenderEvent('precompose', null, frameState, null)); layer.setZIndex(index);
const layerState = frameState.layerStatesArray[0]; map.dispatchEvent(new RenderEvent('precompose', null, frameState, null));
expect(layerState.zIndex).to.be(42); const layerState = frameState.layerStatesArray[0];
expect(layerState.zIndex).to.be(index);
});
}); });
}); });