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

package/build/api-client.js

@@ -9399,25 +9399,26 @@ function findAccessorKey(keys, properties) {
 function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range }, opacity, data) {
   const { scale: scale2, 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) => {
     if (!(accessorKeys[0] in properties)) {
       accessorKeys = findAccessorKey(accessorKeys, properties);
     }
     const propertyValue = properties[accessorKeys[0]];
-    const [r, g, b] = scale2(propertyValue);
-    return [r, g, b, propertyValue === null ? 0 : alpha];
+    const scaled = scale2(propertyValue);
+    const rgb2 = typeof scaled === "string" ? hexToRGB(scaled) : scaled;
+    return [...rgb2, propertyValue === null ? 0 : alpha];
   };
   return {
     accessor: normalizeAccessor(accessor, data),
     scaleDomain: scale2.domain(),
     domain,
-    range: scale2.range().map(rgbToHex)
+    range: (scale2.range() || []).map(rgbToHex)
   };
 }
 function calculateLayerScale(name, scaleType, range, data) {
@@ -9426,9 +9427,9 @@ function calculateLayerScale(name, scaleType, range, data) {
   let scaleColor = [];
   const { colors } = range;
   if (scaleType === "custom") {
+    domain = calculateDomain(data, name, scaleType, colors.length);
+    const [min2, max2] = domain;
     if (range.uiCustomScaleType === "logarithmic") {
-      domain = calculateDomain(data, name, scaleType, colors.length);
-      const [min2, max2] = domain;
       scaleDomain = getLog10ScaleSteps({
         min: min2,
         max: max2,
@@ -9437,8 +9438,9 @@ function calculateLayerScale(name, scaleType, range, data) {
       scaleColor = colors;
     } else if (range.colorMap) {
       const { colorMap } = range;
+      scaleDomain = [];
       colorMap.forEach(([value, color2]) => {
-        domain.push(value);
+        scaleDomain.push(Number(value));
         scaleColor.push(color2);
       });
     }