@carto/api-client 0.5.18-alpha.colormapfix-1 → 0.5.18

package/build/api-client.js

@@ -9587,43 +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;
+  const domain = calculateDomain(data, name, scaleType, colors.length);
   if (scaleType !== "identity") {
     if (range.colorMap) {
       const { colorMap } = range;
       scaleDomain = [];
       colorMap.forEach(([value, color2]) => {
         scaleDomain.push(value);
-        scaleColor.push(color2);
+        scaleColors.push(color2);
       });
-      domain = scaleDomain;
     } else {
       if (scaleType === "custom" && range.uiCustomScaleType === "logarithmic") {
-        domain = calculateDomain(data, name, scaleType, colors.length);
         const [min2, max2] = domain;
         scaleDomain = getLog10ScaleSteps({
           min: min2,
           max: max2,
           steps: colors.length
         });
-        scaleColor = colors;
+        scaleColors = colors;
       } else {
-        domain = calculateDomain(data, name, scaleType, colors.length);
-        scaleColor = colors;
+        scaleColors = colors;
       }
     }
-    if (scaleType === "ordinal") {
-      domain = domain.slice(0, scaleColor.length);
-    }
   }
   return {
     scale: createColorScale(
       scaleType,
       scaleDomain || domain,
-      scaleColor.map(hexToRGB),
+      scaleColors.map(hexToRGB),
       UNKNOWN_COLOR_RGB
     ),
     domain