From f60ec385df90aa988b46f1dc9aa5c1f2df13411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Tue, 4 Feb 2025 22:54:42 +0100 Subject: [PATCH] front: map: use the sprites for signals served by editoast MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reduces a dependency to an external server The sprites are also smaller 0.41Mb instead of 1.2Mb for the default sprite @2x Signed-off-by: Tristram Gräbener --- editoast/src/views/sprites.rs | 2 +- front/src/common/Map/Layers/blankStyle.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editoast/src/views/sprites.rs b/editoast/src/views/sprites.rs index 7130fdf7a10..cc130fca2d1 100644 --- a/editoast/src/views/sprites.rs +++ b/editoast/src/views/sprites.rs @@ -82,7 +82,7 @@ async fn sprites( } let sprite_configs = SpriteConfig::load(); - if !sprite_configs.contains_key(&signaling_system) { + if signaling_system != "default" && !sprite_configs.contains_key(&signaling_system) { return Err(SpriteErrors::UnknownSignalingSystem { signaling_system }.into()); } let path = diff --git a/front/src/common/Map/Layers/blankStyle.ts b/front/src/common/Map/Layers/blankStyle.ts index df19a76801d..4654653721a 100644 --- a/front/src/common/Map/Layers/blankStyle.ts +++ b/front/src/common/Map/Layers/blankStyle.ts @@ -30,7 +30,7 @@ export const useMapBlankStyle = (): MapProps['mapStyle'] => { if (!signalingSystems) return []; const ponctualObjectsSprites: Sprite = { - url: 'https://static.osm.osrd.fr/sprites/sprites', + url: `${window.location.origin}${baseURL}/sprites/default/sprites`, id: 'default', }; const isDefaultSpriteValid = await isValidUrl(ponctualObjectsSprites.url);