kepler.gl 3.1.9 → 3.1.10

package/src/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kepler.gl/utils",
   "author": "Shan He <shan@uber.com>",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
@@ -31,9 +31,9 @@
   ],
   "dependencies": {
     "@deck.gl/core": "^8.9.27",
-    "@kepler.gl/common-utils": "3.1.9",
-    "@kepler.gl/constants": "3.1.9",
-    "@kepler.gl/types": "3.1.9",
+    "@kepler.gl/common-utils": "3.1.10",
+    "@kepler.gl/constants": "3.1.10",
+    "@kepler.gl/types": "3.1.10",
     "@loaders.gl/arrow": "^4.3.2",
     "@luma.gl/constants": "^8.5.20",
     "@luma.gl/core": "^8.5.20",

package/src/utils/src/data-scale-utils.ts

@@ -382,31 +382,44 @@ export function getCategoricalColorMap(
   colors: string[],
   domain: (string | number | string[] | number[] | null)[]
 ): any {
-  // colorMap: [string | string[], hexstring]
-  const colorToUniqueValues = {};
-  const uniqueValues = unique(domain).filter(notNullorUndefined).sort();
-  // each unique value assign to a color, the rest unique values assign to last color
-  const lastColor = colors[colors.length - 1];
-  for (let i = 0; i < uniqueValues.length; ++i) {
-    if (i < colors.length) {
-      colorToUniqueValues[colors[i]] = uniqueValues[i];
-    } else {
-      colorToUniqueValues[lastColor] = [
-        ...(Array.isArray(colorToUniqueValues[lastColor])
-          ? colorToUniqueValues[lastColor]
-          : [colorToUniqueValues[lastColor]]),
-        uniqueValues[i]
-      ];
-    }
+  const uniqueValues = unique(domain).sort();
+  const colorMap = colors.map(color => [null, color]);
+
+  if (colors.length === 0 || uniqueValues.length === 0) {
+    return colorMap;
   }
 
-  const colorMap = colors.map(color => {
-    if (color in colorToUniqueValues) {
-      return [colorToUniqueValues[color], color];
+  const lastIndex = colors.length - 1;
+  const assignCount = Math.min(lastIndex, uniqueValues.length);
+
+  // Assign first values one-to-one up to the penultimate color (if any)
+  for (let i = 0; i < assignCount; i++) {
+    // @ts-ignore tuple
+    colorMap[i][0] = uniqueValues[i];
+  }
+
+  if (uniqueValues.length > colors.length) {
+    // Aggregate the rest (including the value that would have gone to last color)
+    // Build aggregated array incrementally to match legacy behavior
+    const aggregatedValues: any[] = [];
+    for (let i = lastIndex; i < uniqueValues.length; i++) {
+      const value = uniqueValues[i];
+      if (Array.isArray(value)) {
+        // Spread array elements to match legacy flattening behavior
+        aggregatedValues.push(...(value as any[]));
+      } else {
+        aggregatedValues.push(value);
+      }
     }
-    return [null, color];
-  });
+    // @ts-ignore tuple
+    colorMap[lastIndex][0] = aggregatedValues;
+  } else if (uniqueValues.length === colors.length) {
+    // Exactly one per color
+    // @ts-ignore tuple
+    colorMap[lastIndex][0] = uniqueValues[lastIndex];
+  }
 
+  // @ts-ignore tuple
   return colorMap;
 }
 

package/src/utils/src/data-utils.ts

@@ -76,6 +76,7 @@ export function validateCoordinate(value: number, minValue: number, maxValue: nu
 
 /**
  * simple getting unique values of an array
+ * Note: filters out null and undefined values
  *
  * @param values
  * @returns unique values