@deck.gl/carto 9.0.26 → 9.0.28

package/dist/cartoRasterTile-worker.js

@@ -1008,7 +1008,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.26" : "latest";
+  var VERSION = true ? "9.0.28" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1397,7 +1397,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.26" : "latest";
+  var VERSION = true ? "9.0.28" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1625,7 +1625,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.26" : "latest";
+  var VERSION = true ? "9.0.28" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -7028,7 +7028,7 @@ var __exports__ = (() => {
   // src/layers/cluster-tile-layer.ts
   var import_layers = __toESM(require_layers(), 1);
   var import_geo_layers2 = __toESM(require_geo_layers(), 1);
-  var import_core4 = __toESM(require_core(), 1);
+  var import_core5 = __toESM(require_core(), 1);
 
   // ../../node_modules/@loaders.gl/gis/dist/lib/binary-features/binary-to-geojson.js
   function binaryToGeojson(data, options) {
@@ -7193,7 +7193,7 @@ var __exports__ = (() => {
   }
 
   // src/layers/cluster-tile-layer.ts
-  var import_core5 = __toESM(require_core2(), 1);
+  var import_core6 = __toESM(require_core2(), 1);
 
   // ../../node_modules/quadbin/dist/esm/index.js
   var import_tile_cover = __toESM(require_tile_cover(), 1);
@@ -7258,13 +7258,19 @@ var __exports__ = (() => {
   }
 
   // src/layers/cluster-utils.ts
+  var import_core = __toESM(require_core2(), 1);
   function aggregateTile(tile, aggregationLevels, properties = [], getPosition, getWeight) {
     if (!tile.content)
-      return;
+      return false;
     if (!tile.userData)
       tile.userData = {};
-    if (tile.userData[aggregationLevels])
-      return;
+    const cell0 = tile.userData[aggregationLevels]?.[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;
@@ -7304,6 +7310,7 @@ var __exports__ = (() => {
       }
     }
     tile.userData[aggregationLevels] = Object.values(out);
+    return true;
   }
   function extractAggregationProperties(tile) {
     const properties = [];
@@ -7311,6 +7318,7 @@ var __exports__ = (() => {
     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 });
@@ -7685,9 +7693,9 @@ var __exports__ = (() => {
   }
 
   // src/utils.ts
-  var import_core = __toESM(require_core2(), 1);
+  var import_core2 = __toESM(require_core2(), 1);
   function assert2(condition, message) {
-    import_core.log.assert(condition, message);
+    import_core2.log.assert(condition, message);
   }
   function createBinaryProxy(data, index2) {
     const { properties, numericProps } = data;
@@ -7785,8 +7793,8 @@ var __exports__ = (() => {
   var carto_spatial_tile_loader_default = CartoSpatialTileLoader;
 
   // src/layers/utils.ts
-  var import_core2 = __toESM(require_core2(), 1);
   var import_core3 = __toESM(require_core2(), 1);
+  var import_core4 = __toESM(require_core2(), 1);
   function injectAccessToken(loadOptions, accessToken) {
     if (!loadOptions?.fetch?.headers?.Authorization) {
       loadOptions.fetch = {
@@ -7799,7 +7807,7 @@ var __exports__ = (() => {
     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;
       }
@@ -7844,13 +7852,13 @@ var __exports__ = (() => {
     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
   };
 
   // src/layers/cluster-tile-layer.ts
-  (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 },
@@ -7875,22 +7883,29 @@ var __exports__ = (() => {
       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?.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,
@@ -7899,7 +7914,7 @@ var __exports__ = (() => {
         dataComparator: (data2, oldData) => {
           const newIds = data2?.points?.properties?.map((tile) => tile.id);
           const oldIds = oldData?.points?.properties?.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));
@@ -7925,7 +7940,7 @@ var __exports__ = (() => {
   };
   ClusterGeoJsonLayer.layerName = "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;
@@ -7953,7 +7968,7 @@ var __exports__ = (() => {
   ClusterTileLayer.defaultProps = defaultProps;
 
   // src/layers/h3-tile-layer.ts
-  var import_core7 = __toESM(require_core2(), 1);
+  var import_core8 = __toESM(require_core2(), 1);
   var import_geo_layers5 = __toESM(require_geo_layers(), 1);
 
   // src/layers/h3-tileset-2d.ts
@@ -8058,7 +8073,7 @@ var __exports__ = (() => {
   };
 
   // src/layers/spatial-index-tile-layer.ts
-  var import_core6 = __toESM(require_core(), 1);
+  var import_core7 = __toESM(require_core(), 1);
 
   // src/layers/schema/carto-raster-tile.ts
   var ARRAY_TYPES = {
@@ -8140,7 +8155,7 @@ var __exports__ = (() => {
 
   // src/layers/spatial-index-tile-layer.ts
   var import_geo_layers4 = __toESM(require_geo_layers(), 1);
-  (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 !== "";
   }
@@ -8213,7 +8228,7 @@ var __exports__ = (() => {
     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();
     }
@@ -8259,7 +8274,7 @@ var __exports__ = (() => {
   H3TileLayer.defaultProps = defaultProps3;
 
   // src/layers/heatmap-tile-layer.ts
-  var import_core10 = __toESM(require_core2(), 1);
+  var import_core11 = __toESM(require_core2(), 1);
   var import_layers2 = __toESM(require_layers(), 1);
 
   // src/layers/heatmap.ts
@@ -8437,7 +8452,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
   };
 
   // src/layers/post-process-utils.ts
-  var import_core8 = __toESM(require_core2(), 1);
+  var import_core9 = __toESM(require_core2(), 1);
   var TEXTURE_PROPS = {
     format: "rgba8unorm",
     mipmaps: false,
@@ -8454,7 +8469,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     }
     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}`;
     }
@@ -8486,7 +8501,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       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) {
@@ -8551,7 +8566,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
   }
 
   // src/layers/quadbin-tile-layer.ts
-  var import_core9 = __toESM(require_core2(), 1);
+  var import_core10 = __toESM(require_core2(), 1);
 
   // src/layers/quadbin-layer.ts
   var import_geo_layers6 = __toESM(require_geo_layers(), 1);
@@ -8588,7 +8603,7 @@ vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     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;
@@ -8669,7 +8684,7 @@ uniform float densityFactor;
     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,
@@ -8782,7 +8797,7 @@ uniform float densityFactor;
   var heatmap_tile_layer_default = HeatmapTileLayer;
 
   // src/layers/point-label-layer.ts
-  var import_core11 = __toESM(require_core2(), 1);
+  var import_core12 = __toESM(require_core2(), 1);
   var import_layers3 = __toESM(require_layers(), 1);
   var [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
   var EnhancedTextBackgroundLayer = class extends import_layers3._TextBackgroundLayer {
@@ -8813,7 +8828,7 @@ uniform float densityFactor;
     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,
@@ -8952,10 +8967,10 @@ uniform float densityFactor;
   PointLabelLayer.defaultProps = defaultProps7;
 
   // src/layers/raster-tile-layer.ts
-  var import_core13 = __toESM(require_core2(), 1);
+  var import_core14 = __toESM(require_core2(), 1);
 
   // src/layers/raster-layer.ts
-  var import_core12 = __toESM(require_core2(), 1);
+  var import_core13 = __toESM(require_core2(), 1);
   var import_layers4 = __toESM(require_layers(), 1);
 
   // src/layers/raster-layer-vertex.glsl.ts
@@ -9102,7 +9117,7 @@ void main(void) {
     }
   };
   RasterColumnLayer.layerName = "RasterColumnLayer";
-  var RasterLayer = class extends import_core12.CompositeLayer {
+  var RasterLayer = class extends import_core13.CompositeLayer {
     renderLayers() {
       const {
         data,
@@ -9195,7 +9210,7 @@ void main(void) {
     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;
@@ -9224,7 +9239,7 @@ void main(void) {
   RasterTileLayer.defaultProps = defaultProps9;
 
   // src/layers/vector-tile-layer.ts
-  var import_core14 = __toESM(require_core(), 1);
+  var import_core15 = __toESM(require_core(), 1);
 
   // src/layers/schema/carto-properties-tile.ts
   var TileReader4 = class {
@@ -9328,7 +9343,7 @@ void main(void) {
   var import_extensions = __toESM(require_extensions(), 1);
   var import_geo_layers8 = __toESM(require_geo_layers(), 1);
   var import_layers5 = __toESM(require_layers(), 1);
-  (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,
@@ -11329,9 +11344,9 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     };
     return scale;
   }
-  function log4() {
+  function log5() {
     const scale = loggish(transformer()).domain([1, 10]);
-    scale.copy = () => copy(scale, log4()).base(scale.base());
+    scale.copy = () => copy(scale, log5()).base(scale.base());
     initRange.apply(scale, arguments);
     return scale;
   }
@@ -12921,11 +12936,11 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
 
   // src/style/utils.ts
   var ALLOWED_ATTR_TYPES = Object.freeze(["function", "string"]);
-  function getAttrValue(attr, d) {
+  function getAttrValue(attr, d, info) {
     assert2(typeof d === "object", 'Expected "data" to be an object');
     assert2(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 d?.properties?.[attr];
   }
@@ -12940,8 +12955,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     assert2(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
     const palette = typeof colors === "string" ? getPalette(colors, domain.length + 1) : colors;
     const color2 = threshold().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) ? color2(value) : nullColor;
     };
   }
@@ -12960,8 +12975,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     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;
     };
   }
@@ -12976,8 +12991,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     assert2(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
     const palette = typeof colors === "string" ? getPalette(colors, domain.length) : colors;
     const color2 = linear2().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) ? color2(value) : nullColor;
     };
   }
@@ -13028,10 +13043,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
 
   // src/api/request-with-parameters.ts
-  var import_core15 = __toESM(require_core2(), 1);
+  var import_core16 = __toESM(require_core2(), 1);
   var DEFAULT_PARAMETERS = {
     v: V3_MINOR_VERSION,
-    deckglVersion: import_core15.VERSION
+    deckglVersion: import_core16.VERSION
   };
   var DEFAULT_HEADERS = {
     Accept: "application/json",
@@ -13374,7 +13389,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   };
 
   // src/api/parse-map.ts
-  var import_core16 = __toESM(require_core2(), 1);
+  var import_core17 = __toESM(require_core2(), 1);
 
   // src/api/layer-map.ts
   var import_moment_timezone = __toESM(require_moment_timezone2(), 1);
@@ -13384,7 +13399,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var SCALE_FUNCS = {
     linear: linear2,
     ordinal,
-    log: log4,
+    log: log5,
     point,
     quantile: quantile2,
     quantize,
@@ -13761,7 +13776,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
             ...createLoadOptions(token)
           });
         } catch (e) {
-          import_core16.log.error(e.message)();
+          import_core17.log.error(e.message)();
           return void 0;
         }
       })