@deck.gl/aggregation-layers 9.0.0-alpha.7 → 9.0.0-beta.10

package/src/heatmap-layer/triangle-layer.ts

@@ -18,14 +18,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import type {Device, Texture} from '@luma.gl/core';
-import {Model, Geometry} from '@luma.gl/engine';
-import {GL} from '@luma.gl/constants';
+import type {Buffer, Device, Texture} from '@luma.gl/core';
+import {Model} from '@luma.gl/engine';
 import {Layer, LayerContext, project32} from '@deck.gl/core';
 import vs from './triangle-layer-vertex.glsl';
 import fs from './triangle-layer-fragment.glsl';
 
 type _TriangleLayerProps = {
+  data: {attributes: {positions: Buffer; texCoords: Buffer}};
   colorDomain: number[];
   aggregationMode: string;
   threshold: number;
@@ -33,7 +33,7 @@ type _TriangleLayerProps = {
   vertexCount: number;
   colorTexture: Texture;
   maxTexture: Texture;
-  texture: Texture;
+  weightsTexture: Texture;
 };
 
 export default class TriangleLayer extends Layer<_TriangleLayerProps> {
@@ -41,6 +41,8 @@ export default class TriangleLayer extends Layer<_TriangleLayerProps> {
 
   state!: {
     model: Model;
+    positions: Buffer;
+    texCoords: Buffer;
   };
 
   getShaders() {
@@ -48,40 +50,31 @@ export default class TriangleLayer extends Layer<_TriangleLayerProps> {
   }
 
   initializeState({device}: LayerContext): void {
-    const attributeManager = this.getAttributeManager()!;
-    attributeManager.add({
-      positions: {size: 3, noAlloc: true},
-      texCoords: {size: 2, noAlloc: true}
-    });
-    this.setState({
-      model: this._getModel(device)
-    });
+    this.setState({model: this._getModel(device)});
   }
 
   _getModel(device: Device): Model {
-    const {vertexCount} = this.props;
+    const {vertexCount, data, weightsTexture, maxTexture, colorTexture} = this.props;
 
     return new Model(device, {
       ...this.getShaders(),
       id: this.props.id,
-      geometry: new Geometry({
-        topology: 'triangle-fan-webgl',
-        vertexCount
-      })
+      bindings: {weightsTexture, maxTexture, colorTexture},
+      attributes: data.attributes,
+      bufferLayout: [
+        {name: 'positions', format: 'float32x3'},
+        {name: 'texCoords', format: 'float32x2'}
+      ],
+      topology: 'triangle-fan-webgl',
+      vertexCount
     });
   }
 
   draw({uniforms}): void {
     const {model} = this.state;
-
-    const {texture, maxTexture, colorTexture, intensity, threshold, aggregationMode, colorDomain} =
-      this.props;
-
+    const {intensity, threshold, aggregationMode, colorDomain} = this.props;
     model.setUniforms({
       ...uniforms,
-      texture,
-      maxTexture,
-      colorTexture,
       intensity,
       threshold,
       aggregationMode,

package/src/heatmap-layer/weights-vs.glsl.ts

@@ -8,17 +8,19 @@ uniform float radiusPixels;
 uniform float textureWidth;
 uniform vec4 commonBounds;
 uniform float weightsScale;
+
 void main()
 {
   weightsTexture = vec4(weights * weightsScale, 0., 0., 1.);
 
-  float radiusTexels  = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);
+  float radiusTexels = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);
   gl_PointSize = radiusTexels * 2.;
 
   vec3 commonPosition = project_position(positions, positions64Low);
 
-  // map xy from commonBounds to [-1, 1]
+  // // map xy from commonBounds to [-1, 1]
   gl_Position.xy = (commonPosition.xy - commonBounds.xy) / (commonBounds.zw - commonBounds.xy) ;
   gl_Position.xy = (gl_Position.xy * 2.) - (1.);
+  gl_Position.w = 1.0;
 }
 `;

package/src/hexagon-layer/hexagon-layer.ts

@@ -29,7 +29,6 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
-import {GL} from '@luma.gl/constants';
 
 import {defaultColorRange} from '../utils/color-utils';
 
@@ -249,7 +248,7 @@ type _HexagonLayerProps<DataT = unknown> = {
 /** Aggregates data into a hexagon-based heatmap. The color and height of a hexagon are determined based on the objects it contains. */
 export default class HexagonLayer<DataT, ExtraPropsT extends {} = {}> extends AggregationLayer<
   DataT,
-  ExtraPropsT & Required<_HexagonLayerProps>
+  ExtraPropsT & Required<_HexagonLayerProps<DataT>>
 > {
   static layerName = 'HexagonLayer';
   static defaultProps = defaultProps;
@@ -272,7 +271,7 @@ export default class HexagonLayer<DataT, ExtraPropsT extends {} = {}> extends Ag
     };
     const attributeManager = this.getAttributeManager()!;
     attributeManager.add({
-      positions: {size: 3, type: GL.DOUBLE, accessor: 'getPosition'}
+      positions: {size: 3, type: 'float64', accessor: 'getPosition'}
     });
     // color and elevation attributes can't be added as attributes
     // they are calculated using 'getValue' accessor that takes an array of pints.

package/src/screen-grid-layer/screen-grid-cell-layer.ts

@@ -54,10 +54,6 @@ export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {
   static layerName = 'ScreenGridCellLayer';
   static defaultProps = defaultProps;
 
-  static isSupported(device: Device) {
-    return device.features.has('texture-formats-float32-webgl1');
-  }
-
   state!: {
     model?: Model;
   };

package/src/screen-grid-layer/screen-grid-layer.ts

@@ -32,7 +32,6 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import type {Buffer, Texture} from '@luma.gl/core';
-import {GL} from '@luma.gl/constants';
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
 import {AGGREGATION_OPERATION, getValueFunc} from '../utils/aggregation-operation-utils';
 import ScreenGridCellLayer from './screen-grid-cell-layer';
@@ -44,7 +43,7 @@ const defaultProps: DefaultProps<ScreenGridLayerProps> = {
   getPosition: {type: 'accessor', value: (d: any) => d.position},
   getWeight: {type: 'accessor', value: 1},
 
-  gpuAggregation: true,
+  gpuAggregation: false, // TODO(v9): Re-enable GPU aggregation.
   aggregation: 'SUM'
 };
 
@@ -121,9 +120,6 @@ export type _ScreenGridLayerProps<DataT> = {
   /**
    * Perform aggregation is performed on GPU.
    *
-   * NOTE: GPU Aggregation requires WebGL2 support by the browser.
-   * When `gpuAggregation` is set to true and browser doesn't support WebGL2, aggregation falls back to CPU.
-   *
    * @default true
    */
   gpuAggregation?: boolean;
@@ -157,12 +153,6 @@ export default class ScreenGridLayer<
   };
 
   initializeState() {
-    if (!ScreenGridCellLayer.isSupported(this.context.device)) {
-      // max aggregated value is sampled from a float texture
-      this.setState({supported: false});
-      log.error(`ScreenGridLayer: ${this.id} is not supported on this browser`)();
-      return;
-    }
     super.initializeAggregationLayer({
       dimensions: DIMENSIONS,
       // @ts-expect-error
@@ -191,7 +181,7 @@ export default class ScreenGridLayer<
       [POSITION_ATTRIBUTE_NAME]: {
         size: 3,
         accessor: 'getPosition',
-        type: GL.DOUBLE,
+        type: 'float64',
         fp64: this.use64bitPositions()
       },
       // this attribute is used in gpu aggregation path only

package/src/utils/cpu-aggregator.ts

@@ -21,7 +21,7 @@ import BinSorter from './bin-sorter';
 import {getScaleFunctionByScaleType} from './scale-utils';
 import {getValueFunc, wrapGetValueFunc} from './aggregation-operation-utils';
 
-// @eslint-disable-next-line @typescript-eslint/no-empty-function
+// eslint-disable-next-line @typescript-eslint/no-empty-function
 function noop() {}
 
 const dimensionSteps = ['getBins', 'getDomain', 'getScaleFunc'];

package/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.ts

@@ -21,7 +21,6 @@
 import type {Device, DeviceFeature} from '@luma.gl/core';
 import {Model, TextureTransform} from '@luma.gl/engine';
 import {fp64arithmetic} from '@luma.gl/shadertools';
-import {readPixelsToBuffer, withGLParameters, clear} from '@luma.gl/webgl';
 import {GL} from '@luma.gl/constants';
 import {log, project32, _mergeShaders as mergeShaders, getShaderAssembler} from '@deck.gl/core';
 
@@ -52,11 +51,8 @@ const ARRAY_BUFFER_MAP = {
 };
 
 const REQUIRED_FEATURES: DeviceFeature[] = [
-  'webgl2',
-  'blend-minmax-webgl1',
-  'texture-renderable-float32-webgl',
-  'texture-blend-float-webgl1',
-  'texture-formats-float32-webgl1'
+  'float32-renderable-webgl',
+  'texture-blend-float-webgl'
 ];
 
 export type GPUGridAggregatorProps = {
@@ -180,15 +176,10 @@ export default class GPUGridAggregator {
     this.device = device;
 
     const REQUIRED_FEATURES: DeviceFeature[] = [
-      'blend-minmax-webgl1', // set min/max blend modes
-      'texture-renderable-float32-webgl', // render to float texture
-      'texture-formats-float32-webgl1' // sample from a float texture
+      'float32-renderable-webgl' // render to float texture
     ];
 
-    // gl_InstanceID usage in min/max calculation shaders
-    this._hasGPUSupport =
-      this.device.info.type === 'webgl2' &&
-      REQUIRED_FEATURES.every(feature => device.features.has(feature));
+    this._hasGPUSupport = REQUIRED_FEATURES.every(feature => device.features.has(feature));
     if (this._hasGPUSupport) {
       this._setupModels();
     }
@@ -227,9 +218,6 @@ export default class GPUGridAggregator {
     // reset results
     this.setState({results: {}});
     const aggregationParams = this._normalizeAggregationParams(opts);
-    if (!this._hasGPUSupport) {
-      log.log(1, 'GPUGridAggregator: not supported')();
-    }
     return this._runAggregation(aggregationParams);
   }
 
@@ -302,26 +290,26 @@ export default class GPUGridAggregator {
       results[id] = {};
       const {needMin, needMax, combineMaxMin} = weights[id];
       results[id].aggregationTexture = textures[id];
-      results[id].aggregationBuffer = readPixelsToBuffer(framebuffers[id], {
+      results[id].aggregationBuffer = this.device.readPixelsToBufferWebGL(framebuffers[id], {
         target: weights[id].aggregationBuffer, // update if a buffer is provided
         sourceType: GL.FLOAT
       });
       if (needMin && needMax && combineMaxMin) {
-        results[id].maxMinBuffer = readPixelsToBuffer(maxMinFramebuffers[id], {
+        results[id].maxMinBuffer = this.device.readPixelsToBufferWebGL(maxMinFramebuffers[id], {
           target: weights[id].maxMinBuffer, // update if a buffer is provided
           sourceType: GL.FLOAT
         });
         results[id].maxMinTexture = resources[`${id}-maxMinTexture`];
       } else {
         if (needMin) {
-          results[id].minBuffer = readPixelsToBuffer(minFramebuffers[id], {
+          results[id].minBuffer = this.device.readPixelsToBufferWebGL(minFramebuffers[id], {
             target: weights[id].minBuffer, // update if a buffer is provided
             sourceType: GL.FLOAT
           });
           results[id].minTexture = resources[`${id}-minTexture`];
         }
         if (needMax) {
-          results[id].maxBuffer = readPixelsToBuffer(maxFramebuffers[id], {
+          results[id].maxBuffer = this.device.readPixelsToBufferWebGL(maxFramebuffers[id], {
             target: weights[id].maxBuffer, // update if a buffer is provided
             sourceType: GL.FLOAT
           });
@@ -413,15 +401,14 @@ export default class GPUGridAggregator {
     const {framebuffers} = this.state;
     const {allAggregationModel} = this;
 
-    withGLParameters(
-      this.device,
+    this.device.withParametersWebGL(
       {
         ...clearParams,
         framebuffer: minOrMaxFb,
         viewport: [0, 0, gridSize[0], gridSize[1]]
       },
       () => {
-        clear(this.device, {color: true});
+        this.device.clearWebGL({color: true});
 
         // allAggregationModel.setParameters(parameters);
         allAggregationModel.setUniforms({gridSize, combineMaxMin});
@@ -444,15 +431,14 @@ export default class GPUGridAggregator {
       operation === AGGREGATION_OPERATION.MIN
         ? [MAX_32_BIT_FLOAT, MAX_32_BIT_FLOAT, MAX_32_BIT_FLOAT, 0]
         : [0, 0, 0, 0];
-    withGLParameters(
-      this.device,
+    this.device.withParametersWebGL(
       {
         framebuffer: framebuffers[id],
         viewport: [0, 0, gridSize[0], gridSize[1]],
         clearColor
       },
       () => {
-        clear(this.device, {color: true});
+        this.device.clearWebGL({color: true});
 
         const attributes = {weights: weightAttributes[id]};
         gridAggregationModel.draw({
@@ -483,7 +469,7 @@ export default class GPUGridAggregator {
         }
       });
 
-      // update framebuffer with mean results so readPixelsToBuffer returns mean values
+      // update framebuffer with mean results so device.readPixelsToBufferWebGL returns mean values
       framebuffers[id].attach({[GL.COLOR_ATTACHMENT0]: textures[id]});
     }
   }
@@ -607,7 +593,7 @@ export default class GPUGridAggregator {
       if (results[id]) {
         for (const bufferName of BUFFER_NAMES) {
           if (results[id][bufferName] && weights[id][bufferName] !== results[id][bufferName]) {
-            // No result buffer is provided in weights object, `readPixelsToBuffer` has created a new Buffer object
+            // No result buffer is provided in weights object, `device.readPixelsToBufferWebGL` has created a new Buffer object
             // collect the new buffer for garabge collection
             const name = `gpu-result-${id}-${bufferName}`;
             if (resources[name]) {

package/src/utils/resource-utils.ts

@@ -1,4 +1,4 @@
-import {Device, Sampler, SamplerProps} from '@luma.gl/core';
+import {Device, SamplerProps} from '@luma.gl/core';
 
 const DEFAULT_PARAMETERS: SamplerProps = {
   minFilter: 'nearest',
@@ -16,13 +16,7 @@ type FloatTextureOptions = {
 
 // TODO - not working
 export function getFloatTexture(device: Device, opts: FloatTextureOptions) {
-  const {
-    width = 1,
-    height = 1,
-    data = null,
-    unpackFlipY = true,
-    parameters = DEFAULT_PARAMETERS
-  } = opts;
+  const {width = 1, height = 1, data = null, parameters = DEFAULT_PARAMETERS} = opts;
   const texture = device.createTexture({
     data,
     format: 'rgba32float', // device.info.type === 'webgl2' ? 'rgba32float' : GL.RGBA,

package/dist/es5/aggregation-layer.js

@@ -1,213 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _core = require("@deck.gl/core");
-
-var _propUtils = require("./utils/prop-utils");
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var AggregationLayer = function (_CompositeLayer) {
-  (0, _inherits2.default)(AggregationLayer, _CompositeLayer);
-
-  var _super = _createSuper(AggregationLayer);
-
-  function AggregationLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, AggregationLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-    _this.state = void 0;
-    return _this;
-  }
-
-  var _proto = AggregationLayer.prototype;
-
-  _proto.initializeAggregationLayer = function initializeAggregationLayer(dimensions) {
-    (0, _get2.default)((0, _getPrototypeOf2.default)(AggregationLayer.prototype), "initializeState", this).call(this, this.context);
-    this.setState({
-      ignoreProps: (0, _propUtils.filterProps)(this.constructor._propTypes, dimensions.data.props),
-      dimensions: dimensions
-    });
-  };
-
-  _proto.updateState = function updateState(opts) {
-    (0, _get2.default)((0, _getPrototypeOf2.default)(AggregationLayer.prototype), "updateState", this).call(this, opts);
-    var changeFlags = opts.changeFlags;
-
-    if (changeFlags.extensionsChanged) {
-      var shaders = this.getShaders({});
-
-      if (shaders && shaders.defines) {
-        shaders.defines.NON_INSTANCED_MODEL = 1;
-      }
-
-      this.updateShaders(shaders);
-    }
-
-    this._updateAttributes();
-  };
-
-  _proto.updateAttributes = function updateAttributes(changedAttributes) {
-    this.setState({
-      changedAttributes: changedAttributes
-    });
-  };
-
-  _proto.getAttributes = function getAttributes() {
-    return this.getAttributeManager().getAttributes();
-  };
-
-  _proto.getModuleSettings = function getModuleSettings() {
-    var _this$context = this.context,
-        viewport = _this$context.viewport,
-        mousePosition = _this$context.mousePosition,
-        device = _this$context.device;
-    var moduleSettings = Object.assign(Object.create(this.props), {
-      viewport: viewport,
-      mousePosition: mousePosition,
-      pickingActive: 0,
-      devicePixelRatio: device.canvasContext.cssToDeviceRatio()
-    });
-    return moduleSettings;
-  };
-
-  _proto.updateShaders = function updateShaders(shaders) {};
-
-  _proto.isAggregationDirty = function isAggregationDirty(updateOpts) {
-    var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var props = updateOpts.props,
-        oldProps = updateOpts.oldProps,
-        changeFlags = updateOpts.changeFlags;
-    var _params$compareAll = params.compareAll,
-        compareAll = _params$compareAll === void 0 ? false : _params$compareAll,
-        dimension = params.dimension;
-    var ignoreProps = this.state.ignoreProps;
-    var dataProps = dimension.props,
-        _dimension$accessors = dimension.accessors,
-        accessors = _dimension$accessors === void 0 ? [] : _dimension$accessors;
-    var updateTriggersChanged = changeFlags.updateTriggersChanged;
-
-    if (changeFlags.dataChanged) {
-      return true;
-    }
-
-    if (updateTriggersChanged) {
-      if (updateTriggersChanged.all) {
-        return true;
-      }
-
-      var _iterator = _createForOfIteratorHelper(accessors),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var accessor = _step.value;
-
-          if (updateTriggersChanged[accessor]) {
-            return true;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    }
-
-    if (compareAll) {
-      if (changeFlags.extensionsChanged) {
-        return true;
-      }
-
-      return (0, _core._compareProps)({
-        oldProps: oldProps,
-        newProps: props,
-        ignoreProps: ignoreProps,
-        propTypes: this.constructor._propTypes
-      });
-    }
-
-    var _iterator2 = _createForOfIteratorHelper(dataProps),
-        _step2;
-
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var name = _step2.value;
-
-        if (props[name] !== oldProps[name]) {
-          return true;
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-
-    return false;
-  };
-
-  _proto.isAttributeChanged = function isAttributeChanged(name) {
-    var changedAttributes = this.state.changedAttributes;
-
-    if (!name) {
-      return !isObjectEmpty(changedAttributes);
-    }
-
-    return changedAttributes && changedAttributes[name] !== undefined;
-  };
-
-  _proto._getAttributeManager = function _getAttributeManager() {
-    return new _core.AttributeManager(this.context.device, {
-      id: this.props.id,
-      stats: this.context.stats
-    });
-  };
-
-  return AggregationLayer;
-}(_core.CompositeLayer);
-
-exports.default = AggregationLayer;
-AggregationLayer.layerName = 'AggregationLayer';
-
-function isObjectEmpty(obj) {
-  var isEmpty = true;
-
-  for (var key in obj) {
-    isEmpty = false;
-    break;
-  }
-
-  return isEmpty;
-}
-//# sourceMappingURL=aggregation-layer.js.map

package/dist/es5/aggregation-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/aggregation-layer.ts"],"names":["AggregationLayer","state","initializeAggregationLayer","dimensions","context","setState","ignoreProps","constructor","_propTypes","data","props","updateState","opts","changeFlags","extensionsChanged","shaders","getShaders","defines","NON_INSTANCED_MODEL","updateShaders","_updateAttributes","updateAttributes","changedAttributes","getAttributes","getAttributeManager","getModuleSettings","viewport","mousePosition","device","moduleSettings","Object","assign","create","pickingActive","devicePixelRatio","canvasContext","cssToDeviceRatio","isAggregationDirty","updateOpts","params","oldProps","compareAll","dimension","dataProps","accessors","updateTriggersChanged","dataChanged","all","accessor","newProps","propTypes","name","isAttributeChanged","isObjectEmpty","undefined","_getAttributeManager","AttributeManager","id","stats","CompositeLayer","layerName","obj","isEmpty","key"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {\n  CompositeLayer,\n  AttributeManager,\n  LayerDataSource,\n  _compareProps as compareProps,\n  UpdateParameters,\n  CompositeLayerProps\n} from '@deck.gl/core';\nimport {filterProps} from './utils/prop-utils';\n\nexport type AggregationLayerProps<DataT> = CompositeLayerProps & {\n  data: LayerDataSource<DataT>;\n};\n\nexport default abstract class AggregationLayer<\n  DataT,\n  ExtraPropsT extends {} = {}\n> extends CompositeLayer<Required<AggregationLayer<DataT>> & ExtraPropsT> {\n  static layerName = 'AggregationLayer';\n\n  state!: {\n    ignoreProps?: Record<string, any>;\n    dimensions?: any;\n    changedAttributes?: Record<string, any>;\n  };\n\n  initializeAggregationLayer(dimensions: any) {\n    super.initializeState(this.context);\n\n    this.setState({\n      // Layer props , when changed doesn't require updating aggregation\n      ignoreProps: filterProps((this.constructor as any)._propTypes, dimensions.data.props),\n      dimensions\n    });\n  }\n\n  updateState(opts: UpdateParameters<this>) {\n    super.updateState(opts);\n    const {changeFlags} = opts;\n    if (changeFlags.extensionsChanged) {\n      const shaders = this.getShaders({});\n      if (shaders && shaders.defines) {\n        shaders.defines.NON_INSTANCED_MODEL = 1;\n      }\n      this.updateShaders(shaders);\n    }\n\n    // Explictly call to update attributes as 'CompositeLayer' doesn't call this\n    this._updateAttributes();\n  }\n\n  updateAttributes(changedAttributes) {\n    // Super classes, can refer to state.changedAttributes to determine what\n    // attributes changed\n    this.setState({changedAttributes});\n  }\n\n  getAttributes() {\n    return this.getAttributeManager()!.getAttributes();\n  }\n\n  getModuleSettings() {\n    // For regular layer draw this happens during draw cycle (_drawLayersInViewport) not during update cycle\n    // For aggregation layers this is called during updateState to update aggregation data\n    // NOTE: it is similar to LayerPass._getModuleParameters() but doesn't inlcude `effects` it is not needed for aggregation\n    const {viewport, mousePosition, device} = this.context;\n    const moduleSettings = Object.assign(Object.create(this.props), {\n      viewport,\n      mousePosition,\n      pickingActive: 0,\n      // @ts-expect-error TODO - assuming WebGL context\n      devicePixelRatio: device.canvasContext.cssToDeviceRatio()\n    });\n    return moduleSettings;\n  }\n\n  updateShaders(shaders) {\n    // Default implemention is empty, subclasses can update their Model objects if needed\n  }\n\n  /**\n   * Checks if aggregation is dirty\n   * @param {Object} updateOpts - object {props, oldProps, changeFlags}\n   * @param {Object} params - object {dimension, compareAll}\n   * @param {Object} params.dimension - {props, accessors} array of props and/or accessors\n   * @param {Boolean} params.compareAll - when `true` it will include non layer props for comparision\n   * @returns {Boolean} - returns true if dimensions' prop or accessor is changed\n   **/\n  isAggregationDirty(\n    updateOpts,\n    params: {compareAll?: boolean; dimension?: any} = {}\n  ): string | boolean {\n    const {props, oldProps, changeFlags} = updateOpts;\n    const {compareAll = false, dimension} = params;\n    const {ignoreProps} = this.state;\n    const {props: dataProps, accessors = []} = dimension;\n    const {updateTriggersChanged} = changeFlags;\n    if (changeFlags.dataChanged) {\n      return true;\n    }\n    if (updateTriggersChanged) {\n      if (updateTriggersChanged.all) {\n        return true;\n      }\n      for (const accessor of accessors) {\n        if (updateTriggersChanged[accessor]) {\n          return true;\n        }\n      }\n    }\n    if (compareAll) {\n      if (changeFlags.extensionsChanged) {\n        return true;\n      }\n      // Compare non layer props too (like extension props)\n      // ignoreprops refers to all Layer props other than aggregation props that need to be comapred\n      return compareProps({\n        oldProps,\n        newProps: props,\n        ignoreProps,\n        propTypes: (this.constructor as any)._propTypes\n      });\n    }\n    // Compare props of the dimension\n    for (const name of dataProps) {\n      if (props[name] !== oldProps[name]) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  /**\n   * Checks if an attribute is changed\n   * @param {String} name - name of the attribute\n   * @returns {Boolean} - `true` if attribute `name` is changed, `false` otherwise,\n   *                       If `name` is not passed or `undefiend`, `true` if any attribute is changed, `false` otherwise\n   **/\n  isAttributeChanged(name?: string) {\n    const {changedAttributes} = this.state;\n    if (!name) {\n      // if name not specified return true if any attribute is changed\n      return !isObjectEmpty(changedAttributes);\n    }\n    return changedAttributes && changedAttributes[name] !== undefined;\n  }\n\n  // Private\n\n  // override Composite layer private method to create AttributeManager instance\n  _getAttributeManager() {\n    return new AttributeManager(this.context.device, {\n      id: this.props.id,\n      stats: this.context.stats\n    });\n  }\n}\n\n// Helper methods\n\n// Returns true if given object is empty, false otherwise.\nfunction isObjectEmpty(obj) {\n  let isEmpty = true;\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  for (const key in obj) {\n    isEmpty = false;\n    break;\n  }\n  return isEmpty;\n}\n"],"file":"aggregation-layer.js"}