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

package/build/api-client.cjs

@@ -9541,7 +9541,19 @@ var SCALE_FUNCS = {
 function identity2(v2) {
   return v2;
 }
+var hexToRGB = (c) => {
+  const { r, g, b } = rgb(c);
+  return [r, g, b];
+};
+var rgbToHex = (c) => {
+  const [r, g, b] = c;
+  const rStr = r.toString(16).padStart(2, "0");
+  const gStr = g.toString(16).padStart(2, "0");
+  const bStr = b.toString(16).padStart(2, "0");
+  return `#${rStr}${gStr}${bStr}`.toUpperCase();
+};
 var UNKNOWN_COLOR = "#868d91";
+var UNKNOWN_COLOR_RGB = hexToRGB(UNKNOWN_COLOR);
 var OPACITY_MAP = {
   getFillColor: "opacity",
   getLineColor: "strokeOpacity",
@@ -9648,13 +9660,6 @@ function getLayerProps(type, config2, dataset) {
   };
 }
 function domainFromAttribute(attribute, scaleType, scaleLength) {
-  if (scaleType === "log10steps" && attribute.min !== void 0 && attribute.max !== void 0) {
-    return getLog10ScaleSteps({
-      min: attribute.min,
-      max: attribute.max,
-      steps: scaleLength
-    });
-  }
   if (scaleType === "ordinal" || scaleType === "point") {
     if (!attribute.categories) {
       return [0, 1];
@@ -9729,7 +9734,7 @@ function findAccessorKey(keys, properties) {
   return keys;
 }
 function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range }, opacity, data) {
-  const scale2 = calculateLayerScale(
+  const { scale: scale2, domain } = calculateLayerScale(
     colorColumn || name,
     scaleType,
     range,
@@ -9742,18 +9747,30 @@ function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range
       accessorKeys = findAccessorKey(accessorKeys, properties);
     }
     const propertyValue = properties[accessorKeys[0]];
-    const { r, g, b } = rgb(scale2(propertyValue));
+    const [r, g, b] = scale2(propertyValue);
     return [r, g, b, propertyValue === null ? 0 : alpha];
   };
-  return { accessor: normalizeAccessor(accessor, data), scale: scale2 };
+  return {
+    accessor: normalizeAccessor(accessor, data),
+    scaleDomain: scale2.domain(),
+    domain,
+    range: scale2.range().map(rgbToHex)
+  };
 }
 function calculateLayerScale(name, scaleType, range, data) {
   let domain = [];
+  let scaleDomain;
   let scaleColor = [];
   const { colors } = range;
   if (scaleType === "custom") {
     if (range.uiCustomScaleType === "logarithmic") {
-      domain = calculateDomain(data, name, "log10steps", colors.length);
+      domain = calculateDomain(data, name, scaleType, colors.length);
+      const [min2, max2] = domain;
+      scaleDomain = getLog10ScaleSteps({
+        min: min2,
+        max: max2,
+        steps: colors.length
+      });
       scaleColor = colors;
     } else if (range.colorMap) {
       const { colorMap } = range;
@@ -9769,7 +9786,15 @@ function calculateLayerScale(name, scaleType, range, data) {
       domain = domain.slice(0, scaleColor.length);
     }
   }
-  return createColorScale(scaleType, domain, scaleColor, UNKNOWN_COLOR);
+  return {
+    scale: createColorScale(
+      scaleType,
+      scaleDomain || domain,
+      scaleColor.map(hexToRGB),
+      UNKNOWN_COLOR_RGB
+    ),
+    domain
+  };
 }
 function createColorScale(scaleType, domain, range, unknown) {
   const scale2 = SCALE_FUNCS[scaleType]();
@@ -9825,9 +9850,13 @@ function negateAccessor(accessor) {
 }
 function getSizeAccessor({ name }, scaleType, aggregation, range, data) {
   const scale2 = scaleType ? SCALE_FUNCS[scaleType]() : identity2;
-  if (scaleType) {
+  let domain = [];
+  if (scaleType && range) {
     if (aggregation !== AggregationTypes.Count) {
-      scale2.domain(calculateDomain(data, name, scaleType));
+      domain = calculateDomain(data, name, scaleType);
+      scale2.domain(domain);
+    } else {
+      domain = scale2.domain();
     }
     scale2.range(range);
   }
@@ -9839,7 +9868,12 @@ function getSizeAccessor({ name }, scaleType, aggregation, range, data) {
     const propertyValue = properties[accessorKeys[0]];
     return scale2(propertyValue);
   };
-  return { accessor: normalizeAccessor(accessor, data), scale: scale2 };
+  return {
+    accessor: normalizeAccessor(accessor, data),
+    domain,
+    scaleDomain: domain,
+    range
+  };
 }
 var FORMATS = {
   date: formatDate,
@@ -10184,7 +10218,7 @@ function getRasterTileLayerStylePropsScaledBand({
   const scaleFun = createColorScale(
     scaleType,
     domain,
-    colorRange.colors.map(hexToRGB),
+    colorRange.colors.map(hexToRGB2),
     UNKNOWN_COLOR2
   );
   const bandColorScaleDataTransform = createBandColorScaleDataTransform({
@@ -10252,7 +10286,7 @@ function bufferSetRgba(target, index, r, g, b, a) {
   target[index + 2] = b;
   target[index + 3] = a;
 }
-function hexToRGB(hexColor) {
+function hexToRGB2(hexColor) {
   const r = parseInt(hexColor.slice(1, 3), 16);
   const g = parseInt(hexColor.slice(3, 5), 16);
   const b = parseInt(hexColor.slice(5, 7), 16);
@@ -10397,24 +10431,7 @@ function createStyleProps(config2, mapping) {
   result.highlightColor = config2.visConfig.enable3d ? [255, 255, 255, 60] : [252, 242, 26, 255];
   return result;
 }
-function domainAndRangeFromScale(scale2) {
-  return {
-    domain: scale2.domain(),
-    range: scale2.range()
-  };
-}
 function createChannelProps(id, layerType, config2, visualChannels, data, dataset) {
-  const {
-    colorField,
-    colorScale,
-    radiusField,
-    radiusScale,
-    strokeColorField,
-    strokeColorScale,
-    sizeField: strokeWidthField,
-    sizeScale: strokeWidthScale,
-    weightField
-  } = visualChannels;
   if (layerType === "raster") {
     const rasterMetadata = data.raster_metadata;
     if (!rasterMetadata) {
@@ -10432,6 +10449,7 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
           visualChannels
         }),
         scales: {}
+        // TODO
       };
     } else {
       return {
@@ -10441,40 +10459,35 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
           rasterMetadata
         }),
         scales: {
-          ...colorField && {
-            fillColor: {
-              field: colorField,
-              type: "ordinal",
-              domain: [],
-              range: []
-            }
-          }
+          // TODO
         }
       };
     }
   }
-  const { heightField, heightScale } = visualChannels;
   const { textLabel, visConfig } = config2;
   const result = {};
   const updateTriggers = {};
   const scales = {};
-  if (colorField) {
-    const { colorAggregation: aggregation, colorRange: range } = visConfig;
-    const { accessor, scale: scale2 } = getColorAccessor(
-      colorField,
-      colorScale,
-      { aggregation, range },
-      visConfig.opacity,
-      data
-    );
-    result.getFillColor = accessor;
-    scales.fillColor = updateTriggers.getFillColor = {
-      field: colorField,
-      type: colorScale,
-      ...domainAndRangeFromScale(scale2)
-    };
-  } else if (visConfig.filled) {
-    scales.fillColor = {};
+  {
+    const { colorField, colorScale } = visualChannels;
+    const { colorRange, colorAggregation } = visConfig;
+    if (colorField && colorScale && colorRange) {
+      const { accessor, ...scaleProps } = getColorAccessor(
+        colorField,
+        colorScale,
+        { aggregation: colorAggregation, range: colorRange },
+        visConfig.opacity,
+        data
+      );
+      result.getFillColor = accessor;
+      scales.fillColor = updateTriggers.getFillColor = {
+        field: colorField,
+        type: colorScale,
+        ...scaleProps
+      };
+    } else {
+      scales.fillColor = {};
+    }
   }
   if (layerType === "clusterTile") {
     const aggregationExpAlias = getDefaultAggregationExpColumnAliasForLayerType(
@@ -10527,82 +10540,102 @@ function createChannelProps(id, layerType, config2, visualChannels, data, datase
       radiusRange: visConfig.radiusRange
     };
   }
-  if (radiusField) {
-    const { accessor, scale: scale2 } = getSizeAccessor(
-      radiusField,
-      radiusScale,
-      visConfig.sizeAggregation,
-      visConfig.radiusRange || visConfig.sizeRange,
-      data
-    );
-    result.getPointRadius = accessor;
-    scales.pointRadius = updateTriggers.getPointRadius = {
-      field: radiusField,
-      type: radiusScale || "identity",
-      ...domainAndRangeFromScale(scale2)
-    };
+  {
+    const radiusRange = visConfig.radiusRange;
+    const { radiusField, radiusScale } = visualChannels;
+    if (radiusField && radiusRange && radiusScale) {
+      const { accessor, ...scaleProps } = getSizeAccessor(
+        radiusField,
+        radiusScale,
+        visConfig.sizeAggregation,
+        radiusRange,
+        data
+      );
+      result.getPointRadius = accessor;
+      scales.pointRadius = updateTriggers.getPointRadius = {
+        field: radiusField,
+        type: radiusScale,
+        ...scaleProps
+      };
+    }
   }
-  if (strokeColorField) {
-    const opacity = visConfig.strokeOpacity !== void 0 ? visConfig.strokeOpacity : 1;
-    const { strokeColorAggregation: aggregation, strokeColorRange: range } = visConfig;
-    const { accessor, scale: scale2 } = getColorAccessor(
-      strokeColorField,
-      strokeColorScale,
-      { aggregation, range },
-      opacity,
-      data
-    );
-    result.getLineColor = accessor;
-    scales.lineColor = updateTriggers.getLineColor = {
-      field: strokeColorField,
-      type: strokeColorScale,
-      ...domainAndRangeFromScale(scale2)
-    };
+  {
+    const strokeColorRange = visConfig.strokeColorRange;
+    const { strokeColorScale, strokeColorField } = visualChannels;
+    if (strokeColorField && strokeColorRange && strokeColorScale) {
+      const { strokeColorAggregation: aggregation } = visConfig;
+      const opacity = visConfig.strokeOpacity !== void 0 ? visConfig.strokeOpacity : 1;
+      const { accessor, ...scaleProps } = getColorAccessor(
+        strokeColorField,
+        strokeColorScale,
+        { aggregation, range: strokeColorRange },
+        opacity,
+        data
+      );
+      result.getLineColor = accessor;
+      scales.lineColor = updateTriggers.getLineColor = {
+        field: strokeColorField,
+        type: strokeColorScale,
+        ...scaleProps
+      };
+    }
   }
-  if (strokeWidthField) {
-    const { accessor, scale: scale2 } = getSizeAccessor(
-      strokeWidthField,
-      strokeWidthScale,
-      visConfig.sizeAggregation,
-      visConfig.sizeRange,
-      data
-    );
-    result.getLineWidth = accessor;
-    scales.lineWidth = updateTriggers.getLineWidth = {
-      field: strokeWidthField,
-      type: strokeWidthScale || "identity",
-      ...domainAndRangeFromScale(scale2)
-    };
+  {
+    const { sizeField: strokeWidthField, sizeScale: strokeWidthScale } = visualChannels;
+    const { sizeRange, sizeAggregation } = visConfig;
+    if (strokeWidthField && sizeRange) {
+      const { accessor, ...scaleProps } = getSizeAccessor(
+        strokeWidthField,
+        strokeWidthScale,
+        sizeAggregation,
+        sizeRange,
+        data
+      );
+      result.getLineWidth = accessor;
+      scales.lineWidth = updateTriggers.getLineWidth = {
+        field: strokeWidthField,
+        type: strokeWidthScale || "identity",
+        ...scaleProps
+      };
+    }
   }
-  if (heightField && visConfig.enable3d) {
-    const { accessor, scale: scale2 } = getSizeAccessor(
-      heightField,
-      heightScale,
-      visConfig.heightAggregation,
-      visConfig.heightRange || visConfig.sizeRange,
-      data
-    );
-    result.getElevation = accessor;
-    scales.elevation = updateTriggers.getElevation = {
-      field: heightField,
-      type: heightScale || "identity",
-      ...domainAndRangeFromScale(scale2)
-    };
+  {
+    const { enable3d, heightRange } = visConfig;
+    const { heightField, heightScale } = visualChannels;
+    if (heightField && heightRange && enable3d) {
+      const { accessor, ...scaleProps } = getSizeAccessor(
+        heightField,
+        heightScale,
+        visConfig.heightAggregation,
+        heightRange,
+        data
+      );
+      result.getElevation = accessor;
+      scales.elevation = updateTriggers.getElevation = {
+        field: heightField,
+        type: heightScale || "identity",
+        ...scaleProps
+      };
+    }
   }
-  if (weightField) {
-    const { accessor, scale: scale2 } = getSizeAccessor(
-      weightField,
-      void 0,
-      visConfig.weightAggregation,
-      void 0,
-      data
-    );
-    result.getWeight = accessor;
-    scales.weight = updateTriggers.getWeight = {
-      field: weightField,
-      type: "identity",
-      ...domainAndRangeFromScale(scale2)
-    };
+  {
+    const { weightField } = visualChannels;
+    const { weightAggregation } = visConfig;
+    if (weightField && weightAggregation) {
+      const { accessor, ...scaleProps } = getSizeAccessor(
+        weightField,
+        void 0,
+        weightAggregation,
+        void 0,
+        data
+      );
+      result.getWeight = accessor;
+      scales.weight = updateTriggers.getWeight = {
+        field: weightField,
+        type: "identity",
+        ...scaleProps
+      };
+    }
   }
   if (visConfig.customMarkers) {
     const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);