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

package/dist/contour-layer/contour-layer.js

@@ -1,241 +1,282 @@
-// Copyright (c) 2015 - 2018 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 { LineLayer, SolidPolygonLayer } from '@deck.gl/layers';
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { COORDINATE_SYSTEM, project32, Viewport, _deepEqual } from '@deck.gl/core';
+import { PathLayer, SolidPolygonLayer } from '@deck.gl/layers';
+import { WebGLAggregator, CPUAggregator } from "../common/aggregator/index.js";
+import AggregationLayer from "../common/aggregation-layer.js";
 import { generateContours } from "./contour-utils.js";
-import { log } from '@deck.gl/core';
-import GPUGridAggregator from "../utils/gpu-grid-aggregation/gpu-grid-aggregator.js";
-import { AGGREGATION_OPERATION, getValueFunc } from "../utils/aggregation-operation-utils.js";
-import { getBoundingBox, getGridParams } from "../utils/grid-aggregation-utils.js";
-import GridAggregationLayer from "../grid-aggregation-layer.js";
+import { getAggregatorValueReader } from "./value-reader.js";
+import { getBinIdRange } from "../common/utils/bounds-utils.js";
+import { Matrix4 } from '@math.gl/core';
+import { binOptionsUniforms } from "./bin-options-uniforms.js";
 const DEFAULT_COLOR = [255, 255, 255, 255];
 const DEFAULT_STROKE_WIDTH = 1;
-const DEFAULT_THRESHOLD = 1;
 const defaultProps = {
     // grid aggregation
-    cellSize: { type: 'number', min: 1, max: 1000, value: 1000 },
+    cellSize: { type: 'number', min: 1, value: 1000 },
+    gridOrigin: { type: 'array', compare: true, value: [0, 0] },
     getPosition: { type: 'accessor', value: (x) => x.position },
     getWeight: { type: 'accessor', value: 1 },
-    gpuAggregation: false, // TODO(v9): Re-enable GPU aggregation.
+    gpuAggregation: true,
     aggregation: 'SUM',
     // contour lines
     contours: {
         type: 'object',
-        value: [{ threshold: DEFAULT_THRESHOLD }],
+        value: [{ threshold: 1 }],
         optional: true,
         compare: 3
     },
     zOffset: 0.005
 };
-const POSITION_ATTRIBUTE_NAME = 'positions';
-const DIMENSIONS = {
-    data: {
-        props: ['cellSize']
-    },
-    weights: {
-        props: ['aggregation'],
-        accessors: ['getWeight']
+/** Aggregate data into a grid-based heatmap. The color and height of a cell are determined based on the objects it contains. */
+class GridLayer extends AggregationLayer {
+    getAggregatorType() {
+        return this.props.gpuAggregation && WebGLAggregator.isSupported(this.context.device)
+            ? 'gpu'
+            : 'cpu';
     }
-};
-/** Aggregate data into iso-lines or iso-bands for a given threshold and cell size. */
-class ContourLayer extends GridAggregationLayer {
-    initializeState() {
-        super.initializeAggregationLayer({
-            dimensions: DIMENSIONS
-        });
-        this.setState({
-            contourData: {},
-            projectPoints: false,
-            weights: {
-                count: {
-                    size: 1,
-                    operation: AGGREGATION_OPERATION.SUM
-                }
-            }
+    createAggregator(type) {
+        if (type === 'cpu') {
+            return new CPUAggregator({
+                dimensions: 2,
+                getBin: {
+                    sources: ['positions'],
+                    getValue: ({ positions }, index, opts) => {
+                        const viewport = this.state.aggregatorViewport;
+                        // project to common space
+                        const p = viewport.projectPosition(positions);
+                        const { cellSizeCommon, cellOriginCommon } = opts;
+                        return [
+                            Math.floor((p[0] - cellOriginCommon[0]) / cellSizeCommon[0]),
+                            Math.floor((p[1] - cellOriginCommon[1]) / cellSizeCommon[1])
+                        ];
+                    }
+                },
+                getValue: [{ sources: ['counts'], getValue: ({ counts }) => counts }],
+                onUpdate: this._onAggregationUpdate.bind(this)
+            });
+        }
+        return new WebGLAggregator(this.context.device, {
+            dimensions: 2,
+            channelCount: 1,
+            bufferLayout: this.getAttributeManager().getBufferLayouts({ isInstanced: false }),
+            ...super.getShaders({
+                modules: [project32, binOptionsUniforms],
+                vs: /* glsl */ `
+  in vec3 positions;
+  in vec3 positions64Low;
+  in float counts;
+
+  void getBin(out ivec2 binId) {
+    vec3 positionCommon = project_position(positions, positions64Low);
+    vec2 gridCoords = floor(positionCommon.xy / binOptions.cellSizeCommon);
+    binId = ivec2(gridCoords);
+  }
+  void getValue(out float value) {
+    value = counts;
+  }
+  `
+            }),
+            onUpdate: this._onAggregationUpdate.bind(this)
         });
+    }
+    initializeState() {
+        super.initializeState();
         const attributeManager = this.getAttributeManager();
         attributeManager.add({
-            [POSITION_ATTRIBUTE_NAME]: {
+            positions: {
                 size: 3,
                 accessor: 'getPosition',
                 type: 'float64',
                 fp64: this.use64bitPositions()
             },
-            // this attribute is used in gpu aggregation path only
-            count: { size: 3, accessor: 'getWeight' }
+            counts: { size: 1, accessor: 'getWeight' }
+        });
+    }
+    updateState(params) {
+        const aggregatorChanged = super.updateState(params);
+        const { props, oldProps, changeFlags } = params;
+        const { aggregator } = this.state;
+        if (aggregatorChanged ||
+            changeFlags.dataChanged ||
+            props.cellSize !== oldProps.cellSize ||
+            !_deepEqual(props.gridOrigin, oldProps.gridOrigin, 1) ||
+            props.aggregation !== oldProps.aggregation) {
+            this._updateBinOptions();
+            const { cellSizeCommon, cellOriginCommon, binIdRange } = this.state;
+            aggregator.setProps({
+                // @ts-expect-error only used by GPUAggregator
+                binIdRange,
+                pointCount: this.getNumInstances(),
+                operations: [props.aggregation],
+                binOptions: {
+                    cellSizeCommon,
+                    cellOriginCommon
+                }
+            });
+        }
+        if (!_deepEqual(oldProps.contours, props.contours, 2)) {
+            // Recalculate contours
+            this.setState({ contourData: null });
+        }
+        return aggregatorChanged;
+    }
+    _updateBinOptions() {
+        const bounds = this.getBounds();
+        const cellSizeCommon = [1, 1];
+        let cellOriginCommon = [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 { cellSize, gridOrigin } = this.props;
+            const { unitsPerMeter } = viewport.getDistanceScales(centroid);
+            cellSizeCommon[0] = unitsPerMeter[0] * cellSize;
+            cellSizeCommon[1] = unitsPerMeter[1] * cellSize;
+            // Offset common space to center at the origin of the grid cell where the data center is in
+            // This improves precision without affecting the cell positions
+            const centroidCommon = viewport.projectFlat(centroid);
+            cellOriginCommon = [
+                Math.floor((centroidCommon[0] - gridOrigin[0]) / cellSizeCommon[0]) * cellSizeCommon[0] +
+                    gridOrigin[0],
+                Math.floor((centroidCommon[1] - gridOrigin[1]) / cellSizeCommon[1]) * cellSizeCommon[1] +
+                    gridOrigin[1]
+            ];
+            centroid = viewport.unprojectFlat(cellOriginCommon);
+            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 });
+            // Round to the nearest 32-bit float to match CPU and GPU results
+            cellOriginCommon = [Math.fround(viewport.center[0]), Math.fround(viewport.center[1])];
+            binIdRange = getBinIdRange({
+                dataBounds: bounds,
+                getBinId: (p) => {
+                    const positionCommon = viewport.projectFlat(p);
+                    return [
+                        Math.floor((positionCommon[0] - cellOriginCommon[0]) / cellSizeCommon[0]),
+                        Math.floor((positionCommon[1] - cellOriginCommon[1]) / cellSizeCommon[1])
+                    ];
+                }
+            });
+        }
+        this.setState({ cellSizeCommon, cellOriginCommon, binIdRange, aggregatorViewport: viewport });
+    }
+    draw(opts) {
+        // Replaces render time viewport with our own
+        if (opts.shaderModuleProps.project) {
+            opts.shaderModuleProps.project.viewport = this.state.aggregatorViewport;
+        }
+        super.draw(opts);
+    }
+    _onAggregationUpdate() {
+        const { aggregator, binIdRange } = this.state;
+        this.setState({
+            aggregatedValueReader: getAggregatorValueReader({ aggregator, binIdRange, channel: 0 }),
+            contourData: null
         });
     }
-    updateState(opts) {
-        super.updateState(opts);
-        let contoursChanged = false;
-        const { oldProps, props } = opts;
-        const { aggregationDirty } = this.state;
-        if (oldProps.contours !== props.contours || oldProps.zOffset !== props.zOffset) {
-            contoursChanged = true;
-            this._updateThresholdData(opts.props);
+    _getContours() {
+        const { aggregatedValueReader } = this.state;
+        if (!aggregatedValueReader) {
+            return null;
         }
-        if (this.getNumInstances() > 0 && (aggregationDirty || contoursChanged)) {
-            this._generateContours();
+        if (!this.state.contourData) {
+            const { binIdRange } = this.state;
+            const { contours } = this.props;
+            const contourData = generateContours({
+                contours,
+                getValue: aggregatedValueReader,
+                xRange: binIdRange[0],
+                yRange: binIdRange[1]
+            });
+            this.state.contourData = contourData;
+        }
+        return this.state.contourData;
+    }
+    onAttributeChange(id) {
+        const { aggregator } = this.state;
+        switch (id) {
+            case 'positions':
+                aggregator.setNeedsUpdate();
+                this._updateBinOptions();
+                const { cellSizeCommon, cellOriginCommon, binIdRange } = this.state;
+                aggregator.setProps({
+                    // @ts-expect-error only used by GPUAggregator
+                    binIdRange,
+                    binOptions: {
+                        cellSizeCommon,
+                        cellOriginCommon
+                    }
+                });
+                break;
+            case 'counts':
+                aggregator.setNeedsUpdate(0);
+                break;
+            default:
+            // This should not happen
         }
     }
     renderLayers() {
-        const { contourSegments, contourPolygons } = this.state.contourData;
-        const LinesSubLayerClass = this.getSubLayerClass('lines', LineLayer);
+        const contourData = this._getContours();
+        if (!contourData) {
+            return null;
+        }
+        const { lines, polygons } = contourData;
+        const { zOffset } = this.props;
+        const { cellOriginCommon, cellSizeCommon } = this.state;
+        const LinesSubLayerClass = this.getSubLayerClass('lines', PathLayer);
         const BandsSubLayerClass = this.getSubLayerClass('bands', SolidPolygonLayer);
+        const modelMatrix = new Matrix4()
+            .translate([cellOriginCommon[0], cellOriginCommon[1], 0])
+            .scale([cellSizeCommon[0], cellSizeCommon[1], zOffset]);
         // Contour lines layer
-        const lineLayer = contourSegments &&
-            contourSegments.length > 0 &&
+        const lineLayer = lines &&
+            lines.length > 0 &&
             new LinesSubLayerClass(this.getSubLayerProps({
                 id: 'lines'
             }), {
-                data: this.state.contourData.contourSegments,
-                getSourcePosition: d => d.start,
-                getTargetPosition: d => d.end,
-                getColor: d => d.contour.color || DEFAULT_COLOR,
-                getWidth: d => d.contour.strokeWidth || DEFAULT_STROKE_WIDTH
+                data: lines,
+                coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
+                modelMatrix,
+                getPath: d => d.vertices,
+                getColor: d => d.contour.color ?? DEFAULT_COLOR,
+                getWidth: d => d.contour.strokeWidth ?? DEFAULT_STROKE_WIDTH,
+                widthUnits: 'pixels'
             });
         // Contour bands layer
-        const bandsLayer = contourPolygons &&
-            contourPolygons.length > 0 &&
+        const bandsLayer = polygons &&
+            polygons.length > 0 &&
             new BandsSubLayerClass(this.getSubLayerProps({
                 id: 'bands'
             }), {
-                data: this.state.contourData.contourPolygons,
+                data: polygons,
+                coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
+                modelMatrix,
                 getPolygon: d => d.vertices,
-                getFillColor: d => d.contour.color || DEFAULT_COLOR
+                getFillColor: d => d.contour.color ?? DEFAULT_COLOR
             });
         return [lineLayer, bandsLayer];
     }
-    // Aggregation Overrides
-    /* eslint-disable max-statements, complexity */
-    updateAggregationState(opts) {
-        const { props, oldProps } = opts;
-        const { cellSize, coordinateSystem } = props;
-        const { viewport } = this.context;
-        const cellSizeChanged = oldProps.cellSize !== cellSize;
-        let gpuAggregation = props.gpuAggregation;
-        if (this.state.gpuAggregation !== props.gpuAggregation) {
-            if (gpuAggregation && !GPUGridAggregator.isSupported(this.context.device)) {
-                log.warn('GPU Grid Aggregation not supported, falling back to CPU')();
-                gpuAggregation = false;
-            }
-        }
-        const gpuAggregationChanged = gpuAggregation !== this.state.gpuAggregation;
-        this.setState({
-            gpuAggregation
-        });
-        const { dimensions } = this.state;
-        const positionsChanged = this.isAttributeChanged(POSITION_ATTRIBUTE_NAME);
-        const { data, weights } = dimensions;
-        let { boundingBox } = this.state;
-        if (positionsChanged) {
-            boundingBox = getBoundingBox(this.getAttributes(), this.getNumInstances());
-            this.setState({ boundingBox });
-        }
-        if (positionsChanged || cellSizeChanged) {
-            const { gridOffset, translation, width, height, numCol, numRow } = getGridParams(boundingBox, cellSize, viewport, coordinateSystem);
-            this.allocateResources(numRow, numCol);
-            this.setState({
-                gridOffset,
-                boundingBox,
-                translation,
-                posOffset: translation.slice(), // Used for CPU aggregation, to offset points
-                gridOrigin: [-1 * translation[0], -1 * translation[1]],
-                width,
-                height,
-                numCol,
-                numRow
-            });
-        }
-        const aggregationDataDirty = positionsChanged ||
-            gpuAggregationChanged ||
-            this.isAggregationDirty(opts, {
-                dimension: data,
-                compareAll: gpuAggregation // check for all (including extentions props) when using gpu aggregation
-            });
-        const aggregationWeightsDirty = this.isAggregationDirty(opts, {
-            dimension: weights
-        });
-        if (aggregationWeightsDirty) {
-            this._updateAccessors(opts);
-        }
-        if (aggregationDataDirty || aggregationWeightsDirty) {
-            this._resetResults();
-        }
-        this.setState({
-            aggregationDataDirty,
-            aggregationWeightsDirty
-        });
-    }
-    /* eslint-enable max-statements, complexity */
-    // Private (Aggregation)
-    _updateAccessors(opts) {
-        const { getWeight, aggregation, data } = opts.props;
-        const { count } = this.state.weights;
-        if (count) {
-            count.getWeight = getWeight;
-            count.operation = AGGREGATION_OPERATION[aggregation];
-        }
-        this.setState({ getValue: getValueFunc(aggregation, getWeight, { data }) });
-    }
-    _resetResults() {
-        const { count } = this.state.weights;
-        if (count) {
-            count.aggregationData = null;
-        }
-    }
-    // Private (Contours)
-    _generateContours() {
-        const { numCol, numRow, gridOrigin, gridOffset, thresholdData } = this.state;
-        const { count } = this.state.weights;
-        let { aggregationData } = count;
-        if (!aggregationData) {
-            // @ts-ignore
-            aggregationData = count.aggregationBuffer.readSyncWebGL();
-            count.aggregationData = aggregationData;
-        }
-        const { cellWeights } = GPUGridAggregator.getCellData({ countsData: aggregationData });
-        const contourData = generateContours({
-            thresholdData,
-            cellWeights,
-            gridSize: [numCol, numRow],
-            gridOrigin,
-            cellSize: [gridOffset.xOffset, gridOffset.yOffset]
-        });
-        // contourData contains both iso-lines and iso-bands if requested.
-        this.setState({ contourData });
-    }
-    _updateThresholdData(props) {
-        const { contours, zOffset } = props;
-        const count = contours.length;
-        const thresholdData = new Array(count);
-        for (let i = 0; i < count; i++) {
-            const contour = contours[i];
-            thresholdData[i] = {
-                contour,
-                zIndex: contour.zIndex || i,
-                zOffset
+    getPickingInfo(params) {
+        const info = params.info;
+        const { object } = info;
+        if (object) {
+            info.object = {
+                contour: object.contour
             };
         }
-        this.setState({ thresholdData });
+        return info;
     }
 }
-ContourLayer.layerName = 'ContourLayer';
-ContourLayer.defaultProps = defaultProps;
-export default ContourLayer;
+GridLayer.layerName = 'ContourLayer';
+GridLayer.defaultProps = defaultProps;
+export default GridLayer;
+//# sourceMappingURL=contour-layer.js.map

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

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

package/dist/contour-layer/contour-utils.d.ts

@@ -1,18 +1,39 @@
-export declare function generateContours({ thresholdData, cellWeights, gridSize, gridOrigin, cellSize }: {
-    thresholdData: any;
-    cellWeights: Float32Array;
-    gridSize: number[];
-    gridOrigin: number[];
-    cellSize: number[];
+import type { Color } from '@deck.gl/core';
+export type Contour = {
+    /**
+     * Isolines: `threshold` value must be a single `Number`, Isolines are generated based on this threshold value.
+     *
+     * Isobands: `threshold` value must be an Array of two `Number`s. Isobands are generated using `[threshold[0], threshold[1])` as threshold range, i.e area that has values `>= threshold[0]` and `< threshold[1]` are rendered with corresponding color. NOTE: `threshold[0]` is inclusive and `threshold[1]` is not inclusive.
+     */
+    threshold: number | number[];
+    /**
+     * RGBA color array to be used to render the contour.
+     * @default [255, 255, 255, 255]
+     */
+    color?: Color;
+    /**
+     * Applicable for `Isoline`s only, width of the Isoline in pixels.
+     * @default 1
+     */
+    strokeWidth?: number;
+    /** Defines z order of the contour. */
+    zIndex?: number;
+};
+export type ContourLine = {
+    vertices: number[][];
+    contour: Contour;
+};
+export type ContourPolygon = {
+    vertices: number[][];
+    contour: Contour;
+};
+export declare function generateContours({ contours, getValue, xRange, yRange }: {
+    contours: Contour[];
+    getValue: (x: number, y: number) => number;
+    xRange: [number, number];
+    yRange: [number, number];
 }): {
-    contourSegments: {
-        start: number[];
-        end: number[];
-        contour: any;
-    }[];
-    contourPolygons: {
-        vertices: number[][];
-        contour: any;
-    }[];
+    lines: ContourLine[];
+    polygons: ContourPolygon[];
 };
 //# sourceMappingURL=contour-utils.d.ts.map

package/dist/contour-layer/contour-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contour-utils.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,EAC/B,aAAa,EACb,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACT,EAAE;IACD,aAAa,EAAE,GAAG,CAAC;IACnB,WAAW,EAAE,YAAY,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;;eACgC,MAAM,EAAE;aAAO,MAAM,EAAE;iBAAW,GAAG;;;kBAClC,MAAM,EAAE,EAAE;iBAAW,GAAG;;EAyD3D"}
+{"version":3,"file":"contour-utils.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAGzC,MAAM,MAAM,OAAO,GAAG;IACpB;;;;OAIG;IACH,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE7B;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAIF,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,MAAM,EACP,EAAE;IACD,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3C,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1B;;;EAmDA"}

package/dist/contour-layer/contour-utils.js

@@ -1,42 +1,39 @@
-import { getCode, getVertices, CONTOUR_TYPE } from "./marching-squares.js";
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { getCode, getLines, getPolygons } from "./marching-squares.js";
 // Given all the cell weights, generates contours for each threshold.
 /* eslint-disable max-depth */
-export function generateContours({ thresholdData, cellWeights, gridSize, gridOrigin, cellSize }) {
-    const contourSegments = [];
+export function generateContours({ contours, getValue, xRange, yRange }) {
+    const contourLines = [];
     const contourPolygons = [];
-    const width = gridSize[0];
-    const height = gridSize[1];
     let segmentIndex = 0;
     let polygonIndex = 0;
-    for (const data of thresholdData) {
-        const { contour } = data;
+    for (let i = 0; i < contours.length; i++) {
+        const contour = contours[i];
+        const z = contour.zIndex ?? i;
         const { threshold } = contour;
-        for (let x = -1; x < width; x++) {
-            for (let y = -1; y < height; y++) {
+        for (let x = xRange[0] - 1; x < xRange[1]; x++) {
+            for (let y = yRange[0] - 1; y < yRange[1]; y++) {
                 // Get the MarchingSquares code based on neighbor cell weights.
                 const { code, meanCode } = getCode({
-                    cellWeights,
+                    getValue,
                     threshold,
                     x,
                     y,
-                    width,
-                    height
+                    xRange,
+                    yRange
                 });
                 const opts = {
-                    type: CONTOUR_TYPE.ISO_BANDS,
-                    gridOrigin,
-                    cellSize,
                     x,
                     y,
-                    width,
-                    height,
+                    z,
                     code,
-                    meanCode,
-                    thresholdData: data
+                    meanCode
                 };
                 if (Array.isArray(threshold)) {
-                    opts.type = CONTOUR_TYPE.ISO_BANDS;
-                    const polygons = getVertices(opts);
+                    // ISO bands
+                    const polygons = getPolygons(opts);
                     for (const polygon of polygons) {
                         contourPolygons[polygonIndex++] = {
                             vertices: polygon,
@@ -45,13 +42,11 @@ export function generateContours({ thresholdData, cellWeights, gridSize, gridOri
                     }
                 }
                 else {
-                    // Get the intersection vertices based on MarchingSquares code.
-                    opts.type = CONTOUR_TYPE.ISO_LINES;
-                    const vertices = getVertices(opts);
-                    for (let i = 0; i < vertices.length; i += 2) {
-                        contourSegments[segmentIndex++] = {
-                            start: vertices[i],
-                            end: vertices[i + 1],
+                    // ISO lines
+                    const path = getLines(opts);
+                    if (path.length > 0) {
+                        contourLines[segmentIndex++] = {
+                            vertices: path,
                             contour
                         };
                     }
@@ -59,6 +54,7 @@ export function generateContours({ thresholdData, cellWeights, gridSize, gridOri
             }
         }
     }
-    return { contourSegments, contourPolygons };
+    return { lines: contourLines, polygons: contourPolygons };
 }
 /* eslint-enable max-depth */
+//# sourceMappingURL=contour-utils.js.map

package/dist/contour-layer/contour-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contour-utils.js","sourceRoot":"","sources":["../../src/contour-layer/contour-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAC,8BAA2B;AAoClE,qEAAqE;AACrE,8BAA8B;AAC9B,MAAM,UAAU,gBAAgB,CAAC,EAC/B,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,MAAM,EAMP;IACC,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;QAC9B,MAAM,EAAC,SAAS,EAAC,GAAG,OAAO,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/C,+DAA+D;gBAC/D,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC;oBAC/B,QAAQ;oBACR,SAAS;oBACT,CAAC;oBACD,CAAC;oBACD,MAAM;oBACN,MAAM;iBACP,CAAC,CAAC;gBACH,MAAM,IAAI,GAAG;oBACX,CAAC;oBACD,CAAC;oBACD,CAAC;oBACD,IAAI;oBACJ,QAAQ;iBACT,CAAC;gBACF,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC7B,YAAY;oBACZ,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;oBACnC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wBAC/B,eAAe,CAAC,YAAY,EAAE,CAAC,GAAG;4BAChC,QAAQ,EAAE,OAAO;4BACjB,OAAO;yBACR,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,YAAY;oBACZ,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC5B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACpB,YAAY,CAAC,YAAY,EAAE,CAAC,GAAG;4BAC7B,QAAQ,EAAE,IAAI;4BACd,OAAO;yBACR,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAC,CAAC;AAC1D,CAAC;AACD,6BAA6B"}