Skip to content

Commit 53b9045

Browse files
committed
fix: fix loading of layer dom renderer in map gl/gpu renderer
1 parent 0dc7bea commit 53b9045

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

packages/maptalks/src/layer/Layer.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,12 @@ class Layer extends JSONAble(Eventable(Renderable(Class))) {
745745
}
746746
// for map's gl and gpu renderer, layer's renderer is fixed
747747
const mapRenderer = this.getMap().getRenderer();
748-
if (mapRenderer.isWebGL()) {
749-
renderer = 'gl';
750-
} else if (mapRenderer.isWebGPU()) {
751-
renderer = 'gpu';
748+
if (renderer !== 'dom') {
749+
if (mapRenderer.isWebGL()) {
750+
renderer = 'gl';
751+
} else if (mapRenderer.isWebGPU()) {
752+
renderer = 'gpu';
753+
}
752754
}
753755
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
754756
// @ts-ignore

packages/maptalks/src/renderer/map/MapAbstractRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class MapAbstractRenderer extends MapRenderer {
359359
for (let i = layers.length - 1; i >= 0; i--) {
360360
const layer = layers[i];
361361
const renderer = layer._getRenderer();
362-
if (!renderer || !renderer.isRenderComplete()) {
362+
if (!renderer || renderer.isRenderComplete && !renderer.isRenderComplete()) {
363363
continue;
364364
}
365365
/**

packages/maptalks/src/renderer/map/MapCanvasRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ class MapCanvasRenderer extends MapAbstractRenderer {
283283
return;
284284
}
285285
const renderer = layer._getRenderer();
286-
if (!renderer || !renderer.isRenderComplete()) {
286+
if (!renderer || renderer.isRenderComplete && !renderer.isRenderComplete()) {
287287
return;
288288
}
289289
/**

0 commit comments

Comments
 (0)