feat: add more discontinued wastewater sites

Resolves: #1048
GenSpectrum · Dec 5, 2024 · 7845efc · 7845efc
1 parent e61ef18
commit 7845efc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/src/models/wasteWater/constants.ts b/src/models/wasteWater/constants.ts
@@ -28,16 +28,23 @@ export const wastewaterVariantColors: {
   'undetermined': '#969696',
 };
 
-export const discontinuedLocations = new Set<string>([
-  'Sierre/Noes (VS)',
-  'Lausanne (VD)',
-  'Sion (VS)',
-  'Bern (BE)',
-  'Porrentruy (JU)',
-  'Neuchâtel (NE)',
-  'Solothurn (SO)',
-  'Schwyz (SZ)',
-  'test_legacylocation', // for tests
-]);
-
-export const discontinuedDate = ' since March 26th, 2024';
+export const discontinuedSites = [
+  {
+    discontinuedLocations: new Set<string>([
+      'Sierre/Noes (VS)',
+      'Lausanne (VD)',
+      'Sion (VS)',
+      'Bern (BE)',
+      'Porrentruy (JU)',
+      'Neuchâtel (NE)',
+      'Solothurn (SO)',
+      'Schwyz (SZ)',
+      'test_legacylocation', // for tests
+    ]),
+    discontinuedDate: ' March 26th, 2024',
+  },
+  {
+    discontinuedLocations: new Set<string>(['Luzern (LU)', 'Altenrhein (SG)']),
+    discontinuedDate: ' November 25th, 2024',
+  },
+];
diff --git a/src/models/wasteWater/story/WasteWaterSamplingSites.tsx b/src/models/wasteWater/story/WasteWaterSamplingSites.tsx
@@ -6,14 +6,14 @@ import DateRangePicker from '../../../components/DateRangePicker';
 import { GridCell, PackedGrid } from '../../../components/PackedGrid';
 import { WasteWaterLocationTimeWidget } from '../WasteWaterLocationTimeWidget';
 import { ShowMoreButton } from '../../../helpers/ui';
-import { discontinuedLocations } from '../constants';
+import { discontinuedSites } from '../constants';
 
 export interface WasteWaterSitesProps {
   locationFilter?: (location: string) => Boolean;
 }
 
 export const isDiscontinuedSite = (location: string) => {
-  return discontinuedLocations.has(location);
+  return discontinuedSites.some(site => site.discontinuedLocations.has(location));
 };
 
 export const WasteWaterSamplingSites = ({ locationFilter }: WasteWaterSitesProps) => {

diff --git a/src/models/wasteWater/story/WasteWaterStoryPage.tsx b/src/models/wasteWater/story/WasteWaterStoryPage.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { ExternalLink } from '../../../components/ExternalLink';
-import { discontinuedDate } from '../constants';
 import { isDiscontinuedSite, WasteWaterSamplingSites } from './WasteWaterSamplingSites';
+import { discontinuedSites } from '../constants';
 
 export const WasteWaterStoryPage = () => {
   useEffect(() => {
@@ -54,8 +54,12 @@ export const WasteWaterStoryPage = () => {
 const DiscontinuedSamplingSites = () => {
   return (
     <>
-      <h2>Locations discontinued{discontinuedDate}</h2>
-      <WasteWaterSamplingSites locationFilter={isDiscontinuedSite} />
+      {discontinuedSites.map(site => (
+        <>
+          <h2>Locations discontinued since{site.discontinuedDate}</h2>
+          <WasteWaterSamplingSites locationFilter={location => site.discontinuedLocations.has(location)} />
+        </>
+      ))}
     </>
   );
 };