k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-10-18 21:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(atlas): translate unvisited country names via the locale resolver (#1798)

Browse Source
This commit is contained in:
Konstantinos Thermos
2026-08-06 17:14:02 +03:00
committed by GitHub
parent 143200cae6
commit ab9ca4220a
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/atlas/useAtlas.test.tsx
+22
View File
@@ -590,6 +590,28 @@ describe('useAtlas', () => {
expect(atlas.confirmAction).toEqual({ type: 'choose', code: 'DE', name: 'Germany' });
});
it('FE-HOOK-ATLAS-025b: an unvisited country is named by the locale resolver, not the English GeoJSON name (#1789)', async () => {
// GeoJSON only carries English names; marking an unvisited country must still use the
// account-language name, exactly as visited countries do.
await mountAtlas({
geo: {
type: 'FeatureCollection',
features: [
feature({ ISO_A2: 'FR', ADM0_A3: 'FRA', ISO_A3: 'FRA', NAME: 'France', ADMIN: 'France' }),
feature({ ISO_A2: 'DE', ADM0_A3: 'DEU', ISO_A3: 'DEU', NAME: 'GERMANY_EN_ONLY', ADMIN: 'GERMANY_EN_ONLY' }),
],
},
});
await waitFor(() => expect(lf.geoJson.length).toBeGreaterThan(0));
const countryLayer = lf.geoJson[0] as MockGeoJson;
const de = countryLayer.entries.find((e) => (e.feature.properties as Record<string, string>).ISO_A2 === 'DE');
act(() => de!.layer.handlers.click({}));
expect(atlas.confirmAction).toEqual({ type: 'choose', code: 'DE', name: atlas.resolveName('DE') });
expect(atlas.confirmAction?.name).not.toBe('GERMANY_EN_ONLY');
});
it('FE-HOOK-ATLAS-026: plugin tint layers are drawn in their own pane and redrawn on theme change', async () => {
await mountAtlas({
geo: geoCountries,
client/src/pages/atlas/useAtlas.ts
+1 -1
View File
@@ -417,7 +417,7 @@ export function useAtlas() {
const countryCode = a3ToA2Entry ? a3ToA2Entry[0] : (isoA2 && isoA2 !== '-99' ? isoA2 : null)
if (countryCode && countryCode !== '-99') {
country_layer_by_a2_ref.current[countryCode] = layer
const name = feature.properties?.NAME || feature.properties?.ADMIN || resolveName(countryCode)
const name = resolveName(countryCode) || feature.properties?.NAME || feature.properties?.ADMIN || countryCode
layer.bindTooltip(`<div style="font-size:12px;font-weight:600">${name}</div>`, {
sticky: true, className: 'atlas-tooltip', direction: 'top', offset: [0, -10], opacity: 1
})