Updates after rebase

This commit is contained in:
Andreas Hocevar
2022-07-15 11:01:30 +02:00
parent 884c0c6129
commit f720404559
3 changed files with 4 additions and 14 deletions

View File

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

View File

@@ -387,10 +387,7 @@ function renderPointGeometry(
if (opt_declutterBuilderGroup) {
textBuilderGroup = opt_declutterBuilderGroup;
}
const textReplay = textBuilderGroup.getBuilder(
style.getZIndex(),
'Text'
);
const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
textReplay.setTextStyle(textStyle, declutterImageWithText);
textReplay.drawText(geometry, feature);
}
@@ -448,10 +445,7 @@ function renderMultiPointGeometry(
if (opt_declutterBuilderGroup) {
textBuilderGroup = opt_declutterBuilderGroup;
}
const textReplay = textBuilderGroup.getBuilder(
style.getZIndex(),
'Text'
);
const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
textReplay.setTextStyle(textStyle, declutterImageWithText);
textReplay.drawText(geometry, feature);
}

View File

@@ -725,7 +725,7 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
let i, source, tileGrid;
for (i = sources.length - 1; i >= 0; --i) {
source = sources[i];
if (source.getState() === State.READY) {
if (source.getState() === 'ready') {
tileGrid = source.getTileGridForProjection(viewState.projection);
if (source.getWrapX()) {
break;