Resolve conflicts

This commit is contained in:
Andreas Hocevar
2022-04-17 18:48:02 +02:00
parent 252671108f
commit 884c0c6129
7 changed files with 19 additions and 26 deletions
+1 -1
View File
@@ -208,7 +208,7 @@ class Layer extends BaseLayer {
}
/**
* @return {import("../source/State.js").default} Source state.
* @return {import("../source/Source.js").State} Source state.
*/
getSourceState() {
const source = this.getSource();
+5 -6
View File
@@ -3,7 +3,6 @@
*/
import BaseTileLayer from './BaseTile.js';
import LayerProperty from '../layer/Property.js';
import SourceState from '../source/State.js';
import WebGLTileLayerRenderer, {
Attributes,
Uniforms,
@@ -383,11 +382,11 @@ class WebGLTileLayer extends BaseTileLayer {
}
/**
* @return {import("../source/State.js").default} Source state.
* @return {import("../source/Source.js").State} Source state.
*/
getSourceState() {
const source = this.getRenderSource();
return source ? source.getState() : SourceState.UNDEFINED;
return source ? source.getState() : 'undefined';
}
/**
@@ -454,16 +453,16 @@ class WebGLTileLayer extends BaseTileLayer {
for (let i = 0, ii = sources.length; i < ii; ++i) {
const source = sources[i];
const sourceState = source.getState();
if (sourceState == SourceState.LOADING) {
if (sourceState == 'loading') {
const onChange = () => {
if (source.getState() == SourceState.READY) {
if (source.getState() == 'ready') {
source.removeEventListener('change', onChange);
this.changed();
}
};
source.addEventListener('change', onChange);
}
ready = ready && sourceState == SourceState.READY;
ready = ready && sourceState == 'ready';
}
const canvas = this.renderSources(frameState, sources);
if (this.getRenderer().renderComplete && ready) {