Skip to content

Commit dd5f4b2

Browse files
authored
fix(map): add disease outbreak legend entries to all map variants (koala73#2447)
All three alert levels (alert/warning/watch) were present on the map but had no corresponding legend entries in any variant. Since diseaseOutbreaks is user-toggleable on all variants (default off), entries are added to every branch and shown/hidden by updateLegend() based on layer state. Adds 3 i18n keys: diseaseAlert, diseaseWarning, diseaseWatch.
1 parent d01469b commit dd5f4b2

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

src/components/DeckGLMap.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,6 +4520,9 @@ export class DeckGLMap {
45204520
{ shape: shapes.circle(isLight ? 'rgb(180, 120, 0)' : 'rgb(255, 200, 0)'), label: t('components.deckgl.legend.accelerator'), layerKey: 'accelerators' },
45214521
{ shape: shapes.circle('rgb(150, 100, 255)'), label: t('components.deckgl.legend.cloudRegion'), layerKey: 'cloudRegions' },
45224522
{ shape: shapes.square('rgb(136, 68, 255)'), label: t('components.deckgl.legend.datacenter'), layerKey: 'datacenters' },
4523+
{ shape: shapes.circle('rgb(231, 76, 60)'), label: t('components.deckgl.legend.diseaseAlert'), layerKey: 'diseaseOutbreaks' },
4524+
{ shape: shapes.circle('rgb(230, 126, 34)'), label: t('components.deckgl.legend.diseaseWarning'), layerKey: 'diseaseOutbreaks' },
4525+
{ shape: shapes.circle('rgb(241, 196, 15)'), label: t('components.deckgl.legend.diseaseWatch'), layerKey: 'diseaseOutbreaks' },
45234526
]
45244527
: SITE_VARIANT === 'finance'
45254528
? [
@@ -4528,6 +4531,9 @@ export class DeckGLMap {
45284531
{ shape: shapes.hexagon('rgb(255, 210, 80)'), label: t('components.deckgl.legend.centralBank'), layerKey: 'centralBanks' },
45294532
{ shape: shapes.square('rgb(255, 150, 80)'), label: t('components.deckgl.legend.commodityHub'), layerKey: 'commodityHubs' },
45304533
{ shape: shapes.triangle('rgb(80, 170, 255)'), label: t('components.deckgl.legend.waterway'), layerKey: 'waterways' },
4534+
{ shape: shapes.circle('rgb(231, 76, 60)'), label: t('components.deckgl.legend.diseaseAlert'), layerKey: 'diseaseOutbreaks' },
4535+
{ shape: shapes.circle('rgb(230, 126, 34)'), label: t('components.deckgl.legend.diseaseWarning'), layerKey: 'diseaseOutbreaks' },
4536+
{ shape: shapes.circle('rgb(241, 196, 15)'), label: t('components.deckgl.legend.diseaseWatch'), layerKey: 'diseaseOutbreaks' },
45314537
]
45324538
: SITE_VARIANT === 'happy'
45334539
? [
@@ -4539,6 +4545,9 @@ export class DeckGLMap {
45394545
{ shape: shapes.circle('rgb(74, 222, 128)'), label: 'Species Recovery Zone', layerKey: 'speciesRecovery' },
45404546
{ shape: shapes.circle('rgb(255, 200, 50)'), label: 'Renewable Installation', layerKey: 'renewableInstallations' },
45414547
{ shape: shapes.circle('rgb(160, 100, 255)'), label: t('components.deckgl.legend.aircraft'), layerKey: 'flights' },
4548+
{ shape: shapes.circle('rgb(231, 76, 60)'), label: t('components.deckgl.legend.diseaseAlert'), layerKey: 'diseaseOutbreaks' },
4549+
{ shape: shapes.circle('rgb(230, 126, 34)'), label: t('components.deckgl.legend.diseaseWarning'), layerKey: 'diseaseOutbreaks' },
4550+
{ shape: shapes.circle('rgb(241, 196, 15)'), label: t('components.deckgl.legend.diseaseWatch'), layerKey: 'diseaseOutbreaks' },
45424551
]
45434552
: SITE_VARIANT === 'commodity'
45444553
? [
@@ -4548,6 +4557,9 @@ export class DeckGLMap {
45484557
{ shape: shapes.circle('rgb(255, 150, 50)'), label: t('components.deckgl.legend.pipeline'), layerKey: 'pipelines' },
45494558
{ shape: shapes.triangle('rgb(80, 170, 255)'), label: t('components.deckgl.legend.waterway'), layerKey: 'waterways' },
45504559
{ shape: shapes.circle('rgb(200, 100, 255)'), label: t('components.deckgl.legend.processingPlant'), layerKey: 'processingPlants' },
4560+
{ shape: shapes.circle('rgb(231, 76, 60)'), label: t('components.deckgl.legend.diseaseAlert'), layerKey: 'diseaseOutbreaks' },
4561+
{ shape: shapes.circle('rgb(230, 126, 34)'), label: t('components.deckgl.legend.diseaseWarning'), layerKey: 'diseaseOutbreaks' },
4562+
{ shape: shapes.circle('rgb(241, 196, 15)'), label: t('components.deckgl.legend.diseaseWatch'), layerKey: 'diseaseOutbreaks' },
45514563
]
45524564
: [
45534565
{ shape: shapes.circle('rgb(255, 68, 68)'), label: t('components.deckgl.legend.highAlert'), layerKey: 'hotspots' },
@@ -4558,6 +4570,9 @@ export class DeckGLMap {
45584570
{ shape: shapes.hexagon(isLight ? 'rgb(180, 120, 0)' : 'rgb(255, 220, 0)'), label: t('components.deckgl.legend.nuclear'), layerKey: 'nuclear' },
45594571
{ shape: shapes.square('rgb(136, 68, 255)'), label: t('components.deckgl.legend.datacenter'), layerKey: 'datacenters' },
45604572
{ shape: shapes.circle('rgb(160, 100, 255)'), label: t('components.deckgl.legend.aircraft'), layerKey: 'flights' },
4573+
{ shape: shapes.circle('rgb(231, 76, 60)'), label: t('components.deckgl.legend.diseaseAlert'), layerKey: 'diseaseOutbreaks' },
4574+
{ shape: shapes.circle('rgb(230, 126, 34)'), label: t('components.deckgl.legend.diseaseWarning'), layerKey: 'diseaseOutbreaks' },
4575+
{ shape: shapes.circle('rgb(241, 196, 15)'), label: t('components.deckgl.legend.diseaseWatch'), layerKey: 'diseaseOutbreaks' },
45614576
];
45624577

45634578
legend.innerHTML = `

src/locales/en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,9 @@
12171217
"pipeline": "Pipeline",
12181218
"processingPlant": "Processing Plant",
12191219
"conflict": "Conflict Zone",
1220+
"diseaseAlert": "Disease Alert",
1221+
"diseaseWarning": "Disease Warning",
1222+
"diseaseWatch": "Disease Watch",
12201223
"ciiLow": "Low (0–30)",
12211224
"ciiNormal": "Normal (31–50)",
12221225
"ciiElevated": "Elevated (51–65)",

0 commit comments

Comments
 (0)