@genspectrum/dashboard-components 0.11.2 → 0.11.4

package/dist/style.css

@@ -482,7 +482,7 @@ input[type="range"] {
   --tw-contain-paint:  ;
   --tw-contain-style:  ;
 }/*
-! tailwindcss v3.4.16 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com
 *//*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
 2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
@@ -1154,6 +1154,7 @@ html {
   display: grid;
   width: 100%;
   overflow: hidden;
+  direction: ltr;
   container-type: inline-size;
   grid-template-columns: auto 1fr;
 }
@@ -2684,9 +2685,6 @@ input.tab:checked + .tab-content,
   border-end-end-radius: inherit;
   border-start-end-radius: inherit;
 }
-.modal-middle {
-  place-items: center;
-}
 .modal-bottom {
   place-items: end;
 }
@@ -3131,9 +3129,6 @@ input.tab:checked + .tab-content,
 .min-w-\[7\.5rem\] {
   min-width: 7.5rem;
 }
-.max-w-3xl {
-  max-width: 48rem;
-}
 .max-w-screen-lg {
   max-width: 1024px;
 }
@@ -3307,10 +3302,6 @@ input.tab:checked + .tab-content,
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
 }
-.py-4 {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-}
 .pl-2 {
   padding-left: 0.5rem;
 }

package/dist/util.d.ts

@@ -787,7 +787,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutation-comparison-component': MutationComparisonComponent;
+        'gs-mutations-component': MutationsComponent;
     }
 }
 
@@ -795,7 +795,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-mutation-comparison-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-mutations-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -803,7 +803,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutations-component': MutationsComponent;
+        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
     }
 }
 
@@ -811,7 +811,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-mutations-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-prevalence-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -819,7 +819,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
+        'gs-relative-growth-advantage': RelativeGrowthAdvantageComponent;
     }
 }
 
@@ -827,7 +827,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-prevalence-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-relative-growth-advantage': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -835,7 +835,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-relative-growth-advantage': RelativeGrowthAdvantageComponent;
+        'gs-aggregate': AggregateComponent;
     }
 }
 
@@ -843,7 +843,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-relative-growth-advantage': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-aggregate': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -851,7 +851,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-aggregate': AggregateComponent;
+        'gs-mutation-comparison-component': MutationComparisonComponent;
     }
 }
 
@@ -859,7 +859,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-aggregate': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-mutation-comparison-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -883,7 +883,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutations-over-time': MutationsOverTimeComponent;
+        'gs-sequences-by-location': SequencesByLocationComponent;
     }
 }
 
@@ -891,7 +891,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -899,7 +899,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-sequences-by-location': SequencesByLocationComponent;
+        'gs-mutations-over-time': MutationsOverTimeComponent;
     }
 }
 
@@ -907,7 +907,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@genspectrum/dashboard-components",
-    "version": "0.11.2",
+    "version": "0.11.4",
     "description": "GenSpectrum web components for building dashboards",
     "type": "module",
     "license": "AGPL-3.0-only",
@@ -109,7 +109,7 @@
         "@storybook/preact": "^8.0.9",
         "@storybook/preact-vite": "^8.0.9",
         "@storybook/test": "^8.0.0",
-        "@storybook/test-runner": "^0.20.1",
+        "@storybook/test-runner": "^0.21.0",
         "@storybook/types": "^8.0.9",
         "@storybook/web-components": "^8.0.9",
         "@storybook/web-components-vite": "^8.0.9",

package/src/preact/aggregatedData/aggregate.tsx

@@ -53,7 +53,7 @@ export const AggregateInner: FunctionComponent<AggregateProps> = (componentProps
             field: initialSortField,
             direction: initialSortDirection,
         });
-    }, [lapisFilter, fields, lapis]);
+    }, [lapisFilter, fields, lapis, initialSortField, initialSortDirection]);
 
     if (isLoading) {
         return <LoadingDisplay />;

package/src/preact/components/error-display.tsx

@@ -2,6 +2,8 @@ import { type FunctionComponent } from 'preact';
 import { useEffect, useRef } from 'preact/hooks';
 import { type ZodError } from 'zod';
 
+import { InfoHeadline1, InfoParagraph } from './info';
+import { Modal, useModalRef } from './modal';
 import { LapisError, UnknownLapisError } from '../../lapisApi/lapisApi';
 
 export const GS_ERROR_EVENT_TYPE = 'gs-error';
@@ -46,7 +48,7 @@ export const ErrorDisplay: FunctionComponent<ErrorDisplayProps> = ({ error, rese
     console.error(error);
 
     const containerRef = useRef<HTMLInputElement>(null);
-    const ref = useRef<HTMLDialogElement>(null);
+    const modalRef = useModalRef();
 
     useEffect(() => {
         containerRef.current?.dispatchEvent(new ErrorEvent(error));
@@ -66,23 +68,16 @@ export const ErrorDisplay: FunctionComponent<ErrorDisplayProps> = ({ error, rese
                     {details !== undefined && (
                         <>
                             {' '}
-                            <button className='underline hover:text-gray-400' onClick={() => ref.current?.showModal()}>
+                            <button
+                                className='underline hover:text-gray-400'
+                                onClick={() => modalRef.current?.showModal()}
+                            >
                                 Show details.
                             </button>
-                            <dialog ref={ref} class='modal'>
-                                <div class='modal-box'>
-                                    <form method='dialog'>
-                                        <button className='btn btn-sm btn-circle btn-ghost absolute right-2 top-2'>
-                                            ✕
-                                        </button>
-                                    </form>
-                                    <h1 class='text-lg'>{details.headline}</h1>
-                                    <div class='py-4'>{details.message}</div>
-                                </div>
-                                <form method='dialog' class='modal-backdrop'>
-                                    <button>close</button>
-                                </form>
-                            </dialog>
+                            <Modal modalRef={modalRef}>
+                                <InfoHeadline1>{details.headline}</InfoHeadline1>
+                                <InfoParagraph>{details.message}</InfoParagraph>
+                            </Modal>
                         </>
                     )}
                 </div>

package/src/preact/components/info.tsx

@@ -1,11 +1,12 @@
 import { type FunctionComponent } from 'preact';
-import { useRef } from 'preact/hooks';
+
+import { Modal, useModalRef } from './modal';
 
 const Info: FunctionComponent = ({ children }) => {
-    const dialogRef = useRef<HTMLDialogElement>(null);
+    const modalRef = useModalRef();
 
     const toggleHelp = () => {
-        dialogRef.current?.showModal();
+        modalRef.current?.showModal();
     };
 
     return (
@@ -13,22 +14,7 @@ const Info: FunctionComponent = ({ children }) => {
             <button type='button' className='btn btn-xs' onClick={toggleHelp}>
                 ?
             </button>
-            <dialog ref={dialogRef} className={'modal modal-bottom sm:modal-middle'}>
-                <div className='modal-box sm:max-w-5xl'>
-                    <form method='dialog'>
-                        <button className='btn btn-sm btn-circle btn-ghost absolute right-2 top-2'>✕</button>
-                    </form>
-                    <div className={'flex flex-col'}>{children}</div>
-                    <div className='modal-action'>
-                        <form method='dialog'>
-                            <button className={'float-right underline text-sm hover:text-blue-700 mr-2'}>Close</button>
-                        </form>
-                    </div>
-                </div>
-                <form method='dialog' className='modal-backdrop'>
-                    <button>Helper to close when clicked outside</button>
-                </form>
-            </dialog>
+            <Modal modalRef={modalRef}>{children}</Modal>
         </div>
     );
 };

package/src/preact/components/modal.stories.tsx

@@ -0,0 +1,44 @@
+import { type Meta, type StoryObj } from '@storybook/preact';
+import { expect, waitFor, within } from '@storybook/test';
+import { type FunctionComponent } from 'preact';
+
+import { Modal, type ModalProps, useModalRef } from './modal';
+
+const meta: Meta<ModalProps> = {
+    title: 'Component/Modal',
+    component: Modal,
+    parameters: { fetchMock: {} },
+};
+
+export default meta;
+
+const WrapperWithButtonThatOpensTheModal: FunctionComponent = () => {
+    const modalRef = useModalRef();
+
+    return (
+        <div>
+            <button className='btn' onClick={() => modalRef.current?.showModal()}>
+                Open modal
+            </button>
+            <Modal modalRef={modalRef}>
+                <h1>Modal content</h1>
+            </Modal>
+        </div>
+    );
+};
+
+export const ModalStory: StoryObj<ModalProps> = {
+    render: () => {
+        return <WrapperWithButtonThatOpensTheModal />;
+    },
+    play: async ({ canvasElement, step }) => {
+        const canvas = within(canvasElement);
+
+        await step('Open the modal', async () => {
+            const button = canvas.getByText('Open modal');
+            button.click();
+
+            await waitFor(() => expect(canvas.getByText('Modal content')).toBeVisible());
+        });
+    },
+};

package/src/preact/components/modal.tsx

@@ -0,0 +1,31 @@
+import { type FunctionComponent, type Ref } from 'preact';
+import { useRef } from 'preact/hooks';
+
+export type ModalProps = {
+    modalRef: Ref<HTMLDialogElement>;
+};
+
+export function useModalRef() {
+    return useRef<HTMLDialogElement>(null);
+}
+
+export const Modal: FunctionComponent<ModalProps> = ({ children, modalRef }) => {
+    return (
+        <dialog ref={modalRef} className={'modal modal-bottom sm:modal-middle'}>
+            <div className='modal-box sm:max-w-5xl'>
+                <form method='dialog'>
+                    <button className='btn btn-sm btn-circle btn-ghost absolute right-2 top-2'>✕</button>
+                </form>
+                <div className={'flex flex-col'}>{children}</div>
+                <div className='modal-action'>
+                    <form method='dialog'>
+                        <button className={'float-right underline text-sm hover:text-blue-700 mr-2'}>Close</button>
+                    </form>
+                </div>
+            </div>
+            <form method='dialog' className='modal-backdrop'>
+                <button>Helper to close when clicked outside</button>
+            </form>
+        </dialog>
+    );
+};

package/src/preact/map/__mockData__/aggregatedGermany.json

@@ -45,7 +45,7 @@
             "division": "Saxony-Anhalt"
         },
         {
-            "count": 109800,
+            "count": 109799,
             "division": null
         },
         {
@@ -56,6 +56,10 @@
             "count": 50650,
             "division": "Baden-Wuerttemberg"
         },
+        {
+            "count": 1,
+            "division": "Baden-Württemberg"
+        },
         {
             "count": 50102,
             "division": "North Rhine Westphalia"

package/src/preact/map/{useGeoJsonMap.tsx → loadMapSource.tsx}

@@ -4,7 +4,6 @@ import type { GeometryCollection, Topology } from 'topojson-specification';
 import z from 'zod';
 
 import { UserFacingError } from '../components/error-display';
-import { useQuery } from '../useQuery';
 
 export const mapSourceSchema = z.object({
     type: z.literal('topojson'),
@@ -13,33 +12,17 @@ export const mapSourceSchema = z.object({
 });
 export type MapSource = z.infer<typeof mapSourceSchema>;
 
-export function useGeoJsonMap(mapSource: MapSource) {
-    const {
-        data: geojsonData,
-        error,
-        isLoading,
-    } = useQuery(async () => {
-        switch (mapSource.type) {
-            case 'topojson':
-                return await loadTopojsonMap(mapSource);
-        }
-    }, [mapSource]);
-
-    if (isLoading) {
-        return { isLoading };
-    }
-
-    if (error) {
-        throw error;
-    }
-
-    return { geojsonData, isLoading: false as const };
-}
-
 export type GeoJsonFeatureProperties = {
     name: string;
 };
 
+export async function loadMapSource(mapSource: MapSource) {
+    switch (mapSource.type) {
+        case 'topojson':
+            return await loadTopojsonMap(mapSource);
+    }
+}
+
 async function loadTopojsonMap(
     mapSource: MapSource,
 ): Promise<FeatureCollection<GeometryObject, GeoJsonFeatureProperties>> {

package/src/preact/map/sequences-by-location-map.tsx

@@ -1,23 +1,19 @@
-import type { Feature, FeatureCollection, GeometryObject } from 'geojson';
+import type { Feature, Geometry, GeometryObject } from 'geojson';
 import Leaflet, { type Layer, type LayerGroup } from 'leaflet';
 import type { FunctionComponent } from 'preact';
-import { useEffect, useMemo, useRef } from 'preact/hooks';
+import { useEffect, useRef } from 'preact/hooks';
 
-import { type GeoJsonFeatureProperties, type MapSource, useGeoJsonMap } from './useGeoJsonMap';
-import { type AggregateData } from '../../query/queryAggregateData';
+import type { EnhancedGeoJsonFeatureProperties } from '../../query/computeMapLocationData';
 import { InfoHeadline1, InfoParagraph } from '../components/info';
-import { LoadingDisplay } from '../components/loading-display';
+import { Modal, useModalRef } from '../components/modal';
 import { formatProportion } from '../shared/table/formatProportion';
 
-type FeatureData = { proportion: number; count: number };
-
-type EnhancedGeoJsonFeatureProperties = GeoJsonFeatureProperties & {
-    data: FeatureData | null;
-};
-
 type SequencesByLocationMapProps = {
-    mapSource: MapSource;
-    locationData: AggregateData;
+    locations: Feature<Geometry, EnhancedGeoJsonFeatureProperties>[];
+    totalCount: number;
+    countOfMatchedLocationData: number;
+    nullCount: number;
+    unmatchedLocations: string[];
     enableMapNavigation: boolean;
     lapisLocationField: string;
     zoom: number;
@@ -27,25 +23,11 @@ type SequencesByLocationMapProps = {
 };
 
 export const SequencesByLocationMap: FunctionComponent<SequencesByLocationMapProps> = ({
-    mapSource,
-    ...otherProps
-}) => {
-    const { isLoading: isLoadingMap, geojsonData } = useGeoJsonMap(mapSource);
-
-    if (isLoadingMap) {
-        return <LoadingDisplay />;
-    }
-
-    return <SequencesByLocationMapInner geojsonData={geojsonData} {...otherProps} />;
-};
-
-type SequencesByLocationMapInnerProps = Omit<SequencesByLocationMapProps, 'mapSource'> & {
-    geojsonData: FeatureCollection<GeometryObject, GeoJsonFeatureProperties>;
-};
-
-export const SequencesByLocationMapInner: FunctionComponent<SequencesByLocationMapInnerProps> = ({
-    geojsonData,
-    locationData,
+    locations,
+    totalCount,
+    countOfMatchedLocationData,
+    nullCount,
+    unmatchedLocations,
     enableMapNavigation,
     lapisLocationField,
     zoom,
@@ -55,22 +37,6 @@ export const SequencesByLocationMapInner: FunctionComponent<SequencesByLocationM
 }) => {
     const ref = useRef<HTMLDivElement>(null);
 
-    const { locations, totalCount, countOfMatchedLocationData, unmatchedLocations } = useMemo(() => {
-        const countAndProportionByCountry = buildLookupByLocationField(locationData, lapisLocationField);
-        const { locations, unmatchedLocations } = matchLocationDataAndGeoJsonFeatures(
-            geojsonData,
-            countAndProportionByCountry,
-            lapisLocationField,
-        );
-
-        const totalCount = locationData.map((value) => value.count).reduce((sum, b) => sum + b, 0);
-        const countOfMatchedLocationData = locations
-            .map((location) => location.properties.data?.count ?? 0)
-            .reduce((sum, b) => sum + b, 0);
-
-        return { locations, totalCount, countOfMatchedLocationData, unmatchedLocations };
-    }, [geojsonData, locationData, lapisLocationField]);
-
     useEffect(() => {
         if (!ref.current) {
             return;
@@ -90,7 +56,7 @@ export const SequencesByLocationMapInner: FunctionComponent<SequencesByLocationM
             style: (feature: Feature<GeometryObject, EnhancedGeoJsonFeatureProperties> | undefined) => ({
                 fillColor: getColor(feature?.properties.data?.proportion),
                 fillOpacity: 1,
-                color: 'grey',
+                color: '#666666',
                 weight: 1,
             }),
         })
@@ -102,8 +68,6 @@ export const SequencesByLocationMapInner: FunctionComponent<SequencesByLocationM
         };
     }, [ref, locations, enableMapNavigation, lapisLocationField, zoom, offsetX, offsetY]);
 
-    const nullCount = locationData.find((row) => row[lapisLocationField] === null)?.count ?? 0;
-
     return (
         <div className='h-full'>
             <div ref={ref} className='h-full' />
@@ -135,104 +99,45 @@ const DataMatchInformation: FunctionComponent<DataMatchInformationProps> = ({
     nullCount,
     hasTableView,
 }) => {
-    const dialogRef = useRef<HTMLDialogElement>(null);
+    const modalRef = useModalRef();
 
     const proportion = formatProportion(countOfMatchedLocationData / totalCount);
 
     return (
         <>
             <button
-                onClick={() => dialogRef.current?.showModal()}
+                onClick={() => modalRef.current?.showModal()}
                 className='text-sm absolute bottom-0 px-1 z-[1001] bg-white rounded border cursor-pointer tooltip'
                 data-tip='Click for detailed information'
             >
                 This map shows {proportion} of the data.
             </button>
-            <dialog ref={dialogRef} className={'modal modal-middle'}>
-                <div className='modal-box max-w-3xl'>
-                    <InfoHeadline1>Sequences By Location - Map View</InfoHeadline1>
-                    <InfoParagraph>
-                        The current filter has matched {totalCount.toLocaleString('en-us')} sequences. From these
-                        sequences, we were able to match {countOfMatchedLocationData.toLocaleString('en-us')} (
-                        {proportion}) on locations on the map.
-                    </InfoParagraph>
-                    <InfoParagraph>
-                        {unmatchedLocations.length > 0 && (
-                            <>
-                                The following locations from the data could not be matched on the map:{' '}
-                                {unmatchedLocations.map((it) => `"${it}"`).join(', ')}.{' '}
-                            </>
-                        )}
-                        {nullCount > 0 &&
-                            `${nullCount.toLocaleString('en-us')} matching sequences have no location information. `}
-                        {hasTableView && 'You can check the table view for more detailed information.'}
-                    </InfoParagraph>
-                    <div className='modal-action'>
-                        <form method='dialog'>
-                            <button className={'float-right underline text-sm hover:text-blue-700 mr-2'}>Close</button>
-                        </form>
-                    </div>
-                </div>
-                <form method='dialog' className='modal-backdrop'>
-                    <button>Helper to close when clicked outside</button>
-                </form>
-            </dialog>
+            <Modal modalRef={modalRef}>
+                <InfoHeadline1>Sequences By Location - Map View</InfoHeadline1>
+                <InfoParagraph>
+                    The current filter has matched {totalCount.toLocaleString('en-us')} sequences. From these sequences,
+                    we were able to match {countOfMatchedLocationData.toLocaleString('en-us')} ({proportion}) on
+                    locations on the map.
+                </InfoParagraph>
+                <InfoParagraph>
+                    {unmatchedLocations.length > 0 && (
+                        <>
+                            The following locations from the data could not be matched on the map:{' '}
+                            {unmatchedLocations.map((it) => `"${it}"`).join(', ')}.{' '}
+                        </>
+                    )}
+                    {nullCount > 0 &&
+                        `${nullCount.toLocaleString('en-us')} matching sequences have no location information. `}
+                    {hasTableView && 'You can check the table view for more detailed information.'}
+                </InfoParagraph>
+            </Modal>
         </>
     );
 };
 
-function buildLookupByLocationField(locationData: AggregateData, lapisLocationField: string) {
-    return new Map<string, FeatureData>(
-        locationData
-            .filter((row) => typeof row[lapisLocationField] === 'string')
-            .map((row) => [row[lapisLocationField] as string, row]),
-    );
-}
-
-function matchLocationDataAndGeoJsonFeatures(
-    geojsonData: FeatureCollection<GeometryObject, GeoJsonFeatureProperties>,
-    countAndProportionByCountry: Map<string, FeatureData>,
-    lapisLocationField: string,
-) {
-    const matchedLocations: string[] = [];
-
-    const locations: Feature<GeometryObject, EnhancedGeoJsonFeatureProperties>[] = geojsonData.features.map(
-        (feature) => {
-            const name = feature?.properties?.name;
-            if (typeof name !== 'string') {
-                throw new Error(
-                    `GeoJSON feature with id '${feature.id}' does not have 'properties.name' of type string, was: '${name}'`,
-                );
-            }
-
-            const data = countAndProportionByCountry.get(name) ?? null;
-            if (data !== null) {
-                matchedLocations.push(name);
-            }
-            return {
-                ...feature,
-                properties: {
-                    ...feature.properties,
-                    data,
-                },
-            };
-        },
-    );
-
-    const unmatchedLocations = [...countAndProportionByCountry.keys()].filter(
-        (name) => !matchedLocations.includes(name),
-    );
-    if (unmatchedLocations.length > 0) {
-        const unmatchedLocationsWarning = `gs-map: Found location data from LAPIS (aggregated by "${lapisLocationField}") that could not be matched on locations on the given map. Unmatched location names are: ${unmatchedLocations.map((it) => `"${it}"`).join(', ')}`;
-        console.warn(unmatchedLocationsWarning); // eslint-disable-line no-console -- We should give some feedback about unmatched location data.
-    }
-
-    return { locations, unmatchedLocations };
-}
-
 function getColor(value: number | undefined): string {
     if (value === undefined) {
-        return '#888888';
+        return '#DDDDDD';
     }
 
     const thresholds = [