@carto/api-client 0.5.15-alpha.raster-3 → 0.5.15-alpha.raster-5

package/package.json

@@ -8,7 +8,7 @@
   "homepage": "https://github.com/CartoDB/carto-api-client#readme",
   "author": "Don McCurdy <donmccurdy@carto.com>",
   "packageManager": "yarn@4.3.1",
-  "version": "0.5.15-alpha.raster-3",
+  "version": "0.5.15-alpha.raster-5",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -112,7 +112,7 @@
     "@vitest/coverage-istanbul": "^3.0.9",
     "@webcomponents/webcomponentsjs": "^2.8.0",
     "concurrently": "^9.1.2",
-    "echarts": "^5.6.0",
+    "echarts": "^6.0.0",
     "eslint": "^9.22.0",
     "lit": "^3.2.1",
     "lit-analyzer": "^2.0.3",
@@ -124,7 +124,7 @@
     "thenby": "^1.3.4",
     "tinybench": "^4.0.1",
     "tsup": "^8.3.6",
-    "typescript": "~5.8.2",
+    "typescript": "~5.9.2",
     "typescript-eslint": "^8.26.1",
     "vite": "^7.0.0",
     "vitest": "3.2.4"

package/src/fetch-map/layer-map.ts

@@ -344,26 +344,27 @@ export function getColorAccessor(
 } {
   const {scale, domain} = calculateLayerScale(
     colorColumn || name,
-    scaleType,
+    colorColumn ? 'identity' : scaleType,
     range,
     data
   );
   const alpha = opacityToAlpha(opacity);
 
-  let accessorKeys = getAccessorKeys(name, aggregation);
+  let accessorKeys = getAccessorKeys(colorColumn || name, aggregation);
   const accessor = (properties: any) => {
     if (!(accessorKeys[0] in properties)) {
       accessorKeys = findAccessorKey(accessorKeys, properties);
     }
     const propertyValue = properties[accessorKeys[0]];
-    const [r, g, b] = scale(propertyValue);
-    return [r, g, b, propertyValue === null ? 0 : alpha];
+    const scaled = scale(propertyValue);
+    const rgb = typeof scaled === 'string' ? hexToRGB(scaled) : scaled;
+    return [...rgb, propertyValue === null ? 0 : alpha];
   };
   return {
     accessor: normalizeAccessor(accessor, data),
     scaleDomain: scale.domain(),
     domain,
-    range: scale.range().map(rgbToHex),
+    range: (scale.range() || []).map(rgbToHex),
   };
 }
 
@@ -379,9 +380,9 @@ export function calculateLayerScale(
   const {colors} = range;
 
   if (scaleType === 'custom') {
+    domain = calculateDomain(data, name, scaleType, colors.length);
+    const [min, max] = domain as number[];
     if (range.uiCustomScaleType === 'logarithmic') {
-      domain = calculateDomain(data, name, scaleType, colors.length);
-      const [min, max] = domain as number[];
       scaleDomain = getLog10ScaleSteps({
         min,
         max,
@@ -391,8 +392,9 @@ export function calculateLayerScale(
       scaleColor = colors;
     } else if (range.colorMap) {
       const {colorMap} = range;
+      scaleDomain = [];
       colorMap.forEach(([value, color]) => {
-        (domain as string[]).push(value);
+        (scaleDomain as number[]).push(Number(value));
         scaleColor.push(color);
       });
     }