Merge pull request #10239 from ahocevar/simpler-container-reuse

Simpler container reuse
This commit is contained in:
Andreas Hocevar
2019-11-01 19:14:05 +01:00
committed by GitHub
14 changed files with 44 additions and 144 deletions

View File

@@ -39,7 +39,6 @@ describe('ol.layer.Group', function() {
opacity: 1,
visible: true,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
@@ -165,7 +164,6 @@ describe('ol.layer.Group', function() {
opacity: 0.5,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 10,
@@ -209,7 +207,6 @@ describe('ol.layer.Group', function() {
opacity: 0.5,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: groupExtent,
zIndex: 0,
@@ -254,7 +251,6 @@ describe('ol.layer.Group', function() {
opacity: 0.3,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: groupExtent,
zIndex: 10,
@@ -273,7 +269,6 @@ describe('ol.layer.Group', function() {
opacity: 0,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
@@ -290,7 +285,6 @@ describe('ol.layer.Group', function() {
opacity: 1,
visible: true,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
@@ -465,7 +459,6 @@ describe('ol.layer.Group', function() {
opacity: 0.25,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 0,

View File

@@ -57,7 +57,6 @@ describe('ol.layer.Layer', function() {
opacity: 1,
visible: true,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
@@ -99,7 +98,6 @@ describe('ol.layer.Layer', function() {
opacity: 0.5,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 10,
@@ -373,7 +371,6 @@ describe('ol.layer.Layer', function() {
opacity: 0.33,
visible: false,
managed: true,
hasOverlay: false,
sourceState: 'ready',
extent: undefined,
zIndex: 10,

View File

@@ -215,12 +215,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png'
})
}));
map.once('postcompose', function(e) {
expect(e.frameState.layerStatesArray[1].hasOverlay).to.be(true);
});
map.once('rendercomplete', function() {
expect(document.querySelector('.ol-layers').childElementCount).to.be(1);
expect(document.querySelector('.ol-layer').childElementCount).to.be(2);
expect(document.querySelector('.ol-layer').childElementCount).to.be(1);
map.removeLayer(map.getLayers().item(1));
map.renderSync();
expect(document.querySelector('.ol-layer').childElementCount).to.be(1);