@carto/api-client 0.5.1 → 0.5.2-alpha.1

package/build/api-client.cjs

@@ -5510,6 +5510,9 @@ __export(src_exports, {
   SOURCE_DEFAULTS: () => SOURCE_DEFAULTS,
   SpatialIndex: () => SpatialIndex,
   SpatialIndexColumn: () => SpatialIndexColumn,
+  TEXT_LABEL_INDEX: () => TEXT_LABEL_INDEX,
+  TEXT_NUMBER_FORMATTER: () => TEXT_NUMBER_FORMATTER,
+  TEXT_OUTLINE_OPACITY: () => TEXT_OUTLINE_OPACITY,
   TileFormat: () => TileFormat,
   WidgetQuerySource: () => WidgetQuerySource,
   WidgetRasterSource: () => WidgetRasterSource,
@@ -5530,6 +5533,8 @@ __export(src_exports, {
   buildBinaryFeatureFilter: () => buildBinaryFeatureFilter,
   buildPublicMapUrl: () => buildPublicMapUrl,
   buildStatsUrl: () => buildStatsUrl,
+  calculateClusterRadius: () => calculateClusterRadius,
+  calculateClusterTextFontSize: () => calculateClusterTextFontSize,
   clearFilters: () => clearFilters,
   configureSource: () => configureSource,
   createPolygonSpatialFilter: () => createPolygonSpatialFilter,
@@ -5538,11 +5543,13 @@ __export(src_exports, {
   fetchMap: () => fetchMap,
   filterFunctions: () => filterFunctions,
   geojsonFeatures: () => geojsonFeatures,
+  getApplicableFilters: () => getApplicableFilters,
   getClient: () => getClient,
   getColorAccessor: () => getColorAccessor,
   getColorValueAccessor: () => getColorValueAccessor,
   getColumnNameFromGeoColumn: () => getColumnNameFromGeoColumn,
   getDataFilterExtensionProps: () => getDataFilterExtensionProps,
+  getDefaultAggregationExpColumnAliasForLayerType: () => getDefaultAggregationExpColumnAliasForLayerType,
   getFilter: () => getFilter,
   getIconUrlAccessor: () => getIconUrlAccessor,
   getLayerProps: () => getLayerProps,
@@ -11097,23 +11104,6 @@ function isValidBandValue(value, nodata) {
 // src/utils.ts
 init_cjs_shims();
 var FILTER_TYPES = new Set(Object.values(FilterType));
-var isFilterType = (type) => FILTER_TYPES.has(type);
-function getApplicableFilters(owner, filters) {
-  if (!filters) return {};
-  const applicableFilters = {};
-  for (const column in filters) {
-    for (const type in filters[column]) {
-      if (!isFilterType(type)) continue;
-      const filter = filters[column][type];
-      const isApplicable = !owner || !filter?.owner || filter?.owner !== owner;
-      if (filter && isApplicable) {
-        applicableFilters[column] || (applicableFilters[column] = {});
-        applicableFilters[column][type] = filter;
-      }
-    }
-  }
-  return applicableFilters;
-}
 function normalizeObjectKeys(el) {
   if (Array.isArray(el)) {
     return el.map((value) => normalizeObjectKeys(value));
@@ -11800,6 +11790,83 @@ function objectToURLSearchParams(object) {
   return params;
 }
 
+// src/filters.ts
+init_cjs_shims();
+var FILTER_TYPES2 = new Set(Object.values(FilterType));
+var isFilterType = (type) => FILTER_TYPES2.has(type);
+function addFilter(filters, { column, type, values, owner }) {
+  if (!filters[column]) {
+    filters[column] = {};
+  }
+  const filter = { values, owner };
+  filters[column][type] = filter;
+  return filters;
+}
+function removeFilter(filters, { column, owner }) {
+  const filter = filters[column];
+  if (!filter) {
+    return filters;
+  }
+  if (owner) {
+    for (const type of FILTER_TYPES2) {
+      if (owner === filter[type]?.owner) {
+        delete filter[type];
+      }
+    }
+  }
+  if (!owner || isEmptyObject(filter)) {
+    delete filters[column];
+  }
+  return filters;
+}
+function clearFilters(filters) {
+  for (const column of Object.keys(filters)) {
+    delete filters[column];
+  }
+  return filters;
+}
+function hasFilter(filters, { column, owner }) {
+  const filter = filters[column];
+  if (!filter) {
+    return false;
+  }
+  if (!owner) {
+    return true;
+  }
+  for (const type of FILTER_TYPES2) {
+    if (owner === filter[type]?.owner) {
+      return true;
+    }
+  }
+  return false;
+}
+function getFilter(filters, { column, type, owner }) {
+  const filter = filters[column];
+  if (!filter) {
+    return null;
+  }
+  if (!owner || owner === filter[type]?.owner) {
+    return filter[type] || null;
+  }
+  return null;
+}
+function getApplicableFilters(owner, filters) {
+  if (!filters) return {};
+  const applicableFilters = {};
+  for (const column in filters) {
+    for (const type in filters[column]) {
+      if (!isFilterType(type)) continue;
+      const filter = filters[column][type];
+      const isApplicable = !owner || !filter?.owner || filter?.owner !== owner;
+      if (filter && isApplicable) {
+        applicableFilters[column] || (applicableFilters[column] = {});
+        applicableFilters[column][type] = filter;
+      }
+    }
+  }
+  return applicableFilters;
+}
+
 // src/widget-sources/widget-remote-source.ts
 var WidgetRemoteSource = class extends WidgetSource {
   _getModelSource(filters, filterOwner) {
@@ -12135,7 +12202,11 @@ function min(values, keys, joinOperation) {
       Infinity
     );
   }
-  return Math.min(...values);
+  let min3 = Number.POSITIVE_INFINITY;
+  for (const value of values) {
+    min3 = Math.min(min3, value);
+  }
+  return min3;
 }
 function max(values, keys, joinOperation) {
   const normalizedKeys = normalizeKeys(keys);
@@ -12145,7 +12216,11 @@ function max(values, keys, joinOperation) {
       -Infinity
     );
   }
-  return Math.max(...values);
+  let max3 = Number.NEGATIVE_INFINITY;
+  for (const value of values) {
+    max3 = Math.max(max3, value);
+  }
+  return max3;
 }
 function normalizeKeys(keys) {
   return Array.isArray(keys) ? keys : typeof keys === "string" ? [keys] : void 0;
@@ -14497,7 +14572,8 @@ var customMarkersPropsMap = {
 var heatmapTilePropsMap = {
   visConfig: {
     colorRange: (x) => ({ colorRange: x.colors.map(hexToRGBA) }),
-    radius: "radiusPixels"
+    radius: (radius) => ({ radiusPixels: 20 + radius }),
+    opacity: "opacity"
   }
 };
 var defaultProps = {
@@ -14518,6 +14594,12 @@ var deprecatedLayerTypes = [
   "hexagonId",
   "point"
 ];
+var TEXT_LABEL_INDEX = 0;
+var TEXT_OUTLINE_OPACITY = 64;
+var TEXT_NUMBER_FORMATTER = new Intl.NumberFormat("en-US", {
+  maximumFractionDigits: 2,
+  notation: "compact"
+});
 function getLayerProps(type, config2, dataset) {
   if (deprecatedLayerTypes.includes(type)) {
     throw new Error(
@@ -14609,9 +14691,7 @@ function findAccessorKey(keys, properties) {
       return [key];
     }
   }
-  throw new Error(
-    `Could not find property for any accessor key: ${keys.join(", ")}`
-  );
+  return keys;
 }
 function getColorValueAccessor({ name }, colorAggregation, data) {
   const aggregator = AGGREGATION_FUNC[colorAggregation];
@@ -14738,6 +14818,40 @@ function getTextAccessor({ name, type }, data) {
   };
   return normalizeAccessor(accessor, data);
 }
+function calculateClusterRadius(properties, stats, radiusRange, column) {
+  const { min: min3, max: max3 } = stats[column];
+  const value = properties[column];
+  if (min3 === max3) return radiusRange[1];
+  const normalizedValue = (value - min3) / (max3 - min3);
+  return radiusRange[0] + normalizedValue * (radiusRange[1] - radiusRange[0]);
+}
+function getDefaultAggregationExpColumnAliasForLayerType(layerType, provider, columns) {
+  if (columns && layerType === "clusterTile") {
+    return getColumnAliasForAggregationExp(
+      getDefaultColumnFromSchemaForAggregationExp(columns),
+      "count",
+      provider
+    );
+  } else {
+    return DEFAULT_AGGREGATION_EXP_ALIAS;
+  }
+}
+function getColumnAliasForAggregationExp(name, aggregation, provider) {
+  const columnAlias = `${name}_${aggregation}`;
+  return provider === "snowflake" ? columnAlias.toUpperCase() : columnAlias;
+}
+function getDefaultColumnFromSchemaForAggregationExp(columns) {
+  return columns ? columns[0] : "";
+}
+function calculateClusterTextFontSize(radius) {
+  if (radius >= 80) return 24;
+  if (radius >= 72) return 24;
+  if (radius >= 56) return 20;
+  if (radius >= 40) return 16;
+  if (radius >= 24) return 13;
+  if (radius >= 8) return 11;
+  return 11;
+}
 
 // src/fetch-map/parse-map.ts
 function parseMap(json) {
@@ -14778,7 +14892,14 @@ function parseMap(json) {
             ...defaultProps2,
             ...createInteractionProps(interactionConfig),
             ...styleProps,
-            ...createChannelProps(id, type, config3, visualChannels, data),
+            ...createChannelProps(
+              id,
+              type,
+              config3,
+              visualChannels,
+              data,
+              dataset
+            ),
             // Must come after style
             ...createParametersProp(
               layerBlending,
@@ -14853,7 +14974,7 @@ 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) {
+function createChannelProps(id, type, config2, visualChannels, data, dataset) {
   const {
     colorField,
     colorScale,
@@ -14913,6 +15034,47 @@ function createChannelProps(id, type, config2, visualChannels, data) {
       };
     }
   }
+  if (type === "clusterTile") {
+    const aggregationExpAlias = getDefaultAggregationExpColumnAliasForLayerType(
+      type,
+      dataset.providerId,
+      dataset.columns
+    );
+    result.pointType = visConfig.isTextVisible ? "circle+text" : "circle";
+    result.clusterLevel = visConfig.clusterLevel;
+    result.getWeight = (d) => {
+      return d.properties[aggregationExpAlias];
+    };
+    result.getPointRadius = (d, info) => {
+      return calculateClusterRadius(
+        d.properties,
+        info.data.attributes.stats,
+        visConfig.radiusRange,
+        aggregationExpAlias
+      );
+    };
+    result.textCharacterSet = "auto";
+    result.textFontFamily = "Inter, sans";
+    result.textFontSettings = { sdf: true };
+    result.textFontWeight = 600;
+    result.getText = (d) => TEXT_NUMBER_FORMATTER.format(d.properties[aggregationExpAlias]);
+    result.getTextColor = config2.textLabel[TEXT_LABEL_INDEX].color;
+    result.textOutlineColor = [
+      ...config2.textLabel[TEXT_LABEL_INDEX].outlineColor,
+      TEXT_OUTLINE_OPACITY
+    ];
+    result.textOutlineWidth = 5;
+    result.textSizeUnits = "pixels";
+    result.getTextSize = (d, info) => {
+      const radius = calculateClusterRadius(
+        d.properties,
+        info.data.attributes.stats,
+        visConfig.radiusRange,
+        aggregationExpAlias
+      );
+      return calculateClusterTextFontSize(radius);
+    };
+  }
   if (radiusField || sizeField) {
     result.getPointRadius = getSizeAccessor(
       // @ts-ignore
@@ -15477,65 +15639,6 @@ async function fetchMap({
   return out;
 }
 
-// src/filters.ts
-init_cjs_shims();
-function addFilter(filters, { column, type, values, owner }) {
-  if (!filters[column]) {
-    filters[column] = {};
-  }
-  const filter = { values, owner };
-  filters[column][type] = filter;
-  return filters;
-}
-function removeFilter(filters, { column, owner }) {
-  const filter = filters[column];
-  if (!filter) {
-    return filters;
-  }
-  if (owner) {
-    for (const type of Object.values(FilterType)) {
-      if (owner === filter[type]?.owner) {
-        delete filter[type];
-      }
-    }
-  }
-  if (!owner || isEmptyObject(filter)) {
-    delete filters[column];
-  }
-  return filters;
-}
-function clearFilters(filters) {
-  for (const column of Object.keys(filters)) {
-    delete filters[column];
-  }
-  return filters;
-}
-function hasFilter(filters, { column, owner }) {
-  const filter = filters[column];
-  if (!filter) {
-    return false;
-  }
-  if (!owner) {
-    return true;
-  }
-  for (const type of Object.values(FilterType)) {
-    if (owner === filter[type]?.owner) {
-      return true;
-    }
-  }
-  return false;
-}
-function getFilter(filters, { column, type, owner }) {
-  const filter = filters[column];
-  if (!filter) {
-    return null;
-  }
-  if (!owner || owner === filter[type]?.owner) {
-    return filter[type] || null;
-  }
-  return null;
-}
-
 // src/geo.ts
 init_cjs_shims();
 
@@ -15690,6 +15793,9 @@ function _getHexagonResolution(viewport, tileSize) {
   SOURCE_DEFAULTS,
   SpatialIndex,
   SpatialIndexColumn,
+  TEXT_LABEL_INDEX,
+  TEXT_NUMBER_FORMATTER,
+  TEXT_OUTLINE_OPACITY,
   TileFormat,
   WidgetQuerySource,
   WidgetRasterSource,
@@ -15710,6 +15816,8 @@ function _getHexagonResolution(viewport, tileSize) {
   buildBinaryFeatureFilter,
   buildPublicMapUrl,
   buildStatsUrl,
+  calculateClusterRadius,
+  calculateClusterTextFontSize,
   clearFilters,
   configureSource,
   createPolygonSpatialFilter,
@@ -15718,11 +15826,13 @@ function _getHexagonResolution(viewport, tileSize) {
   fetchMap,
   filterFunctions,
   geojsonFeatures,
+  getApplicableFilters,
   getClient,
   getColorAccessor,
   getColorValueAccessor,
   getColumnNameFromGeoColumn,
   getDataFilterExtensionProps,
+  getDefaultAggregationExpColumnAliasForLayerType,
   getFilter,
   getIconUrlAccessor,
   getLayerProps,