Skip to content

Commit b2f1d2d

Browse files
committed
Website updates
1 parent 0057d8b commit b2f1d2d

File tree

12 files changed

+18
-21
lines changed

12 files changed

+18
-21
lines changed

dist/en/main/examples/common.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/examples/offscreen-canvas.worker.worker.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/dist/ol.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/renderer/Layer.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ declare class LayerRenderer<LayerType extends import("../layer/Layer.js").defaul
6161
* @abstract
6262
* @param {import("../Map.js").FrameState} frameState Frame state.
6363
* @param {HTMLElement|null} target Target that may be used to render content to.
64-
* @return {HTMLElement|null} The rendered element.
64+
* @return {HTMLElement} The rendered element.
6565
*/
66-
renderFrame(frameState: import("../Map.js").FrameState, target: HTMLElement | null): HTMLElement | null;
66+
renderFrame(frameState: import("../Map.js").FrameState, target: HTMLElement | null): HTMLElement;
6767
/**
6868
* @abstract
6969
* @param {import("../coordinate.js").Coordinate} coordinate Coordinate.

dist/en/main/ol/renderer/Layer.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/renderer/Layer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class LayerRenderer extends Observable {
9696
* @abstract
9797
* @param {import("../Map.js").FrameState} frameState Frame state.
9898
* @param {HTMLElement|null} target Target that may be used to render content to.
99-
* @return {HTMLElement|null} The rendered element.
99+
* @return {HTMLElement} The rendered element.
100100
*/
101101
renderFrame(frameState, target) {
102102
return abstract();

dist/en/main/ol/renderer/canvas/VectorImageLayer.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/en/main/ol/renderer/canvas/VectorImageLayer.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
133133
[declutter]: new RBush(9),
134134
};
135135
}
136-
let emptyImage = true;
137136
const image = new ImageCanvas(
138137
renderedExtent,
139138
viewResolution,
@@ -145,11 +144,9 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
145144
vectorRenderer.replayGroupChanged
146145
) {
147146
vectorRenderer.clipping = false;
148-
if (vectorRenderer.renderFrame(imageFrameState, null)) {
149-
vectorRenderer.renderDeclutter(imageFrameState);
150-
vectorRenderer.renderDeferred(imageFrameState);
151-
emptyImage = false;
152-
}
147+
vectorRenderer.renderFrame(imageFrameState, null);
148+
vectorRenderer.renderDeclutter(imageFrameState);
149+
vectorRenderer.renderDeferred(imageFrameState);
153150
callback();
154151
}
155152
},
@@ -159,7 +156,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
159156
if (image.getState() !== ImageState.LOADED) {
160157
return;
161158
}
162-
this.image = emptyImage ? null : image;
159+
this.image = image;
163160
const imagePixelRatio = image.getPixelRatio();
164161
const renderedResolution =
165162
(fromResolutionLike(image.getResolution()) * pixelRatio) /
@@ -184,7 +181,7 @@ class CanvasVectorImageLayerRenderer extends CanvasImageLayerRenderer {
184181
frameState.pixelToCoordinateTransform.slice();
185182
}
186183

187-
return !!this.image;
184+
return !this.getLayer().getSource().loading && !!this.image;
188185
}
189186

190187
/**

0 commit comments

Comments
 (0)