@deck.gl/aggregation-layers 9.0.40 → 9.1.0-beta.3

package/dist/hexagon-layer/hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"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"}

package/dist/hexagon-layer/hexagon-layer.js

@@ -1,174 +1,359 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-import { log } from '@deck.gl/core';
-import { ColumnLayer } from '@deck.gl/layers';
-import { defaultColorRange } from "../utils/color-utils.js";
-import { pointToHexbin } from "./hexagon-aggregator.js";
-import CPUAggregator from "../utils/cpu-aggregator.js";
-import AggregationLayer from "../aggregation-layer.js";
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { log, createIterable, project32, Viewport } from '@deck.gl/core';
+import { WebGLAggregator, CPUAggregator } from "../common/aggregator/index.js";
+import AggregationLayer from "../common/aggregation-layer.js";
+import { defaultColorRange } from "../common/utils/color-utils.js";
+import { AttributeWithScale } from "../common/utils/scale-utils.js";
+import { getBinIdRange } from "../common/utils/bounds-utils.js";
+import HexagonCellLayer from "./hexagon-cell-layer.js";
+import { pointToHexbin, HexbinVertices, getHexbinCentroid, pointToHexbinGLSL } from "./hexbin.js";
+import { binOptionsUniforms } from "./bin-options-uniforms.js";
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-function nop() { }
+function noop() { }
 const defaultProps = {
+    gpuAggregation: true,
     // color
     colorDomain: null,
     colorRange: defaultColorRange,
-    getColorValue: { type: 'accessor', value: null }, // default value is calcuated from `getColorWeight` and `colorAggregation`
+    getColorValue: { type: 'accessor', value: null }, // default value is calculated from `getColorWeight` and `colorAggregation`
     getColorWeight: { type: 'accessor', value: 1 },
     colorAggregation: 'SUM',
-    lowerPercentile: { type: 'number', value: 0, min: 0, max: 100 },
-    upperPercentile: { type: 'number', value: 100, min: 0, max: 100 },
+    lowerPercentile: { type: 'number', min: 0, max: 100, value: 0 },
+    upperPercentile: { type: 'number', min: 0, max: 100, value: 100 },
     colorScaleType: 'quantize',
-    onSetColorDomain: nop,
+    onSetColorDomain: noop,
     // elevation
     elevationDomain: null,
     elevationRange: [0, 1000],
-    getElevationValue: { type: 'accessor', value: null }, // default value is calcuated from `getElevationWeight` and `elevationAggregation`
+    getElevationValue: { type: 'accessor', value: null }, // default value is calculated from `getElevationWeight` and `elevationAggregation`
     getElevationWeight: { type: 'accessor', value: 1 },
     elevationAggregation: 'SUM',
-    elevationLowerPercentile: { type: 'number', value: 0, min: 0, max: 100 },
-    elevationUpperPercentile: { type: 'number', value: 100, min: 0, max: 100 },
     elevationScale: { type: 'number', min: 0, value: 1 },
+    elevationLowerPercentile: { type: 'number', min: 0, max: 100, value: 0 },
+    elevationUpperPercentile: { type: 'number', min: 0, max: 100, value: 100 },
     elevationScaleType: 'linear',
-    onSetElevationDomain: nop,
-    radius: { type: 'number', value: 1000, min: 1 },
+    onSetElevationDomain: noop,
+    // hexbin
+    radius: { type: 'number', min: 1, value: 1000 },
     coverage: { type: 'number', min: 0, max: 1, value: 1 },
-    extruded: false,
-    hexagonAggregator: pointToHexbin,
     getPosition: { type: 'accessor', value: (x) => x.position },
+    hexagonAggregator: { type: 'function', optional: true, value: null },
+    extruded: false,
     // Optional material for 'lighting' shader module
-    material: true,
-    // data filter
-    _filterData: { type: 'function', value: null, optional: true }
+    material: true
 };
-/** Aggregates data into a hexagon-based heatmap. The color and height of a hexagon are determined based on the objects it contains. */
+/** Aggregate data into a grid-based heatmap. The color and height of a cell are determined based on the objects it contains. */
 class HexagonLayer extends AggregationLayer {
-    initializeState() {
-        const cpuAggregator = new CPUAggregator({
-            getAggregator: props => props.hexagonAggregator,
-            getCellSize: props => props.radius
+    getAggregatorType() {
+        const { gpuAggregation, hexagonAggregator, getColorValue, getElevationValue } = this.props;
+        if (gpuAggregation && (hexagonAggregator || getColorValue || getElevationValue)) {
+            // If these features are desired by the app, the user should explicitly use CPU aggregation
+            log.warn('Features not supported by GPU aggregation, falling back to CPU')();
+            return 'cpu';
+        }
+        if (
+        // GPU aggregation is requested
+        gpuAggregation &&
+            // GPU aggregation is supported by the device
+            WebGLAggregator.isSupported(this.context.device)) {
+            return 'gpu';
+        }
+        return 'cpu';
+    }
+    createAggregator(type) {
+        if (type === 'cpu') {
+            const { hexagonAggregator, radius } = this.props;
+            return new CPUAggregator({
+                dimensions: 2,
+                getBin: {
+                    sources: ['positions'],
+                    getValue: ({ positions }, index, opts) => {
+                        if (hexagonAggregator) {
+                            return hexagonAggregator(positions, radius);
+                        }
+                        const viewport = this.state.aggregatorViewport;
+                        // project to common space
+                        const p = viewport.projectPosition(positions);
+                        const { radiusCommon, hexOriginCommon } = opts;
+                        return pointToHexbin([p[0] - hexOriginCommon[0], p[1] - hexOriginCommon[1]], radiusCommon);
+                    }
+                },
+                getValue: [
+                    { sources: ['colorWeights'], getValue: ({ colorWeights }) => colorWeights },
+                    { sources: ['elevationWeights'], getValue: ({ elevationWeights }) => elevationWeights }
+                ]
+            });
+        }
+        return new WebGLAggregator(this.context.device, {
+            dimensions: 2,
+            channelCount: 2,
+            bufferLayout: this.getAttributeManager().getBufferLayouts({ isInstanced: false }),
+            ...super.getShaders({
+                modules: [project32, binOptionsUniforms],
+                vs: /* glsl */ `
+  in vec3 positions;
+  in vec3 positions64Low;
+  in float colorWeights;
+  in float elevationWeights;
+  
+  ${pointToHexbinGLSL}
+
+  void getBin(out ivec2 binId) {
+    vec3 positionCommon = project_position(positions, positions64Low);
+    binId = pointToHexbin(positionCommon.xy, binOptions.radiusCommon);
+  }
+  void getValue(out vec2 value) {
+    value = vec2(colorWeights, elevationWeights);
+  }
+  `
+            })
         });
-        this.state = {
-            cpuAggregator,
-            aggregatorState: cpuAggregator.state,
-            vertices: null
-        };
+    }
+    initializeState() {
+        super.initializeState();
         const attributeManager = this.getAttributeManager();
         attributeManager.add({
-            positions: { size: 3, type: 'float64', accessor: 'getPosition' }
+            positions: {
+                size: 3,
+                accessor: 'getPosition',
+                type: 'float64',
+                fp64: this.use64bitPositions()
+            },
+            colorWeights: { size: 1, accessor: 'getColorWeight' },
+            elevationWeights: { size: 1, accessor: 'getElevationWeight' }
         });
-        // color and elevation attributes can't be added as attributes
-        // they are calculated using 'getValue' accessor that takes an array of pints.
     }
-    updateState(opts) {
-        super.updateState(opts);
-        if (opts.changeFlags.propsOrDataChanged) {
-            const aggregatorState = this.state.cpuAggregator.updateState(opts, {
-                viewport: this.context.viewport,
-                attributes: this.getAttributes()
+    updateState(params) {
+        const aggregatorChanged = super.updateState(params);
+        const { props, oldProps, changeFlags } = params;
+        const { aggregator } = this.state;
+        if ((changeFlags.dataChanged || !this.state.dataAsArray) &&
+            (props.getColorValue || props.getElevationValue)) {
+            // Convert data to array
+            this.state.dataAsArray = Array.from(createIterable(props.data).iterable);
+        }
+        if (aggregatorChanged ||
+            changeFlags.dataChanged ||
+            props.radius !== oldProps.radius ||
+            props.getColorValue !== oldProps.getColorValue ||
+            props.getElevationValue !== oldProps.getElevationValue ||
+            props.colorAggregation !== oldProps.colorAggregation ||
+            props.elevationAggregation !== oldProps.elevationAggregation) {
+            this._updateBinOptions();
+            const { radiusCommon, hexOriginCommon, binIdRange, dataAsArray } = this.state;
+            aggregator.setProps({
+                // @ts-expect-error only used by GPUAggregator
+                binIdRange,
+                pointCount: this.getNumInstances(),
+                operations: [props.colorAggregation, props.elevationAggregation],
+                binOptions: {
+                    radiusCommon,
+                    hexOriginCommon
+                },
+                onUpdate: this._onAggregationUpdate.bind(this)
             });
-            if (this.state.aggregatorState.layerData !== aggregatorState.layerData) {
-                // if user provided custom aggregator and returns hexagonVertices,
-                // Need to recalculate radius and angle based on vertices
-                // @ts-expect-error
-                const { hexagonVertices } = aggregatorState.layerData || {};
-                this.setState({
-                    vertices: hexagonVertices && this.convertLatLngToMeterOffset(hexagonVertices)
+            if (dataAsArray) {
+                const { getColorValue, getElevationValue } = this.props;
+                aggregator.setProps({
+                    // @ts-expect-error only used by CPUAggregator
+                    customOperations: [
+                        getColorValue &&
+                            ((indices) => getColorValue(indices.map(i => dataAsArray[i]), { indices, data: props.data })),
+                        getElevationValue &&
+                            ((indices) => getElevationValue(indices.map(i => dataAsArray[i]), { indices, data: props.data }))
+                    ]
                 });
             }
-            this.setState({
-                // make a copy of the internal state of cpuAggregator for testing
-                aggregatorState
-            });
         }
+        if (changeFlags.updateTriggersChanged && changeFlags.updateTriggersChanged.getColorValue) {
+            aggregator.setNeedsUpdate(0);
+        }
+        if (changeFlags.updateTriggersChanged && changeFlags.updateTriggersChanged.getElevationValue) {
+            aggregator.setNeedsUpdate(1);
+        }
+        return aggregatorChanged;
     }
-    convertLatLngToMeterOffset(hexagonVertices) {
-        const { viewport } = this.context;
-        if (Array.isArray(hexagonVertices) && hexagonVertices.length === 6) {
-            // get centroid of hexagons
-            const vertex0 = hexagonVertices[0];
-            const vertex3 = hexagonVertices[3];
-            const centroid = [(vertex0[0] + vertex3[0]) / 2, (vertex0[1] + vertex3[1]) / 2];
-            const centroidFlat = viewport.projectFlat(centroid);
-            const { metersPerUnit } = viewport.getDistanceScales(centroid);
-            // offset all points by centroid to meter offset
-            const vertices = hexagonVertices.map(vt => {
-                const vtFlat = viewport.projectFlat(vt);
-                return [
-                    (vtFlat[0] - centroidFlat[0]) * metersPerUnit[0],
-                    (vtFlat[1] - centroidFlat[1]) * metersPerUnit[1]
-                ];
+    _updateBinOptions() {
+        const bounds = this.getBounds();
+        let radiusCommon = 1;
+        let hexOriginCommon = [0, 0];
+        let binIdRange = [
+            [0, 1],
+            [0, 1]
+        ];
+        let viewport = this.context.viewport;
+        if (bounds && Number.isFinite(bounds[0][0])) {
+            let centroid = [(bounds[0][0] + bounds[1][0]) / 2, (bounds[0][1] + bounds[1][1]) / 2];
+            const { radius } = this.props;
+            const { unitsPerMeter } = viewport.getDistanceScales(centroid);
+            radiusCommon = unitsPerMeter[0] * radius;
+            // Use the centroid of the hex at the center of the data
+            // This offsets the common space without changing the bins
+            const centerHex = pointToHexbin(viewport.projectFlat(centroid), radiusCommon);
+            centroid = viewport.unprojectFlat(getHexbinCentroid(centerHex, radiusCommon));
+            const ViewportType = viewport.constructor;
+            // We construct a viewport for the GPU aggregator's project module
+            // This viewport is determined by data
+            // removes arbitrary precision variance that depends on initial view state
+            viewport = viewport.isGeospatial
+                ? new ViewportType({ longitude: centroid[0], latitude: centroid[1], zoom: 12 })
+                : new Viewport({ position: [centroid[0], centroid[1], 0], zoom: 12 });
+            hexOriginCommon = [Math.fround(viewport.center[0]), Math.fround(viewport.center[1])];
+            binIdRange = getBinIdRange({
+                dataBounds: bounds,
+                getBinId: (p) => {
+                    const positionCommon = viewport.projectFlat(p);
+                    positionCommon[0] -= hexOriginCommon[0];
+                    positionCommon[1] -= hexOriginCommon[1];
+                    return pointToHexbin(positionCommon, radiusCommon);
+                },
+                padding: 1
             });
-            return vertices;
         }
-        log.error('HexagonLayer: hexagonVertices needs to be an array of 6 points')();
-        return null;
+        this.setState({ radiusCommon, hexOriginCommon, binIdRange, aggregatorViewport: viewport });
     }
-    getPickingInfo({ info }) {
-        return this.state.cpuAggregator.getPickingInfo({ info });
-    }
-    // create a method for testing
-    _onGetSublayerColor(cell) {
-        return this.state.cpuAggregator.getAccessor('fillColor')(cell);
+    draw(opts) {
+        // Replaces render time viewport with our own
+        if (opts.shaderModuleProps.project) {
+            opts.shaderModuleProps.project.viewport = this.state.aggregatorViewport;
+        }
+        super.draw(opts);
     }
-    // create a method for testing
-    _onGetSublayerElevation(cell) {
-        return this.state.cpuAggregator.getAccessor('elevation')(cell);
+    _onAggregationUpdate({ channel }) {
+        const props = this.getCurrentLayer().props;
+        const { aggregator } = this.state;
+        if (channel === 0) {
+            const result = aggregator.getResult(0);
+            this.setState({
+                colors: new AttributeWithScale(result, aggregator.binCount)
+            });
+            props.onSetColorDomain(aggregator.getResultDomain(0));
+        }
+        else if (channel === 1) {
+            const result = aggregator.getResult(1);
+            this.setState({
+                elevations: new AttributeWithScale(result, aggregator.binCount)
+            });
+            props.onSetElevationDomain(aggregator.getResultDomain(1));
+        }
     }
-    _getSublayerUpdateTriggers() {
-        return this.state.cpuAggregator.getUpdateTriggers(this.props);
+    onAttributeChange(id) {
+        const { aggregator } = this.state;
+        switch (id) {
+            case 'positions':
+                aggregator.setNeedsUpdate();
+                this._updateBinOptions();
+                const { radiusCommon, hexOriginCommon, binIdRange } = this.state;
+                aggregator.setProps({
+                    // @ts-expect-error only used by GPUAggregator
+                    binIdRange,
+                    binOptions: {
+                        radiusCommon,
+                        hexOriginCommon
+                    }
+                });
+                break;
+            case 'colorWeights':
+                aggregator.setNeedsUpdate(0);
+                break;
+            case 'elevationWeights':
+                aggregator.setNeedsUpdate(1);
+                break;
+            default:
+            // This should not happen
+        }
     }
     renderLayers() {
-        const { elevationScale, extruded, coverage, material, transitions } = this.props;
-        const { aggregatorState, vertices } = this.state;
-        const SubLayerClass = this.getSubLayerClass('hexagon-cell', ColumnLayer);
-        const updateTriggers = this._getSublayerUpdateTriggers();
-        const geometry = vertices
-            ? { vertices, radius: 1 }
-            : {
-                // default geometry
-                // @ts-expect-error TODO - undefined property?
-                radius: aggregatorState.layerData.radiusCommon || 1,
-                radiusUnits: 'common',
-                angle: 90
-            };
-        return new SubLayerClass({
-            ...geometry,
+        const { aggregator, radiusCommon, hexOriginCommon } = this.state;
+        const { elevationScale, colorRange, elevationRange, extruded, coverage, material, transitions, colorScaleType, lowerPercentile, upperPercentile, colorDomain, elevationScaleType, elevationLowerPercentile, elevationUpperPercentile, elevationDomain } = this.props;
+        const CellLayerClass = this.getSubLayerClass('cells', HexagonCellLayer);
+        const binAttribute = aggregator.getBins();
+        const colors = this.state.colors?.update({
+            scaleType: colorScaleType,
+            lowerPercentile,
+            upperPercentile
+        });
+        const elevations = this.state.elevations?.update({
+            scaleType: elevationScaleType,
+            lowerPercentile: elevationLowerPercentile,
+            upperPercentile: elevationUpperPercentile
+        });
+        if (!colors || !elevations) {
+            return null;
+        }
+        return new CellLayerClass(this.getSubLayerProps({
+            id: 'cells'
+        }), {
+            data: {
+                length: aggregator.binCount,
+                attributes: {
+                    getBin: binAttribute,
+                    getColorValue: colors.attribute,
+                    getElevationValue: elevations.attribute
+                }
+            },
+            // Data has changed shallowly, but we likely don't need to update the attributes
+            dataComparator: (data, oldData) => data.length === oldData.length,
+            updateTriggers: {
+                getBin: [binAttribute],
+                getColorValue: [colors.attribute],
+                getElevationValue: [elevations.attribute]
+            },
             diskResolution: 6,
+            vertices: HexbinVertices,
+            radius: radiusCommon,
+            hexOriginCommon,
             elevationScale,
+            colorRange,
+            colorScaleType,
+            elevationRange,
             extruded,
             coverage,
             material,
-            getFillColor: this._onGetSublayerColor.bind(this),
-            getElevation: this._onGetSublayerElevation.bind(this),
+            colorDomain: colors.domain || colorDomain || aggregator.getResultDomain(0),
+            elevationDomain: elevations.domain || elevationDomain || aggregator.getResultDomain(1),
+            colorCutoff: colors.cutoff,
+            elevationCutoff: elevations.cutoff,
             transitions: transitions && {
                 getFillColor: transitions.getColorValue || transitions.getColorWeight,
                 getElevation: transitions.getElevationValue || transitions.getElevationWeight
-            }
-        }, this.getSubLayerProps({
-            id: 'hexagon-cell',
-            updateTriggers
-        }), {
-            data: aggregatorState.layerData.data
+            },
+            // Extensions are already handled by the GPUAggregator, do not pass it down
+            extensions: []
         });
     }
+    getPickingInfo(params) {
+        const info = params.info;
+        const { index } = info;
+        if (index >= 0) {
+            const bin = this.state.aggregator.getBin(index);
+            let object;
+            if (bin) {
+                const centroidCommon = getHexbinCentroid(bin.id, this.state.radiusCommon);
+                const centroid = this.context.viewport.unprojectFlat(centroidCommon);
+                object = {
+                    col: bin.id[0],
+                    row: bin.id[1],
+                    position: centroid,
+                    colorValue: bin.value[0],
+                    elevationValue: bin.value[1],
+                    count: bin.count
+                };
+                if (bin.pointIndices) {
+                    object.pointIndices = bin.pointIndices;
+                    object.points = Array.isArray(this.props.data)
+                        ? bin.pointIndices.map(i => this.props.data[i])
+                        : [];
+                }
+            }
+            info.object = object;
+        }
+        return info;
+    }
 }
 HexagonLayer.layerName = 'HexagonLayer';
 HexagonLayer.defaultProps = defaultProps;
 export default HexagonLayer;
+//# sourceMappingURL=hexagon-layer.js.map

package/dist/hexagon-layer/hexagon-layer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hexagon-layer.js","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"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"}

package/dist/hexagon-layer/hexbin.d.ts

@@ -0,0 +1,17 @@
+type HexBin = [i: number, j: number];
+type Point = [x: number, y: number];
+export declare const HexbinVertices: number[][];
+/**
+ * Adapted from d3-hexbin
+ * Copyright Mike Bostock, 2012-2016
+   All rights reserved.
+ * https://github.com/d3/d3-hexbin/blob/master/src/hexbin.js
+ *
+ * Returns the hexbin that a point (x,y) falls into
+ */
+export declare function pointToHexbin([px, py]: Point, radius: number): HexBin;
+export declare const pointToHexbinGLSL: string;
+export declare function getHexbinCentroid([i, j]: HexBin, radius: number): Point;
+export declare const getHexbinCentroidGLSL: string;
+export {};
+//# sourceMappingURL=hexbin.d.ts.map

package/dist/hexagon-layer/hexbin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hexbin.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexbin.ts"],"names":[],"mappings":"AAQA,KAAK,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AACrC,KAAK,KAAK,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAEpC,eAAO,MAAM,cAAc,YAGzB,CAAC;AAEH;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAiBrE;AAED,eAAO,MAAM,iBAAiB,QAsB7B,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAEvE;AAED,eAAO,MAAM,qBAAqB,QAOjC,CAAC"}

package/dist/hexagon-layer/hexbin.js

@@ -0,0 +1,70 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const THIRD_PI = Math.PI / 3;
+const DIST_X = 2 * Math.sin(THIRD_PI);
+const DIST_Y = 1.5;
+export const HexbinVertices = Array.from({ length: 6 }, (_, i) => {
+    const angle = i * THIRD_PI;
+    return [Math.sin(angle), -Math.cos(angle)];
+});
+/**
+ * Adapted from d3-hexbin
+ * Copyright Mike Bostock, 2012-2016
+   All rights reserved.
+ * https://github.com/d3/d3-hexbin/blob/master/src/hexbin.js
+ *
+ * Returns the hexbin that a point (x,y) falls into
+ */
+export function pointToHexbin([px, py], radius) {
+    let pj = Math.round((py = py / radius / DIST_Y));
+    let pi = Math.round((px = px / radius / DIST_X - (pj & 1) / 2));
+    const py1 = py - pj;
+    if (Math.abs(py1) * 3 > 1) {
+        const px1 = px - pi;
+        const pi2 = pi + (px < pi ? -1 : 1) / 2;
+        const pj2 = pj + (py < pj ? -1 : 1);
+        const px2 = px - pi2;
+        const py2 = py - pj2;
+        if (px1 * px1 + py1 * py1 > px2 * px2 + py2 * py2) {
+            pi = pi2 + (pj & 1 ? 1 : -1) / 2;
+            pj = pj2;
+        }
+    }
+    return [pi, pj];
+}
+export const pointToHexbinGLSL = /* glsl */ `
+const vec2 DIST = vec2(${DIST_X}, ${DIST_Y});
+
+ivec2 pointToHexbin(vec2 p, float radius) {
+  p /= radius * DIST;
+  float pj = round(p.y);
+  float pjm2 = mod(pj, 2.0);
+  p.x -= pjm2 * 0.5;
+  float pi = round(p.x);
+  vec2 d1 = p - vec2(pi, pj);
+
+  if (abs(d1.y) * 3. > 1.) {
+    vec2 v2 = step(0.0, d1) - 0.5;
+    v2.y *= 2.0;
+    vec2 d2 = d1 - v2;
+    if (dot(d1, d1) > dot(d2, d2)) {
+      pi += v2.x + pjm2 - 0.5;
+      pj += v2.y;
+    }
+  }
+  return ivec2(pi, pj);
+}
+`;
+export function getHexbinCentroid([i, j], radius) {
+    return [(i + (j & 1) / 2) * radius * DIST_X, j * radius * DIST_Y];
+}
+export const getHexbinCentroidGLSL = `
+const vec2 DIST = vec2(${DIST_X}, ${DIST_Y});
+
+vec2 hexbinCentroid(vec2 binId, float radius) {
+  binId.x += fract(binId.y * 0.5);
+  return binId * DIST * radius;
+}
+`;
+//# sourceMappingURL=hexbin.js.map

package/dist/hexagon-layer/hexbin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hexbin.js","sourceRoot":"","sources":["../../src/hexagon-layer/hexbin.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AAC7B,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,GAAG,CAAC;AAKnB,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IAC7D,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,CAAQ,EAAE,MAAc;IAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;IACjD,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IAEpB,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC;QACrB,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,CAAC;YAClD,EAAE,GAAG,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACjC,EAAE,GAAG,GAAG,CAAC;QACX,CAAC;IACH,CAAC;IACD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAC;yBACnB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;CAqBzC,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAS,EAAE,MAAc;IAC9D,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;yBACZ,MAAM,KAAK,MAAM;;;;;;CAMzC,CAAC"}