@deck.gl/aggregation-layers 8.8.5 → 8.8.6

package/typed/cpu-grid-layer/grid-aggregator.js

@@ -1,141 +0,0 @@
-// 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 { createIterable } from '@deck.gl/core';
-import { getGridOffset } from '../utils/grid-aggregation-utils';
-/**
- * Calculate density grid from an array of points
- * @param {Object} props - object containing :
- * @param {Iterable} [props.data] - data objects to be aggregated
- * @param {Integer} [props.cellSize] - size of the grid cell
- *
- * @param {Object} aggregationParams - object containing :
- * @param {Object} gridOffset - {xOffset, yOffset} cell size in meters
- * @param {Integer} width - width of the grid
- * @param {Integer} height - height of the grid
- * @param {Boolean} projectPoints - `true` if doing screen space projection, `false` otherwise
- * @param {Array} attributes - attributes array containing position values
- * @param {Viewport} viewport - viewport to be used for projection
- * @param {Array} posOffset - [xOffset, yOffset] offset to be applied to positions to get cell index
- * @param {Object} boundingBox - {xMin, yMin, xMax, yMax} bounding box of input data
- *
- * @returns {object} - grid data, cell dimension
- */
-export function pointToDensityGridDataCPU(props, aggregationParams) {
-    const hashInfo = pointsToGridHashing(props, aggregationParams);
-    const result = getGridLayerDataFromGridHash(hashInfo);
-    return {
-        gridHash: hashInfo.gridHash,
-        gridOffset: hashInfo.gridOffset,
-        data: result
-    };
-}
-/**
- * Project points into each cell, return a hash table of cells
- * @param {Iterable} points
- * @param {number} cellSize - unit size in meters
- * @param {function} getPosition - position accessor
- * @returns {object} - grid hash and cell dimension
- */
-/* eslint-disable max-statements, complexity */
-function pointsToGridHashing(props, aggregationParams) {
-    const { data = [], cellSize } = props;
-    const { attributes, viewport, projectPoints, numInstances } = aggregationParams;
-    const positions = attributes.positions.value;
-    const { size } = attributes.positions.getAccessor();
-    const boundingBox = aggregationParams.boundingBox || getPositionBoundingBox(attributes.positions, numInstances);
-    const offsets = aggregationParams.posOffset || [180, 90];
-    const gridOffset = aggregationParams.gridOffset || getGridOffset(boundingBox, cellSize);
-    if (gridOffset.xOffset <= 0 || gridOffset.yOffset <= 0) {
-        return { gridHash: {}, gridOffset };
-    }
-    const { width, height } = viewport;
-    const numCol = Math.ceil(width / gridOffset.xOffset);
-    const numRow = Math.ceil(height / gridOffset.yOffset);
-    // calculate count per cell
-    const gridHash = {};
-    const { iterable, objectInfo } = createIterable(data);
-    const position = new Array(3);
-    for (const pt of iterable) {
-        objectInfo.index++;
-        position[0] = positions[objectInfo.index * size];
-        position[1] = positions[objectInfo.index * size + 1];
-        position[2] = size >= 3 ? positions[objectInfo.index * size + 2] : 0;
-        const [x, y] = projectPoints ? viewport.project(position) : position;
-        if (Number.isFinite(x) && Number.isFinite(y)) {
-            const yIndex = Math.floor((y + offsets[1]) / gridOffset.yOffset);
-            const xIndex = Math.floor((x + offsets[0]) / gridOffset.xOffset);
-            if (!projectPoints ||
-                // when doing screen space agggregation (projectPoints = true), filter points outside of the viewport range.
-                (xIndex >= 0 && xIndex < numCol && yIndex >= 0 && yIndex < numRow)) {
-                const key = `${yIndex}-${xIndex}`;
-                gridHash[key] = gridHash[key] || { count: 0, points: [], lonIdx: xIndex, latIdx: yIndex };
-                gridHash[key].count += 1;
-                gridHash[key].points.push({
-                    source: pt,
-                    index: objectInfo.index
-                });
-            }
-        }
-    }
-    return { gridHash, gridOffset, offsets: [offsets[0] * -1, offsets[1] * -1] };
-}
-/* eslint-enable max-statements, complexity */
-function getGridLayerDataFromGridHash({ gridHash, gridOffset, offsets }) {
-    const data = new Array(Object.keys(gridHash).length);
-    let i = 0;
-    for (const key in gridHash) {
-        const idxs = key.split('-');
-        const latIdx = parseInt(idxs[0], 10);
-        const lonIdx = parseInt(idxs[1], 10);
-        const index = i++;
-        data[index] = {
-            index,
-            position: [
-                offsets[0] + gridOffset.xOffset * lonIdx,
-                offsets[1] + gridOffset.yOffset * latIdx
-            ],
-            ...gridHash[key]
-        };
-    }
-    return data;
-}
-// Calculate bounding box of position attribute
-function getPositionBoundingBox(positionAttribute, numInstance) {
-    // TODO - value might not exist (e.g. attribute transition)
-    const positions = positionAttribute.value;
-    const { size } = positionAttribute.getAccessor();
-    let yMin = Infinity;
-    let yMax = -Infinity;
-    let xMin = Infinity;
-    let xMax = -Infinity;
-    let y;
-    let x;
-    for (let i = 0; i < numInstance; i++) {
-        x = positions[i * size];
-        y = positions[i * size + 1];
-        if (Number.isFinite(x) && Number.isFinite(y)) {
-            yMin = y < yMin ? y : yMin;
-            yMax = y > yMax ? y : yMax;
-            xMin = x < xMin ? x : xMin;
-            xMax = x > xMax ? x : xMax;
-        }
-    }
-    return { xMin, xMax, yMin, yMax };
-}

package/typed/gpu-grid-layer/gpu-grid-cell-layer-fragment.glsl.js

@@ -1,34 +0,0 @@
-// 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.
-export default `\
-#version 300 es
-#define SHADER_NAME gpu-grid-cell-layer-fragment-shader
-
-precision highp float;
-
-in vec4 vColor;
-
-out vec4 fragColor;
-
-void main(void) {
-  fragColor = vColor;
-  fragColor = picking_filterColor(fragColor);
-}
-`;

package/typed/gpu-grid-layer/gpu-grid-cell-layer-vertex.glsl.js

@@ -1,141 +0,0 @@
-// 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.
-// Inspired by screen-grid-layer vertex shader in deck.gl
-export default `\
-#version 300 es
-#define SHADER_NAME gpu-grid-cell-layer-vertex-shader
-#define RANGE_COUNT 6
-
-in vec3 positions;
-in vec3 normals;
-
-in vec4 colors;
-in vec4 elevations;
-in vec3 instancePickingColors;
-
-// Custom uniforms
-uniform vec2 offset;
-uniform bool extruded;
-uniform float cellSize;
-uniform float coverage;
-uniform float opacity;
-uniform float elevationScale;
-
-uniform ivec2 gridSize;
-uniform vec2 gridOrigin;
-uniform vec2 gridOriginLow;
-uniform vec2 gridOffset;
-uniform vec2 gridOffsetLow;
-uniform vec4 colorRange[RANGE_COUNT];
-uniform vec2 elevationRange;
-
-// Domain uniforms
-uniform vec2 colorDomain;
-uniform bool colorDomainValid;
-uniform vec2 elevationDomain;
-uniform bool elevationDomainValid;
-
-layout(std140) uniform;
-uniform ColorData
-{
-  vec4 maxMinCount;
-} colorData;
-uniform ElevationData
-{
-  vec4 maxMinCount;
-} elevationData;
-
-#define EPSILON 0.00001
-
-// Result
-out vec4 vColor;
-
-vec4 quantizeScale(vec2 domain, vec4 range[RANGE_COUNT], float value) {
-  vec4 outColor = vec4(0., 0., 0., 0.);
-  if (value >= (domain.x - EPSILON) && value <= (domain.y + EPSILON)) {
-    float domainRange = domain.y - domain.x;
-    if (domainRange <= 0.) {
-      outColor = colorRange[0];
-    } else {
-      float rangeCount = float(RANGE_COUNT);
-      float rangeStep = domainRange / rangeCount;
-      float idx = floor((value - domain.x) / rangeStep);
-      idx = clamp(idx, 0., rangeCount - 1.);
-      int intIdx = int(idx);
-      outColor = colorRange[intIdx];
-    }
-  }
-  return outColor;
-}
-
-float linearScale(vec2 domain, vec2 range, float value) {
-  if (value >= (domain.x - EPSILON) && value <= (domain.y + EPSILON)) {
-    return ((value - domain.x) / (domain.y - domain.x)) * (range.y - range.x) + range.x;
-  }
-  return -1.;
-}
-
-void main(void) {
-  vec2 clrDomain = colorDomainValid ? colorDomain : vec2(colorData.maxMinCount.a, colorData.maxMinCount.r);
-  vec4 color = quantizeScale(clrDomain, colorRange, colors.r);
-
-  float elevation = 0.0;
-
-  if (extruded) {
-    vec2 elvDomain = elevationDomainValid ? elevationDomain : vec2(elevationData.maxMinCount.a, elevationData.maxMinCount.r);
-    elevation = linearScale(elvDomain, elevationRange, elevations.r);
-    elevation = elevation  * (positions.z + 1.0) / 2.0 * elevationScale;
-  }
-
-  // if aggregated color or elevation is 0 do not render
-  float shouldRender = float(color.r > 0.0 && elevations.r >= 0.0);
-  float dotRadius = cellSize / 2. * coverage * shouldRender;
-
-  int yIndex = (gl_InstanceID / gridSize[0]);
-  int xIndex = gl_InstanceID - (yIndex * gridSize[0]);
-
-  vec2 instancePositionXFP64 = mul_fp64(vec2(gridOffset[0], gridOffsetLow[0]), vec2(float(xIndex), 0.));
-  instancePositionXFP64 = sum_fp64(instancePositionXFP64, vec2(gridOrigin[0], gridOriginLow[0]));
-  vec2 instancePositionYFP64 = mul_fp64(vec2(gridOffset[1], gridOffsetLow[1]), vec2(float(yIndex), 0.));
-  instancePositionYFP64 = sum_fp64(instancePositionYFP64, vec2(gridOrigin[1], gridOriginLow[1]));
-
-  vec3 centroidPosition = vec3(instancePositionXFP64[0], instancePositionYFP64[0], elevation);
-  vec3 centroidPosition64Low = vec3(instancePositionXFP64[1], instancePositionYFP64[1], 0.0);
-  geometry.worldPosition = centroidPosition;
-  vec3 pos = vec3(project_size(positions.xy + offset) * dotRadius, 0.);
-
-  // Set color to be rendered to picking fbo (also used to check for selection highlight).
-  picking_setPickingColor(instancePickingColors);
-
-  gl_Position = project_position_to_clipspace(centroidPosition, centroidPosition64Low, pos, geometry.position);
-
-  // Light calculations
-  // Worldspace is the linear space after Mercator projection
-
-  vec3 normals_commonspace = project_normal(normals);
-
-   if (extruded) {
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, normals_commonspace);
-    vColor = vec4(lightColor, color.a * opacity) / 255.;
-  } else {
-    vColor = vec4(color.rgb, color.a * opacity) / 255.;
-  }
-}
-`;

package/typed/gpu-grid-layer/gpu-grid-cell-layer.js

@@ -1,143 +0,0 @@
-// 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 { Layer, fp64LowPart, project32, gouraudLighting, picking } from '@deck.gl/core';
-import GL from '@luma.gl/constants';
-import { Model, CubeGeometry } from '@luma.gl/core';
-import { fp64arithmetic } from '@luma.gl/shadertools';
-import { defaultColorRange, colorRangeToFlatArray } from '../utils/color-utils';
-import vs from './gpu-grid-cell-layer-vertex.glsl';
-import fs from './gpu-grid-cell-layer-fragment.glsl';
-const COLOR_DATA_UBO_INDEX = 0;
-const ELEVATION_DATA_UBO_INDEX = 1;
-const defaultProps = {
-    // color
-    colorDomain: null,
-    colorRange: defaultColorRange,
-    // elevation
-    elevationDomain: null,
-    elevationRange: [0, 1000],
-    elevationScale: { type: 'number', min: 0, value: 1 },
-    // grid
-    gridSize: { type: 'array', min: 0, value: [1, 1] },
-    gridOrigin: { type: 'array', min: 0, value: [0, 0] },
-    gridOffset: { type: 'array', min: 0, value: [0, 0] },
-    cellSize: { type: 'number', min: 0, max: 1000, value: 1000 },
-    offset: { type: 'array', min: 0, value: [1, 1] },
-    coverage: { type: 'number', min: 0, max: 1, value: 1 },
-    extruded: true,
-    material: true // Use lighting module defaults
-};
-export default class GPUGridCellLayer extends Layer {
-    getShaders() {
-        return super.getShaders({
-            vs,
-            fs,
-            modules: [project32, gouraudLighting, picking, fp64arithmetic]
-        });
-    }
-    initializeState({ gl }) {
-        const attributeManager = this.getAttributeManager();
-        attributeManager.addInstanced({
-            colors: {
-                size: 4,
-                noAlloc: true
-            },
-            elevations: {
-                size: 4,
-                noAlloc: true
-            }
-        });
-        const model = this._getModel(gl);
-        this._setupUniformBuffer(model);
-        this.setState({ model });
-    }
-    _getModel(gl) {
-        return new Model(gl, {
-            ...this.getShaders(),
-            id: this.props.id,
-            geometry: new CubeGeometry(),
-            isInstanced: true
-        });
-    }
-    draw({ uniforms }) {
-        const { cellSize, offset, extruded, elevationScale, coverage, gridSize, gridOrigin, gridOffset, elevationRange, colorMaxMinBuffer, elevationMaxMinBuffer } = this.props;
-        const gridOriginLow = [fp64LowPart(gridOrigin[0]), fp64LowPart(gridOrigin[1])];
-        const gridOffsetLow = [fp64LowPart(gridOffset[0]), fp64LowPart(gridOffset[1])];
-        const domainUniforms = this.getDomainUniforms();
-        const colorRange = colorRangeToFlatArray(this.props.colorRange);
-        this.bindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer);
-        this.state.model
-            .setUniforms(uniforms)
-            .setUniforms(domainUniforms)
-            .setUniforms({
-            cellSize,
-            offset,
-            extruded,
-            elevationScale,
-            coverage,
-            gridSize,
-            gridOrigin,
-            gridOriginLow,
-            gridOffset,
-            gridOffsetLow,
-            colorRange,
-            elevationRange
-        })
-            .draw();
-        this.unbindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer);
-    }
-    bindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer) {
-        colorMaxMinBuffer.bind({ target: GL.UNIFORM_BUFFER, index: COLOR_DATA_UBO_INDEX });
-        elevationMaxMinBuffer.bind({ target: GL.UNIFORM_BUFFER, index: ELEVATION_DATA_UBO_INDEX });
-    }
-    unbindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer) {
-        colorMaxMinBuffer.unbind({ target: GL.UNIFORM_BUFFER, index: COLOR_DATA_UBO_INDEX });
-        elevationMaxMinBuffer.unbind({ target: GL.UNIFORM_BUFFER, index: ELEVATION_DATA_UBO_INDEX });
-    }
-    getDomainUniforms() {
-        const { colorDomain, elevationDomain } = this.props;
-        const domainUniforms = {};
-        if (colorDomain !== null) {
-            domainUniforms.colorDomainValid = true;
-            domainUniforms.colorDomain = colorDomain;
-        }
-        else {
-            domainUniforms.colorDomainValid = false;
-        }
-        if (elevationDomain !== null) {
-            domainUniforms.elevationDomainValid = true;
-            domainUniforms.elevationDomain = elevationDomain;
-        }
-        else {
-            domainUniforms.elevationDomainValid = false;
-        }
-        return domainUniforms;
-    }
-    _setupUniformBuffer(model) {
-        const gl = this.context.gl;
-        const programHandle = model.program.handle;
-        const colorIndex = gl.getUniformBlockIndex(programHandle, 'ColorData');
-        const elevationIndex = gl.getUniformBlockIndex(programHandle, 'ElevationData');
-        gl.uniformBlockBinding(programHandle, colorIndex, COLOR_DATA_UBO_INDEX);
-        gl.uniformBlockBinding(programHandle, elevationIndex, ELEVATION_DATA_UBO_INDEX);
-    }
-}
-GPUGridCellLayer.layerName = 'GPUGridCellLayer';
-GPUGridCellLayer.defaultProps = defaultProps;