Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 49 additions & 38 deletions src/layers/src/icon-layer/icon-layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Comment thread
igorDykhta marked this conversation as resolved.
}
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 = {};
}
}

Expand Down Expand Up @@ -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
];
}
}
4 changes: 2 additions & 2 deletions test/browser/layer-tests/icon-layer-specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
}
},
Expand Down