@carto/api-client 0.5.17 → 0.5.18-alpha.colormapfix-2

package/build/api-client.js

@@ -9587,40 +9587,37 @@ function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range
   };
 }
 function calculateLayerScale(name, scaleType, range, data) {
-  let domain = [];
   let scaleDomain;
-  let scaleColor = [];
+  let scaleColors = [];
   const { colors } = range;
-  if (scaleType === "custom") {
-    domain = calculateDomain(data, name, scaleType, colors.length);
-    const [min2, max2] = domain;
-    if (range.uiCustomScaleType === "logarithmic") {
-      scaleDomain = getLog10ScaleSteps({
-        min: min2,
-        max: max2,
-        steps: colors.length
-      });
-      scaleColor = colors;
-    } else if (range.colorMap) {
+  const domain = calculateDomain(data, name, scaleType, colors.length);
+  if (scaleType !== "identity") {
+    if (range.colorMap) {
       const { colorMap } = range;
       scaleDomain = [];
       colorMap.forEach(([value, color2]) => {
-        scaleDomain.push(Number(value));
-        scaleColor.push(color2);
+        scaleDomain.push(value);
+        scaleColors.push(color2);
       });
-    }
-  } else if (scaleType !== "identity") {
-    domain = calculateDomain(data, name, scaleType, colors.length);
-    scaleColor = colors;
-    if (scaleType === "ordinal") {
-      domain = domain.slice(0, scaleColor.length);
+    } else {
+      if (scaleType === "custom" && range.uiCustomScaleType === "logarithmic") {
+        const [min2, max2] = domain;
+        scaleDomain = getLog10ScaleSteps({
+          min: min2,
+          max: max2,
+          steps: colors.length
+        });
+        scaleColors = colors;
+      } else {
+        scaleColors = colors;
+      }
     }
   }
   return {
     scale: createColorScale(
       scaleType,
       scaleDomain || domain,
-      scaleColor.map(hexToRGB),
+      scaleColors.map(hexToRGB),
       UNKNOWN_COLOR_RGB
     ),
     domain