@deck.gl/aggregation-layers 8.10.0-alpha.4 → 8.10.0-alpha.5

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/grid-aggregation-layer.ts"],"names":["GridAggregationLayer","dimensions","gl","context","setState","layerData","gpuGridAggregator","GPUGridAggregator","id","cpuGridAggregator","pointToDensityGridDataCPU","opts","updateAggregationState","state","aggregationDataDirty","aggregationWeightsDirty","gpuAggregation","getNumInstances","aggregationDirty","_updateAggregation","_updateWeightBins","_uploadAggregationResults","count","weights","aggregationBuffer","delete","shaders","updateShaders","log","assert","numRow","numCol","dataBytes","name","weight","Buffer","byteLength","accessor","size","type","divisor","aggregationData","maxMinData","maxData","minData","gridOffset","posOffset","translation","scaling","boundingBox","projectPoints","props","viewport","attributes","getAttributes","vertexCount","result","run","cellSize","xOffset","yOffset","moduleSettings","getModuleSettings","getValue","sortedBins","BinSorter","data","aggregatedBins","minValue","maxValue","totalCount","ELEMENTCOUNT","aggregationSize","Float32Array","fill","bin","i","lonIdx","latIdx","value","counts","cellIndex","updateResults","AggregationLayer"],"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 AggregationLayer, {AggregationLayerProps} from './aggregation-layer';\nimport GPUGridAggregator from './utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport {Buffer} from '@luma.gl/core';\nimport {LayerContext, log, UpdateParameters} from '@deck.gl/core';\nimport GL from '@luma.gl/constants';\nimport BinSorter from './utils/bin-sorter';\nimport {pointToDensityGridDataCPU} from './cpu-grid-layer/grid-aggregator';\n\nexport type GridAggregationLayerProps<DataT> = AggregationLayerProps<DataT>;\n\nexport default abstract class GridAggregationLayer<\n  DataT,\n  ExtraPropsT extends {} = {}\n> extends AggregationLayer<DataT, ExtraPropsT> {\n  static layerName = 'GridAggregationLayer';\n\n  state!: AggregationLayer<DataT>['state'] & {\n    aggregationDataDirty?: any;\n    aggregationWeightsDirty?: any;\n    gpuAggregation?: any;\n    getValue?: () => any;\n    sortedBins?: BinSorter;\n  };\n\n  initializeAggregationLayer({dimensions}) {\n    const {gl} = this.context;\n    super.initializeAggregationLayer(dimensions);\n    this.setState({\n      // CPU aggregation results\n      layerData: {},\n      gpuGridAggregator: new GPUGridAggregator(gl, {id: `${this.id}-gpu-aggregator`}),\n      cpuGridAggregator: pointToDensityGridDataCPU\n    });\n  }\n\n  updateState(opts: UpdateParameters<this>) {\n    // get current attributes\n    super.updateState(opts);\n\n    this.updateAggregationState(opts);\n\n    const {aggregationDataDirty, aggregationWeightsDirty, gpuAggregation} = this.state;\n    if (this.getNumInstances() <= 0) {\n      return;\n    }\n    let aggregationDirty = false;\n    // CPU aggregation is two steps\n    // 1. Create bins (based on cellSize and position) 2. Aggregate weights for each bin\n    // For GPU aggregation both above steps are combined into one step\n\n    // step-1\n    if (aggregationDataDirty || (gpuAggregation && aggregationWeightsDirty)) {\n      this._updateAggregation(opts);\n      aggregationDirty = true;\n    }\n    // step-2 (Applicalbe for CPU aggregation only)\n    if (!gpuAggregation && (aggregationDataDirty || aggregationWeightsDirty)) {\n      this._updateWeightBins();\n      this._uploadAggregationResults();\n      aggregationDirty = true;\n    }\n\n    this.setState({aggregationDirty});\n  }\n\n  finalizeState(context: LayerContext) {\n    const {count} = this.state.weights;\n    if (count && count.aggregationBuffer) {\n      count.aggregationBuffer.delete();\n    }\n    this.state.gpuGridAggregator?.delete();\n    super.finalizeState(context);\n  }\n\n  updateShaders(shaders: any): void {\n    if (this.state.gpuAggregation) {\n      this.state.gpuGridAggregator.updateShaders(shaders);\n    }\n  }\n\n  // Methods that can be overriden by subclasses for customizations\n\n  updateAggregationState(opts) {\n    // Sublayers should implement this method.\n    log.assert(false);\n  }\n\n  allocateResources(numRow, numCol) {\n    if (this.state.numRow !== numRow || this.state.numCol !== numCol) {\n      const dataBytes = numCol * numRow * 4 * 4;\n      const gl = this.context.gl;\n      const {weights} = this.state;\n      for (const name in weights) {\n        const weight = weights[name];\n        if (weight.aggregationBuffer) {\n          weight.aggregationBuffer.delete();\n        }\n        weight.aggregationBuffer = new Buffer(gl, {\n          byteLength: dataBytes,\n          accessor: {\n            size: 4,\n            type: GL.FLOAT,\n            divisor: 1\n          }\n        });\n      }\n    }\n  }\n\n  updateResults({aggregationData, maxMinData, maxData, minData}) {\n    const {count} = this.state.weights;\n    if (count) {\n      count.aggregationData = aggregationData;\n      count.maxMinData = maxMinData;\n      count.maxData = maxData;\n      count.minData = minData;\n    }\n  }\n\n  // Private\n\n  _updateAggregation(opts) {\n    const {\n      cpuGridAggregator,\n      gpuGridAggregator,\n      gridOffset,\n      posOffset,\n      translation = [0, 0],\n      scaling = [0, 0, 0],\n      boundingBox,\n      projectPoints,\n      gpuAggregation,\n      numCol,\n      numRow\n    } = this.state;\n    const {props} = opts;\n    const {viewport} = this.context;\n    const attributes = this.getAttributes();\n    const vertexCount = this.getNumInstances();\n\n    if (!gpuAggregation) {\n      const result = cpuGridAggregator(props, {\n        gridOffset,\n        projectPoints,\n        attributes,\n        viewport,\n        posOffset,\n        boundingBox\n      });\n      this.setState({\n        layerData: result\n      });\n    } else {\n      const {weights} = this.state;\n      gpuGridAggregator.run({\n        weights,\n        cellSize: [gridOffset.xOffset, gridOffset.yOffset],\n        numCol,\n        numRow,\n        translation,\n        scaling,\n        vertexCount,\n        projectPoints,\n        attributes,\n        moduleSettings: this.getModuleSettings()\n      });\n    }\n  }\n\n  _updateWeightBins() {\n    const {getValue} = this.state;\n\n    const sortedBins = new BinSorter(this.state.layerData.data || [], {getValue});\n    this.setState({sortedBins});\n  }\n\n  _uploadAggregationResults(): void {\n    const {numCol, numRow} = this.state;\n    const {data} = this.state.layerData;\n    const {aggregatedBins, minValue, maxValue, totalCount} = this.state.sortedBins!;\n\n    const ELEMENTCOUNT = 4;\n    const aggregationSize = numCol * numRow * ELEMENTCOUNT;\n    const aggregationData = new Float32Array(aggregationSize).fill(0);\n    for (const bin of aggregatedBins) {\n      const {lonIdx, latIdx} = data[bin.i];\n      const {value, counts} = bin;\n      const cellIndex = (lonIdx + latIdx * numCol) * ELEMENTCOUNT;\n      aggregationData[cellIndex] = value;\n      aggregationData[cellIndex + ELEMENTCOUNT - 1] = counts;\n    }\n    const maxMinData = new Float32Array([maxValue, 0, 0, minValue]);\n    const maxData = new Float32Array([maxValue, 0, 0, totalCount]);\n    const minData = new Float32Array([minValue, 0, 0, totalCount]);\n    this.updateResults({aggregationData, maxMinData, maxData, minData});\n  }\n}\n"],"file":"grid-aggregation-layer.js"}
+{"version":3,"sources":["../../src/grid-aggregation-layer.ts"],"names":["GridAggregationLayer","state","initializeAggregationLayer","dimensions","gl","context","setState","layerData","gpuGridAggregator","GPUGridAggregator","id","cpuGridAggregator","pointToDensityGridDataCPU","updateState","opts","updateAggregationState","aggregationDataDirty","aggregationWeightsDirty","gpuAggregation","getNumInstances","aggregationDirty","_updateAggregation","_updateWeightBins","_uploadAggregationResults","finalizeState","count","weights","aggregationBuffer","delete","updateShaders","shaders","log","assert","allocateResources","numRow","numCol","dataBytes","name","weight","Buffer","byteLength","accessor","size","type","divisor","updateResults","aggregationData","maxMinData","maxData","minData","gridOffset","posOffset","translation","scaling","boundingBox","projectPoints","props","viewport","attributes","getAttributes","vertexCount","result","run","cellSize","xOffset","yOffset","moduleSettings","getModuleSettings","getValue","sortedBins","BinSorter","data","aggregatedBins","minValue","maxValue","totalCount","ELEMENTCOUNT","aggregationSize","Float32Array","fill","bin","i","lonIdx","latIdx","value","counts","cellIndex","AggregationLayer","layerName"],"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 AggregationLayer, {AggregationLayerProps} from './aggregation-layer';\nimport GPUGridAggregator from './utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport {Buffer} from '@luma.gl/core';\nimport {LayerContext, log, UpdateParameters} from '@deck.gl/core';\nimport GL from '@luma.gl/constants';\nimport BinSorter from './utils/bin-sorter';\nimport {pointToDensityGridDataCPU} from './cpu-grid-layer/grid-aggregator';\n\nexport type GridAggregationLayerProps<DataT> = AggregationLayerProps<DataT>;\n\nexport default abstract class GridAggregationLayer<\n  DataT,\n  ExtraPropsT extends {} = {}\n> extends AggregationLayer<DataT, ExtraPropsT> {\n  static layerName = 'GridAggregationLayer';\n\n  state!: AggregationLayer<DataT>['state'] & {\n    aggregationDataDirty?: any;\n    aggregationWeightsDirty?: any;\n    gpuAggregation?: any;\n    getValue?: () => any;\n    sortedBins?: BinSorter;\n  };\n\n  initializeAggregationLayer({dimensions}) {\n    const {gl} = this.context;\n    super.initializeAggregationLayer(dimensions);\n    this.setState({\n      // CPU aggregation results\n      layerData: {},\n      gpuGridAggregator: new GPUGridAggregator(gl, {id: `${this.id}-gpu-aggregator`}),\n      cpuGridAggregator: pointToDensityGridDataCPU\n    });\n  }\n\n  updateState(opts: UpdateParameters<this>) {\n    // get current attributes\n    super.updateState(opts);\n\n    this.updateAggregationState(opts);\n\n    const {aggregationDataDirty, aggregationWeightsDirty, gpuAggregation} = this.state;\n    if (this.getNumInstances() <= 0) {\n      return;\n    }\n    let aggregationDirty = false;\n    // CPU aggregation is two steps\n    // 1. Create bins (based on cellSize and position) 2. Aggregate weights for each bin\n    // For GPU aggregation both above steps are combined into one step\n\n    // step-1\n    if (aggregationDataDirty || (gpuAggregation && aggregationWeightsDirty)) {\n      this._updateAggregation(opts);\n      aggregationDirty = true;\n    }\n    // step-2 (Applicalbe for CPU aggregation only)\n    if (!gpuAggregation && (aggregationDataDirty || aggregationWeightsDirty)) {\n      this._updateWeightBins();\n      this._uploadAggregationResults();\n      aggregationDirty = true;\n    }\n\n    this.setState({aggregationDirty});\n  }\n\n  finalizeState(context: LayerContext) {\n    const {count} = this.state.weights;\n    if (count && count.aggregationBuffer) {\n      count.aggregationBuffer.delete();\n    }\n    this.state.gpuGridAggregator?.delete();\n    super.finalizeState(context);\n  }\n\n  updateShaders(shaders: any): void {\n    if (this.state.gpuAggregation) {\n      this.state.gpuGridAggregator.updateShaders(shaders);\n    }\n  }\n\n  // Methods that can be overriden by subclasses for customizations\n\n  updateAggregationState(opts) {\n    // Sublayers should implement this method.\n    log.assert(false);\n  }\n\n  allocateResources(numRow, numCol) {\n    if (this.state.numRow !== numRow || this.state.numCol !== numCol) {\n      const dataBytes = numCol * numRow * 4 * 4;\n      const gl = this.context.gl;\n      const {weights} = this.state;\n      for (const name in weights) {\n        const weight = weights[name];\n        if (weight.aggregationBuffer) {\n          weight.aggregationBuffer.delete();\n        }\n        weight.aggregationBuffer = new Buffer(gl, {\n          byteLength: dataBytes,\n          accessor: {\n            size: 4,\n            type: GL.FLOAT,\n            divisor: 1\n          }\n        });\n      }\n    }\n  }\n\n  updateResults({aggregationData, maxMinData, maxData, minData}) {\n    const {count} = this.state.weights;\n    if (count) {\n      count.aggregationData = aggregationData;\n      count.maxMinData = maxMinData;\n      count.maxData = maxData;\n      count.minData = minData;\n    }\n  }\n\n  // Private\n\n  _updateAggregation(opts) {\n    const {\n      cpuGridAggregator,\n      gpuGridAggregator,\n      gridOffset,\n      posOffset,\n      translation = [0, 0],\n      scaling = [0, 0, 0],\n      boundingBox,\n      projectPoints,\n      gpuAggregation,\n      numCol,\n      numRow\n    } = this.state;\n    const {props} = opts;\n    const {viewport} = this.context;\n    const attributes = this.getAttributes();\n    const vertexCount = this.getNumInstances();\n\n    if (!gpuAggregation) {\n      const result = cpuGridAggregator(props, {\n        gridOffset,\n        projectPoints,\n        attributes,\n        viewport,\n        posOffset,\n        boundingBox\n      });\n      this.setState({\n        layerData: result\n      });\n    } else {\n      const {weights} = this.state;\n      gpuGridAggregator.run({\n        weights,\n        cellSize: [gridOffset.xOffset, gridOffset.yOffset],\n        numCol,\n        numRow,\n        translation,\n        scaling,\n        vertexCount,\n        projectPoints,\n        attributes,\n        moduleSettings: this.getModuleSettings()\n      });\n    }\n  }\n\n  _updateWeightBins() {\n    const {getValue} = this.state;\n\n    const sortedBins = new BinSorter(this.state.layerData.data || [], {getValue});\n    this.setState({sortedBins});\n  }\n\n  _uploadAggregationResults(): void {\n    const {numCol, numRow} = this.state;\n    const {data} = this.state.layerData;\n    const {aggregatedBins, minValue, maxValue, totalCount} = this.state.sortedBins!;\n\n    const ELEMENTCOUNT = 4;\n    const aggregationSize = numCol * numRow * ELEMENTCOUNT;\n    const aggregationData = new Float32Array(aggregationSize).fill(0);\n    for (const bin of aggregatedBins) {\n      const {lonIdx, latIdx} = data[bin.i];\n      const {value, counts} = bin;\n      const cellIndex = (lonIdx + latIdx * numCol) * ELEMENTCOUNT;\n      aggregationData[cellIndex] = value;\n      aggregationData[cellIndex + ELEMENTCOUNT - 1] = counts;\n    }\n    const maxMinData = new Float32Array([maxValue, 0, 0, minValue]);\n    const maxData = new Float32Array([maxValue, 0, 0, totalCount]);\n    const minData = new Float32Array([minValue, 0, 0, totalCount]);\n    this.updateResults({aggregationData, maxMinData, maxData, minData});\n  }\n}\n"],"file":"grid-aggregation-layer.js"}

package/dist/es5/grid-layer/grid-layer.js

@@ -9,10 +9,6 @@ exports.default = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -56,77 +52,74 @@ var GridLayer = function (_CompositeLayer) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", void 0);
+    _this.state = void 0;
     return _this;
   }
 
-  (0, _createClass2.default)(GridLayer, [{
-    key: "initializeState",
-    value: function initializeState() {
-      this.state = {
-        useGPUAggregation: true
-      };
+  var _proto = GridLayer.prototype;
+
+  _proto.initializeState = function initializeState() {
+    this.state = {
+      useGPUAggregation: true
+    };
+  };
+
+  _proto.updateState = function updateState(_ref) {
+    var props = _ref.props;
+    this.setState({
+      useGPUAggregation: this.canUseGPUAggregation(props)
+    });
+  };
+
+  _proto.renderLayers = function renderLayers() {
+    var _this$props = this.props,
+        data = _this$props.data,
+        updateTriggers = _this$props.updateTriggers;
+    var id = this.state.useGPUAggregation ? 'GPU' : 'CPU';
+    var LayerType = this.state.useGPUAggregation ? this.getSubLayerClass('GPU', _gpuGridLayer.default) : this.getSubLayerClass('CPU', _cpuGridLayer.default);
+    return new LayerType(this.props, this.getSubLayerProps({
+      id: id,
+      updateTriggers: updateTriggers
+    }), {
+      data: data
+    });
+  };
+
+  _proto.canUseGPUAggregation = function canUseGPUAggregation(props) {
+    var gpuAggregation = props.gpuAggregation,
+        lowerPercentile = props.lowerPercentile,
+        upperPercentile = props.upperPercentile,
+        getColorValue = props.getColorValue,
+        getElevationValue = props.getElevationValue,
+        colorScaleType = props.colorScaleType;
+
+    if (!gpuAggregation) {
+      return false;
     }
-  }, {
-    key: "updateState",
-    value: function updateState(_ref) {
-      var props = _ref.props;
-      this.setState({
-        useGPUAggregation: this.canUseGPUAggregation(props)
-      });
+
+    if (!_gpuGridAggregator.default.isSupported(this.context.gl)) {
+      return false;
     }
-  }, {
-    key: "renderLayers",
-    value: function renderLayers() {
-      var _this$props = this.props,
-          data = _this$props.data,
-          updateTriggers = _this$props.updateTriggers;
-      var id = this.state.useGPUAggregation ? 'GPU' : 'CPU';
-      var LayerType = this.state.useGPUAggregation ? this.getSubLayerClass('GPU', _gpuGridLayer.default) : this.getSubLayerClass('CPU', _cpuGridLayer.default);
-      return new LayerType(this.props, this.getSubLayerProps({
-        id: id,
-        updateTriggers: updateTriggers
-      }), {
-        data: data
-      });
+
+    if (lowerPercentile !== 0 || upperPercentile !== 100) {
+      return false;
     }
-  }, {
-    key: "canUseGPUAggregation",
-    value: function canUseGPUAggregation(props) {
-      var gpuAggregation = props.gpuAggregation,
-          lowerPercentile = props.lowerPercentile,
-          upperPercentile = props.upperPercentile,
-          getColorValue = props.getColorValue,
-          getElevationValue = props.getElevationValue,
-          colorScaleType = props.colorScaleType;
-
-      if (!gpuAggregation) {
-        return false;
-      }
-
-      if (!_gpuGridAggregator.default.isSupported(this.context.gl)) {
-        return false;
-      }
-
-      if (lowerPercentile !== 0 || upperPercentile !== 100) {
-        return false;
-      }
-
-      if (getColorValue !== null || getElevationValue !== null) {
-        return false;
-      }
-
-      if (colorScaleType === 'quantile' || colorScaleType === 'ordinal') {
-        return false;
-      }
-
-      return true;
+
+    if (getColorValue !== null || getElevationValue !== null) {
+      return false;
     }
-  }]);
+
+    if (colorScaleType === 'quantile' || colorScaleType === 'ordinal') {
+      return false;
+    }
+
+    return true;
+  };
+
   return GridLayer;
 }(_core.CompositeLayer);
 
 exports.default = GridLayer;
-(0, _defineProperty2.default)(GridLayer, "layerName", 'GridLayer');
-(0, _defineProperty2.default)(GridLayer, "defaultProps", defaultProps);
+GridLayer.layerName = 'GridLayer';
+GridLayer.defaultProps = defaultProps;
 //# sourceMappingURL=grid-layer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/grid-layer/grid-layer.ts"],"names":["defaultProps","GPUGridLayer","CPUGridLayer","gpuAggregation","GridLayer","state","useGPUAggregation","props","setState","canUseGPUAggregation","data","updateTriggers","id","LayerType","getSubLayerClass","getSubLayerProps","lowerPercentile","upperPercentile","getColorValue","getElevationValue","colorScaleType","GPUGridAggregator","isSupported","context","gl","CompositeLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAOA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAA0C,iDAC3CC,sBAAaD,YAD8B,GAE3CE,sBAAaF,YAF8B;AAG9CG,EAAAA,cAAc,EAAE;AAH8B,EAAhD;;IA0BqBC,S;;;;;;;;;;;;;;;;;;;;;WAUnB,2BAAkB;AAChB,WAAKC,KAAL,GAAa;AACXC,QAAAA,iBAAiB,EAAE;AADR,OAAb;AAGD;;;WAED,2BAA6C;AAAA,UAAhCC,KAAgC,QAAhCA,KAAgC;AAC3C,WAAKC,QAAL,CAAc;AACZF,QAAAA,iBAAiB,EAAE,KAAKG,oBAAL,CAA0BF,KAA1B;AADP,OAAd;AAGD;;;WAED,wBAAsB;AACpB,wBAA+B,KAAKA,KAApC;AAAA,UAAOG,IAAP,eAAOA,IAAP;AAAA,UAAaC,cAAb,eAAaA,cAAb;AACA,UAAMC,EAAE,GAAG,KAAKP,KAAL,CAAWC,iBAAX,GAA+B,KAA/B,GAAuC,KAAlD;AACA,UAAMO,SAAS,GAAG,KAAKR,KAAL,CAAWC,iBAAX,GACd,KAAKQ,gBAAL,CAAsB,KAAtB,EAA6Bb,qBAA7B,CADc,GAEd,KAAKa,gBAAL,CAAsB,KAAtB,EAA6BZ,qBAA7B,CAFJ;AAGA,aAAO,IAAIW,SAAJ,CACL,KAAKN,KADA,EAEL,KAAKQ,gBAAL,CAAsB;AACpBH,QAAAA,EAAE,EAAFA,EADoB;AAEpBD,QAAAA,cAAc,EAAdA;AAFoB,OAAtB,CAFK,EAML;AACED,QAAAA,IAAI,EAAJA;AADF,OANK,CAAP;AAUD;;;WAID,8BAAqBH,KAArB,EAAgD;AAC9C,UACEJ,cADF,GAOII,KAPJ,CACEJ,cADF;AAAA,UAEEa,eAFF,GAOIT,KAPJ,CAEES,eAFF;AAAA,UAGEC,eAHF,GAOIV,KAPJ,CAGEU,eAHF;AAAA,UAIEC,aAJF,GAOIX,KAPJ,CAIEW,aAJF;AAAA,UAKEC,iBALF,GAOIZ,KAPJ,CAKEY,iBALF;AAAA,UAMEC,cANF,GAOIb,KAPJ,CAMEa,cANF;;AAQA,UAAI,CAACjB,cAAL,EAAqB;AAEnB,eAAO,KAAP;AACD;;AACD,UAAI,CAACkB,2BAAkBC,WAAlB,CAA8B,KAAKC,OAAL,CAAaC,EAA3C,CAAL,EAAqD;AACnD,eAAO,KAAP;AACD;;AACD,UAAIR,eAAe,KAAK,CAApB,IAAyBC,eAAe,KAAK,GAAjD,EAAsD;AAEpD,eAAO,KAAP;AACD;;AACD,UAAIC,aAAa,KAAK,IAAlB,IAA0BC,iBAAiB,KAAK,IAApD,EAA0D;AAExD,eAAO,KAAP;AACD;;AACD,UAAIC,cAAc,KAAK,UAAnB,IAAiCA,cAAc,KAAK,SAAxD,EAAmE;AAEjE,eAAO,KAAP;AACD;;AACD,aAAO,IAAP;AACD;;;EAvE8EK,oB;;;8BAA5DrB,S,eAGA,W;8BAHAA,S,kBAIGJ,Y","sourcesContent":["import {\n  CompositeLayer,\n  CompositeLayerProps,\n  Layer,\n  UpdateParameters,\n  DefaultProps\n} from '@deck.gl/core';\nimport GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport GPUGridLayer, {GPUGridLayerProps} from '../gpu-grid-layer/gpu-grid-layer';\nimport CPUGridLayer, {CPUGridLayerProps} from '../cpu-grid-layer/cpu-grid-layer';\n\nconst defaultProps: DefaultProps<GridLayerProps> = {\n  ...GPUGridLayer.defaultProps,\n  ...CPUGridLayer.defaultProps,\n  gpuAggregation: false\n};\n\n/** All properties supported by GridLayer. */\nexport type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps;\n\n/** Properties added by GridLayer. */\ntype _GridLayerProps<DataT> = CPUGridLayerProps<DataT> &\n  GPUGridLayerProps<DataT> & {\n    /**\n     * Whether the aggregation should be performed in high-precision 64-bit mode.\n     * @default false\n     */\n    fp64?: boolean;\n\n    /**\n     * When set to true, aggregation is performed on GPU, provided other conditions are met.\n     * @default false\n     */\n    gpuAggregation?: boolean;\n  };\n\n/** Aggregate data into a grid-based heatmap. The color and height of a cell are determined based on the objects it contains. */\nexport default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<\n  ExtraPropsT & Required<_GridLayerProps<DataT>>\n> {\n  static layerName = 'GridLayer';\n  static defaultProps = defaultProps;\n\n  state!: CompositeLayer['state'] & {\n    useGPUAggregation: boolean;\n  };\n\n  initializeState() {\n    this.state = {\n      useGPUAggregation: true\n    };\n  }\n\n  updateState({props}: UpdateParameters<this>) {\n    this.setState({\n      useGPUAggregation: this.canUseGPUAggregation(props)\n    });\n  }\n\n  renderLayers(): Layer {\n    const {data, updateTriggers} = this.props;\n    const id = this.state.useGPUAggregation ? 'GPU' : 'CPU';\n    const LayerType = this.state.useGPUAggregation\n      ? this.getSubLayerClass('GPU', GPUGridLayer)\n      : this.getSubLayerClass('CPU', CPUGridLayer);\n    return new LayerType(\n      this.props,\n      this.getSubLayerProps({\n        id,\n        updateTriggers\n      }),\n      {\n        data\n      }\n    );\n  }\n\n  // Private methods\n\n  canUseGPUAggregation(props: GridLayer['props']) {\n    const {\n      gpuAggregation,\n      lowerPercentile,\n      upperPercentile,\n      getColorValue,\n      getElevationValue,\n      colorScaleType\n    } = props;\n    if (!gpuAggregation) {\n      // cpu aggregation is requested\n      return false;\n    }\n    if (!GPUGridAggregator.isSupported(this.context.gl)) {\n      return false;\n    }\n    if (lowerPercentile !== 0 || upperPercentile !== 100) {\n      // percentile calculations requires sorting not supported on GPU\n      return false;\n    }\n    if (getColorValue !== null || getElevationValue !== null) {\n      // accessor for custom color or elevation calculation is specified\n      return false;\n    }\n    if (colorScaleType === 'quantile' || colorScaleType === 'ordinal') {\n      // quantile and ordinal scales are not supported on GPU\n      return false;\n    }\n    return true;\n  }\n}\n"],"file":"grid-layer.js"}
+{"version":3,"sources":["../../../src/grid-layer/grid-layer.ts"],"names":["defaultProps","GPUGridLayer","CPUGridLayer","gpuAggregation","GridLayer","state","initializeState","useGPUAggregation","updateState","props","setState","canUseGPUAggregation","renderLayers","data","updateTriggers","id","LayerType","getSubLayerClass","getSubLayerProps","lowerPercentile","upperPercentile","getColorValue","getElevationValue","colorScaleType","GPUGridAggregator","isSupported","context","gl","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AAOA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAA0C,iDAC3CC,sBAAaD,YAD8B,GAE3CE,sBAAaF,YAF8B;AAG9CG,EAAAA,cAAc,EAAE;AAH8B,EAAhD;;IA0BqBC,S;;;;;;;;;;;;;;;UAMnBC,K;;;;;;SAIAC,e,GAAA,2BAAkB;AAChB,SAAKD,KAAL,GAAa;AACXE,MAAAA,iBAAiB,EAAE;AADR,KAAb;AAGD,G;;SAEDC,W,GAAA,2BAA6C;AAAA,QAAhCC,KAAgC,QAAhCA,KAAgC;AAC3C,SAAKC,QAAL,CAAc;AACZH,MAAAA,iBAAiB,EAAE,KAAKI,oBAAL,CAA0BF,KAA1B;AADP,KAAd;AAGD,G;;SAEDG,Y,GAAA,wBAAsB;AACpB,sBAA+B,KAAKH,KAApC;AAAA,QAAOI,IAAP,eAAOA,IAAP;AAAA,QAAaC,cAAb,eAAaA,cAAb;AACA,QAAMC,EAAE,GAAG,KAAKV,KAAL,CAAWE,iBAAX,GAA+B,KAA/B,GAAuC,KAAlD;AACA,QAAMS,SAAS,GAAG,KAAKX,KAAL,CAAWE,iBAAX,GACd,KAAKU,gBAAL,CAAsB,KAAtB,EAA6BhB,qBAA7B,CADc,GAEd,KAAKgB,gBAAL,CAAsB,KAAtB,EAA6Bf,qBAA7B,CAFJ;AAGA,WAAO,IAAIc,SAAJ,CACL,KAAKP,KADA,EAEL,KAAKS,gBAAL,CAAsB;AACpBH,MAAAA,EAAE,EAAFA,EADoB;AAEpBD,MAAAA,cAAc,EAAdA;AAFoB,KAAtB,CAFK,EAML;AACED,MAAAA,IAAI,EAAJA;AADF,KANK,CAAP;AAUD,G;;SAIDF,oB,GAAA,8BAAqBF,KAArB,EAAgD;AAC9C,QACEN,cADF,GAOIM,KAPJ,CACEN,cADF;AAAA,QAEEgB,eAFF,GAOIV,KAPJ,CAEEU,eAFF;AAAA,QAGEC,eAHF,GAOIX,KAPJ,CAGEW,eAHF;AAAA,QAIEC,aAJF,GAOIZ,KAPJ,CAIEY,aAJF;AAAA,QAKEC,iBALF,GAOIb,KAPJ,CAKEa,iBALF;AAAA,QAMEC,cANF,GAOId,KAPJ,CAMEc,cANF;;AAQA,QAAI,CAACpB,cAAL,EAAqB;AAEnB,aAAO,KAAP;AACD;;AACD,QAAI,CAACqB,2BAAkBC,WAAlB,CAA8B,KAAKC,OAAL,CAAaC,EAA3C,CAAL,EAAqD;AACnD,aAAO,KAAP;AACD;;AACD,QAAIR,eAAe,KAAK,CAApB,IAAyBC,eAAe,KAAK,GAAjD,EAAsD;AAEpD,aAAO,KAAP;AACD;;AACD,QAAIC,aAAa,KAAK,IAAlB,IAA0BC,iBAAiB,KAAK,IAApD,EAA0D;AAExD,aAAO,KAAP;AACD;;AACD,QAAIC,cAAc,KAAK,UAAnB,IAAiCA,cAAc,KAAK,SAAxD,EAAmE;AAEjE,aAAO,KAAP;AACD;;AACD,WAAO,IAAP;AACD,G;;;EAvE8EK,oB;;;AAA5DxB,S,CAGZyB,S,GAAY,W;AAHAzB,S,CAIZJ,Y,GAAeA,Y","sourcesContent":["import {\n  CompositeLayer,\n  CompositeLayerProps,\n  Layer,\n  UpdateParameters,\n  DefaultProps\n} from '@deck.gl/core';\nimport GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport GPUGridLayer, {GPUGridLayerProps} from '../gpu-grid-layer/gpu-grid-layer';\nimport CPUGridLayer, {CPUGridLayerProps} from '../cpu-grid-layer/cpu-grid-layer';\n\nconst defaultProps: DefaultProps<GridLayerProps> = {\n  ...GPUGridLayer.defaultProps,\n  ...CPUGridLayer.defaultProps,\n  gpuAggregation: false\n};\n\n/** All properties supported by GridLayer. */\nexport type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps;\n\n/** Properties added by GridLayer. */\ntype _GridLayerProps<DataT> = CPUGridLayerProps<DataT> &\n  GPUGridLayerProps<DataT> & {\n    /**\n     * Whether the aggregation should be performed in high-precision 64-bit mode.\n     * @default false\n     */\n    fp64?: boolean;\n\n    /**\n     * When set to true, aggregation is performed on GPU, provided other conditions are met.\n     * @default false\n     */\n    gpuAggregation?: boolean;\n  };\n\n/** Aggregate data into a grid-based heatmap. The color and height of a cell are determined based on the objects it contains. */\nexport default class GridLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<\n  ExtraPropsT & Required<_GridLayerProps<DataT>>\n> {\n  static layerName = 'GridLayer';\n  static defaultProps = defaultProps;\n\n  state!: CompositeLayer['state'] & {\n    useGPUAggregation: boolean;\n  };\n\n  initializeState() {\n    this.state = {\n      useGPUAggregation: true\n    };\n  }\n\n  updateState({props}: UpdateParameters<this>) {\n    this.setState({\n      useGPUAggregation: this.canUseGPUAggregation(props)\n    });\n  }\n\n  renderLayers(): Layer {\n    const {data, updateTriggers} = this.props;\n    const id = this.state.useGPUAggregation ? 'GPU' : 'CPU';\n    const LayerType = this.state.useGPUAggregation\n      ? this.getSubLayerClass('GPU', GPUGridLayer)\n      : this.getSubLayerClass('CPU', CPUGridLayer);\n    return new LayerType(\n      this.props,\n      this.getSubLayerProps({\n        id,\n        updateTriggers\n      }),\n      {\n        data\n      }\n    );\n  }\n\n  // Private methods\n\n  canUseGPUAggregation(props: GridLayer['props']) {\n    const {\n      gpuAggregation,\n      lowerPercentile,\n      upperPercentile,\n      getColorValue,\n      getElevationValue,\n      colorScaleType\n    } = props;\n    if (!gpuAggregation) {\n      // cpu aggregation is requested\n      return false;\n    }\n    if (!GPUGridAggregator.isSupported(this.context.gl)) {\n      return false;\n    }\n    if (lowerPercentile !== 0 || upperPercentile !== 100) {\n      // percentile calculations requires sorting not supported on GPU\n      return false;\n    }\n    if (getColorValue !== null || getElevationValue !== null) {\n      // accessor for custom color or elevation calculation is specified\n      return false;\n    }\n    if (colorScaleType === 'quantile' || colorScaleType === 'ordinal') {\n      // quantile and ordinal scales are not supported on GPU\n      return false;\n    }\n    return true;\n  }\n}\n"],"file":"grid-layer.js"}