@cdc/map 4.25.8 → 4.25.11

package/src/data/initial-state.js

@@ -1,135 +1,158 @@
-export default {
-  annotations: [],
-  general: {
-    navigationTarget: '_self',
-    noStateFoundMessage: 'Map Unavailable',
-    annotationDropdownText: 'Annotations',
-    geoBorderColor: 'darkGray',
-    headerColor: 'theme-blue',
-    title: '',
-    showTitle: true,
-    showSidebar: true,
-    showDownloadMediaButton: false,
-    displayAsHex: false,
-    displayStateLabels: true,
-    territoriesAlwaysShow: false,
-    language: 'en',
-    geoType: 'single-state',
-    geoLabelOverride: '',
-    hasRegions: false,
-    fullBorder: false,
-    type: 'data',
-    convertFipsCodes: true,
-    palette: {
-      isReversed: false
-    },
-    allowMapZoom: true,
-    hideGeoColumnInTooltip: false,
-    hidePrimaryColumnInTooltip: false,
-    statesPicked: [
-      {
-        fipsCode: '01',
-        stateName: 'Alabama'
+import { USE_V2_MIGRATION } from '@cdc/core/helpers/constants'
+
+// Dynamic initial state based on migration flag
+const createInitialState = () => {
+  const paletteDefaults = USE_V2_MIGRATION
+    ? {
+        isReversed: true,
+        name: 'sequential_bluereverse',
+        version: '2.0'
+      }
+    : {
+        isReversed: true,
+        name: 'bluegreen',
+        version: '1.0'
       }
-    ]
-  },
-  type: 'map',
-  color: 'pinkpurple',
-  columns: {
-    geo: {
-      name: 'FIPS Codes',
-      label: 'Location',
-      tooltip: false,
-      dataTable: true
+
+  return {
+    annotations: [],
+    general: {
+      navigationTarget: '_self',
+      noDataMessage: 'No State Selected',
+      annotationDropdownText: 'Annotations',
+      geoBorderColor: 'darkGray',
+      headerColor: 'theme-blue',
+      title: '',
+      showTitle: true,
+      showSidebar: true,
+      showDownloadMediaButton: false,
+      displayAsHex: false,
+      displayStateLabels: true,
+      territoriesAlwaysShow: false,
+      language: 'en',
+      geoType: 'single-state',
+      geoLabelOverride: '',
+      hasRegions: false,
+      fullBorder: false,
+      type: 'data',
+      convertFipsCodes: true,
+      palette: paletteDefaults,
+      allowMapZoom: true,
+      hideGeoColumnInTooltip: false,
+      hidePrimaryColumnInTooltip: false,
+      statesPicked: []
     },
-    primary: {
-      dataTable: true,
-      tooltip: true,
-      prefix: '',
-      suffix: '',
-      name: '',
-      label: '',
-      roundToPlace: 0
+    type: 'map',
+    columns: {
+      geo: {
+        name: 'FIPS Codes',
+        label: 'Location',
+        tooltip: false,
+        dataTable: true
+      },
+      primary: {
+        dataTable: true,
+        tooltip: true,
+        prefix: '',
+        suffix: '',
+        name: '',
+        label: '',
+        roundToPlace: 0
+      },
+      navigate: {
+        name: ''
+      },
+      latitude: { name: '' },
+      longitude: { name: '' }
     },
-    navigate: {
-      name: ''
+    legend: {
+      descriptions: {},
+      specialClasses: [],
+      unified: false,
+      singleColumn: false,
+      singleRow: false,
+      verticalSorted: false,
+      showSpecialClassesLast: false,
+      dynamicDescription: false,
+      type: 'equalnumber',
+      numberOfItems: 3,
+      position: 'side',
+      title: '',
+      style: 'circles',
+      subStyle: 'linear blocks',
+      tickRotation: '',
+      singleColumnLegend: false,
+      hideBorder: false,
+      groupBy: ''
     },
-    latitude: { name: '' },
-    longitude: { name: '' }
-  },
-  legend: {
-    descriptions: {},
-    specialClasses: [],
-    unified: false,
-    singleColumn: false,
-    singleRow: false,
-    verticalSorted: false,
-    showSpecialClassesLast: false,
-    dynamicDescription: false,
-    type: 'equalnumber',
-    numberOfItems: 3,
-    position: 'side',
-    title: '',
-    style: 'circles',
-    subStyle: 'linear blocks',
-    tickRotation: '',
-    singleColumnLegend: false,
-    hideBorder: false,
-    groupBy: ''
-  },
-  filters: [],
-  data: [],
-  table: {
-    wrapColumns: false,
-    label: 'Data Table',
-    expanded: false,
-    limitHeight: false,
-    height: '',
-    caption: '',
-    showDownloadUrl: false,
-    showDataTableLink: true,
-    showDownloadLinkBelow: true,
-    showFullGeoNameInCSV: false,
-    forceDisplay: true,
-    download: false,
-    indexLabel: '',
-    cellMinWidth: '0',
-    collapsible: true
-  },
-  tooltips: {
-    appearanceType: 'hover',
-    linkLabel: 'Learn More',
-    opacity: 90
-  },
-  runtime: {
-    editorErrorMessage: []
-  },
-  visual: {
-    minBubbleSize: 1,
-    maxBubbleSize: 20,
-    extraBubbleBorder: false,
-    cityStyle: 'circle',
-    cityStyleLabel: '',
-    showBubbleZeros: false,
-    additionalCityStyles: [],
-    geoCodeCircleSize: 8,
-    showBubbleZeros: false
-  },
-  mapPosition: { coordinates: [0, 30], zoom: 1 },
-  map: {
-    layers: [],
-    patterns: []
-  },
-  hexMap: {
-    type: '',
-    shapeGroups: [
-      {
-        legendTitle: '',
-        legendDescription: '',
-        items: [{ key: '', shape: 'Arrow Up', column: '', operator: '=', value: '' }]
-      }
-    ]
-  },
-  filterBehavior: 'Filter Change',
-  filterIntro: ''
+    filters: [],
+    data: [],
+    table: {
+      wrapColumns: false,
+      label: 'Data Table',
+      expanded: false,
+      limitHeight: false,
+      height: '',
+      caption: '',
+      showDownloadUrl: false,
+      showDataTableLink: true,
+      showDownloadLinkBelow: true,
+      showFullGeoNameInCSV: false,
+      forceDisplay: true,
+      download: false,
+      indexLabel: '',
+      cellMinWidth: '0',
+      collapsible: true
+    },
+    tooltips: {
+      appearanceType: 'hover',
+      linkLabel: 'Learn More',
+      opacity: 90
+    },
+    runtime: {
+      editorErrorMessage: []
+    },
+    visual: {
+      minBubbleSize: 1,
+      maxBubbleSize: 20,
+      extraBubbleBorder: false,
+      cityStyle: 'circle',
+      cityStyleLabel: '',
+      showBubbleZeros: false,
+      additionalCityStyles: [],
+      geoCodeCircleSize: 8,
+      showBubbleZeros: false
+    },
+    mapPosition: { coordinates: [0, 30], zoom: 1 },
+    map: {
+      layers: [],
+      patterns: []
+    },
+    hexMap: {
+      type: '',
+      shapeGroups: [
+        {
+          legendTitle: '',
+          legendDescription: '',
+          items: [{ key: '', shape: 'Arrow Up', column: '', operator: '=', value: '' }]
+        }
+      ]
+    },
+    filterBehavior: 'Filter Change',
+    filterIntro: '',
+    smallMultiples: {
+      mode: '',
+      tileColumn: '',
+      tilesPerRowDesktop: 2,
+      tilesPerRowMobile: 1,
+      tileOrderType: 'asc',
+      tileOrder: [],
+      tileTitles: {},
+      synchronizedTooltips: true
+    },
+    markupVariables: [],
+    enableMarkupVariables: false
+  }
 }
+
+export default createInitialState()

package/src/data/supported-geos.js

@@ -98,74 +98,6 @@ export const supportedRegions = {
   'region 10': ['REGION 10', 'R10']
 }
 
-/**
- * State Name to ISO Code Mapping
- *
- * Maps proper case state names to their corresponding ISO 3166-2 codes.
- * Provides reverse lookup capability for the supportedStates table.
- *
- * Structure: { 'State Name': 'US-XX' }
- * - Key: Proper case state name (e.g., 'California')
- * - Value: ISO 3166-2 state code (e.g., 'US-CA')
- *
- * Used in:
- * - Data processing when state names need to be converted to ISO codes
- * - Validation and normalization of state data
- */
-export const stateToIso = {
-  // States
-  Alabama: 'US-AL',
-  Alaska: 'US-AK',
-  Arizona: 'US-AZ',
-  Arkansas: 'US-AR',
-  California: 'US-CA',
-  Colorado: 'US-CO',
-  Connecticut: 'US-CT',
-  Delaware: 'US-DE',
-  Florida: 'US-FL',
-  Georgia: 'US-GA',
-  Hawaii: 'US-HI',
-  Idaho: 'US-ID',
-  Illinois: 'US-IL',
-  Indiana: 'US-IN',
-  Iowa: 'US-IA',
-  Kansas: 'US-KS',
-  Kentucky: 'US-KY',
-  Louisiana: 'US-LA',
-  Maine: 'US-ME',
-  Maryland: 'US-MD',
-  Massachusetts: 'US-MA',
-  Michigan: 'US-MI',
-  Minnesota: 'US-MN',
-  Mississippi: 'US-MS',
-  Missouri: 'US-MO',
-  Montana: 'US-MT',
-  Nebraska: 'US-NE',
-  Nevada: 'US-NV',
-  'New Hampshire': 'US-NH',
-  'New Jersey': 'US-NJ',
-  'New Mexico': 'US-NM',
-  'New York': 'US-NY',
-  'North Carolina': 'US-NC',
-  'North Dakota': 'US-ND',
-  Ohio: 'US-OH',
-  Oklahoma: 'US-OK',
-  Oregon: 'US-OR',
-  Pennsylvania: 'US-PA',
-  'Rhode Island': 'US-RI',
-  'South Carolina': 'US-SC',
-  'South Dakota': 'US-SD',
-  Tennessee: 'US-TN',
-  Texas: 'US-TX',
-  Utah: 'US-UT',
-  Vermont: 'US-VT',
-  Virginia: 'US-VA',
-  Washington: 'US-WA',
-  'West Virginia': 'US-WV',
-  Wisconsin: 'US-WI',
-  Wyoming: 'US-WY'
-}
-
 /**
  * State FIPS Code to Two-Letter Abbreviation Mapping
  *
@@ -512,7 +444,14 @@ export const supportedCountries = {
   NIU: ['Niue', 'Niue (New Zealand)'],
   NFK: ['Norfolk Island', 'Norfolk Island (Australia)'],
   MKD: ['North Macedonia', 'Republic of North Macedonia', 'Macedonia'],
-  MNP: ['Northern Mariana Islands', 'N. Mariana Is.', 'Northern Mariana Islands (U.S.)'],
+  MNP: [
+    'Northern Mariana Islands',
+    'N. Mariana Is.',
+    'Northern Mariana Islands (U.S.)',
+    'Commonwealth of Northern Mariana Islands',
+    'Commonwealth of the Northern Mariana Islands',
+    'Commonwealth of the Northern Mariana Islands (CNMI)'
+  ],
   NOR: ['Norway'],
   OMN: ['Oman'],
   PAK: ['Pakistan'],
@@ -643,7 +582,15 @@ export const supportedTerritories = {
   'US-GU': ['GUAM', 'GU'],
   'US-PR': ['PUERTO RICO', 'PR'],
   'US-VI': ['U.S. VIRGIN ISLANDS', 'VI', 'US VIRGIN ISLANDS', 'VIRGIN ISLANDS'],
-  'US-MP': ['NORTHERN MARIANAS', 'MP', 'CNMI'],
+  'US-MP': [
+    'NORTHERN MARIANA ISLANDS',
+    'MP',
+    'CNMI',
+    'NORTHERN MARIANAS',
+    'COMMONWEALTH OF NORTHERN MARIANA ISLANDS',
+    'COMMONWEALTH OF THE NORTHERN MARIANA ISLANDS',
+    'COMMONWEALTH OF THE NORTHERN MARIANA ISLANDS (CNMI)'
+  ],
   'US-FM': ['MICRONESIA', 'FM', 'Federated States of Micronesia'], // Note: Key is not an official ISO code
   'US-PW': ['PALAU', 'PW'], // Note: Key is not an official ISO code
   'US-MH': ['MARSHALL ISLANDS', 'MH', 'RMI'] // Note: Key is not an official ISO code
@@ -735,7 +682,7 @@ export const supportedCities = {
   'GREAT PLAINS TRIBAL LEADERS HEALTH BOARD': [-103.22444, 44.083054],
   'GREENSBORO': [-79.791977, 36.072636],
   'HENDERSON': [-114.981720, 36.039524],
-  'HERSHEY': [-76.6779444, 40.2849997 ],
+  'HERSHEY': [-76.6779444, 40.2849997],
   'HIALEAH': [-80.278107, 25.857595],
   'HONOLULU': [-157.858337, 21.306944],
   'HOPI TRIBE': [-110.5035, 35.7833],
@@ -768,7 +715,7 @@ export const supportedCities = {
   'LUBBOCK': [-101.855164, 33.577862],
   'MADISON': [-89.401230, 43.073051],
   'MARION COUNTY, INDIANA': [-86.136543, 39.781029],
-  'MARION':[-88.9330556,37.7305556],
+  'MARION': [-88.9330556, 37.7305556],
   'MEMPHIS': [-90.048981, 35.149532],
   'MESA': [-111.831474, 33.415184],
   'MIAMI': [-80.191788, 25.761681],
@@ -793,7 +740,7 @@ export const supportedCities = {
   'OLYMPIA': [-122.9382403, 47.0394791],
   'OMAHA': [-95.934502, 41.256538],
   'ORLANDO': [-81.379234, 28.538336],
-  'PASADENA':[-95.209099,29.691063],
+  'PASADENA': [-95.209099, 29.691063],
   'PHILADELPHIA': [-75.165222, 39.952583],
   'PHOENIX': [-112.074036, 33.448376],
   'PITTSBURGH': [-79.995888, 40.440624],
@@ -813,9 +760,9 @@ export const supportedCities = {
   'SACRAMENTO': [-121.494400, 38.581573],
   'SAINT PAUL': [-93.089958, 44.953705],
   'SALEM, ALABAMA': [-85.2386, 32.5968],
-  'SALEM, CONNECTICUT': [-72.2754,41.4904],
+  'SALEM, CONNECTICUT': [-72.2754, 41.4904],
   'SALEM, FLORIDA': [-83.4129, 29.8869],
-  'SALEM, ILLINOIS':[-88.945618,38.626991],
+  'SALEM, ILLINOIS': [-88.945618, 38.626991],
   'SALEM, MASSACHUSETTS': [-70.8955, 42.5197],
   'SALEM, OR': [-123.0351, 44.9429],
   'SALEM, OREGON': [-123.0351, 44.9429],
@@ -824,19 +771,19 @@ export const supportedCities = {
   'SALUDA, VIRGINIA': [-76.5950, 37.6064],
   'SAN ANTONIO': [-98.493629, 29.424122],
   'SAN BENITO': [-97.6311, 26.1326],
-  'SAN BERNARDINO':[-117.302399,34.115784],
+  'SAN BERNARDINO': [-117.302399, 34.115784],
   'SAN DIEGO': [-117.161087, 32.715736],
   'SAN FRANCISCO': [-122.419418, 37.774929],
   'SAN JOSE': [-121.886330, 37.338207],
   'SANTA ANA': [-117.867653, 33.745472],
-  'SANTA CLARA':[-121.955238,37.354107],
+  'SANTA CLARA': [-121.955238, 37.354107],
   'SCOTTSDALE': [-111.926048, 33.494171],
   'SEATTLE': [-122.332069, 47.606209],
   'SOUTH PUGET INTERTRIBAL PLANNING AGENCY': [-123.0832, 47.1241],
   'SOUTHCENTRAL FOUNDATION': [-149.7971, 61.1821],
   'SOUTHEAST ALASKA REGIONAL HEALTH CONSORTIUM': [-135.3369, 57.05479],
   'SPOKANE': [-117.426048, 47.658779],
-  'ST PAUL': [ -93.089958, 44.953705],
+  'ST PAUL': [-93.089958, 44.953705],
   'ST. LOUIS': [-90.199402, 38.627003],
   'ST. PETERSBURG': [-82.640289, 27.767601],
   'STOCKTON': [-121.290779, 37.957703],

package/src/helpers/addUIDs.ts

@@ -25,8 +25,16 @@ const geoLookups: Record<string, GeoLookup> = {
   country: { keys: countryKeys, data: supportedCountries }
 }
 
-const memoizedFindUID = (geoName: string, type: keyof typeof geoLookups): string | undefined => {
+const memoizedFindUID = (
+  geoName: string,
+  type: keyof typeof geoLookups,
+  caseInsensitive = false
+): string | undefined => {
   const lookup = geoLookups[type]
+  if (caseInsensitive) {
+    const lowerGeoName = geoName.toLowerCase()
+    return lookup.keys.find(key => lookup.data[key].some(name => name.toLowerCase() === lowerGeoName))
+  }
   return lookup.keys.find(key => lookup.data[key].includes(geoName))
 }
 
@@ -72,7 +80,10 @@ const handleUSLocation = (row: DataRow, geoColumn: string, displayAsHex: boolean
 
 const handleWorldLocation = (row: DataRow, geoColumn: string, isWorldGeocodeType: boolean): string | null => {
   const geoName = row[geoColumn]
-  let uid = memoizedFindUID(geoName, 'country')
+  if (!geoName) return null
+
+  // Use case-insensitive matching for world countries to handle various input formats
+  let uid = memoizedFindUID(geoName, 'country', true)
   if (!uid && (isWorldGeocodeType || geoName)) {
     uid = findCityUID(geoName)
   }

package/src/helpers/applyColorToLegend.ts

@@ -1,7 +1,44 @@
-import colorPalettes from '@cdc/core/data/colorPalettes'
+import { mapColorPalettes as colorPalettes } from '@cdc/core/data/colorPalettes'
 import chroma from 'chroma-js'
-import { type MapConfig } from '@cdc/map/src/types/MapConfig'
-import { colorDistributions } from './colorDistributions'
+import { type MapConfig } from '../types/MapConfig'
+import { mapV1ColorDistribution } from '@cdc/core/helpers/palettes/colorDistributions'
+import { getColorPaletteVersion } from '@cdc/core/helpers/getColorPaletteVersion'
+
+// Palette name migrations from v1 to v2
+const mapPaletteNameMigrations = {
+  yelloworangered: 'sequential_yellow_orange_red',
+  yelloworangebrown: 'sequential_yellow_orange_brown',
+  pinkpurple: 'sequential_pink_purple',
+  pinkpurplereverse: 'sequential_pink_purplereverse',
+  bluegreen: 'sequential_blue_green',
+  bluegreenreverse: 'sequential_blue_greenreverse',
+  orangered: 'sequential_orange_red',
+  orangeredreverse: 'sequential_orange_redreverse',
+  red: 'sequential_red',
+  redreverse: 'sequential_redreverse',
+  greenblue: 'sequential_green_blue',
+  greenbluereverse: 'sequential_green_bluereverse',
+  yelloworangeredreverse: 'sequential_yellow_orange_redreverse',
+  yelloworangebrownreverse: 'sequential_yellow_orange_brownreverse',
+  yellowpurple: 'divergent_yellow_purple',
+  yellowpurplereverse: 'divergent_yellow_purplereverse',
+  qualitative1: 'qualitative1',
+  qualitative2: 'qualitative2',
+  qualitative3: 'qualitative3',
+  qualitative4: 'qualitative4',
+  qualitative9: 'qualitative9',
+  'sequential-blue-2(MPX)': 'sequential_blue_extended',
+  'sequential-blue-2(MPX)reverse': 'sequential_blue_extendedreverse',
+  'sequential-orange(MPX)': 'sequential_orange_extended',
+  'sequential-orange(MPX)reverse': 'sequential_orange_extendedreverse',
+  colorblindsafe: 'colorblindsafe',
+  qualitative1reverse: 'qualitative1reverse',
+  qualitative2reverse: 'qualitative2reverse',
+  qualitative3reverse: 'qualitative3reverse',
+  qualitative4reverse: 'qualitative4reverse',
+  qualitative9reverse: 'qualitative9reverse',
+  colorblindsafereverse: 'colorblindsafereverse'
+}
 
 type LegendItem = {
   special: boolean
@@ -17,39 +54,122 @@ type LegendItem = {
 export const applyColorToLegend = (legendIdx: number, config: MapConfig, result: LegendItem[] = []): string => {
   if (!config) throw new Error('Config is required')
 
-  const { legend, customColors, general, color } = config
-  const { geoType, palette } = general
-  const specialClasses = legend?.specialClasses ?? []
-  const mapColorPalette = customColors ?? colorPalettes[color] ?? colorPalettes['bluegreen']
+  const { legend, general } = config
+  const { geoType, palette = { name: 'bluegreen', isReversed: false } } = general
+  // Support both migrated (general.palette.name) and legacy (config.color) palette locations
+  const version = getColorPaletteVersion(config)
+  let color = general?.palette?.name || config.color || palette.name || 'bluegreen'
+
+  // Apply palette migration if needed (v1 name -> v2 name)
+  if (mapPaletteNameMigrations[color]) {
+    color = mapPaletteNameMigrations[color]
+  }
+
+  // Check for customColorsOrdered first (direct 1-to-1 mapping, no distribution)
+  if (general?.palette?.customColorsOrdered && Array.isArray(general.palette.customColorsOrdered)) {
+    const customColorsOrdered = general.palette.customColorsOrdered
+
+    // Count actual special classes in the result array
+    const actualSpecialClassCount = result.filter(item => item.special).length
+    const colorIdx = legendIdx - actualSpecialClassCount
+
+    // Handle special classes coloring
+    if (result[legendIdx]?.special) {
+      const specialClassColors = chroma.scale(['#D4D4D4', '#939393']).colors(actualSpecialClassCount)
+      const specialClassIdx = result.slice(0, legendIdx + 1).filter(item => item.special).length - 1
+      return specialClassColors[specialClassIdx]
+    }
+
+    // Direct 1-to-1 mapping with customColorsOrdered (no distribution array)
+    if (colorIdx >= 0 && colorIdx < customColorsOrdered.length) {
+      return customColorsOrdered[colorIdx]
+    }
+
+    // Fallback to last color if index out of bounds
+    return customColorsOrdered[customColorsOrdered.length - 1] || '#d3d3d3'
+  }
+
+  // Try multiple approaches to find the palette
+  let mapColorPalette = general?.palette?.customColors
+
+  if (!mapColorPalette) {
+    // Try the detected version first
+    mapColorPalette = colorPalettes?.[`v${version}`]?.[color]
+  }
+
+  if (!mapColorPalette) {
+    // Try v2 explicitly
+    mapColorPalette = colorPalettes?.v2?.[color]
+  }
+
+  if (!mapColorPalette) {
+    // Try v1 with original color name
+    const originalColor = general?.palette?.name || config.color || palette.name || 'bluegreen'
+    mapColorPalette = colorPalettes?.v1?.[originalColor]
+  }
+
+  if (!mapColorPalette) {
+    // Final fallback
+    mapColorPalette = colorPalettes.v1['bluegreen']
+  }
 
   // Handle Region Maps need for a 10th color
   if (geoType === 'us-region' && mapColorPalette.length < 10 && mapColorPalette.length > 8) {
-    const newColor = chroma(mapColorPalette[palette.isReversed ? 0 : 8])
+    const newColor = chroma(mapColorPalette[config.general.palette.isReversed ? 0 : 8])
       .darken(0.75)
       .hex()
-    palette.isReversed ? mapColorPalette.unshift(newColor) : mapColorPalette.push(newColor)
+    config.general.palette.isReversed ? mapColorPalette.unshift(newColor) : mapColorPalette.push(newColor)
   }
 
-  const colorIdx = legendIdx - specialClasses.length
+  // Count actual special classes in the result array
+  const actualSpecialClassCount = result.filter(item => item.special).length
+  const colorIdx = legendIdx - actualSpecialClassCount
 
   // Handle special classes coloring
   if (result[legendIdx]?.special) {
-    const specialClassColors = chroma.scale(['#D4D4D4', '#939393']).colors(specialClasses.length)
-    return specialClassColors[legendIdx]
+    const specialClassColors = chroma.scale(['#D4D4D4', '#939393']).colors(actualSpecialClassCount)
+    const specialClassIdx = result.slice(0, legendIdx + 1).filter(item => item.special).length - 1
+    return specialClassColors[specialClassIdx]
   }
 
   // Use qualitative color palettes directly
-  if (color.includes('qualitative')) return mapColorPalette[colorIdx]
+  if (color.includes('qualitative')) {
+    return mapColorPalette[colorIdx]
+  }
+
+  // Determine color distribution based on non-special items
+  // For numeric legends, use the configured numberOfItems for consistent color distribution
+  // For category legends, use the actual result length
+  const isNumericLegend = legend && ['equalnumber', 'equalinterval'].includes(legend.type)
+  const nonSpecialItemCount = isNumericLegend
+    ? legend.numberOfItems || result.length
+    : result.length - actualSpecialClassCount
 
-  // Determine color distribution
   const amt =
-    Math.max(result.length - specialClasses.length, 1) < 10
-      ? Math.max(result.length - specialClasses.length, 1)
-      : Object.keys(colorDistributions).length
-  const distributionArray = colorDistributions[amt] ?? []
+    Math.max(nonSpecialItemCount, 1) < 10
+      ? Math.max(nonSpecialItemCount, 1)
+      : Object.keys(mapV1ColorDistribution).length
+  const distributionArray = mapV1ColorDistribution[amt] ?? []
+
+  // Safety check to ensure mapColorPalette exists and is an array
+  if (!mapColorPalette || !Array.isArray(mapColorPalette) || mapColorPalette.length === 0) {
+    console.warn('No valid color palette found, returning gray fallback')
+    return '#d3d3d3'
+  }
 
   const specificColor =
-    distributionArray[legendIdx - specialClasses.length] ?? mapColorPalette[colorIdx] ?? mapColorPalette.at(-1)
+    distributionArray[colorIdx] ?? mapColorPalette[colorIdx] ?? mapColorPalette[mapColorPalette.length - 1]
+
+  if (typeof specificColor === 'number') {
+    return specificColor < mapColorPalette.length
+      ? mapColorPalette[specificColor]
+      : mapColorPalette[mapColorPalette.length - 1]
+  }
+
+  if (typeof specificColor === 'string') {
+    return specificColor
+  }
 
-  return mapColorPalette[specificColor]
+  // Final fallback
+  return mapColorPalette[0] || '#d3d3d3'
 }