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

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

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
@@ -19,8 +19,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _core = require("@luma.gl/core");
 
 var _core2 = require("@deck.gl/core");
@@ -105,321 +103,313 @@ var GPUGridLayer = function (_GridAggregationLayer) {
     return _super.apply(this, arguments);
   }
 
-  (0, _createClass2.default)(GPUGridLayer, [{
-    key: "initializeState",
-    value: function initializeState(_ref) {
-      var _attributeManager$add;
+  var _proto = GPUGridLayer.prototype;
 
-      var gl = _ref.gl;
+  _proto.initializeState = function initializeState(_ref) {
+    var _attributeManager$add;
 
-      var isSupported = _gpuGridAggregator.default.isSupported(gl);
+    var gl = _ref.gl;
 
-      if (!isSupported) {
-        _core2.log.error('GPUGridLayer is not supported on this browser, use GridLayer instead')();
-      }
+    var isSupported = _gpuGridAggregator.default.isSupported(gl);
 
-      (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "initializeAggregationLayer", this).call(this, {
-        dimensions: DIMENSIONS
-      });
-      this.setState({
-        gpuAggregation: true,
-        projectPoints: false,
-        isSupported: isSupported,
-        weights: {
-          color: {
-            needMin: true,
-            needMax: true,
-            combineMaxMin: true,
-            maxMinBuffer: new _core.Buffer(gl, {
-              byteLength: 4 * 4,
-              accessor: {
-                size: 4,
-                type: 5126,
-                divisor: 1
-              }
-            })
-          },
-          elevation: {
-            needMin: true,
-            needMax: true,
-            combineMaxMin: true,
-            maxMinBuffer: new _core.Buffer(gl, {
-              byteLength: 4 * 4,
-              accessor: {
-                size: 4,
-                type: 5126,
-                divisor: 1
-              }
-            })
-          }
+    if (!isSupported) {
+      _core2.log.error('GPUGridLayer is not supported on this browser, use GridLayer instead')();
+    }
+
+    (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "initializeAggregationLayer", this).call(this, {
+      dimensions: DIMENSIONS
+    });
+    this.setState({
+      gpuAggregation: true,
+      projectPoints: false,
+      isSupported: isSupported,
+      weights: {
+        color: {
+          needMin: true,
+          needMax: true,
+          combineMaxMin: true,
+          maxMinBuffer: new _core.Buffer(gl, {
+            byteLength: 4 * 4,
+            accessor: {
+              size: 4,
+              type: 5126,
+              divisor: 1
+            }
+          })
         },
-        positionAttributeName: 'positions'
-      });
-      var attributeManager = this.getAttributeManager();
-      attributeManager.add((_attributeManager$add = {}, (0, _defineProperty2.default)(_attributeManager$add, POSITION_ATTRIBUTE_NAME, {
-        size: 3,
-        accessor: 'getPosition',
-        type: 5130,
-        fp64: this.use64bitPositions()
-      }), (0, _defineProperty2.default)(_attributeManager$add, "color", {
-        size: 3,
-        accessor: 'getColorWeight'
-      }), (0, _defineProperty2.default)(_attributeManager$add, "elevation", {
-        size: 3,
-        accessor: 'getElevationWeight'
-      }), _attributeManager$add));
+        elevation: {
+          needMin: true,
+          needMax: true,
+          combineMaxMin: true,
+          maxMinBuffer: new _core.Buffer(gl, {
+            byteLength: 4 * 4,
+            accessor: {
+              size: 4,
+              type: 5126,
+              divisor: 1
+            }
+          })
+        }
+      },
+      positionAttributeName: 'positions'
+    });
+    var attributeManager = this.getAttributeManager();
+    attributeManager.add((_attributeManager$add = {}, (0, _defineProperty2.default)(_attributeManager$add, POSITION_ATTRIBUTE_NAME, {
+      size: 3,
+      accessor: 'getPosition',
+      type: 5130,
+      fp64: this.use64bitPositions()
+    }), (0, _defineProperty2.default)(_attributeManager$add, "color", {
+      size: 3,
+      accessor: 'getColorWeight'
+    }), (0, _defineProperty2.default)(_attributeManager$add, "elevation", {
+      size: 3,
+      accessor: 'getElevationWeight'
+    }), _attributeManager$add));
+  };
+
+  _proto.updateState = function updateState(opts) {
+    if (this.state.isSupported === false) {
+      return;
     }
-  }, {
-    key: "updateState",
-    value: function updateState(opts) {
-      if (this.state.isSupported === false) {
-        return;
-      }
 
-      (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "updateState", this).call(this, opts);
-      var aggregationDirty = this.state.aggregationDirty;
+    (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "updateState", this).call(this, opts);
+    var aggregationDirty = this.state.aggregationDirty;
 
-      if (aggregationDirty) {
-        this.setState({
-          gridHash: null
-        });
-      }
-    }
-  }, {
-    key: "getHashKeyForIndex",
-    value: function getHashKeyForIndex(index) {
-      var _this$state = this.state,
-          numRow = _this$state.numRow,
-          numCol = _this$state.numCol,
-          boundingBox = _this$state.boundingBox,
-          gridOffset = _this$state.gridOffset;
-      var gridSize = [numCol, numRow];
-      var gridOrigin = [boundingBox.xMin, boundingBox.yMin];
-      var cellSize = [gridOffset.xOffset, gridOffset.yOffset];
-      var yIndex = Math.floor(index / gridSize[0]);
-      var xIndex = index - yIndex * gridSize[0];
-      var latIdx = Math.floor((yIndex * cellSize[1] + gridOrigin[1] + 90 + cellSize[1] / 2) / cellSize[1]);
-      var lonIdx = Math.floor((xIndex * cellSize[0] + gridOrigin[0] + 180 + cellSize[0] / 2) / cellSize[0]);
-      return "".concat(latIdx, "-").concat(lonIdx);
-    }
-  }, {
-    key: "getPositionForIndex",
-    value: function getPositionForIndex(index) {
-      var _this$state2 = this.state,
-          numRow = _this$state2.numRow,
-          numCol = _this$state2.numCol,
-          boundingBox = _this$state2.boundingBox,
-          gridOffset = _this$state2.gridOffset;
-      var gridSize = [numCol, numRow];
-      var gridOrigin = [boundingBox.xMin, boundingBox.yMin];
-      var cellSize = [gridOffset.xOffset, gridOffset.yOffset];
-      var yIndex = Math.floor(index / gridSize[0]);
-      var xIndex = index - yIndex * gridSize[0];
-      var yPos = yIndex * cellSize[1] + gridOrigin[1];
-      var xPos = xIndex * cellSize[0] + gridOrigin[0];
-      return [xPos, yPos];
+    if (aggregationDirty) {
+      this.setState({
+        gridHash: null
+      });
     }
-  }, {
-    key: "getPickingInfo",
-    value: function getPickingInfo(_ref2) {
-      var info = _ref2.info,
-          mode = _ref2.mode;
-      var index = info.index;
-      var object = null;
-
-      if (index >= 0) {
-        var gpuGridAggregator = this.state.gpuGridAggregator;
-        var position = this.getPositionForIndex(index);
-
-        var colorInfo = _gpuGridAggregator.default.getAggregationData(_objectSpread({
-          pixelIndex: index
-        }, gpuGridAggregator.getData('color')));
-
-        var elevationInfo = _gpuGridAggregator.default.getAggregationData(_objectSpread({
-          pixelIndex: index
-        }, gpuGridAggregator.getData('elevation')));
-
-        object = {
-          colorValue: colorInfo.cellWeight,
-          elevationValue: elevationInfo.cellWeight,
-          count: colorInfo.cellCount || elevationInfo.cellCount,
-          position: position,
-          totalCount: colorInfo.totalCount || elevationInfo.totalCount
-        };
-
-        if (mode !== 'hover') {
-          var props = this.props;
-          var gridHash = this.state.gridHash;
-
-          if (!gridHash) {
-            var _this$state3 = this.state,
-                gridOffset = _this$state3.gridOffset,
-                translation = _this$state3.translation,
-                boundingBox = _this$state3.boundingBox;
-            var viewport = this.context.viewport;
-            var attributes = this.getAttributes();
-            var cpuAggregation = (0, _gridAggregator.pointToDensityGridDataCPU)(props, {
-              gridOffset: gridOffset,
-              attributes: attributes,
-              viewport: viewport,
-              translation: translation,
-              boundingBox: boundingBox
-            });
-            gridHash = cpuAggregation.gridHash;
-            this.setState({
-              gridHash: gridHash
-            });
-          }
-
-          var key = this.getHashKeyForIndex(index);
-          var cpuAggregationData = gridHash[key];
-          Object.assign(object, cpuAggregationData);
+  };
+
+  _proto.getHashKeyForIndex = function getHashKeyForIndex(index) {
+    var _this$state = this.state,
+        numRow = _this$state.numRow,
+        numCol = _this$state.numCol,
+        boundingBox = _this$state.boundingBox,
+        gridOffset = _this$state.gridOffset;
+    var gridSize = [numCol, numRow];
+    var gridOrigin = [boundingBox.xMin, boundingBox.yMin];
+    var cellSize = [gridOffset.xOffset, gridOffset.yOffset];
+    var yIndex = Math.floor(index / gridSize[0]);
+    var xIndex = index - yIndex * gridSize[0];
+    var latIdx = Math.floor((yIndex * cellSize[1] + gridOrigin[1] + 90 + cellSize[1] / 2) / cellSize[1]);
+    var lonIdx = Math.floor((xIndex * cellSize[0] + gridOrigin[0] + 180 + cellSize[0] / 2) / cellSize[0]);
+    return "".concat(latIdx, "-").concat(lonIdx);
+  };
+
+  _proto.getPositionForIndex = function getPositionForIndex(index) {
+    var _this$state2 = this.state,
+        numRow = _this$state2.numRow,
+        numCol = _this$state2.numCol,
+        boundingBox = _this$state2.boundingBox,
+        gridOffset = _this$state2.gridOffset;
+    var gridSize = [numCol, numRow];
+    var gridOrigin = [boundingBox.xMin, boundingBox.yMin];
+    var cellSize = [gridOffset.xOffset, gridOffset.yOffset];
+    var yIndex = Math.floor(index / gridSize[0]);
+    var xIndex = index - yIndex * gridSize[0];
+    var yPos = yIndex * cellSize[1] + gridOrigin[1];
+    var xPos = xIndex * cellSize[0] + gridOrigin[0];
+    return [xPos, yPos];
+  };
+
+  _proto.getPickingInfo = function getPickingInfo(_ref2) {
+    var info = _ref2.info,
+        mode = _ref2.mode;
+    var index = info.index;
+    var object = null;
+
+    if (index >= 0) {
+      var gpuGridAggregator = this.state.gpuGridAggregator;
+      var position = this.getPositionForIndex(index);
+
+      var colorInfo = _gpuGridAggregator.default.getAggregationData(_objectSpread({
+        pixelIndex: index
+      }, gpuGridAggregator.getData('color')));
+
+      var elevationInfo = _gpuGridAggregator.default.getAggregationData(_objectSpread({
+        pixelIndex: index
+      }, gpuGridAggregator.getData('elevation')));
+
+      object = {
+        colorValue: colorInfo.cellWeight,
+        elevationValue: elevationInfo.cellWeight,
+        count: colorInfo.cellCount || elevationInfo.cellCount,
+        position: position,
+        totalCount: colorInfo.totalCount || elevationInfo.totalCount
+      };
+
+      if (mode !== 'hover') {
+        var props = this.props;
+        var gridHash = this.state.gridHash;
+
+        if (!gridHash) {
+          var _this$state3 = this.state,
+              gridOffset = _this$state3.gridOffset,
+              translation = _this$state3.translation,
+              boundingBox = _this$state3.boundingBox;
+          var viewport = this.context.viewport;
+          var attributes = this.getAttributes();
+          var cpuAggregation = (0, _gridAggregator.pointToDensityGridDataCPU)(props, {
+            gridOffset: gridOffset,
+            attributes: attributes,
+            viewport: viewport,
+            translation: translation,
+            boundingBox: boundingBox
+          });
+          gridHash = cpuAggregation.gridHash;
+          this.setState({
+            gridHash: gridHash
+          });
         }
-      }
 
-      info.picked = Boolean(object);
-      info.object = object;
-      return info;
-    }
-  }, {
-    key: "renderLayers",
-    value: function renderLayers() {
-      if (!this.state.isSupported) {
-        return null;
+        var key = this.getHashKeyForIndex(index);
+        var cpuAggregationData = gridHash[key];
+        Object.assign(object, cpuAggregationData);
       }
-
-      var _this$props = this.props,
-          elevationScale = _this$props.elevationScale,
-          extruded = _this$props.extruded,
-          cellSizeMeters = _this$props.cellSize,
-          coverage = _this$props.coverage,
-          material = _this$props.material,
-          elevationRange = _this$props.elevationRange,
-          colorDomain = _this$props.colorDomain,
-          elevationDomain = _this$props.elevationDomain;
-      var _this$state4 = this.state,
-          weights = _this$state4.weights,
-          numRow = _this$state4.numRow,
-          numCol = _this$state4.numCol,
-          gridOrigin = _this$state4.gridOrigin,
-          gridOffset = _this$state4.gridOffset;
-      var color = weights.color,
-          elevation = weights.elevation;
-      var colorRange = (0, _colorUtils.colorRangeToFlatArray)(this.props.colorRange);
-      var SubLayerClass = this.getSubLayerClass('gpu-grid-cell', _gpuGridCellLayer.default);
-      return new SubLayerClass({
-        gridSize: [numCol, numRow],
-        gridOrigin: gridOrigin,
-        gridOffset: [gridOffset.xOffset, gridOffset.yOffset],
-        colorRange: colorRange,
-        elevationRange: elevationRange,
-        colorDomain: colorDomain,
-        elevationDomain: elevationDomain,
-        cellSize: cellSizeMeters,
-        coverage: coverage,
-        material: material,
-        elevationScale: elevationScale,
-        extruded: extruded
-      }, this.getSubLayerProps({
-        id: 'gpu-grid-cell'
-      }), {
-        data: {
-          attributes: {
-            colors: color.aggregationBuffer,
-            elevations: elevation.aggregationBuffer
-          }
-        },
-        colorMaxMinBuffer: color.maxMinBuffer,
-        elevationMaxMinBuffer: elevation.maxMinBuffer,
-        numInstances: numCol * numRow
-      });
     }
-  }, {
-    key: "finalizeState",
-    value: function finalizeState(context) {
-      var _this$state$weights = this.state.weights,
-          color = _this$state$weights.color,
-          elevation = _this$state$weights.elevation;
-      [color, elevation].forEach(function (weight) {
-        var aggregationBuffer = weight.aggregationBuffer,
-            maxMinBuffer = weight.maxMinBuffer;
-        maxMinBuffer.delete();
-        aggregationBuffer === null || aggregationBuffer === void 0 ? void 0 : aggregationBuffer.delete();
-      });
-      (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "finalizeState", this).call(this, context);
-    }
-  }, {
-    key: "updateAggregationState",
-    value: function updateAggregationState(opts) {
-      var props = opts.props,
-          oldProps = opts.oldProps;
-      var cellSize = props.cellSize,
-          coordinateSystem = props.coordinateSystem;
-      var viewport = this.context.viewport;
-      var cellSizeChanged = oldProps.cellSize !== cellSize;
-      var dimensions = this.state.dimensions;
-      var positionsChanged = this.isAttributeChanged(POSITION_ATTRIBUTE_NAME);
-      var attributesChanged = positionsChanged || this.isAttributeChanged();
-      var boundingBox = this.state.boundingBox;
-
-      if (positionsChanged) {
-        boundingBox = (0, _gridAggregationUtils.getBoundingBox)(this.getAttributes(), this.getNumInstances());
-        this.setState({
-          boundingBox: boundingBox
-        });
-      }
 
-      if (positionsChanged || cellSizeChanged) {
-        var _getGridParams = (0, _gridAggregationUtils.getGridParams)(boundingBox, cellSize, viewport, coordinateSystem),
-            gridOffset = _getGridParams.gridOffset,
-            translation = _getGridParams.translation,
-            width = _getGridParams.width,
-            height = _getGridParams.height,
-            numCol = _getGridParams.numCol,
-            numRow = _getGridParams.numRow;
-
-        this.allocateResources(numRow, numCol);
-        this.setState({
-          gridOffset: gridOffset,
-          translation: translation,
-          gridOrigin: [-1 * translation[0], -1 * translation[1]],
-          width: width,
-          height: height,
-          numCol: numCol,
-          numRow: numRow
-        });
-      }
+    info.picked = Boolean(object);
+    info.object = object;
+    return info;
+  };
+
+  _proto.renderLayers = function renderLayers() {
+    if (!this.state.isSupported) {
+      return null;
+    }
 
-      var aggregationDataDirty = attributesChanged || this.isAggregationDirty(opts, {
-        dimension: dimensions.data,
-        compareAll: true
+    var _this$props = this.props,
+        elevationScale = _this$props.elevationScale,
+        extruded = _this$props.extruded,
+        cellSizeMeters = _this$props.cellSize,
+        coverage = _this$props.coverage,
+        material = _this$props.material,
+        elevationRange = _this$props.elevationRange,
+        colorDomain = _this$props.colorDomain,
+        elevationDomain = _this$props.elevationDomain;
+    var _this$state4 = this.state,
+        weights = _this$state4.weights,
+        numRow = _this$state4.numRow,
+        numCol = _this$state4.numCol,
+        gridOrigin = _this$state4.gridOrigin,
+        gridOffset = _this$state4.gridOffset;
+    var color = weights.color,
+        elevation = weights.elevation;
+    var colorRange = (0, _colorUtils.colorRangeToFlatArray)(this.props.colorRange);
+    var SubLayerClass = this.getSubLayerClass('gpu-grid-cell', _gpuGridCellLayer.default);
+    return new SubLayerClass({
+      gridSize: [numCol, numRow],
+      gridOrigin: gridOrigin,
+      gridOffset: [gridOffset.xOffset, gridOffset.yOffset],
+      colorRange: colorRange,
+      elevationRange: elevationRange,
+      colorDomain: colorDomain,
+      elevationDomain: elevationDomain,
+      cellSize: cellSizeMeters,
+      coverage: coverage,
+      material: material,
+      elevationScale: elevationScale,
+      extruded: extruded
+    }, this.getSubLayerProps({
+      id: 'gpu-grid-cell'
+    }), {
+      data: {
+        attributes: {
+          colors: color.aggregationBuffer,
+          elevations: elevation.aggregationBuffer
+        }
+      },
+      colorMaxMinBuffer: color.maxMinBuffer,
+      elevationMaxMinBuffer: elevation.maxMinBuffer,
+      numInstances: numCol * numRow
+    });
+  };
+
+  _proto.finalizeState = function finalizeState(context) {
+    var _this$state$weights = this.state.weights,
+        color = _this$state$weights.color,
+        elevation = _this$state$weights.elevation;
+    [color, elevation].forEach(function (weight) {
+      var aggregationBuffer = weight.aggregationBuffer,
+          maxMinBuffer = weight.maxMinBuffer;
+      maxMinBuffer.delete();
+      aggregationBuffer === null || aggregationBuffer === void 0 ? void 0 : aggregationBuffer.delete();
+    });
+    (0, _get2.default)((0, _getPrototypeOf2.default)(GPUGridLayer.prototype), "finalizeState", this).call(this, context);
+  };
+
+  _proto.updateAggregationState = function updateAggregationState(opts) {
+    var props = opts.props,
+        oldProps = opts.oldProps;
+    var cellSize = props.cellSize,
+        coordinateSystem = props.coordinateSystem;
+    var viewport = this.context.viewport;
+    var cellSizeChanged = oldProps.cellSize !== cellSize;
+    var dimensions = this.state.dimensions;
+    var positionsChanged = this.isAttributeChanged(POSITION_ATTRIBUTE_NAME);
+    var attributesChanged = positionsChanged || this.isAttributeChanged();
+    var boundingBox = this.state.boundingBox;
+
+    if (positionsChanged) {
+      boundingBox = (0, _gridAggregationUtils.getBoundingBox)(this.getAttributes(), this.getNumInstances());
+      this.setState({
+        boundingBox: boundingBox
       });
+    }
 
-      if (aggregationDataDirty) {
-        this._updateAccessors(opts);
-      }
+    if (positionsChanged || cellSizeChanged) {
+      var _getGridParams = (0, _gridAggregationUtils.getGridParams)(boundingBox, cellSize, viewport, coordinateSystem),
+          gridOffset = _getGridParams.gridOffset,
+          translation = _getGridParams.translation,
+          width = _getGridParams.width,
+          height = _getGridParams.height,
+          numCol = _getGridParams.numCol,
+          numRow = _getGridParams.numRow;
 
+      this.allocateResources(numRow, numCol);
       this.setState({
-        aggregationDataDirty: aggregationDataDirty
+        gridOffset: gridOffset,
+        translation: translation,
+        gridOrigin: [-1 * translation[0], -1 * translation[1]],
+        width: width,
+        height: height,
+        numCol: numCol,
+        numRow: numRow
       });
     }
-  }, {
-    key: "_updateAccessors",
-    value: function _updateAccessors(opts) {
-      var _opts$props = opts.props,
-          colorAggregation = _opts$props.colorAggregation,
-          elevationAggregation = _opts$props.elevationAggregation;
-      var _this$state$weights2 = this.state.weights,
-          color = _this$state$weights2.color,
-          elevation = _this$state$weights2.elevation;
-      color.operation = _aggregationOperationUtils.AGGREGATION_OPERATION[colorAggregation];
-      elevation.operation = _aggregationOperationUtils.AGGREGATION_OPERATION[elevationAggregation];
+
+    var aggregationDataDirty = attributesChanged || this.isAggregationDirty(opts, {
+      dimension: dimensions.data,
+      compareAll: true
+    });
+
+    if (aggregationDataDirty) {
+      this._updateAccessors(opts);
     }
-  }]);
+
+    this.setState({
+      aggregationDataDirty: aggregationDataDirty
+    });
+  };
+
+  _proto._updateAccessors = function _updateAccessors(opts) {
+    var _opts$props = opts.props,
+        colorAggregation = _opts$props.colorAggregation,
+        elevationAggregation = _opts$props.elevationAggregation;
+    var _this$state$weights2 = this.state.weights,
+        color = _this$state$weights2.color,
+        elevation = _this$state$weights2.elevation;
+    color.operation = _aggregationOperationUtils.AGGREGATION_OPERATION[colorAggregation];
+    elevation.operation = _aggregationOperationUtils.AGGREGATION_OPERATION[elevationAggregation];
+  };
+
   return GPUGridLayer;
 }(_gridAggregationLayer.default);
 
 exports.default = GPUGridLayer;
-(0, _defineProperty2.default)(GPUGridLayer, "layerName", 'GPUGridLayer');
-(0, _defineProperty2.default)(GPUGridLayer, "defaultProps", defaultProps);
+GPUGridLayer.layerName = 'GPUGridLayer';
+GPUGridLayer.defaultProps = defaultProps;
 //# sourceMappingURL=gpu-grid-layer.js.map