Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[fix] icon layer - render default icon in case svgIconUrl loading fails (#3204)

Igor Dykhta2005927bd0d6
diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.ts
index 5176b1dc8..de336d2e4 100644
--- a/src/layers/src/icon-layer/icon-layer.ts
+++ b/src/layers/src/icon-layer/icon-layer.ts
@@ -209,10 +209,23 @@ export default class IconLayer extends Layer {
if (Window.fetch && this.svgIconUrl) {
Window.fetch(this.svgIconUrl, fetchConfig)
- .then(response => response.json())
+ .then(response => {
+ if (!response.ok) {
+ throw new Error(`Failed to load svg-icons.json: ${response.status}`);
+ }
+ return response.json();
+ })
.then((parsed: {svgIcons?: any[]} = {}) => {
this.setSvgIcons(parsed.svgIcons);
+ })
+ .catch(err => {
+ console.error('Error fetching or parsing svg-icons.json:', err);
+ // Fallback to empty geometry to allow default icon rendering
+ this.iconGeometry = {};
});
+ } else {
+ // No fetch available; set empty geometry so layer can render default icons
+ this.iconGeometry = {};
}
}
@@ -389,42 +402,40 @@ export default class IconLayer extends Layer {
cullFace: GL.FRONT
};
- return !this.iconGeometry
- ? []
- : [
- new SvgIconLayer({
- ...defaultLayerProps,
- ...brushingProps,
- ...layerProps,
- ...data,
- parameters,
- getIconGeometry: id => this.iconGeometry?.[id],
-
- // update triggers
- updateTriggers,
- extensions
- }),
-
- // hover layer
- ...(hoveredObject
- ? [
- // @ts-expect-error SvgIconLayerProps needs getIcon Field
- new SvgIconLayer({
- ...this.getDefaultHoverLayerProps(),
- ...layerProps,
- visible: defaultLayerProps.visible,
- data: [hoveredObject],
- parameters,
- getPosition: data.getPosition,
- getRadius: data.getRadius,
- getFillColor: this.config.highlightColor,
- getIconGeometry: id => this.iconGeometry?.[id]
- })
- ]
- : []),
-
- // text label layer
- ...labelLayers
- ];
+ return [
+ new SvgIconLayer({
+ ...defaultLayerProps,
+ ...brushingProps,
+ ...layerProps,
+ ...data,
+ parameters,
+ getIconGeometry: id => this.iconGeometry?.[id],
+
+ // update triggers
+ updateTriggers,
+ extensions
+ }),
+
+ // hover layer
+ ...(hoveredObject
+ ? [
+ // @ts-expect-error SvgIconLayerProps needs getIcon Field
+ new SvgIconLayer({
+ ...this.getDefaultHoverLayerProps(),
+ ...layerProps,
+ visible: defaultLayerProps.visible,
+ data: [hoveredObject],
+ parameters,
+ getPosition: data.getPosition,
+ getRadius: data.getRadius,
+ getFillColor: this.config.highlightColor,
+ getIconGeometry: id => this.iconGeometry?.[id]
+ })
+ ]
+ : []),
+
+ // text label layer
+ ...labelLayers
+ ];
}
}
diff --git a/test/browser/layer-tests/icon-layer-specs.js b/test/browser/layer-tests/icon-layer-specs.js
index 07a7afbb6..0c44a1106 100644
--- a/test/browser/layer-tests/icon-layer-specs.js
+++ b/test/browser/layer-tests/icon-layer-specs.js
@@ -270,8 +270,8 @@ test('#IconLayer -> renderLayer', t => {
t.equal(layer.type, 'icon', 'should create 1 icon layer');
t.equal(
deckLayers.length,
- 0,
- 'Should create 0 deck.gl layer when icon geometry is not provided'
+ 3,
+ 'Should create 3 deck.gl layer when default icon geometry is not provided or missing'
);
}
},