@carto/api-client 0.5.4 → 0.5.5

package/build/api-client.js

@@ -3169,9 +3169,9 @@ function compare(x, y) {
   for (i = 0; i < j; i++) if (xc[i] != yc[i]) return xc[i] > yc[i] ^ a ? 1 : -1;
   return k == l ? 0 : k > l ^ a ? 1 : -1;
 }
-function intCheck(n, min3, max3, name) {
-  if (n < min3 || n > max3 || n !== mathfloor(n)) {
-    throw Error(bignumberError + (name || "Argument") + (typeof n == "number" ? n < min3 || n > max3 ? " out of range: " : " not an integer: " : " not a primitive number: ") + String(n));
+function intCheck(n, min2, max2, name) {
+  if (n < min2 || n > max2 || n !== mathfloor(n)) {
+    throw Error(bignumberError + (name || "Argument") + (typeof n == "number" ? n < min2 || n > max2 ? " out of range: " : " not an integer: " : " not a primitive number: ") + String(n));
   }
 }
 function isOdd(n) {
@@ -6111,6 +6111,7 @@ function executeModel(props) {
     filters,
     filtersLogicalOperator = "and",
     spatialDataType = "geo",
+    spatialDataColumn = DEFAULT_GEO_COLUMN,
     spatialFiltersMode = "intersects"
   } = source;
   const queryParams = {
@@ -6122,18 +6123,13 @@ function executeModel(props) {
     filters,
     filtersLogicalOperator
   };
-  const spatialDataColumn = source.spatialDataColumn || DEFAULT_GEO_COLUMN;
-  if (model === "pick") {
-    queryParams.spatialDataColumn = spatialDataColumn;
-  }
-  const spatialFilters = source.spatialFilter ? { [spatialDataColumn]: source.spatialFilter } : void 0;
-  if (spatialFilters) {
-    queryParams.spatialFilters = spatialFilters;
-    queryParams.spatialDataColumn = spatialDataColumn;
-    queryParams.spatialDataType = spatialDataType;
-  }
-  if (spatialDataType !== "geo") {
-    queryParams.spatialFiltersMode = spatialFiltersMode;
+  queryParams.spatialDataType = spatialDataType;
+  queryParams.spatialDataColumn = spatialDataColumn;
+  if (source.spatialFilter) {
+    queryParams.spatialFilters = { [spatialDataColumn]: source.spatialFilter };
+    if (spatialDataType !== "geo") {
+      queryParams.spatialFiltersMode = spatialFiltersMode;
+    }
   }
   const urlWithSearchParams = url + "?" + objectToURLSearchParams(queryParams).toString();
   const isGet = urlWithSearchParams.length <= REQUEST_GET_MAX_URL_LENGTH;
@@ -6567,11 +6563,11 @@ function min(values, keys, joinOperation) {
       Infinity
     );
   }
-  let min3 = Number.POSITIVE_INFINITY;
+  let min2 = Number.POSITIVE_INFINITY;
   for (const value of values) {
-    min3 = Math.min(min3, value);
+    min2 = Math.min(min2, value);
   }
-  return min3;
+  return min2;
 }
 function max(values, keys, joinOperation) {
   const normalizedKeys = normalizeKeys(keys);
@@ -6581,11 +6577,11 @@ function max(values, keys, joinOperation) {
       -Infinity
     );
   }
-  let max3 = Number.NEGATIVE_INFINITY;
+  let max2 = Number.NEGATIVE_INFINITY;
   for (const value of values) {
-    max3 = Math.max(max3, value);
+    max2 = Math.max(max2, value);
   }
-  return max3;
+  return max2;
 }
 function normalizeKeys(keys) {
   return Array.isArray(keys) ? keys : typeof keys === "string" ? [keys] : void 0;
@@ -8112,69 +8108,18 @@ function ascending(a, b) {
   return a == null || b == null ? NaN : a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
 }
 
-// node_modules/d3-array/src/number.js
-function* numbers(values, valueof) {
-  if (valueof === void 0) {
-    for (let value of values) {
-      if (value != null && (value = +value) >= value) {
-        yield value;
-      }
-    }
-  } else {
-    let index = -1;
-    for (let value of values) {
-      if ((value = valueof(value, ++index, values)) != null && (value = +value) >= value) {
-        yield value;
-      }
-    }
-  }
-}
-
-// node_modules/d3-array/src/variance.js
-function variance(values, valueof) {
-  let count = 0;
-  let delta;
-  let mean = 0;
-  let sum3 = 0;
-  if (valueof === void 0) {
-    for (let value of values) {
-      if (value != null && (value = +value) >= value) {
-        delta = value - mean;
-        mean += delta / ++count;
-        sum3 += delta * (value - mean);
-      }
-    }
-  } else {
-    let index = -1;
-    for (let value of values) {
-      if ((value = valueof(value, ++index, values)) != null && (value = +value) >= value) {
-        delta = value - mean;
-        mean += delta / ++count;
-        sum3 += delta * (value - mean);
-      }
-    }
-  }
-  if (count > 1) return sum3 / (count - 1);
-}
-
-// node_modules/d3-array/src/deviation.js
-function deviation(values, valueof) {
-  const v2 = variance(values, valueof);
-  return v2 ? Math.sqrt(v2) : v2;
-}
-
 // node_modules/d3-array/src/extent.js
 function extent(values, valueof) {
-  let min3;
-  let max3;
+  let min2;
+  let max2;
   if (valueof === void 0) {
     for (const value of values) {
       if (value != null) {
-        if (min3 === void 0) {
-          if (value >= value) min3 = max3 = value;
+        if (min2 === void 0) {
+          if (value >= value) min2 = max2 = value;
         } else {
-          if (min3 > value) min3 = value;
-          if (max3 < value) max3 = value;
+          if (min2 > value) min2 = value;
+          if (max2 < value) max2 = value;
         }
       }
     }
@@ -8182,16 +8127,16 @@ function extent(values, valueof) {
     let index = -1;
     for (let value of values) {
       if ((value = valueof(value, ++index, values)) != null) {
-        if (min3 === void 0) {
-          if (value >= value) min3 = max3 = value;
+        if (min2 === void 0) {
+          if (value >= value) min2 = max2 = value;
         } else {
-          if (min3 > value) min3 = value;
-          if (max3 < value) max3 = value;
+          if (min2 > value) min2 = value;
+          if (max2 < value) max2 = value;
         }
       }
     }
   }
-  return [min3, max3];
+  return [min2, max2];
 }
 
 // node_modules/internmap/src/index.js
@@ -8313,102 +8258,6 @@ function groupSort(values, reduce, key) {
   return (reduce.length !== 2 ? sort(rollup(values, reduce, key), ([ak, av], [bk, bv]) => ascending(av, bv) || ascending(ak, bk)) : sort(group(values, key), ([ak, av], [bk, bv]) => reduce(av, bv) || ascending(ak, bk))).map(([key2]) => key2);
 }
 
-// node_modules/d3-array/src/max.js
-function max2(values, valueof) {
-  let max3;
-  if (valueof === void 0) {
-    for (const value of values) {
-      if (value != null && (max3 < value || max3 === void 0 && value >= value)) {
-        max3 = value;
-      }
-    }
-  } else {
-    let index = -1;
-    for (let value of values) {
-      if ((value = valueof(value, ++index, values)) != null && (max3 < value || max3 === void 0 && value >= value)) {
-        max3 = value;
-      }
-    }
-  }
-  return max3;
-}
-
-// node_modules/d3-array/src/min.js
-function min2(values, valueof) {
-  let min3;
-  if (valueof === void 0) {
-    for (const value of values) {
-      if (value != null && (min3 > value || min3 === void 0 && value >= value)) {
-        min3 = value;
-      }
-    }
-  } else {
-    let index = -1;
-    for (let value of values) {
-      if ((value = valueof(value, ++index, values)) != null && (min3 > value || min3 === void 0 && value >= value)) {
-        min3 = value;
-      }
-    }
-  }
-  return min3;
-}
-
-// node_modules/d3-array/src/quickselect.js
-function quickselect(array, k, left = 0, right = Infinity, compare2) {
-  k = Math.floor(k);
-  left = Math.floor(Math.max(0, left));
-  right = Math.floor(Math.min(array.length - 1, right));
-  if (!(left <= k && k <= right)) return array;
-  compare2 = compare2 === void 0 ? ascendingDefined : compareDefined(compare2);
-  while (right > left) {
-    if (right - left > 600) {
-      const n = right - left + 1;
-      const m = k - left + 1;
-      const z = Math.log(n);
-      const s = 0.5 * Math.exp(2 * z / 3);
-      const sd = 0.5 * Math.sqrt(z * s * (n - s) / n) * (m - n / 2 < 0 ? -1 : 1);
-      const newLeft = Math.max(left, Math.floor(k - m * s / n + sd));
-      const newRight = Math.min(right, Math.floor(k + (n - m) * s / n + sd));
-      quickselect(array, k, newLeft, newRight, compare2);
-    }
-    const t = array[k];
-    let i = left;
-    let j = right;
-    swap(array, left, k);
-    if (compare2(array[right], t) > 0) swap(array, left, right);
-    while (i < j) {
-      swap(array, i, j), ++i, --j;
-      while (compare2(array[i], t) < 0) ++i;
-      while (compare2(array[j], t) > 0) --j;
-    }
-    if (compare2(array[left], t) === 0) swap(array, left, j);
-    else ++j, swap(array, j, right);
-    if (j <= k) left = j + 1;
-    if (k <= j) right = j - 1;
-  }
-  return array;
-}
-function swap(array, i, j) {
-  const t = array[i];
-  array[i] = array[j];
-  array[j] = t;
-}
-
-// node_modules/d3-array/src/quantile.js
-function quantile(values, p, valueof) {
-  values = Float64Array.from(numbers(values, valueof));
-  if (!(n = values.length) || isNaN(p = +p)) return;
-  if (p <= 0 || n < 2) return min2(values);
-  if (p >= 1) return max2(values);
-  var n, i = (n - 1) * p, i0 = Math.floor(i), value0 = max2(quickselect(values, i0).subarray(0, i0 + 1)), value1 = min2(values.subarray(i0 + 1));
-  return value0 + (value1 - value0) * (i - i0);
-}
-
-// node_modules/d3-array/src/median.js
-function median(values, valueof) {
-  return quantile(values, 0.5, valueof);
-}
-
 // node_modules/d3-color/src/define.js
 function define_default(constructor, factory, prototype) {
   constructor.prototype = factory.prototype = prototype;
@@ -8696,12 +8545,12 @@ function hslConvert(o) {
   if (!o) return new Hsl();
   if (o instanceof Hsl) return o;
   o = o.rgb();
-  var r = o.r / 255, g = o.g / 255, b = o.b / 255, min3 = Math.min(r, g, b), max3 = Math.max(r, g, b), h = NaN, s = max3 - min3, l = (max3 + min3) / 2;
+  var r = o.r / 255, g = o.g / 255, b = o.b / 255, min2 = Math.min(r, g, b), max2 = Math.max(r, g, b), h = NaN, s = max2 - min2, l = (max2 + min2) / 2;
   if (s) {
-    if (r === max3) h = (g - b) / s + (g < b) * 6;
-    else if (g === max3) h = (b - r) / s + 2;
+    if (r === max2) h = (g - b) / s + (g < b) * 6;
+    else if (g === max2) h = (b - r) / s + 2;
     else h = (r - g) / s + 4;
-    s /= l < 0.5 ? max3 + min3 : 2 - max3 - min3;
+    s /= l < 0.5 ? max2 + min2 : 2 - max2 - min2;
     h *= 60;
   } else {
     s = l > 0 && l < 1 ? 0 : h;
@@ -8849,25 +8698,11 @@ function identity2(v2) {
   return v2;
 }
 var UNKNOWN_COLOR = "#868d91";
-var AGGREGATION = {
-  average: "MEAN",
-  maximum: "MAX",
-  minimum: "MIN",
-  sum: "SUM"
-};
 var OPACITY_MAP = {
   getFillColor: "opacity",
   getLineColor: "strokeOpacity",
   getTextColor: "opacity"
 };
-var AGGREGATION_FUNC = {
-  "count unique": (values, accessor) => groupSort(values, (v2) => v2.length, accessor).length,
-  median,
-  // Unfortunately mode() is only available in d3-array@3+ which is ESM only
-  mode: (values, accessor) => groupSort(values, (v2) => v2.length, accessor).pop(),
-  stddev: deviation,
-  variance
-};
 var hexToRGBA = (c) => {
   const { r, g, b, opacity } = rgb(c);
   return [r, g, b, 255 * opacity];
@@ -8963,11 +8798,11 @@ function domainFromAttribute(attribute, scaleType, scaleLength) {
   if (scaleType === "quantile" && attribute.quantiles) {
     return attribute.quantiles.global ? attribute.quantiles.global[scaleLength] : attribute.quantiles[scaleLength];
   }
-  let { min: min3 } = attribute;
-  if (scaleType === "log" && min3 === 0) {
-    min3 = 1e-5;
+  let { min: min2 } = attribute;
+  if (scaleType === "log" && min2 === 0) {
+    min2 = 1e-5;
   }
-  return [min3, attribute.max];
+  return [min2, attribute.max];
 }
 function domainFromValues(values, scaleType) {
   if (scaleType === "ordinal" || scaleType === "point") {
@@ -9025,11 +8860,6 @@ function findAccessorKey(keys, properties) {
   }
   return keys;
 }
-function getColorValueAccessor({ name }, colorAggregation, data) {
-  const aggregator = AGGREGATION_FUNC[colorAggregation];
-  const accessor = (values) => aggregator(values, (p) => p[name]);
-  return normalizeAccessor(accessor, data);
-}
 function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range }, opacity, data) {
   const scale2 = calculateLayerScale(
     colorColumn || name,
@@ -9047,7 +8877,7 @@ function getColorAccessor({ name, colorColumn }, scaleType, { aggregation, range
     const { r, g, b } = rgb(scale2(propertyValue));
     return [r, g, b, propertyValue === null ? 0 : alpha];
   };
-  return normalizeAccessor(accessor, data);
+  return { accessor: normalizeAccessor(accessor, data), scale: scale2 };
 }
 function calculateLayerScale(name, scaleType, range, data) {
   const scale2 = SCALE_FUNCS[scaleType]();
@@ -9134,7 +8964,7 @@ function getSizeAccessor({ name }, scaleType, aggregation, range, data) {
     const propertyValue = properties[accessorKeys[0]];
     return scale2(propertyValue);
   };
-  return normalizeAccessor(accessor, data);
+  return { accessor: normalizeAccessor(accessor, data), scale: scale2 };
 }
 var FORMATS = {
   date: formatDate,
@@ -9151,10 +8981,10 @@ function getTextAccessor({ name, type }, data) {
   return normalizeAccessor(accessor, data);
 }
 function calculateClusterRadius(properties, stats, radiusRange, column) {
-  const { min: min3, max: max3 } = stats[column];
+  const { min: min2, max: max2 } = stats[column];
   const value = properties[column];
-  if (min3 === max3) return radiusRange[1];
-  const normalizedValue = (value - min3) / (max3 - min3);
+  if (min2 === max2) return radiusRange[1];
+  const normalizedValue = (value - min2) / (max2 - min2);
   return radiusRange[0] + normalizedValue * (radiusRange[1] - radiusRange[0]);
 }
 function getDefaultAggregationExpColumnAliasForLayerType(layerType, provider, schema) {
@@ -9215,6 +9045,14 @@ function parseMap(json) {
         assert2(data, `No data loaded for dataId: ${dataId}`);
         const { propMap, defaultProps: defaultProps2 } = getLayerProps(type, config3, dataset);
         const styleProps = createStyleProps(config3, propMap);
+        const { channelProps, scales } = createChannelProps(
+          id,
+          type,
+          config3,
+          visualChannels,
+          data,
+          dataset
+        );
         const layer = {
           type,
           filters: isEmptyObject(filters) || isRemoteCalculationSupported(dataset) ? void 0 : filters[dataId],
@@ -9224,22 +9062,15 @@ function parseMap(json) {
             ...defaultProps2,
             ...createInteractionProps(interactionConfig),
             ...styleProps,
-            ...createChannelProps(
-              id,
-              type,
-              config3,
-              visualChannels,
-              data,
-              dataset
-            ),
-            // Must come after style
+            ...channelProps,
             ...createParametersProp(
               layerBlending,
               styleProps.parameters || {}
             ),
             // Must come after style
             ...createLoadOptions(token)
-          }
+          },
+          scales
         };
         return layer;
       } catch (e) {
@@ -9306,69 +9137,47 @@ function createStyleProps(config2, mapping) {
   result.highlightColor = config2.visConfig.enable3d ? [255, 255, 255, 60] : [252, 242, 26, 255];
   return result;
 }
-function createChannelProps(id, type, config2, visualChannels, data, dataset) {
+function domainAndRangeFromScale(scale2) {
+  return {
+    domain: scale2.domain(),
+    range: scale2.range()
+  };
+}
+function createChannelProps(id, layerType, config2, visualChannels, data, dataset) {
   const {
     colorField,
     colorScale,
     radiusField,
     radiusScale,
-    sizeField,
-    sizeScale,
     strokeColorField,
     strokeColorScale,
     weightField
   } = visualChannels;
-  let { heightField, heightScale } = visualChannels;
-  if (type === "hexagonId") {
-    heightField = sizeField;
-    heightScale = sizeScale;
-  }
+  const { heightField, heightScale } = visualChannels;
   const { textLabel, visConfig } = config2;
   const result = {};
-  if (type === "grid" || type === "hexagon") {
-    result.colorScaleType = colorScale;
-    if (colorField) {
-      const { colorAggregation } = config2.visConfig;
-      if (!AGGREGATION[colorAggregation]) {
-        result.getColorValue = getColorValueAccessor(
-          colorField,
-          colorAggregation,
-          data
-        );
-      } else {
-        result.getColorWeight = (d) => d[colorField.name];
-      }
-    }
-  } else if (colorField) {
+  const scales = {};
+  if (colorField) {
     const { colorAggregation: aggregation, colorRange: range } = visConfig;
-    result.getFillColor = getColorAccessor(
+    const { accessor, scale: scale2 } = getColorAccessor(
       colorField,
-      // @ts-ignore
       colorScale,
       { aggregation, range },
       visConfig.opacity,
       data
     );
+    result.getFillColor = accessor;
+    scales.fillColor = {
+      field: colorField,
+      type: colorScale,
+      ...domainAndRangeFromScale(scale2)
+    };
+  } else if (visConfig.filled) {
+    scales.fillColor = {};
   }
-  if (type === "point") {
-    const altitude = config2.columns?.altitude;
-    if (altitude) {
-      result.dataTransform = (data2) => {
-        data2.features.forEach(
-          ({ geometry, properties }) => {
-            const { type: type2, coordinates } = geometry;
-            if (type2 === "Point") {
-              coordinates[2] = properties[altitude];
-            }
-          }
-        );
-        return data2;
-      };
-    }
-  }
-  if (type === "clusterTile") {
+  if (layerType === "clusterTile") {
     const aggregationExpAlias = getDefaultAggregationExpColumnAliasForLayerType(
-      type,
+      layerType,
       dataset.providerId,
       data.schema
     );
@@ -9407,49 +9216,67 @@ function createChannelProps(id, type, config2, visualChannels, data, dataset) {
       return calculateClusterTextFontSize(radius);
     };
   }
-  if (radiusField || sizeField) {
-    result.getPointRadius = getSizeAccessor(
-      // @ts-ignore
-      radiusField || sizeField,
-      // @ts-ignore
-      radiusScale || sizeScale,
+  if (radiusField) {
+    const { accessor, scale: scale2 } = getSizeAccessor(
+      radiusField,
+      radiusScale,
       visConfig.sizeAggregation,
       visConfig.radiusRange || visConfig.sizeRange,
       data
     );
+    result.getPointRadius = accessor;
+    scales.pointRadius = {
+      field: radiusField,
+      type: radiusScale || "identity",
+      ...domainAndRangeFromScale(scale2)
+    };
   }
   if (strokeColorField) {
-    const fallbackOpacity = type === "point" ? visConfig.opacity : 1;
-    const opacity = visConfig.strokeOpacity !== void 0 ? visConfig.strokeOpacity : fallbackOpacity;
+    const opacity = visConfig.strokeOpacity !== void 0 ? visConfig.strokeOpacity : 1;
     const { strokeColorAggregation: aggregation, strokeColorRange: range } = visConfig;
-    result.getLineColor = getColorAccessor(
+    const { accessor, scale: scale2 } = getColorAccessor(
       strokeColorField,
-      // @ts-ignore
       strokeColorScale,
-      // @ts-ignore
       { aggregation, range },
       opacity,
       data
     );
+    result.getLineColor = accessor;
+    scales.lineColor = {
+      field: strokeColorField,
+      type: strokeColorScale,
+      ...domainAndRangeFromScale(scale2)
+    };
   }
   if (heightField && visConfig.enable3d) {
-    result.getElevation = getSizeAccessor(
+    const { accessor, scale: scale2 } = getSizeAccessor(
       heightField,
-      // @ts-ignore
       heightScale,
       visConfig.heightAggregation,
       visConfig.heightRange || visConfig.sizeRange,
       data
     );
+    result.getElevation = accessor;
+    scales.elevation = {
+      field: heightField,
+      type: heightScale || "identity",
+      ...domainAndRangeFromScale(scale2)
+    };
   }
   if (weightField) {
-    result.getWeight = getSizeAccessor(
+    const { accessor, scale: scale2 } = getSizeAccessor(
       weightField,
       void 0,
       visConfig.weightAggregation,
       void 0,
       data
     );
+    result.getWeight = accessor;
+    scales.weight = {
+      field: weightField,
+      type: "identity",
+      ...domainAndRangeFromScale(scale2)
+    };
   }
   if (visConfig.customMarkers) {
     const maxIconSize = getMaxMarkerSize(visConfig, visualChannels);
@@ -9487,17 +9314,16 @@ function createChannelProps(id, type, config2, visualChannels, data, dataset) {
       result.getIconSize = getPointRadius;
     }
     if (visualChannels.rotationField) {
-      result.getIconAngle = negateAccessor(
-        getSizeAccessor(
-          visualChannels.rotationField,
-          void 0,
-          null,
-          void 0,
-          data
-        )
+      const { accessor } = getSizeAccessor(
+        visualChannels.rotationField,
+        void 0,
+        null,
+        void 0,
+        data
       );
+      result.getIconAngle = negateAccessor(accessor);
     }
-  } else if (type === "point" || type === "tileset") {
+  } else if (layerType === "tileset") {
     result.pointType = "circle";
   }
   if (textLabel && textLabel.length && textLabel[0].field) {
@@ -9540,7 +9366,7 @@ function createChannelProps(id, type, config2, visualChannels, data, dataset) {
       }
     };
   }
-  return result;
+  return { channelProps: result, scales };
 }
 function createLoadOptions(accessToken) {
   return {
@@ -10105,7 +9931,6 @@ function _getHexagonResolution(viewport, tileSize) {
   );
 }
 export {
-  AGGREGATION,
   ApiVersion,
   basemap_styles_default as BASEMAP,
   CartoAPIError,
@@ -10155,7 +9980,6 @@ export {
   getApplicableFilters,
   getClient,
   getColorAccessor,
-  getColorValueAccessor,
   getColumnNameFromGeoColumn,
   getDataFilterExtensionProps,
   getDefaultAggregationExpColumnAliasForLayerType,