@deck.gl/carto 9.0.26 → 9.0.27

package/dist/layers/cluster-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAGL,cAAc,EACd,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE/C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,cAAc,EAGd,KAAK,EACL,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAEL,2BAA2B,EAI3B,iBAAiB,EACjB,iBAAiB,EAClB,2BAAwB;AAMzB,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAgBrD,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,GAAG,EAAE,IAAI,oBAAoB,CACrF,iBAAiB,CAAC,kBAAkB,CAAC,EACrC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CACnD,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,GAAG,OAAO,IAC5D,sBAAsB,CAAC,kBAAkB,CAAC,GACxC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAExE,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,kBAAkB,IAAI,IAAI,CACpD,iBAAiB,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAC,EAClE,MAAM,CACP,GAAG;IACF,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhF;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;CACrE,CAAC;AA6FF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzF,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAiB1C"}
+{"version":3,"file":"cluster-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAGL,cAAc,EACd,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE/C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,cAAc,EAGd,KAAK,EACL,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAEL,2BAA2B,EAI3B,iBAAiB,EACjB,iBAAiB,EAClB,2BAAwB;AAMzB,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAgBrD,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,GAAG,EAAE,IAAI,oBAAoB,CACrF,iBAAiB,CAAC,kBAAkB,CAAC,EACrC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CACnD,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,GAAG,OAAO,IAC5D,sBAAsB,CAAC,kBAAkB,CAAC,GACxC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAExE,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,kBAAkB,IAAI,IAAI,CACpD,iBAAiB,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAC,EAClE,MAAM,CACP,GAAG;IACF,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhF;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;CACrE,CAAC;AAoGF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzF,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,cAAc,IAAI,GAAG;IAQrB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAiB1C"}

package/dist/layers/cluster-tile-layer.js

@@ -36,23 +36,24 @@ class ClusterGeoJsonLayer extends TileLayer {
         const { clusterLevel, getPosition, getWeight } = this.props;
         const properties = extractAggregationProperties(visibleTiles[0]);
         const data = [];
+        let needsUpdate = false;
         for (const tile of visibleTiles) {
             // Calculate aggregation based on viewport zoom
             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 = !deepEqual(clusterIds, this.state.clusterIds, 1);
+        needsUpdate ||= !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,

package/dist/layers/cluster-utils.d.ts

@@ -10,21 +10,33 @@ export type ClusteredFeaturePropertiesT<FeaturePropertiesT> = FeaturePropertiesT
     id: bigint;
     count: number;
     position: [number, number];
-    stats: Record<keyof FeaturePropertiesT, {
-        min: number;
-        max: number;
-    }>;
 };
 export type ParsedQuadbinCell<FeaturePropertiesT> = {
     id: bigint;
     properties: FeaturePropertiesT;
 };
 export type ParsedQuadbinTile<FeaturePropertiesT> = ParsedQuadbinCell<FeaturePropertiesT>[];
-export declare function aggregateTile<FeaturePropertiesT>(tile: Tile2DHeader<ParsedQuadbinTile<FeaturePropertiesT>>, aggregationLevels: number, properties: AggregationProperties<FeaturePropertiesT> | undefined, getPosition: Accessor<ParsedQuadbinCell<FeaturePropertiesT>, [number, number]>, getWeight: Accessor<ParsedQuadbinCell<FeaturePropertiesT>, number>): void;
+/**
+ * Aggregates tile by specified properties, caching result in tile.userData
+ *
+ * @returns true if data was aggregated, false if cache used
+ */
+export declare function aggregateTile<FeaturePropertiesT>(tile: Tile2DHeader<ParsedQuadbinTile<FeaturePropertiesT>>, aggregationLevels: number, properties: AggregationProperties<FeaturePropertiesT> | undefined, getPosition: Accessor<ParsedQuadbinCell<FeaturePropertiesT>, [number, number]>, getWeight: Accessor<ParsedQuadbinCell<FeaturePropertiesT>, number>): boolean;
 export declare function extractAggregationProperties<FeaturePropertiesT extends {}>(tile: Tile2DHeader<ParsedQuadbinTile<FeaturePropertiesT>>): AggregationProperties<FeaturePropertiesT>;
 export declare function computeAggregationStats<FeaturePropertiesT>(data: ClusteredFeaturePropertiesT<FeaturePropertiesT>[], properties: AggregationProperties<FeaturePropertiesT>): Record<keyof FeaturePropertiesT, {
     min: number;
     max: number;
 }>;
-export declare function clustersToBinary<FeaturePropertiesT>(data: ClusteredFeaturePropertiesT<FeaturePropertiesT>[]): BinaryFeatureCollection;
+type BinaryFeatureCollectionWithStats<FeaturePropertiesT> = Omit<BinaryFeatureCollection, 'points'> & {
+    points: BinaryFeatureCollection['points'] & {
+        attributes?: {
+            stats: Record<keyof FeaturePropertiesT, {
+                min: number;
+                max: number;
+            }>;
+        };
+    };
+};
+export declare function clustersToBinary<FeaturePropertiesT>(data: ClusteredFeaturePropertiesT<FeaturePropertiesT>[]): BinaryFeatureCollectionWithStats<FeaturePropertiesT>;
+export {};
 //# sourceMappingURL=cluster-utils.d.ts.map

package/dist/layers/cluster-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-utils.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAE3D,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAC9E,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,IAAI;IACtD,WAAW,EAAE,WAAW,CAAC;IACzB,IAAI,EAAE,MAAM,kBAAkB,CAAC;CAChC,EAAE,CAAC;AACJ,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,IAAI,kBAAkB,GAAG;IACjF,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,kBAAkB,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;CACrE,CAAC;AACF,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,kBAAkB,CAAA;CAAC,CAAC;AACjG,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAE5F,wBAAgB,aAAa,CAAC,kBAAkB,EAC9C,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EACzD,iBAAiB,EAAE,MAAM,EACzB,UAAU,uDAAgD,EAC1D,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC9E,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,GACjE,IAAI,CAyDN;AAED,wBAAgB,4BAA4B,CAAC,kBAAkB,SAAS,EAAE,EACxE,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,GACxD,qBAAqB,CAAC,kBAAkB,CAAC,CAY3C;AAED,wBAAgB,uBAAuB,CAAC,kBAAkB,EACxD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,EACvD,UAAU,EAAE,qBAAqB,CAAC,kBAAkB,CAAC;SAEM,MAAM;SAAO,MAAM;GAY/E;AAWD,wBAAgB,gBAAgB,CAAC,kBAAkB,EACjD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,GACtD,uBAAuB,CA8BzB"}
+{"version":3,"file":"cluster-utils.d.ts","sourceRoot":"","sources":["../../src/layers/cluster-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAM,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAE3D,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;AAC9E,MAAM,MAAM,qBAAqB,CAAC,kBAAkB,IAAI;IACtD,WAAW,EAAE,WAAW,CAAC;IACzB,IAAI,EAAE,MAAM,kBAAkB,CAAC;CAChC,EAAE,CAAC;AACJ,MAAM,MAAM,2BAA2B,CAAC,kBAAkB,IAAI,kBAAkB,GAAG;IACjF,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,kBAAkB,CAAA;CAAC,CAAC;AACjG,MAAM,MAAM,iBAAiB,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAE5F;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,kBAAkB,EAC9C,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,EACzD,iBAAiB,EAAE,MAAM,EACzB,UAAU,uDAAgD,EAC1D,WAAW,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC9E,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,GACjE,OAAO,CAoET;AAED,wBAAgB,4BAA4B,CAAC,kBAAkB,SAAS,EAAE,EACxE,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,GACxD,qBAAqB,CAAC,kBAAkB,CAAC,CAa3C;AAED,wBAAgB,uBAAuB,CAAC,kBAAkB,EACxD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,EACvD,UAAU,EAAE,qBAAqB,CAAC,kBAAkB,CAAC;SAEM,MAAM;SAAO,MAAM;GAY/E;AAWD,KAAK,gCAAgC,CAAC,kBAAkB,IAAI,IAAI,CAC9D,uBAAuB,EACvB,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,GAAG;QAC1C,UAAU,CAAC,EAAE;YACX,KAAK,EAAE,MAAM,CAAC,MAAM,kBAAkB,EAAE;gBAAC,GAAG,EAAE,MAAM,CAAC;gBAAC,GAAG,EAAE,MAAM,CAAA;aAAC,CAAC,CAAC;SACrE,CAAC;KACH,CAAC;CACH,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,kBAAkB,EACjD,IAAI,EAAE,2BAA2B,CAAC,kBAAkB,CAAC,EAAE,GACtD,gCAAgC,CAAC,kBAAkB,CAAC,CA8BtD"}

package/dist/layers/cluster-utils.js

@@ -1,12 +1,26 @@
 import { cellToParent } from 'quadbin';
+import { log } from '@deck.gl/core';
+/**
+ * Aggregates tile by specified properties, caching result in tile.userData
+ *
+ * @returns true if data was aggregated, false if cache used
+ */
 export function aggregateTile(tile, aggregationLevels, properties = [], getPosition, getWeight) {
     if (!tile.content)
-        return;
+        return false;
     // Aggregate on demand and cache result
     if (!tile.userData)
         tile.userData = {};
-    if (tile.userData[aggregationLevels])
-        return;
+    const cell0 = tile.userData[aggregationLevels]?.[0];
+    if (cell0) {
+        // Have already aggregated this tile
+        if (properties.every(property => property.name in cell0)) {
+            // Use cached result
+            return false;
+        }
+        // Aggregated properties have changed, re-aggregate
+        tile.userData = {};
+    }
     const out = {};
     for (const cell of tile.content) {
         let id = cell.id;
@@ -56,6 +70,7 @@ export function aggregateTile(tile, aggregationLevels, properties = [], getPosit
         }
     }
     tile.userData[aggregationLevels] = Object.values(out);
+    return true;
 }
 export function extractAggregationProperties(tile) {
     const properties = [];
@@ -63,6 +78,7 @@ export function extractAggregationProperties(tile) {
     for (const name of Object.keys(tile.content[0].properties)) {
         let aggregation = name.split('_').pop().toLowerCase();
         if (!validAggregations.includes(aggregation)) {
+            log.warn(`No valid aggregation present in ${name} property`)();
             aggregation = 'any';
         }
         properties.push({ name: name, aggregation });

package/dist/layers/schema/carto-raster-tile-loader.js

@@ -1,7 +1,7 @@
 import { TileReader } from "./carto-raster-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.26" !== 'undefined' ? "9.0.26" : 'latest';
+const VERSION = typeof "9.0.27" !== 'undefined' ? "9.0.27" : 'latest';
 const id = 'cartoRasterTile';
 const DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/layers/schema/carto-spatial-tile-loader.js

@@ -2,7 +2,7 @@ import { TileReader } from "./carto-spatial-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
 import { binaryToSpatialjson } from "./spatialjson-utils.js";
-const VERSION = typeof "9.0.26" !== 'undefined' ? "9.0.26" : 'latest';
+const VERSION = typeof "9.0.27" !== 'undefined' ? "9.0.27" : 'latest';
 const id = 'cartoSpatialTile';
 const DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/layers/schema/carto-vector-tile-loader.js

@@ -2,7 +2,7 @@ import earcut from 'earcut';
 import { TileReader } from "./carto-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.26" !== 'undefined' ? "9.0.26" : 'latest';
+const VERSION = typeof "9.0.27" !== 'undefined' ? "9.0.27" : 'latest';
 const id = 'cartoVectorTile';
 const DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/style/color-bins-style.js

@@ -14,8 +14,8 @@ export default function colorBins({ attr, domain, colors = DEFAULT_PALETTE, null
     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 = 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;
     };
 }

package/dist/style/color-categories-style.js

@@ -16,8 +16,8 @@ export default function colorCategories({ attr, domain, colors = DEFAULT_PALETTE
     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;

package/dist/style/color-continuous-style.js

@@ -14,8 +14,8 @@ export default function colorContinuous({ attr, domain, colors = DEFAULT_PALETTE
     assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
     const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;
     const color = 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;
     };
 }

package/dist/style/utils.d.ts

@@ -1,4 +1,4 @@
 import { Feature } from 'geojson';
-export type AttributeSelector<DataT = Feature, OutT = any> = string | ((d: DataT) => OutT);
-export declare function getAttrValue<DataT = Feature, OutT = any>(attr: string | AttributeSelector<DataT, OutT>, d: DataT): OutT;
+export type AttributeSelector<DataT = Feature, OutT = any> = string | ((d: DataT, info: any) => OutT);
+export declare function getAttrValue<DataT = Feature, OutT = any>(attr: string | AttributeSelector<DataT, OutT>, d: DataT, info: any): OutT;
 //# sourceMappingURL=utils.d.ts.map

package/dist/style/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/style/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAKhC,MAAM,MAAM,iBAAiB,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,GAAG,GAAG,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC;AAE3F,wBAAgB,YAAY,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,GAAG,GAAG,EACtD,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,EAC7C,CAAC,EAAE,KAAK,GACP,IAAI,CASN"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/style/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAKhC,MAAM,MAAM,iBAAiB,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,GAAG,GAAG,IACrD,MAAM,GACN,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC;AAEpC,wBAAgB,YAAY,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,GAAG,GAAG,EACtD,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,EAC7C,CAAC,EAAE,KAAK,EACR,IAAI,EAAE,GAAG,GACR,IAAI,CASN"}

package/dist/style/utils.js

@@ -1,11 +1,11 @@
 import { assert } from "../utils.js";
 const ALLOWED_ATTR_TYPES = Object.freeze(['function', 'string']);
-export function getAttrValue(attr, d) {
+export function getAttrValue(attr, d, info) {
     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');
     // Is function
     if (typeof attr === 'function') {
-        return attr(d);
+        return attr(d, info);
     }
     return d?.properties?.[attr];
 }