From 5dcb93ca5d20e20dd116a14fade10774397dc3e7 Mon Sep 17 00:00:00 2001
From: vcoppe <vianney.coppe@gmail.com>
Date: Sun, 4 Jan 2026 19:29:46 +0100
Subject: [PATCH] fix loading style font

---
 .../map/layer-control/LayerControl.svelte       |  4 +---
 website/src/lib/components/map/map.ts           | 17 ++++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/website/src/lib/components/map/layer-control/LayerControl.svelte b/website/src/lib/components/map/layer-control/LayerControl.svelte
index d8d279453..9f0b1a137 100644
--- a/website/src/lib/components/map/layer-control/LayerControl.svelte
+++ b/website/src/lib/components/map/layer-control/LayerControl.svelte
@@ -101,9 +101,7 @@
                                 acc: Record<string, ImportSpecification>,
                                 imprt: ImportSpecification
                             ) => {
-                                if (
-                                    !['basemap', 'overlays', 'glyphs-and-sprite'].includes(imprt.id)
-                                ) {
+                                if (!['basemap', 'overlays'].includes(imprt.id)) {
                                     acc[imprt.id] = imprt;
                                 }
                                 return acc;
diff --git a/website/src/lib/components/map/map.ts b/website/src/lib/components/map/map.ts
index 5b31fe291..14e83462a 100644
--- a/website/src/lib/components/map/map.ts
+++ b/website/src/lib/components/map/map.ts
@@ -35,17 +35,6 @@ export class MapboxGLMap {
                 sources: {},
                 layers: [],
                 imports: [
-                    {
-                        id: 'glyphs-and-sprite', // make Mapbox glyphs and sprite available to other styles
-                        url: '',
-                        data: {
-                            version: 8,
-                            sources: {},
-                            layers: [],
-                            glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf',
-                            sprite: 'mapbox://sprites/mapbox/outdoors-v12',
-                        },
-                    },
                     {
                         id: 'basemap',
                         url: '',
@@ -163,6 +152,12 @@ export class MapboxGLMap {
                 }
             });
         });
+        map.on('style.import.load', () => {
+            const basemap = map.getStyle().imports?.find((imprt) => imprt.id === 'basemap');
+            if (basemap && basemap.data && basemap.data.glyphs) {
+                map.setGlyphsUrl(basemap.data.glyphs);
+            }
+        });
         map.on('load', () => {
             this._map.set(map); // only set the store after the map has loaded
             window._map = map; // entry point for extensions