@deck.gl/carto 9.0.17 → 9.0.18

package/dist/index.d.ts

@@ -1,18 +1,18 @@
 import { default as H3TileLayer } from "./layers/h3-tile-layer.js";
+import { default as HeatmapTileLayer } from "./layers/heatmap-tile-layer.js";
 import { default as _PointLabelLayer } from "./layers/point-label-layer.js";
 import { default as QuadbinTileLayer } from "./layers/quadbin-tile-layer.js";
-import { default as QuadbinHeatmapTileLayer } from "./layers/quadbin-heatmap-tile-layer.js";
 import { default as RasterTileLayer } from "./layers/raster-tile-layer.js";
 import { default as VectorTileLayer } from "./layers/vector-tile-layer.js";
 declare const CARTO_LAYERS: {
     H3TileLayer: typeof H3TileLayer;
+    HeatmapTileLayer: typeof HeatmapTileLayer;
     _PointLabelLayer: typeof _PointLabelLayer;
     QuadbinTileLayer: typeof QuadbinTileLayer;
-    QuadbinHeatmapTileLayer: typeof QuadbinHeatmapTileLayer;
     RasterTileLayer: typeof RasterTileLayer;
     VectorTileLayer: typeof VectorTileLayer;
 };
-export { CARTO_LAYERS, H3TileLayer, _PointLabelLayer, QuadbinTileLayer, QuadbinHeatmapTileLayer, RasterTileLayer, VectorTileLayer };
+export { CARTO_LAYERS, H3TileLayer, HeatmapTileLayer, _PointLabelLayer, QuadbinTileLayer, RasterTileLayer, VectorTileLayer };
 export { default as BASEMAP, GOOGLE_BASEMAPS as _GOOGLE_BASEMAPS, getStyleUrl as _getStyleUrl, fetchStyle as _fetchStyle, applyLayerGroupFilters as _applyLayerGroupFilters, STYLE_LAYER_GROUPS as _STYLE_LAYER_GROUPS } from "./basemap.js";
 export { default as colorBins } from "./style/color-bins-style.js";
 export { default as colorCategories } from "./style/color-categories-style.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,kCAA+B;AAC9D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,sCAAmC;AACvE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,uBAAuB,EAAC,+CAA4C;AACvF,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,QAAA,MAAM,YAAY;;;;;;;CAOjB,CAAC;AACF,OAAO,EACL,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,eAAe,EAChB,CAAC;AAEF,OAAO,EACL,OAAO,IAAI,OAAO,EAClB,eAAe,IAAI,gBAAgB,EACnC,WAAW,IAAI,YAAY,EAC3B,UAAU,IAAI,WAAW,EACzB,sBAAsB,IAAI,uBAAuB,EACjD,kBAAkB,IAAI,mBAAmB,EAC1C,qBAAkB;AACnB,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,oCAAiC;AAC9D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,uBAAoB;AAC3D,OAAO,EAAC,iBAAiB,EAAC,yBAAsB;AAChD,YAAY,EACV,eAAe,EACf,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,EACP,WAAW,EACX,eAAe,EACf,YAAY,EACZ,OAAO,IAAI,QAAQ,EACnB,eAAe,IAAI,gBAAgB,EACnC,aAAa,IAAI,cAAc,EAChC,uBAAoB;AAErB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EAChB,2BAAwB;AAEzB,QAAA,MAAM,aAAa;;;;;;;;;;;;;CAalB,CAAC;AAEF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,eAAe,EAChB,CAAC;AAEF,YAAY,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,EAC1B,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,yBAAyB,EACzB,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,0BAA0B,EAC3B,2BAAwB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,kCAA+B;AAC9D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,sCAAmC;AACvE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,uCAAoC;AACxE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,sCAAmC;AACtE,QAAA,MAAM,YAAY;;;;;;;CAOjB,CAAC;AACF,OAAO,EACL,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EAChB,CAAC;AAEF,OAAO,EACL,OAAO,IAAI,OAAO,EAClB,eAAe,IAAI,gBAAgB,EACnC,WAAW,IAAI,YAAY,EAC3B,UAAU,IAAI,WAAW,EACzB,sBAAsB,IAAI,uBAAuB,EACjD,kBAAkB,IAAI,mBAAmB,EAC1C,qBAAkB;AACnB,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,oCAAiC;AAC9D,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,OAAO,IAAI,eAAe,EAAC,0CAAuC;AAC1E,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,uBAAoB;AAC3D,OAAO,EAAC,iBAAiB,EAAC,yBAAsB;AAChD,YAAY,EACV,eAAe,EACf,eAAe,EACf,cAAc,EACd,MAAM,EACN,OAAO,EACP,WAAW,EACX,eAAe,EACf,YAAY,EACZ,OAAO,IAAI,QAAQ,EACnB,eAAe,IAAI,gBAAgB,EACnC,aAAa,IAAI,cAAc,EAChC,uBAAoB;AAErB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EAChB,2BAAwB;AAEzB,QAAA,MAAM,aAAa;;;;;;;;;;;;;CAalB,CAAC;AAEF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,eAAe,EAChB,CAAC;AAEF,YAAY,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,0BAA0B,EAC1B,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,yBAAyB,EACzB,2BAA2B,EAC3B,wBAAwB,EACxB,wBAAwB,EACxB,0BAA0B,EAC3B,2BAAwB"}

package/dist/index.js

@@ -1,18 +1,18 @@
 import { default as H3TileLayer } from "./layers/h3-tile-layer.js";
+import { default as HeatmapTileLayer } from "./layers/heatmap-tile-layer.js";
 import { default as _PointLabelLayer } from "./layers/point-label-layer.js";
 import { default as QuadbinTileLayer } from "./layers/quadbin-tile-layer.js";
-import { default as QuadbinHeatmapTileLayer } from "./layers/quadbin-heatmap-tile-layer.js";
 import { default as RasterTileLayer } from "./layers/raster-tile-layer.js";
 import { default as VectorTileLayer } from "./layers/vector-tile-layer.js";
 const CARTO_LAYERS = {
     H3TileLayer,
+    HeatmapTileLayer,
     _PointLabelLayer,
     QuadbinTileLayer,
-    QuadbinHeatmapTileLayer,
     RasterTileLayer,
     VectorTileLayer
 };
-export { CARTO_LAYERS, H3TileLayer, _PointLabelLayer, QuadbinTileLayer, QuadbinHeatmapTileLayer, RasterTileLayer, VectorTileLayer };
+export { CARTO_LAYERS, H3TileLayer, HeatmapTileLayer, _PointLabelLayer, QuadbinTileLayer, RasterTileLayer, VectorTileLayer };
 export { default as BASEMAP, GOOGLE_BASEMAPS as _GOOGLE_BASEMAPS, getStyleUrl as _getStyleUrl, fetchStyle as _fetchStyle, applyLayerGroupFilters as _applyLayerGroupFilters, STYLE_LAYER_GROUPS as _STYLE_LAYER_GROUPS } from "./basemap.js";
 export { default as colorBins } from "./style/color-bins-style.js";
 export { default as colorCategories } from "./style/color-categories-style.js";

package/dist/layers/heatmap-tile-layer.d.ts

@@ -0,0 +1,36 @@
+import { Accessor, CompositeLayer, CompositeLayerProps, DefaultProps, Layer } from '@deck.gl/core';
+import { HeatmapProps } from "./heatmap.js";
+import { QuadbinTileLayerProps } from "./quadbin-tile-layer.js";
+import { TilejsonResult } from "../sources.js";
+import { _Tile2DHeader as Tile2DHeader } from '@deck.gl/geo-layers';
+/** All properties supported by HeatmapTileLayer. */
+export type HeatmapTileLayerProps<DataT = unknown> = _HeatmapTileLayerProps<DataT> & CompositeLayerProps & {
+    data: null | TilejsonResult | Promise<TilejsonResult>;
+};
+/** Properties added by HeatmapTileLayer. */
+type _HeatmapTileLayerProps<DataT> = QuadbinTileLayerProps<DataT> & HeatmapProps & {
+    /**
+     * The weight of each object.
+     *
+     * @default 1
+     */
+    getWeight?: Accessor<DataT, number>;
+    /** Called when maximum density in displayed tiles changes. */
+    onMaxDensityChange?: ((maxDensity: number) => void) | null;
+};
+declare class HeatmapTileLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<ExtraProps & Required<_HeatmapTileLayerProps<DataT>>> {
+    static layerName: string;
+    static defaultProps: DefaultProps<HeatmapTileLayerProps<unknown>>;
+    state: {
+        isLoaded: boolean;
+        tiles: Set<Tile2DHeader>;
+        viewportChanged?: boolean;
+    };
+    initializeState(): void;
+    shouldUpdateState({ changeFlags }: {
+        changeFlags: any;
+    }): boolean;
+    renderLayers(): Layer;
+}
+export default HeatmapTileLayer;
+//# sourceMappingURL=heatmap-tile-layer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"heatmap-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap-tile-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AAGjG,OAAO,EAAC,YAAY,EAAU,qBAAkB;AAEhD,OAAyB,EAAC,qBAAqB,EAAC,gCAA6B;AAE7E,OAAO,EAAC,cAAc,EAAC,sBAAmB;AAC1C,OAAO,EAAC,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAkElE,oDAAoD;AACpD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,OAAO,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAChF,mBAAmB,GAAG;IACpB,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAEJ,4CAA4C;AAC5C,KAAK,sBAAsB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAC/D,YAAY,GAAG;IACb;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpC,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5D,CAAC;AAEJ,cAAM,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACrD;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,+CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,OAAO,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,eAAe;IAQf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA,GAAG,OAAO;IAMzC,YAAY,IAAI,KAAK;CAgHtB;AAED,eAAe,gBAAgB,CAAC"}

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

@@ -0,0 +1,165 @@
+import { getResolution } from 'quadbin';
+import { CompositeLayer } from '@deck.gl/core';
+import { SolidPolygonLayer } from '@deck.gl/layers';
+import { heatmap } from "./heatmap.js";
+import { RTTModifier, PostProcessModifier } from "./post-process-utils.js";
+import QuadbinTileLayer from "./quadbin-tile-layer.js";
+import { TilejsonPropType } from "./utils.js";
+/**
+ * Computes the unit density (inverse of cell area)
+ */
+function unitDensityForCell(cell) {
+    const cellResolution = Number(getResolution(cell));
+    return Math.pow(4.0, cellResolution);
+}
+// Modified polygon layer to draw offscreen and output value expected by heatmap
+class RTTSolidPolygonLayer extends RTTModifier(SolidPolygonLayer) {
+    static { this.layerName = 'RTTSolidPolygonLayer'; }
+    getShaders(type) {
+        const shaders = super.getShaders(type);
+        shaders.inject = {
+            'vs:#decl': `
+uniform float densityFactor;
+`,
+            'vs:#main-end': `
+      // Value from getWeight accessor
+  float weight = elevations;
+
+  // Keep "power" delivered to screen constant when tiles update
+  // by outputting normalized density 
+  weight *= densityFactor;
+
+  // Pack float into 3 channels to pass to heatmap shader
+  // SCALE value important, as we don't want to saturate
+  // but also want enough definition to avoid banding
+  const vec3 SHIFT = vec3(1.0, 256.0, 256.0 * 256.0);
+  const float MAX_VAL = SHIFT.z * 255.0;
+  const float SCALE = MAX_VAL / 8.0;
+  weight *= SCALE;
+  weight = clamp(weight, 0.0, MAX_VAL);
+  vColor = vec4(mod(vec3(weight, floor(weight / SHIFT.yz)), 256.0), 255.0) / 255.0;
+`
+        };
+        return shaders;
+    }
+    draw(opts) {
+        const cell = this.props.data[0];
+        const maxDensity = this.props.elevationScale;
+        const densityFactor = unitDensityForCell(cell.id) / maxDensity;
+        for (const model of this.state.models) {
+            model.setUniforms({ densityFactor });
+        }
+        super.draw(opts);
+    }
+}
+// Modify QuadbinTileLayer to apply heatmap post process effect
+const PostProcessQuadbinTileLayer = PostProcessModifier(QuadbinTileLayer, heatmap);
+const defaultProps = {
+    data: TilejsonPropType,
+    getWeight: { type: 'accessor', value: 1 },
+    onMaxDensityChange: { type: 'function', optional: true, value: null },
+    colorDomain: { type: 'array', value: [0, 1] },
+    intensity: { type: 'number', value: 1 },
+    radiusPixels: { type: 'number', min: 0, max: 100, value: 20 }
+};
+class HeatmapTileLayer extends CompositeLayer {
+    static { this.layerName = 'HeatmapTileLayer'; }
+    static { this.defaultProps = defaultProps; }
+    initializeState() {
+        this.state = {
+            isLoaded: false,
+            tiles: new Set(),
+            viewportChanged: false
+        };
+    }
+    shouldUpdateState({ changeFlags }) {
+        const { viewportChanged } = changeFlags;
+        this.setState({ viewportChanged });
+        return changeFlags.somethingChanged;
+    }
+    renderLayers() {
+        const { data, getWeight, colorDomain, colorRange, intensity, radiusPixels, _subLayerProps, updateTriggers, onMaxDensityChange, onViewportLoad, onTileLoad, onTileUnload, ...tileLayerProps } = this.props;
+        // Inject modified polygon layer as sublayer into TileLayer
+        const subLayerProps = {
+            ..._subLayerProps,
+            cell: {
+                ..._subLayerProps?.cell,
+                _subLayerProps: {
+                    ..._subLayerProps?.cell?._subLayerProps,
+                    fill: {
+                        ..._subLayerProps?.cell?._subLayerProps?.fill,
+                        type: RTTSolidPolygonLayer
+                    }
+                }
+            }
+        };
+        let tileZ = 0;
+        let maxDensity = 0;
+        const tiles = [...this.state.tiles].filter(t => t.isVisible && t.data);
+        for (const tile of tiles) {
+            const cell = tile.data[0];
+            const unitDensity = unitDensityForCell(cell.id);
+            maxDensity = Math.max(tile.userData.maxWeight * unitDensity, maxDensity);
+            tileZ = Math.max(tile.zoom, tileZ);
+        }
+        // Between zoom levels the max density will change, but it isn't possible to know by what factor. Uniform data distributions lead to a factor of 4, while very localized data gives 1. As a heurstic estimate with a value inbetween (2) to make the transitions less obvious.
+        const overzoom = this.context.viewport.zoom - tileZ;
+        const estimatedMaxDensity = maxDensity * Math.pow(2, overzoom);
+        maxDensity = estimatedMaxDensity;
+        if (typeof onMaxDensityChange === 'function') {
+            onMaxDensityChange(maxDensity);
+        }
+        return new PostProcessQuadbinTileLayer(tileLayerProps, this.getSubLayerProps({
+            id: 'heatmap',
+            data,
+            // Re-use existing props to pass down values to sublayer
+            // TODO replace with custom layer
+            getFillColor: 0,
+            getElevation: getWeight,
+            elevationScale: maxDensity,
+            colorDomain,
+            colorRange,
+            radiusPixels,
+            intensity,
+            _subLayerProps: subLayerProps,
+            refinementStrategy: 'no-overlap',
+            // Disable line rendering
+            extruded: false,
+            stroked: false,
+            updateTriggers: {
+                getElevation: updateTriggers.getWeight
+            },
+            // Tile stats
+            onViewportLoad: tiles => {
+                this.setState({ isLoaded: true });
+                if (typeof onViewportLoad === 'function') {
+                    onViewportLoad(tiles);
+                }
+            },
+            onTileLoad: (tile) => {
+                let maxWeight = -Infinity;
+                if (typeof getWeight !== 'function') {
+                    maxWeight = getWeight;
+                }
+                else if (tile.content) {
+                    for (const d of tile.content) {
+                        maxWeight = Math.max(getWeight(d, {}), maxWeight);
+                    }
+                }
+                tile.userData = { maxWeight };
+                this.state.tiles.add(tile);
+                if (typeof onTileLoad === 'function') {
+                    onTileLoad(tile);
+                }
+            },
+            onTileUnload: (tile) => {
+                this.state.tiles.delete(tile);
+                if (typeof onTileUnload === 'function') {
+                    onTileUnload(tile);
+                }
+            },
+            transitions: { elevationScale: { type: 'spring', stiffness: 0.3, damping: 0.5 } }
+        }));
+    }
+}
+export default HeatmapTileLayer;

package/dist/layers/heatmap.d.ts

@@ -19,6 +19,10 @@ export type HeatmapProps = {
      * @default `6-class YlOrRd` - [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6)
      */
     colorRange: Color[];
+    /**
+     * Value that is multiplied with the total weight at a pixel to obtain the final weight. A value larger than 1 biases the output color towards the higher end of the spectrum, and a value less than 1 biases the output color towards the lower end of the spectrum.
+     */
+    intensity?: number;
     opacity: number;
 };
 export type HeatmapUniforms = {
@@ -31,6 +35,7 @@ export type HeatmapUniforms = {
     color4?: [number, number, number];
     color5?: [number, number, number];
     color6?: [number, number, number];
+    intensity: number;
     opacity?: number;
 };
 export declare const heatmap: ShaderPass<HeatmapProps, HeatmapUniforms>;

package/dist/layers/heatmap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heatmap.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAuHpC,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,eAAe,CAsD7D,CAAC"}
+{"version":3,"file":"heatmap.d.ts","sourceRoot":"","sources":["../../src/layers/heatmap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AA6HpC,MAAM,MAAM,YAAY,GAAG;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,UAAU,CAAC,YAAY,EAAE,eAAe,CAyD7D,CAAC"}

package/dist/layers/heatmap.js

@@ -1,4 +1,3 @@
-import { random } from '@luma.gl/shadertools';
 const glsl = (s) => `${s}`;
 /**
  * @filter       Heatmap
@@ -17,9 +16,9 @@ vec3 color3;
 vec3 color4;
 vec3 color5;
 vec3 color6;
+float intensity;
 float opacity;
 } heatmap;
-const float SUPPORT = 8.0;
 const vec4 STOPS = vec4(0.2, 0.4, 0.6, 0.8);
 vec3 colorGradient(float value) {
 vec3 c1;
@@ -37,17 +36,16 @@ c1 = heatmap.color3; c2 = heatmap.color4;
 } else if (value < STOPS.w) {
 range = STOPS.zw;
 c1 = heatmap.color4; c2 = heatmap.color5;
-} else if (value < 1.0 ) {
+} else {
 range = vec2(STOPS.w, 1.0);
 c1 = heatmap.color5; c2 = heatmap.color6;
-} else {
-range = vec2(1.0, 10.0);
-c1 = heatmap.color6; c2 = vec3(255.0);
 }
-float f = (value - range.x) / (range.y - range.x);
+float f = (clamp(value, 0.0, 1.0) - range.x) / (range.y - range.x);
 return mix(c1, c2, f) / 255.0;
 }
 const vec3 SHIFT = vec3(1.0, 256.0, 256.0 * 256.0);
+const float MAX_VAL = SHIFT.z * 255.0;
+const float SCALE = MAX_VAL / 8.0;
 vec4 pack(float value) {
 return vec4(mod(vec3(value, floor(value / SHIFT.yz)), 256.0), 255.0) / 255.0;
 }
@@ -57,12 +55,12 @@ return 255.0 * dot(color, SHIFT);
 vec4 heatmap_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 bool firstPass = (heatmap.delta.y < 0.5);
 float accumulator = 0.0;
-float offset = 0.5 * random(vec3(12.9898, 78.233, 151.7182), 0.0);
-const float sigma = SUPPORT / 3.0;
-const float a = -0.5 / (sigma * sigma);
-const float w0 = 0.3989422804014327 / sigma;
+float SUPPORT = clamp(heatmap.radiusPixels / 2.0, 8.0, 32.0);
+float sigma = SUPPORT / 3.0;
+float a = -0.5 / (sigma * sigma);
+float w0 = 0.3989422804014327 / sigma;
 for (float t = -SUPPORT; t <= SUPPORT; t++) {
-vec2 percent = (t * heatmap.delta + offset - 0.5) / SUPPORT;
+vec2 percent = (t * heatmap.delta - 0.5) / SUPPORT;
 vec2 delta = percent * heatmap.radiusPixels / texSize;
 vec4 offsetColor = texture(source, texCoord + delta);
 float value = unpack(offsetColor.rgb);
@@ -72,7 +70,9 @@ accumulator += value * weight;
 if (firstPass) {
 return pack(accumulator);
 }
-float f = (accumulator - heatmap.colorDomain[0]) / (heatmap.colorDomain[1] - heatmap.colorDomain[0]);
+float density = 10.0 * heatmap.intensity * accumulator / SCALE;
+vec2 domain = heatmap.colorDomain;
+float f = (density - domain[0]) / (domain[1] - domain[0]);
 vec4 color = vec4(0.0);
 color.rgb = colorGradient(f);
 color.a = smoothstep(0.0, 0.1, f);
@@ -101,6 +101,7 @@ export const heatmap = {
         color4: { value: [0, 0, 0] },
         color5: { value: [0, 0, 0] },
         color6: { value: [0, 0, 0] },
+        intensity: { value: 1, min: 0.1, max: 10 },
         opacity: { value: 1, min: 0, max: 1 }
     },
     uniformTypes: {
@@ -113,10 +114,11 @@ export const heatmap = {
         color4: 'vec3<f32>',
         color5: 'vec3<f32>',
         color6: 'vec3<f32>',
+        intensity: 'f32',
         opacity: 'f32'
     },
     getUniforms: opts => {
-        const { delta = [1, 0], colorRange = defaultColorRange, radiusPixels = 20, colorDomain = [0, 1], opacity = 1 } = opts;
+        const { delta = [1, 0], colorRange = defaultColorRange, radiusPixels = 20, colorDomain = [0, 1], intensity = 1, opacity = 1 } = opts;
         const [color1, color2, color3, color4, color5, color6] = colorRange;
         return {
             delta,
@@ -128,10 +130,10 @@ export const heatmap = {
             color6,
             radiusPixels,
             colorDomain,
+            intensity,
             opacity
         };
     },
-    dependencies: [random],
     fs,
     passes: [
         { sampler: true, uniforms: { delta: [1, 0] } },

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.17" !== 'undefined' ? "9.0.17" : 'latest';
+const VERSION = typeof "9.0.18" !== 'undefined' ? "9.0.18" : '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.17" !== 'undefined' ? "9.0.17" : 'latest';
+const VERSION = typeof "9.0.18" !== 'undefined' ? "9.0.18" : '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.17" !== 'undefined' ? "9.0.17" : 'latest';
+const VERSION = typeof "9.0.18" !== 'undefined' ? "9.0.18" : 'latest';
 const id = 'cartoVectorTile';
 const DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/layers/vector-tile-layer.d.ts

@@ -25,7 +25,7 @@ export default class VectorTileLayer<FeaturePropertiesT = any, ExtraProps extend
         _offset: number;
         tile: _Tile2DHeader;
     }): GeoJsonLayer | null;
-    getPickingInfo(params: any): import("@deck.gl/geo-layers").MVTLayerPickingInfo<FeaturePropertiesT>;
+    protected _isWGS84(): boolean;
 }
 export {};
 //# sourceMappingURL=vector-tile-layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAWrD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,kBAAkB,GAAG,OAAO,IAAI,qBAAqB,GACpF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;AAElD,2CAA2C;AAC3C,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC;IAClF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,QAAQ,CAAC,OAAO,CAAC,GAAG;QAC1B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;gBAEU,GAAG,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,EAAE;IAMtE,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,UAAU,KAAA;IAWtB,cAAc,IAAI,GAAG;IASf,WAAW,CAAC,IAAI,EAAE,aAAa;IAqCrC,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAuBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}
+{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAWrD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,kBAAkB,GAAG,OAAO,IAAI,qBAAqB,GACpF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;AAElD,2CAA2C;AAC3C,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC;IAClF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,QAAQ,CAAC,OAAO,CAAC,GAAG;QAC1B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;gBAEU,GAAG,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,EAAE;IAMtE,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,UAAU,KAAA;IAWtB,cAAc,IAAI,GAAG;IASf,WAAW,CAAC,IAAI,EAAE,aAAa;IAqCrC,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;cAuBH,QAAQ,IAAI,OAAO;CAKvC"}

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

@@ -5,7 +5,6 @@ registerLoaders([CartoPropertiesTileLoader, CartoVectorTileLoader]);
 import { ClipExtension } from '@deck.gl/extensions';
 import { MVTLayer, _getURLFromTemplate } from '@deck.gl/geo-layers';
 import { GeoJsonLayer } from '@deck.gl/layers';
-import { binaryToGeojson } from '@loaders.gl/gis';
 import { TilejsonPropType, injectAccessToken, mergeBoundaryData } from "./utils.js";
 import { DEFAULT_TILE_SIZE } from "../constants.js";
 const defaultProps = {
@@ -93,14 +92,10 @@ export default class VectorTileLayer extends MVTLayer {
         const subLayer = new GeoJsonLayer(subLayerProps);
         return subLayer;
     }
-    getPickingInfo(params) {
-        const info = super.getPickingInfo(params);
-        if (this.state.binary && info.index !== -1) {
-            const { data } = params.sourceLayer.props;
-            info.object = binaryToGeojson(data, {
-                globalFeatureId: info.index
-            });
-        }
-        return info;
+    _isWGS84() {
+        // CARTO binary tile coordinates are [lng, lat], not tile-relative like MVT.
+        if (this.state.mvt)
+            return super._isWGS84();
+        return true;
     }
 }