@deck.gl/carto 9.0.26 → 9.0.28

package/dist/index.cjs

@@ -67,19 +67,26 @@ module.exports = __toCommonJS(dist_exports);
 // dist/layers/cluster-tile-layer.js
 var import_layers = require("@deck.gl/layers");
 var import_geo_layers2 = require("@deck.gl/geo-layers");
-var import_core4 = require("@loaders.gl/core");
+var import_core5 = require("@loaders.gl/core");
 var import_gis = require("@loaders.gl/gis");
-var import_core5 = require("@deck.gl/core");
+var import_core6 = require("@deck.gl/core");
 
 // dist/layers/cluster-utils.js
 var import_quadbin = require("quadbin");
+var import_core = require("@deck.gl/core");
 function aggregateTile(tile, aggregationLevels, properties = [], getPosition, getWeight) {
+  var _a;
   if (!tile.content)
-    return;
+    return false;
   if (!tile.userData)
     tile.userData = {};
-  if (tile.userData[aggregationLevels])
-    return;
+  const cell0 = (_a = tile.userData[aggregationLevels]) == null ? void 0 : _a[0];
+  if (cell0) {
+    if (properties.every((property) => property.name in cell0)) {
+      return false;
+    }
+    tile.userData = {};
+  }
   const out = {};
   for (const cell of tile.content) {
     let id4 = cell.id;
@@ -119,6 +126,7 @@ function aggregateTile(tile, aggregationLevels, properties = [], getPosition, ge
     }
   }
   tile.userData[aggregationLevels] = Object.values(out);
+  return true;
 }
 function extractAggregationProperties(tile) {
   const properties = [];
@@ -126,6 +134,7 @@ function extractAggregationProperties(tile) {
   for (const name of Object.keys(tile.content[0].properties)) {
     let aggregation = name.split("_").pop().toLowerCase();
     if (!validAggregations.includes(aggregation)) {
+      import_core.log.warn(`No valid aggregation present in ${name} property`)();
       aggregation = "any";
     }
     properties.push({ name, aggregation });
@@ -471,9 +480,9 @@ function parsePbf(buffer, TileReader5) {
 }
 
 // dist/utils.js
-var import_core = require("@deck.gl/core");
+var import_core2 = require("@deck.gl/core");
 function assert(condition, message) {
-  import_core.log.assert(condition, message);
+  import_core2.log.assert(condition, message);
 }
 function createBinaryProxy(data, index) {
   const { properties, numericProps } = data;
@@ -539,7 +548,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION = true ? "9.0.26" : "latest";
+var VERSION = true ? "9.0.28" : "latest";
 var id = "cartoSpatialTile";
 var DEFAULT_OPTIONS = {
   cartoSpatialTile: {
@@ -573,8 +582,8 @@ function parseCartoSpatialTile(arrayBuffer, options) {
 var carto_spatial_tile_loader_default = CartoSpatialTileLoader;
 
 // dist/layers/utils.js
-var import_core2 = require("@deck.gl/core");
 var import_core3 = require("@deck.gl/core");
+var import_core4 = require("@deck.gl/core");
 function injectAccessToken(loadOptions, accessToken) {
   var _a, _b, _c;
   if (!((_b = (_a = loadOptions == null ? void 0 : loadOptions.fetch) == null ? void 0 : _a.headers) == null ? void 0 : _b.Authorization)) {
@@ -588,7 +597,7 @@ function mergeBoundaryData(geometry, properties) {
   const mapping = {};
   for (const { geoid, ...rest } of properties.properties) {
     if (geoid in mapping) {
-      import_core2.log.warn("Duplicate geoid key in boundary mapping, using first occurance")();
+      import_core3.log.warn("Duplicate geoid key in boundary mapping, using first occurance")();
     } else {
       mapping[geoid] = rest;
     }
@@ -633,13 +642,13 @@ var TilejsonPropType = {
   value: null,
   validate: (value, propType) => propType.optional && value === null || typeof value === "object" && Array.isArray(value.tiles) && value.tiles.every((url) => typeof url === "string"),
   equal: (value1, value2) => {
-    return (0, import_core3._deepEqual)(value1, value2, 2);
+    return (0, import_core4._deepEqual)(value1, value2, 2);
   },
   async: true
 };
 
 // dist/layers/cluster-tile-layer.js
-(0, import_core4.registerLoaders)([carto_spatial_tile_loader_default]);
+(0, import_core5.registerLoaders)([carto_spatial_tile_loader_default]);
 var defaultProps = {
   data: TilejsonPropType,
   clusterLevel: { type: "number", value: 5, min: 1 },
@@ -665,22 +674,23 @@ var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
     const { clusterLevel, getPosition, getWeight } = this.props;
     const properties = extractAggregationProperties(visibleTiles[0]);
     const data = [];
+    let needsUpdate = false;
     for (const tile of visibleTiles) {
       const overZoom = Math.round(zoom - tile.zoom);
       const aggregationLevels = Math.round(clusterLevel) - overZoom;
-      aggregateTile(tile, aggregationLevels, properties, getPosition, getWeight);
+      const didAggregate = aggregateTile(tile, aggregationLevels, properties, getPosition, getWeight);
+      needsUpdate ||= didAggregate;
       data.push(...tile.userData[aggregationLevels]);
     }
     data.sort((a, b) => Number(b.count - a.count));
     const clusterIds = data == null ? void 0 : data.map((tile) => tile.id);
-    const needsUpdate = !(0, import_core5._deepEqual)(clusterIds, this.state.clusterIds, 1);
+    needsUpdate ||= !(0, import_core6._deepEqual)(clusterIds, this.state.clusterIds, 1);
     this.setState({ clusterIds });
     if (needsUpdate) {
       const stats = computeAggregationStats(data, properties);
-      for (const d of data) {
-        d.stats = stats;
-      }
-      this.setState({ data: clustersToBinary(data) });
+      const binaryData = clustersToBinary(data);
+      binaryData.points.attributes = { stats };
+      this.setState({ data: binaryData });
     }
     const props = {
       ...this.props,
@@ -690,7 +700,7 @@ var _ClusterGeoJsonLayer = class extends import_geo_layers2.TileLayer {
         var _a2, _b, _c, _d;
         const newIds = (_b = (_a2 = data2 == null ? void 0 : data2.points) == null ? void 0 : _a2.properties) == null ? void 0 : _b.map((tile) => tile.id);
         const oldIds = (_d = (_c = oldData == null ? void 0 : oldData.points) == null ? void 0 : _c.properties) == null ? void 0 : _d.map((tile) => tile.id);
-        return (0, import_core5._deepEqual)(newIds, oldIds, 1);
+        return (0, import_core6._deepEqual)(newIds, oldIds, 1);
       }
     };
     return new import_layers.GeoJsonLayer(this.getSubLayerProps(props));
@@ -721,7 +731,7 @@ var ClusterGeoJsonLayer = _ClusterGeoJsonLayer;
 (() => {
   _ClusterGeoJsonLayer.defaultProps = defaultProps;
 })();
-var _ClusterTileLayer = class extends import_core5.CompositeLayer {
+var _ClusterTileLayer = class extends import_core6.CompositeLayer {
   getLoadOptions() {
     const loadOptions = super.getLoadOptions() || {};
     const tileJSON = this.props.data;
@@ -754,7 +764,7 @@ var ClusterTileLayer = _ClusterTileLayer;
 })();
 
 // dist/layers/h3-tile-layer.js
-var import_core7 = require("@deck.gl/core");
+var import_core8 = require("@deck.gl/core");
 var import_geo_layers5 = require("@deck.gl/geo-layers");
 
 // dist/layers/h3-tileset-2d.js
@@ -855,7 +865,7 @@ var H3Tileset2D = class extends import_geo_layers3._Tileset2D {
 };
 
 // dist/layers/spatial-index-tile-layer.js
-var import_core6 = require("@loaders.gl/core");
+var import_core7 = require("@loaders.gl/core");
 
 // dist/layers/schema/carto-raster-tile.js
 var ARRAY_TYPES = {
@@ -902,7 +912,7 @@ var TileReader3 = class {
 };
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION2 = true ? "9.0.26" : "latest";
+var VERSION2 = true ? "9.0.28" : "latest";
 var id2 = "cartoRasterTile";
 var DEFAULT_OPTIONS2 = {
   cartoRasterTile: {
@@ -937,7 +947,7 @@ var carto_raster_tile_loader_default = CartoRasterTileLoader;
 
 // dist/layers/spatial-index-tile-layer.js
 var import_geo_layers4 = require("@deck.gl/geo-layers");
-(0, import_core6.registerLoaders)([carto_raster_tile_loader_default, carto_spatial_tile_loader_default]);
+(0, import_core7.registerLoaders)([carto_raster_tile_loader_default, carto_spatial_tile_loader_default]);
 function isFeatureIdDefined(value) {
   return value !== void 0 && value !== null && value !== "";
 }
@@ -1015,7 +1025,7 @@ var defaultProps3 = {
   data: TilejsonPropType,
   tileSize: DEFAULT_TILE_SIZE
 };
-var _H3TileLayer = class extends import_core7.CompositeLayer {
+var _H3TileLayer = class extends import_core8.CompositeLayer {
   initializeState() {
     import_geo_layers5.H3HexagonLayer._checkH3Lib();
   }
@@ -1061,7 +1071,7 @@ var H3TileLayer = _H3TileLayer;
 
 // dist/layers/heatmap-tile-layer.js
 var import_quadbin6 = require("quadbin");
-var import_core10 = require("@deck.gl/core");
+var import_core11 = require("@deck.gl/core");
 var import_layers2 = require("@deck.gl/layers");
 
 // dist/layers/heatmap.js
@@ -1201,7 +1211,7 @@ var heatmap = {
 };
 
 // dist/layers/post-process-utils.js
-var import_core8 = require("@deck.gl/core");
+var import_core9 = require("@deck.gl/core");
 var TEXTURE_PROPS = {
   format: "rgba8unorm",
   mipmaps: false,
@@ -1218,7 +1228,7 @@ function getPostProcessLayer(layer) {
   }
   return layer;
 }
-var _DrawCallbackLayer = class extends import_core8.Layer {
+var _DrawCallbackLayer = class extends import_core9.Layer {
   initializeState() {
     this.id = `draw-callback-${getPostProcessLayer(this).props.id}`;
   }
@@ -1255,7 +1265,7 @@ function PostProcessModifier(BaseLayer, effect) {
     initializeState(context) {
       super.initializeState(context);
       this._createTextures();
-      this.internalState.postProcess = new import_core8.PostProcessEffect(effect, this.props);
+      this.internalState.postProcess = new import_core9.PostProcessEffect(effect, this.props);
       this.internalState.postProcess.setup(context);
     }
     updateState(params) {
@@ -1322,7 +1332,7 @@ function PostProcessModifier(BaseLayer, effect) {
 }
 
 // dist/layers/quadbin-tile-layer.js
-var import_core9 = require("@deck.gl/core");
+var import_core10 = require("@deck.gl/core");
 
 // dist/layers/quadbin-layer.js
 var import_geo_layers6 = require("@deck.gl/geo-layers");
@@ -1365,7 +1375,7 @@ var defaultProps5 = {
   data: TilejsonPropType,
   tileSize: DEFAULT_TILE_SIZE
 };
-var _QuadbinTileLayer = class extends import_core9.CompositeLayer {
+var _QuadbinTileLayer = class extends import_core10.CompositeLayer {
   getLoadOptions() {
     const loadOptions = super.getLoadOptions() || {};
     const tileJSON = this.props.data;
@@ -1454,7 +1464,7 @@ var defaultProps6 = {
   intensity: { type: "number", value: 1 },
   radiusPixels: { type: "number", min: 0, max: 100, value: 20 }
 };
-var _HeatmapTileLayer = class extends import_core10.CompositeLayer {
+var _HeatmapTileLayer = class extends import_core11.CompositeLayer {
   initializeState() {
     this.state = {
       isLoaded: false,
@@ -1556,7 +1566,7 @@ var HeatmapTileLayer = _HeatmapTileLayer;
 var heatmap_tile_layer_default = HeatmapTileLayer;
 
 // dist/layers/point-label-layer.js
-var import_core11 = require("@deck.gl/core");
+var import_core12 = require("@deck.gl/core");
 var import_layers3 = require("@deck.gl/layers");
 var [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
 var _EnhancedTextBackgroundLayer = class extends import_layers3._TextBackgroundLayer {
@@ -1590,7 +1600,7 @@ var defaultProps7 = {
   getRadius: { type: "accessor", value: 1 },
   radiusScale: { type: "number", min: 0, value: 1 }
 };
-var _PointLabelLayer = class extends import_core11.CompositeLayer {
+var _PointLabelLayer = class extends import_core12.CompositeLayer {
   calculatePixelOffset(secondary) {
     const { getTextAnchor: anchor, getAlignmentBaseline: alignment, getRadius, getSecondaryText, radiusScale, secondarySizeScale, sizeScale } = this.props;
     const xMult = anchor === "middle" ? 0 : anchor === "start" ? 1 : -1;
@@ -1700,10 +1710,10 @@ var PointLabelLayer = _PointLabelLayer;
 })();
 
 // dist/layers/raster-tile-layer.js
-var import_core13 = require("@deck.gl/core");
+var import_core14 = require("@deck.gl/core");
 
 // dist/layers/raster-layer.js
-var import_core12 = require("@deck.gl/core");
+var import_core13 = require("@deck.gl/core");
 var import_layers4 = require("@deck.gl/layers");
 
 // dist/layers/raster-layer-vertex.glsl.js
@@ -1823,7 +1833,7 @@ var RasterColumnLayer = _RasterColumnLayer;
 (() => {
   _RasterColumnLayer.layerName = "RasterColumnLayer";
 })();
-var _RasterLayer = class extends import_core12.CompositeLayer {
+var _RasterLayer = class extends import_core13.CompositeLayer {
   renderLayers() {
     const { data, getElevation, getFillColor, getLineColor, getLineWidth, tileIndex, updateTriggers } = this.props;
     if (!data || !tileIndex)
@@ -1910,7 +1920,7 @@ var defaultProps9 = {
   data: TilejsonPropType,
   tileSize: DEFAULT_TILE_SIZE
 };
-var _RasterTileLayer = class extends import_core13.CompositeLayer {
+var _RasterTileLayer = class extends import_core14.CompositeLayer {
   getLoadOptions() {
     const loadOptions = super.getLoadOptions() || {};
     const tileJSON = this.props.data;
@@ -1944,7 +1954,7 @@ var RasterTileLayer = _RasterTileLayer;
 })();
 
 // dist/layers/vector-tile-layer.js
-var import_core14 = require("@loaders.gl/core");
+var import_core15 = require("@loaders.gl/core");
 
 // dist/layers/schema/carto-properties-tile.js
 var TileReader4 = class {
@@ -1984,7 +1994,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.26" : "latest";
+var VERSION3 = true ? "9.0.28" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -2044,7 +2054,7 @@ var carto_vector_tile_loader_default = CartoVectorTileLoader;
 var import_extensions = require("@deck.gl/extensions");
 var import_geo_layers8 = require("@deck.gl/geo-layers");
 var import_layers5 = require("@deck.gl/layers");
-(0, import_core14.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
+(0, import_core15.registerLoaders)([carto_properties_tile_loader_default, carto_vector_tile_loader_default]);
 var defaultProps10 = {
   ...import_geo_layers8.MVTLayer.defaultProps,
   data: TilejsonPropType,
@@ -2352,12 +2362,12 @@ function hexToRgb(hex) {
 
 // dist/style/utils.js
 var ALLOWED_ATTR_TYPES = Object.freeze(["function", "string"]);
-function getAttrValue(attr, d) {
+function getAttrValue(attr, d, info) {
   var _a;
   assert(typeof d === "object", 'Expected "data" to be an object');
   assert(ALLOWED_ATTR_TYPES.includes(typeof attr), 'Expected "attr" to be a function or string');
   if (typeof attr === "function") {
-    return attr(d);
+    return attr(d, info);
   }
   return (_a = d == null ? void 0 : d.properties) == null ? void 0 : _a[attr];
 }
@@ -2367,8 +2377,8 @@ function colorBins({ attr, domain, colors = DEFAULT_PALETTE, nullColor = NULL_CO
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
   const palette = typeof colors === "string" ? getPalette(colors, domain.length + 1) : colors;
   const color = (0, import_d3_scale.scaleThreshold)().domain(domain).range(palette);
-  return (d) => {
-    const value = getAttrValue(attr, d);
+  return (d, info) => {
+    const value = getAttrValue(attr, d, info);
     return typeof value === "number" && Number.isFinite(value) ? color(value) : nullColor;
   };
 }
@@ -2381,8 +2391,8 @@ function colorCategories({ attr, domain, colors = DEFAULT_PALETTE, nullColor = N
   for (const [i, c] of domain.entries()) {
     colorsByCategory[c] = palette[i];
   }
-  return (d) => {
-    const value = getAttrValue(attr, d);
+  return (d, info) => {
+    const value = getAttrValue(attr, d, info);
     return typeof value === "number" && Number.isFinite(value) || typeof value === "string" ? colorsByCategory[value] || othersColor : nullColor;
   };
 }
@@ -2393,8 +2403,8 @@ function colorContinuous({ attr, domain, colors = DEFAULT_PALETTE, nullColor = N
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
   const palette = typeof colors === "string" ? getPalette(colors, domain.length) : colors;
   const color = (0, import_d3_scale2.scaleLinear)().domain(domain).range(palette);
-  return (d) => {
-    const value = getAttrValue(attr, d);
+  return (d, info) => {
+    const value = getAttrValue(attr, d, info);
     return typeof value === "number" && Number.isFinite(value) ? color(value) : nullColor;
   };
 }
@@ -2429,10 +2439,10 @@ function buildQueryUrl({ apiBaseUrl, connectionName }) {
 }
 
 // dist/api/request-with-parameters.js
-var import_core15 = require("@deck.gl/core");
+var import_core16 = require("@deck.gl/core");
 var DEFAULT_PARAMETERS = {
   v: V3_MINOR_VERSION,
-  deckglVersion: import_core15.VERSION
+  deckglVersion: import_core16.VERSION
 };
 var DEFAULT_HEADERS = {
   Accept: "application/json",
@@ -2731,7 +2741,7 @@ var vectorTilesetSource = async function(options) {
 };
 
 // dist/api/parse-map.js
-var import_core16 = require("@deck.gl/core");
+var import_core17 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
 var import_d3_array = require("d3-array");
@@ -3119,7 +3129,7 @@ function parseMap(json) {
           ...createLoadOptions(token)
         });
       } catch (e) {
-        import_core16.log.error(e.message)();
+        import_core17.log.error(e.message)();
         return void 0;
       }
     })