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

Merge pull request #13835 from ahocevar/source-state

Browse Source 
Recover from incorrect rebase after removal of string enums
This commit is contained in:
Andreas Hocevar
2022-07-18 22:42:58 +02:00
parent 3b991343b5
commit ac5b80a0df
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/Layer.js
View File

@@ -195,7 +195,7 @@ class LayerRenderer extends Observable {
*/
renderIfReadyAndVisible() {
const layer = this.getLayer();
if (layer && layer.getVisible() && 'ready') {
if (layer && layer.getVisible() && layer.getSourceState() === 'ready') {
layer.changed();
}
}

23
test/browser/spec/ol/renderer/layer.test.js
View File

@@ -7,15 +7,32 @@ import View from '../../../../../src/ol/View.js';
import XYZ from '../../../../../src/ol/source/XYZ.js';
import {fromKey} from '../../../../../src/ol/tilecoord.js';
describe('ol.renderer.Layer', function () {
let renderer;
describe('ol/renderer/Layer', function () {
let layer, renderer;
const eventType = 'change';
beforeEach(function () {
const layer = new Layer({});
layer = new Layer({});
renderer = new LayerRenderer(layer);
});
describe('#renderIfReadyAndVisible', function () {
it('updates revision when data is ready and layer is visible', function () {
layer.setVisible(true);
let state;
layer.getSourceState = function () {
return state;
};
const revision = layer.getRevision();
state = 'foo';
renderer.renderIfReadyAndVisible();
expect(layer.getRevision()).to.be(revision);
state = 'ready';
renderer.renderIfReadyAndVisible();
expect(layer.getRevision()).to.be(revision + 1);
});
});
describe('#loadImage', function () {
let image;
let imageLoadFunction;