diff --git a/src/utils/isochrone-palettes.spec.ts b/src/utils/isochrone-palettes.spec.ts index 8f595d3..a0c8c6c 100644 --- a/src/utils/isochrone-palettes.spec.ts +++ b/src/utils/isochrone-palettes.spec.ts @@ -1,5 +1,9 @@ import { describe, it, expect } from 'vitest'; -import { getPaletteColor, DEFAULT_FILL } from './isochrone-palettes'; +import { + getPaletteColor, + DEFAULT_FILL, + ISOCHRONE_PALETTES, +} from './isochrone-palettes'; const BINARY = ['#000000', '#ffffff']; @@ -46,3 +50,18 @@ describe('getPaletteColor', () => { expect(getPaletteColor(VIRIDIS, 60 / 60)).toBe('#fde725'); }); }); + +describe('ISOCHRONE_PALETTES', () => { + it('includes colorblind-friendly palettes', () => { + const ids = ISOCHRONE_PALETTES.map((p) => p.id); + expect(ids).toContain('viridis'); + expect(ids).toContain('cividis'); + }); + + it('labels colorblind-friendly palettes correctly', () => { + const viridis = ISOCHRONE_PALETTES.find((p) => p.id === 'viridis'); + const cividis = ISOCHRONE_PALETTES.find((p) => p.id === 'cividis'); + expect(viridis?.label).toContain('colorblind-friendly'); + expect(cividis?.label).toContain('colorblind-friendly'); + }); +}); diff --git a/src/utils/isochrone-palettes.ts b/src/utils/isochrone-palettes.ts index a8498ce..43f49a7 100644 --- a/src/utils/isochrone-palettes.ts +++ b/src/utils/isochrone-palettes.ts @@ -1,4 +1,4 @@ -export type PaletteId = 'default' | 'viridis' | 'plasma' | 'blues'; +export type PaletteId = 'default' | 'viridis' | 'plasma' | 'blues' | 'cividis'; export const DEFAULT_FILL = '#6200ea'; @@ -16,11 +16,6 @@ export const ISOCHRONE_PALETTES: IsochronePalette[] = [ label: 'Default', colors: null, }, - { - id: 'viridis', - label: 'Viridis (colorblind-friendly)', - colors: ['#440154', '#3b528b', '#21918c', '#5ec962', '#fde725'], - }, { id: 'plasma', label: 'Plasma', @@ -31,6 +26,16 @@ export const ISOCHRONE_PALETTES: IsochronePalette[] = [ label: 'Blues', colors: ['#084594', '#2171b5', '#4292c6', '#9ecae1', '#deebf7'], }, + { + id: 'viridis', + label: 'Viridis (colorblind-friendly)', + colors: ['#440154', '#3b528b', '#21918c', '#5ec962', '#fde725'], + }, + { + id: 'cividis', + label: 'Cividis (colorblind-friendly)', + colors: ['#00204d', '#31446b', '#666870', '#958f78', '#e4cf5b'], + }, ]; export function isPaletteId(value: string): value is PaletteId {