front: use constants for sprites/fonts url

Signed-off-by: Tristram Gräbener <[email protected]>
OpenRailAssociation · Feb 18, 2025 · 3e66137 · 3e66137
1 parent 5149c78
commit 3e66137
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/front/src/common/Map/Layers/blankStyle.ts b/front/src/common/Map/Layers/blankStyle.ts
@@ -3,7 +3,7 @@ import { useEffect, useMemo, useState } from 'react';
 import type { MapProps } from 'react-map-gl/maplibre';
 
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
-import { MAIN_API } from 'config/config';
+import { SPRITES_URL, FONTS_URL } from 'common/Map/const';
 
 type Sprite = { url: string; id: string };
 
@@ -21,24 +21,22 @@ const isValidUrl = async (url: string) => {
 };
 
 export const useMapBlankStyle = (): MapProps['mapStyle'] => {
-  const baseURL = MAIN_API.proxy_editoast;
-
   const { data: signalingSystems } =
     osrdEditoastApi.endpoints.getSpritesSignalingSystems.useQuery();
 
   const getSpriteData = async () => {
     if (!signalingSystems) return [];
 
     const ponctualObjectsSprites: Sprite = {
-      url: `${window.location.origin}${baseURL}/sprites/default/sprites`,
+      url: `${SPRITES_URL}/default/sprites`,
       id: 'default',
     };
     const isDefaultSpriteValid = await isValidUrl(ponctualObjectsSprites.url);
 
     const sprites: (Sprite | null)[] = await Promise.all([
       isDefaultSpriteValid ? ponctualObjectsSprites : null,
       ...signalingSystems.map(async (id) => {
-        const signalingSystemsURL = `${window.location.origin}${baseURL}/sprites/${id}/sprites`;
+        const signalingSystemsURL = `${SPRITES_URL}/${id}/sprites`;
         const isValid = await isValidUrl(signalingSystemsURL);
         return isValid ? { url: signalingSystemsURL, id } : null;
       }),
@@ -66,7 +64,7 @@ export const useMapBlankStyle = (): MapProps['mapStyle'] => {
       name: 'Blank',
       sources: {},
       sprite,
-      glyphs: `${window.location.origin}${baseURL}/fonts/{fontstack}/{range}.pbf`,
+      glyphs: `${FONTS_URL}/{fontstack}/{range}.pbf`,
       layers: [
         {
           id: 'emptyBackground',

diff --git a/front/src/common/Map/const.ts b/front/src/common/Map/const.ts
@@ -3,6 +3,7 @@ import config from 'config/config';
 // Map constants
 export const MAP_URL = `${config.proxy_editoast}/layers`;
 export const SPRITES_URL = `${config.proxy_editoast}/sprites`;
+export const FONTS_URL = `${config.proxy_editoast}/fonts`;
 export const OSM_URL = 'https://osm.osrd.fr/data/v3.json';
 
 export const MAP_MODES = {