@deck.gl/aggregation-layers 8.10.0-alpha.6 → 9.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +9369 -356
- package/dist/es5/aggregation-layer.js +4 -6
- package/dist/es5/aggregation-layer.js.map +1 -1
- package/dist/es5/contour-layer/contour-layer.js +13 -2
- package/dist/es5/contour-layer/contour-layer.js.map +1 -1
- package/dist/es5/cpu-grid-layer/cpu-grid-layer.js +12 -1
- package/dist/es5/cpu-grid-layer/cpu-grid-layer.js.map +1 -1
- package/dist/es5/cpu-grid-layer/grid-aggregator.js +12 -8
- package/dist/es5/cpu-grid-layer/grid-aggregator.js.map +1 -1
- package/dist/es5/gpu-grid-layer/gpu-grid-cell-layer.js +27 -13
- package/dist/es5/gpu-grid-layer/gpu-grid-cell-layer.js.map +1 -1
- package/dist/es5/gpu-grid-layer/gpu-grid-layer.js +19 -10
- package/dist/es5/gpu-grid-layer/gpu-grid-layer.js.map +1 -1
- package/dist/es5/grid-aggregation-layer.js +7 -9
- package/dist/es5/grid-aggregation-layer.js.map +1 -1
- package/dist/es5/grid-layer/grid-layer.js +1 -1
- package/dist/es5/grid-layer/grid-layer.js.map +1 -1
- package/dist/es5/heatmap-layer/heatmap-layer-utils.js +3 -3
- package/dist/es5/heatmap-layer/heatmap-layer-utils.js.map +1 -1
- package/dist/es5/heatmap-layer/heatmap-layer.js +58 -55
- package/dist/es5/heatmap-layer/heatmap-layer.js.map +1 -1
- package/dist/es5/heatmap-layer/triangle-layer.js +22 -12
- package/dist/es5/heatmap-layer/triangle-layer.js.map +1 -1
- package/dist/es5/hexagon-layer/hexagon-aggregator.js.map +1 -1
- package/dist/es5/hexagon-layer/hexagon-layer.js +2 -0
- package/dist/es5/hexagon-layer/hexagon-layer.js.map +1 -1
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/screen-grid-layer/screen-grid-cell-layer.js +23 -20
- package/dist/es5/screen-grid-layer/screen-grid-cell-layer.js.map +1 -1
- package/dist/es5/screen-grid-layer/screen-grid-layer.js +6 -6
- package/dist/es5/screen-grid-layer/screen-grid-layer.js.map +1 -1
- package/dist/es5/utils/aggregation-operation-utils.js.map +1 -1
- package/dist/es5/utils/bin-sorter.js.map +1 -1
- package/dist/es5/utils/cpu-aggregator.js +11 -7
- package/dist/es5/utils/cpu-aggregator.js.map +1 -1
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js +7 -2
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js.map +1 -1
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator.js +83 -60
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator.js.map +1 -1
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator.md +3 -3
- package/dist/es5/utils/grid-aggregation-utils.js.map +1 -1
- package/dist/es5/utils/prop-utils.js.map +1 -1
- package/dist/es5/utils/resource-utils.js +12 -23
- package/dist/es5/utils/resource-utils.js.map +1 -1
- package/dist/esm/aggregation-layer.js +4 -5
- package/dist/esm/aggregation-layer.js.map +1 -1
- package/dist/esm/contour-layer/contour-layer.js +7 -1
- package/dist/esm/contour-layer/contour-layer.js.map +1 -1
- package/dist/esm/cpu-grid-layer/cpu-grid-layer.js +6 -0
- package/dist/esm/cpu-grid-layer/cpu-grid-layer.js.map +1 -1
- package/dist/esm/cpu-grid-layer/grid-aggregator.js +2 -1
- package/dist/esm/cpu-grid-layer/grid-aggregator.js.map +1 -1
- package/dist/esm/gpu-grid-layer/gpu-grid-cell-layer.js +19 -10
- package/dist/esm/gpu-grid-layer/gpu-grid-cell-layer.js.map +1 -1
- package/dist/esm/gpu-grid-layer/gpu-grid-layer.js +13 -10
- package/dist/esm/gpu-grid-layer/gpu-grid-layer.js.map +1 -1
- package/dist/esm/grid-aggregation-layer.js +4 -8
- package/dist/esm/grid-aggregation-layer.js.map +1 -1
- package/dist/esm/grid-layer/grid-layer.js +1 -1
- package/dist/esm/grid-layer/grid-layer.js.map +1 -1
- package/dist/esm/heatmap-layer/heatmap-layer-utils.js +3 -3
- package/dist/esm/heatmap-layer/heatmap-layer-utils.js.map +1 -1
- package/dist/esm/heatmap-layer/heatmap-layer.js +40 -58
- package/dist/esm/heatmap-layer/heatmap-layer.js.map +1 -1
- package/dist/esm/heatmap-layer/triangle-layer.js +13 -7
- package/dist/esm/heatmap-layer/triangle-layer.js.map +1 -1
- package/dist/esm/hexagon-layer/hexagon-aggregator.js.map +1 -1
- package/dist/esm/hexagon-layer/hexagon-layer.js +1 -0
- package/dist/esm/hexagon-layer/hexagon-layer.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/screen-grid-layer/screen-grid-cell-layer.js +21 -24
- package/dist/esm/screen-grid-layer/screen-grid-cell-layer.js.map +1 -1
- package/dist/esm/screen-grid-layer/screen-grid-layer.js +5 -8
- package/dist/esm/screen-grid-layer/screen-grid-layer.js.map +1 -1
- package/dist/esm/utils/aggregation-operation-utils.js.map +1 -1
- package/dist/esm/utils/bin-sorter.js.map +1 -1
- package/dist/esm/utils/cpu-aggregator.js +11 -7
- package/dist/esm/utils/cpu-aggregator.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/aggregate-all-fs.glsl.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/aggregate-all-vs.glsl.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/aggregate-to-grid-fs.glsl.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/aggregate-to-grid-vs.glsl.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js +4 -3
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator.js +62 -51
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator.md +3 -3
- package/dist/esm/utils/gpu-grid-aggregation/transform-mean-vs.glsl.js.map +1 -1
- package/dist/esm/utils/grid-aggregation-utils.js.map +1 -1
- package/dist/esm/utils/prop-utils.js.map +1 -1
- package/dist/esm/utils/resource-utils.js +10 -17
- package/dist/esm/utils/resource-utils.js.map +1 -1
- package/dist.min.js +185 -30
- package/package.json +8 -6
- package/src/aggregation-layer.ts +7 -6
- package/src/contour-layer/contour-layer.ts +25 -9
- package/src/cpu-grid-layer/cpu-grid-layer.ts +8 -3
- package/src/cpu-grid-layer/{grid-aggregator.js → grid-aggregator.ts} +28 -4
- package/src/gpu-grid-layer/gpu-grid-cell-layer.ts +38 -27
- package/src/gpu-grid-layer/gpu-grid-layer.ts +18 -12
- package/src/grid-aggregation-layer.ts +39 -13
- package/src/grid-layer/grid-layer.ts +2 -2
- package/src/heatmap-layer/heatmap-layer-utils.ts +10 -4
- package/src/heatmap-layer/heatmap-layer.ts +74 -67
- package/src/heatmap-layer/triangle-layer.ts +26 -22
- package/src/hexagon-layer/{hexagon-aggregator.js → hexagon-aggregator.ts} +5 -1
- package/src/hexagon-layer/hexagon-layer.ts +8 -5
- package/src/index.ts +0 -1
- package/src/screen-grid-layer/screen-grid-cell-layer.ts +36 -33
- package/src/screen-grid-layer/screen-grid-layer.ts +12 -11
- package/src/utils/{aggregation-operation-utils.js → aggregation-operation-utils.ts} +8 -2
- package/src/utils/bin-sorter.ts +1 -1
- package/src/utils/{cpu-aggregator.js → cpu-aggregator.ts} +42 -30
- package/src/utils/gpu-grid-aggregation/{gpu-grid-aggregator-constants.js → gpu-grid-aggregator-constants.ts} +4 -4
- package/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.md +3 -3
- package/src/utils/gpu-grid-aggregation/{gpu-grid-aggregator.js → gpu-grid-aggregator.ts} +123 -94
- package/src/utils/{grid-aggregation-utils.js → grid-aggregation-utils.ts} +1 -1
- package/src/utils/resource-utils.ts +59 -0
- package/typed/aggregation-layer.d.ts +4 -3
- package/typed/aggregation-layer.d.ts.map +1 -1
- package/typed/contour-layer/contour-layer.d.ts +19 -5
- package/typed/contour-layer/contour-layer.d.ts.map +1 -1
- package/typed/cpu-grid-layer/cpu-grid-layer.d.ts +8 -3
- package/typed/cpu-grid-layer/cpu-grid-layer.d.ts.map +1 -1
- package/typed/cpu-grid-layer/grid-aggregator.d.ts +16 -4
- package/typed/cpu-grid-layer/grid-aggregator.d.ts.map +1 -1
- package/typed/gpu-grid-layer/gpu-grid-cell-layer.d.ts +18 -4
- package/typed/gpu-grid-layer/gpu-grid-cell-layer.d.ts.map +1 -1
- package/typed/gpu-grid-layer/gpu-grid-layer.d.ts +8 -3
- package/typed/gpu-grid-layer/gpu-grid-layer.d.ts.map +1 -1
- package/typed/grid-aggregation-layer.d.ts +39 -4
- package/typed/grid-aggregation-layer.d.ts.map +1 -1
- package/typed/grid-layer/grid-layer.d.ts +2 -2
- package/typed/grid-layer/grid-layer.d.ts.map +1 -1
- package/typed/heatmap-layer/heatmap-layer-utils.d.ts +7 -5
- package/typed/heatmap-layer/heatmap-layer-utils.d.ts.map +1 -1
- package/typed/heatmap-layer/heatmap-layer.d.ts +19 -6
- package/typed/heatmap-layer/heatmap-layer.d.ts.map +1 -1
- package/typed/heatmap-layer/triangle-layer.d.ts +10 -6
- package/typed/heatmap-layer/triangle-layer.d.ts.map +1 -1
- package/typed/hexagon-layer/hexagon-aggregator.d.ts +6 -3
- package/typed/hexagon-layer/hexagon-aggregator.d.ts.map +1 -1
- package/typed/hexagon-layer/hexagon-layer.d.ts +5 -4
- package/typed/hexagon-layer/hexagon-layer.d.ts.map +1 -1
- package/typed/index.d.ts.map +1 -1
- package/typed/screen-grid-layer/screen-grid-cell-layer.d.ts +10 -9
- package/typed/screen-grid-layer/screen-grid-cell-layer.d.ts.map +1 -1
- package/typed/screen-grid-layer/screen-grid-layer.d.ts +6 -4
- package/typed/screen-grid-layer/screen-grid-layer.d.ts.map +1 -1
- package/typed/utils/aggregation-operation-utils.d.ts +18 -12
- package/typed/utils/aggregation-operation-utils.d.ts.map +1 -1
- package/typed/utils/bin-sorter.d.ts +1 -1
- package/typed/utils/bin-sorter.d.ts.map +1 -1
- package/typed/utils/cpu-aggregator.d.ts +28 -14
- package/typed/utils/cpu-aggregator.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-all-fs.glsl.d.ts +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-all-fs.glsl.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-all-vs.glsl.d.ts +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-all-vs.glsl.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-to-grid-fs.glsl.d.ts +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-to-grid-fs.glsl.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-to-grid-vs.glsl.d.ts +1 -1
- package/typed/utils/gpu-grid-aggregation/aggregate-to-grid-vs.glsl.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.d.ts +35 -33
- package/typed/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/gpu-grid-aggregator-utils.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/gpu-grid-aggregator.d.ts +29 -19
- package/typed/utils/gpu-grid-aggregation/gpu-grid-aggregator.d.ts.map +1 -1
- package/typed/utils/gpu-grid-aggregation/transform-mean-vs.glsl.d.ts +1 -1
- package/typed/utils/gpu-grid-aggregation/transform-mean-vs.glsl.d.ts.map +1 -1
- package/typed/utils/grid-aggregation-utils.d.ts +11 -5
- package/typed/utils/grid-aggregation-utils.d.ts.map +1 -1
- package/typed/utils/prop-utils.d.ts +1 -1
- package/typed/utils/prop-utils.d.ts.map +1 -1
- package/typed/utils/resource-utils.d.ts +13 -3
- package/typed/utils/resource-utils.d.ts.map +1 -1
- package/src/utils/resource-utils.js +0 -51
- /package/src/utils/gpu-grid-aggregation/{aggregate-all-fs.glsl.js → aggregate-all-fs.glsl.ts} +0 -0
- /package/src/utils/gpu-grid-aggregation/{aggregate-all-vs.glsl.js → aggregate-all-vs.glsl.ts} +0 -0
- /package/src/utils/gpu-grid-aggregation/{aggregate-to-grid-fs.glsl.js → aggregate-to-grid-fs.glsl.ts} +0 -0
- /package/src/utils/gpu-grid-aggregation/{aggregate-to-grid-vs.glsl.js → aggregate-to-grid-vs.glsl.ts} +0 -0
- /package/src/utils/gpu-grid-aggregation/{gpu-grid-aggregator-utils.js → gpu-grid-aggregator-utils.ts} +0 -0
- /package/src/utils/gpu-grid-aggregation/{transform-mean-vs.glsl.js → transform-mean-vs.glsl.ts} +0 -0
- /package/src/utils/{prop-utils.js → prop-utils.ts} +0 -0
|
@@ -19,8 +19,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
19
19
|
|
|
20
20
|
var _core = require("@deck.gl/core");
|
|
21
21
|
|
|
22
|
-
var _core2 = require("@luma.gl/core");
|
|
23
|
-
|
|
24
22
|
var _propUtils = require("./utils/prop-utils");
|
|
25
23
|
|
|
26
24
|
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; } } }; }
|
|
@@ -86,19 +84,19 @@ var AggregationLayer = function (_CompositeLayer) {
|
|
|
86
84
|
};
|
|
87
85
|
|
|
88
86
|
_proto.getAttributes = function getAttributes() {
|
|
89
|
-
return this.getAttributeManager().
|
|
87
|
+
return this.getAttributeManager().getAttributes();
|
|
90
88
|
};
|
|
91
89
|
|
|
92
90
|
_proto.getModuleSettings = function getModuleSettings() {
|
|
93
91
|
var _this$context = this.context,
|
|
94
92
|
viewport = _this$context.viewport,
|
|
95
93
|
mousePosition = _this$context.mousePosition,
|
|
96
|
-
|
|
94
|
+
device = _this$context.device;
|
|
97
95
|
var moduleSettings = Object.assign(Object.create(this.props), {
|
|
98
96
|
viewport: viewport,
|
|
99
97
|
mousePosition: mousePosition,
|
|
100
98
|
pickingActive: 0,
|
|
101
|
-
devicePixelRatio:
|
|
99
|
+
devicePixelRatio: device.canvasContext.cssToDeviceRatio()
|
|
102
100
|
});
|
|
103
101
|
return moduleSettings;
|
|
104
102
|
};
|
|
@@ -190,7 +188,7 @@ var AggregationLayer = function (_CompositeLayer) {
|
|
|
190
188
|
};
|
|
191
189
|
|
|
192
190
|
_proto._getAttributeManager = function _getAttributeManager() {
|
|
193
|
-
return new _core.AttributeManager(this.context.
|
|
191
|
+
return new _core.AttributeManager(this.context.device, {
|
|
194
192
|
id: this.props.id,
|
|
195
193
|
stats: this.context.stats
|
|
196
194
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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","getShaderAttributes","getModuleSettings","viewport","mousePosition","gl","moduleSettings","Object","assign","create","pickingActive","devicePixelRatio","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 {cssToDeviceRatio} from '@luma.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!: CompositeLayer['state'] & {\n ignoreProps?: Record<string, any>;\n dimensions?: 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()!.getShaderAttributes();\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, gl} = this.context;\n const moduleSettings = Object.assign(Object.create(this.props), {\n viewport,\n mousePosition,\n pickingActive: 0,\n devicePixelRatio: cssToDeviceRatio(gl)\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.gl, {\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"}
|
|
1
|
+
{"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"}
|
|
@@ -19,6 +19,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
19
19
|
|
|
20
20
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
21
21
|
|
|
22
|
+
var _constants = require("@luma.gl/constants");
|
|
23
|
+
|
|
22
24
|
var _layers = require("@deck.gl/layers");
|
|
23
25
|
|
|
24
26
|
var _contourUtils = require("./contour-utils");
|
|
@@ -86,8 +88,17 @@ var ContourLayer = function (_GridAggregationLayer) {
|
|
|
86
88
|
var _super = _createSuper(ContourLayer);
|
|
87
89
|
|
|
88
90
|
function ContourLayer() {
|
|
91
|
+
var _this;
|
|
92
|
+
|
|
89
93
|
(0, _classCallCheck2.default)(this, ContourLayer);
|
|
90
|
-
|
|
94
|
+
|
|
95
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
96
|
+
args[_key] = arguments[_key];
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
100
|
+
_this.state = void 0;
|
|
101
|
+
return _this;
|
|
91
102
|
}
|
|
92
103
|
|
|
93
104
|
var _proto = ContourLayer.prototype;
|
|
@@ -185,7 +196,7 @@ var ContourLayer = function (_GridAggregationLayer) {
|
|
|
185
196
|
var gpuAggregation = props.gpuAggregation;
|
|
186
197
|
|
|
187
198
|
if (this.state.gpuAggregation !== props.gpuAggregation) {
|
|
188
|
-
if (gpuAggregation && !_gpuGridAggregator.default.isSupported(this.context.
|
|
199
|
+
if (gpuAggregation && !_gpuGridAggregator.default.isSupported(this.context.device)) {
|
|
189
200
|
_core.log.warn('GPU Grid Aggregation not supported, falling back to CPU')();
|
|
190
201
|
|
|
191
202
|
gpuAggregation = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/contour-layer/contour-layer.ts"],"names":["DEFAULT_COLOR","DEFAULT_STROKE_WIDTH","DEFAULT_THRESHOLD","defaultProps","cellSize","type","min","max","value","getPosition","x","position","getWeight","gpuAggregation","aggregation","contours","threshold","optional","compare","zOffset","POSITION_ATTRIBUTE_NAME","DIMENSIONS","data","props","weights","accessors","ContourLayer","initializeState","dimensions","setState","contourData","projectPoints","count","size","operation","AGGREGATION_OPERATION","SUM","attributeManager","getAttributeManager","add","accessor","fp64","use64bitPositions","updateState","opts","contoursChanged","oldProps","aggregationDirty","state","_updateThresholdData","getNumInstances","_generateContours","renderLayers","contourSegments","contourPolygons","LinesSubLayerClass","getSubLayerClass","LineLayer","BandsSubLayerClass","SolidPolygonLayer","lineLayer","length","getSubLayerProps","id","getSourcePosition","d","start","getTargetPosition","end","getColor","contour","color","getWidth","strokeWidth","bandsLayer","getPolygon","vertices","getFillColor","updateAggregationState","coordinateSystem","viewport","context","cellSizeChanged","GPUGridAggregator","isSupported","gl","log","warn","gpuAggregationChanged","positionsChanged","isAttributeChanged","boundingBox","getAttributes","gridOffset","translation","width","height","numCol","numRow","allocateResources","posOffset","slice","gridOrigin","aggregationDataDirty","isAggregationDirty","dimension","compareAll","aggregationWeightsDirty","_updateAccessors","_resetResults","getValue","aggregationData","thresholdData","aggregationBuffer","getData","getCellData","countsData","cellWeights","gridSize","xOffset","yOffset","Array","i","zIndex","GridAggregationLayer","layerName"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2018 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 GL from '@luma.gl/constants';\nimport {LineLayer, SolidPolygonLayer} from '@deck.gl/layers';\nimport {generateContours} from './contour-utils';\nimport {\n Accessor,\n AccessorFunction,\n Color,\n Layer,\n log,\n Position,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\n\nimport GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport {AGGREGATION_OPERATION, getValueFunc} from '../utils/aggregation-operation-utils';\nimport {getBoundingBox, getGridParams} from '../utils/grid-aggregation-utils';\nimport GridAggregationLayer, {GridAggregationLayerProps} from '../grid-aggregation-layer';\n\nconst DEFAULT_COLOR = [255, 255, 255, 255];\nconst DEFAULT_STROKE_WIDTH = 1;\nconst DEFAULT_THRESHOLD = 1;\n\nconst defaultProps: DefaultProps<ContourLayerProps> = {\n // grid aggregation\n cellSize: {type: 'number', min: 1, max: 1000, value: 1000},\n getPosition: {type: 'accessor', value: x => x.position},\n getWeight: {type: 'accessor', value: 1},\n gpuAggregation: true,\n aggregation: 'SUM',\n\n // contour lines\n contours: {\n type: 'object',\n value: [{threshold: DEFAULT_THRESHOLD}],\n optional: true,\n compare: 3\n },\n\n zOffset: 0.005\n};\n\nconst POSITION_ATTRIBUTE_NAME = 'positions';\n\nconst DIMENSIONS = {\n data: {\n props: ['cellSize']\n },\n weights: {\n props: ['aggregation'],\n accessors: ['getWeight']\n }\n};\n\n/** All properties supported by ContourLayer. */\nexport type ContourLayerProps<DataT = any> = _ContourLayerProps<DataT> &\n GridAggregationLayerProps<DataT>;\n\n/** Properties added by ContourLayer. */\nexport type _ContourLayerProps<DataT> = {\n /**\n * Size of each cell in meters.\n * @default 1000\n */\n cellSize?: number;\n\n /**\n * When set to true, aggregation is performed on GPU, provided other conditions are met.\n * @default true\n */\n gpuAggregation?: boolean;\n\n /**\n * Defines the type of aggregation operation, valid values are 'SUM', 'MEAN', 'MIN' and 'MAX'.\n * @default 'SUM'\n */\n aggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Definition of contours to be drawn.\n * @default [{threshold: 1}]\n */\n contours: {\n /**\n * Isolines: `threshold` value must be a single `Number`, Isolines are generated based on this threshold value.\n *\n * Isobands: `threshold` value must be an Array of two `Number`s. Isobands are generated using `[threshold[0], threshold[1])` as threshold range, i.e area that has values `>= threshold[0]` and `< threshold[1]` are rendered with corresponding color. NOTE: `threshold[0]` is inclusive and `threshold[1]` is not inclusive.\n */\n threshold: number | number[];\n\n /**\n * RGBA color array to be used to render the contour.\n * @default [255, 255, 255, 255]\n */\n color?: Color;\n\n /**\n * Applicable for `Isoline`s only, width of the Isoline in pixels.\n * @default 1\n */\n strokeWidth?: number;\n\n /** Defines z order of the contour. */\n zIndex?: number;\n }[];\n\n /**\n * A very small z offset that is added for each vertex of a contour (Isoline or Isoband).\n * @default 0.005\n */\n zOffset?: number;\n\n /**\n * Method called to retrieve the position of each object.\n * @default object => object.position\n */\n getPosition?: AccessorFunction<DataT, Position>;\n\n /**\n * The weight of each object.\n * @default 1\n */\n getWeight?: Accessor<DataT, number>;\n};\n\n/** Aggregate data into iso-lines or iso-bands for a given threshold and cell size. */\nexport default class ContourLayer<\n DataT = any,\n ExtraPropsT extends {} = {}\n> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_ContourLayerProps<DataT>>> {\n static layerName = 'ContourLayer';\n static defaultProps = defaultProps;\n\n initializeState(): void {\n super.initializeAggregationLayer({\n dimensions: DIMENSIONS\n });\n this.setState({\n contourData: {},\n projectPoints: false,\n weights: {\n count: {\n size: 1,\n operation: AGGREGATION_OPERATION.SUM\n }\n }\n });\n const attributeManager = this.getAttributeManager()!;\n attributeManager.add({\n [POSITION_ATTRIBUTE_NAME]: {\n size: 3,\n accessor: 'getPosition',\n type: GL.DOUBLE,\n fp64: this.use64bitPositions()\n },\n // this attribute is used in gpu aggregation path only\n count: {size: 3, accessor: 'getWeight'}\n });\n }\n\n updateState(opts: UpdateParameters<this>): void {\n super.updateState(opts);\n let contoursChanged = false;\n const {oldProps, props} = opts;\n const {aggregationDirty} = this.state;\n\n if (oldProps.contours !== props.contours || oldProps.zOffset !== props.zOffset) {\n contoursChanged = true;\n this._updateThresholdData(opts.props);\n }\n\n if (this.getNumInstances() > 0 && (aggregationDirty || contoursChanged)) {\n this._generateContours();\n }\n }\n\n renderLayers(): Layer[] {\n const {contourSegments, contourPolygons} = this.state.contourData;\n\n const LinesSubLayerClass = this.getSubLayerClass('lines', LineLayer);\n const BandsSubLayerClass = this.getSubLayerClass('bands', SolidPolygonLayer);\n\n // Contour lines layer\n const lineLayer =\n contourSegments &&\n contourSegments.length > 0 &&\n new LinesSubLayerClass(\n this.getSubLayerProps({\n id: 'lines'\n }),\n {\n data: this.state.contourData.contourSegments,\n getSourcePosition: d => d.start,\n getTargetPosition: d => d.end,\n getColor: d => d.contour.color || DEFAULT_COLOR,\n getWidth: d => d.contour.strokeWidth || DEFAULT_STROKE_WIDTH\n }\n );\n\n // Contour bands layer\n const bandsLayer =\n contourPolygons &&\n contourPolygons.length > 0 &&\n new BandsSubLayerClass(\n this.getSubLayerProps({\n id: 'bands'\n }),\n {\n data: this.state.contourData.contourPolygons,\n getPolygon: d => d.vertices,\n getFillColor: d => d.contour.color || DEFAULT_COLOR\n }\n );\n\n return [lineLayer, bandsLayer];\n }\n\n // Aggregation Overrides\n\n /* eslint-disable max-statements, complexity */\n updateAggregationState(opts) {\n const {props, oldProps} = opts;\n const {cellSize, coordinateSystem} = props;\n const {viewport} = this.context;\n const cellSizeChanged = oldProps.cellSize !== cellSize;\n let gpuAggregation = props.gpuAggregation;\n if (this.state.gpuAggregation !== props.gpuAggregation) {\n if (gpuAggregation && !GPUGridAggregator.isSupported(this.context.gl)) {\n log.warn('GPU Grid Aggregation not supported, falling back to CPU')();\n gpuAggregation = false;\n }\n }\n const gpuAggregationChanged = gpuAggregation !== this.state.gpuAggregation;\n this.setState({\n gpuAggregation\n });\n\n const {dimensions} = this.state;\n const positionsChanged = this.isAttributeChanged(POSITION_ATTRIBUTE_NAME);\n const {data, weights} = dimensions;\n\n let {boundingBox} = this.state;\n if (positionsChanged) {\n boundingBox = getBoundingBox(this.getAttributes(), this.getNumInstances());\n this.setState({boundingBox});\n }\n if (positionsChanged || cellSizeChanged) {\n const {gridOffset, translation, width, height, numCol, numRow} = getGridParams(\n boundingBox,\n cellSize,\n viewport,\n coordinateSystem\n );\n this.allocateResources(numRow, numCol);\n this.setState({\n gridOffset,\n boundingBox,\n translation,\n posOffset: translation.slice(), // Used for CPU aggregation, to offset points\n gridOrigin: [-1 * translation[0], -1 * translation[1]],\n width,\n height,\n numCol,\n numRow\n });\n }\n\n const aggregationDataDirty =\n positionsChanged ||\n gpuAggregationChanged ||\n this.isAggregationDirty(opts, {\n dimension: data,\n compareAll: gpuAggregation // check for all (including extentions props) when using gpu aggregation\n });\n const aggregationWeightsDirty = this.isAggregationDirty(opts, {\n dimension: weights\n });\n\n if (aggregationWeightsDirty) {\n this._updateAccessors(opts);\n }\n if (aggregationDataDirty || aggregationWeightsDirty) {\n this._resetResults();\n }\n this.setState({\n aggregationDataDirty,\n aggregationWeightsDirty\n });\n }\n /* eslint-enable max-statements, complexity */\n\n // Private (Aggregation)\n\n private _updateAccessors(opts) {\n const {getWeight, aggregation, data} = opts.props;\n const {count} = this.state.weights;\n if (count) {\n count.getWeight = getWeight;\n count.operation = AGGREGATION_OPERATION[aggregation];\n }\n this.setState({getValue: getValueFunc(aggregation, getWeight, {data})});\n }\n\n private _resetResults() {\n const {count} = this.state.weights;\n if (count) {\n count.aggregationData = null;\n }\n }\n\n // Private (Contours)\n\n private _generateContours() {\n const {numCol, numRow, gridOrigin, gridOffset, thresholdData} = this.state;\n const {count} = this.state.weights;\n let {aggregationData} = count;\n if (!aggregationData) {\n aggregationData = count.aggregationBuffer.getData();\n count.aggregationData = aggregationData;\n }\n\n const {cellWeights} = GPUGridAggregator.getCellData({countsData: aggregationData});\n const contourData = generateContours({\n thresholdData,\n cellWeights,\n gridSize: [numCol, numRow],\n gridOrigin,\n cellSize: [gridOffset.xOffset, gridOffset.yOffset]\n });\n\n // contourData contains both iso-lines and iso-bands if requested.\n this.setState({contourData});\n }\n\n private _updateThresholdData(props) {\n const {contours, zOffset} = props;\n const count = contours.length;\n const thresholdData = new Array(count);\n for (let i = 0; i < count; i++) {\n const contour = contours[i];\n thresholdData[i] = {\n contour,\n zIndex: contour.zIndex || i,\n zOffset\n };\n }\n this.setState({thresholdData});\n }\n}\n"],"file":"contour-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/contour-layer/contour-layer.ts"],"names":["DEFAULT_COLOR","DEFAULT_STROKE_WIDTH","DEFAULT_THRESHOLD","defaultProps","cellSize","type","min","max","value","getPosition","x","position","getWeight","gpuAggregation","aggregation","contours","threshold","optional","compare","zOffset","POSITION_ATTRIBUTE_NAME","DIMENSIONS","data","props","weights","accessors","ContourLayer","state","initializeState","dimensions","setState","contourData","projectPoints","count","size","operation","AGGREGATION_OPERATION","SUM","attributeManager","getAttributeManager","add","accessor","fp64","use64bitPositions","updateState","opts","contoursChanged","oldProps","aggregationDirty","_updateThresholdData","getNumInstances","_generateContours","renderLayers","contourSegments","contourPolygons","LinesSubLayerClass","getSubLayerClass","LineLayer","BandsSubLayerClass","SolidPolygonLayer","lineLayer","length","getSubLayerProps","id","getSourcePosition","d","start","getTargetPosition","end","getColor","contour","color","getWidth","strokeWidth","bandsLayer","getPolygon","vertices","getFillColor","updateAggregationState","coordinateSystem","viewport","context","cellSizeChanged","GPUGridAggregator","isSupported","device","log","warn","gpuAggregationChanged","positionsChanged","isAttributeChanged","boundingBox","getAttributes","gridOffset","translation","width","height","numCol","numRow","allocateResources","posOffset","slice","gridOrigin","aggregationDataDirty","isAggregationDirty","dimension","compareAll","aggregationWeightsDirty","_updateAccessors","_resetResults","getValue","aggregationData","thresholdData","aggregationBuffer","getData","getCellData","countsData","cellWeights","gridSize","xOffset","yOffset","Array","i","zIndex","GridAggregationLayer","layerName"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2018 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 {GL} from '@luma.gl/constants';\nimport {LineLayer, SolidPolygonLayer} from '@deck.gl/layers';\nimport {generateContours} from './contour-utils';\nimport {\n Accessor,\n AccessorFunction,\n Color,\n Layer,\n log,\n Position,\n UpdateParameters,\n DefaultProps,\n LayersList\n} from '@deck.gl/core';\n\nimport GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';\nimport {AGGREGATION_OPERATION, getValueFunc} from '../utils/aggregation-operation-utils';\nimport {getBoundingBox, getGridParams} from '../utils/grid-aggregation-utils';\nimport GridAggregationLayer, {GridAggregationLayerProps} from '../grid-aggregation-layer';\n\nconst DEFAULT_COLOR = [255, 255, 255, 255];\nconst DEFAULT_STROKE_WIDTH = 1;\nconst DEFAULT_THRESHOLD = 1;\n\nconst defaultProps: DefaultProps<ContourLayerProps> = {\n // grid aggregation\n cellSize: {type: 'number', min: 1, max: 1000, value: 1000},\n getPosition: {type: 'accessor', value: (x: any) => x.position},\n getWeight: {type: 'accessor', value: 1},\n gpuAggregation: true,\n aggregation: 'SUM',\n\n // contour lines\n contours: {\n type: 'object',\n value: [{threshold: DEFAULT_THRESHOLD}],\n optional: true,\n compare: 3\n },\n\n zOffset: 0.005\n};\n\nconst POSITION_ATTRIBUTE_NAME = 'positions';\n\nconst DIMENSIONS = {\n data: {\n props: ['cellSize']\n },\n weights: {\n props: ['aggregation'],\n accessors: ['getWeight']\n }\n};\n\n/** All properties supported by ContourLayer. */\nexport type ContourLayerProps<DataT = unknown> = _ContourLayerProps<DataT> &\n GridAggregationLayerProps<DataT>;\n\n/** Properties added by ContourLayer. */\nexport type _ContourLayerProps<DataT> = {\n /**\n * Size of each cell in meters.\n * @default 1000\n */\n cellSize?: number;\n\n /**\n * When set to true, aggregation is performed on GPU, provided other conditions are met.\n * @default true\n */\n gpuAggregation?: boolean;\n\n /**\n * Defines the type of aggregation operation, valid values are 'SUM', 'MEAN', 'MIN' and 'MAX'.\n * @default 'SUM'\n */\n aggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Definition of contours to be drawn.\n * @default [{threshold: 1}]\n */\n contours: {\n /**\n * Isolines: `threshold` value must be a single `Number`, Isolines are generated based on this threshold value.\n *\n * Isobands: `threshold` value must be an Array of two `Number`s. Isobands are generated using `[threshold[0], threshold[1])` as threshold range, i.e area that has values `>= threshold[0]` and `< threshold[1]` are rendered with corresponding color. NOTE: `threshold[0]` is inclusive and `threshold[1]` is not inclusive.\n */\n threshold: number | number[];\n\n /**\n * RGBA color array to be used to render the contour.\n * @default [255, 255, 255, 255]\n */\n color?: Color;\n\n /**\n * Applicable for `Isoline`s only, width of the Isoline in pixels.\n * @default 1\n */\n strokeWidth?: number;\n\n /** Defines z order of the contour. */\n zIndex?: number;\n }[];\n\n /**\n * A very small z offset that is added for each vertex of a contour (Isoline or Isoband).\n * @default 0.005\n */\n zOffset?: number;\n\n /**\n * Method called to retrieve the position of each object.\n * @default object => object.position\n */\n getPosition?: AccessorFunction<DataT, Position>;\n\n /**\n * The weight of each object.\n * @default 1\n */\n getWeight?: Accessor<DataT, number>;\n};\n\n/** Aggregate data into iso-lines or iso-bands for a given threshold and cell size. */\nexport default class ContourLayer<\n DataT = any,\n ExtraPropsT extends {} = {}\n> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_ContourLayerProps<DataT>>> {\n static layerName = 'ContourLayer';\n static defaultProps = defaultProps;\n\n state!: GridAggregationLayer<DataT>['state'] & {\n contourData: {\n contourSegments: {\n start: number[];\n end: number[];\n contour: any;\n }[];\n contourPolygons: {\n vertices: number[][];\n contour: any;\n }[];\n };\n thresholdData: any;\n };\n\n initializeState(): void {\n super.initializeAggregationLayer({\n dimensions: DIMENSIONS\n });\n this.setState({\n contourData: {},\n projectPoints: false,\n weights: {\n count: {\n size: 1,\n operation: AGGREGATION_OPERATION.SUM\n }\n }\n });\n const attributeManager = this.getAttributeManager()!;\n attributeManager.add({\n [POSITION_ATTRIBUTE_NAME]: {\n size: 3,\n accessor: 'getPosition',\n type: GL.DOUBLE,\n fp64: this.use64bitPositions()\n },\n // this attribute is used in gpu aggregation path only\n count: {size: 3, accessor: 'getWeight'}\n });\n }\n\n updateState(opts: UpdateParameters<this>): void {\n super.updateState(opts);\n let contoursChanged = false;\n const {oldProps, props} = opts;\n const {aggregationDirty} = this.state;\n\n if (oldProps.contours !== props.contours || oldProps.zOffset !== props.zOffset) {\n contoursChanged = true;\n this._updateThresholdData(opts.props);\n }\n\n if (this.getNumInstances() > 0 && (aggregationDirty || contoursChanged)) {\n this._generateContours();\n }\n }\n\n renderLayers(): LayersList {\n const {contourSegments, contourPolygons} = this.state.contourData;\n\n const LinesSubLayerClass = this.getSubLayerClass('lines', LineLayer);\n const BandsSubLayerClass = this.getSubLayerClass('bands', SolidPolygonLayer);\n\n // Contour lines layer\n const lineLayer =\n contourSegments &&\n contourSegments.length > 0 &&\n new LinesSubLayerClass(\n this.getSubLayerProps({\n id: 'lines'\n }),\n {\n data: this.state.contourData.contourSegments,\n getSourcePosition: d => d.start,\n getTargetPosition: d => d.end,\n getColor: d => d.contour.color || DEFAULT_COLOR,\n getWidth: d => d.contour.strokeWidth || DEFAULT_STROKE_WIDTH\n }\n );\n\n // Contour bands layer\n const bandsLayer =\n contourPolygons &&\n contourPolygons.length > 0 &&\n new BandsSubLayerClass(\n this.getSubLayerProps({\n id: 'bands'\n }),\n {\n data: this.state.contourData.contourPolygons,\n getPolygon: d => d.vertices,\n getFillColor: d => d.contour.color || DEFAULT_COLOR\n }\n );\n\n return [lineLayer, bandsLayer];\n }\n\n // Aggregation Overrides\n\n /* eslint-disable max-statements, complexity */\n updateAggregationState(opts: UpdateParameters<this>) {\n const {props, oldProps} = opts;\n const {cellSize, coordinateSystem} = props;\n const {viewport} = this.context;\n const cellSizeChanged = oldProps.cellSize !== cellSize;\n let gpuAggregation = props.gpuAggregation;\n if (this.state.gpuAggregation !== props.gpuAggregation) {\n if (gpuAggregation && !GPUGridAggregator.isSupported(this.context.device)) {\n log.warn('GPU Grid Aggregation not supported, falling back to CPU')();\n gpuAggregation = false;\n }\n }\n const gpuAggregationChanged = gpuAggregation !== this.state.gpuAggregation;\n this.setState({\n gpuAggregation\n });\n\n const {dimensions} = this.state;\n const positionsChanged = this.isAttributeChanged(POSITION_ATTRIBUTE_NAME);\n const {data, weights} = dimensions;\n\n let {boundingBox} = this.state;\n if (positionsChanged) {\n boundingBox = getBoundingBox(this.getAttributes(), this.getNumInstances());\n this.setState({boundingBox});\n }\n if (positionsChanged || cellSizeChanged) {\n const {gridOffset, translation, width, height, numCol, numRow} = getGridParams(\n boundingBox,\n cellSize,\n viewport,\n coordinateSystem\n );\n this.allocateResources(numRow, numCol);\n this.setState({\n gridOffset,\n boundingBox,\n translation,\n posOffset: translation.slice(), // Used for CPU aggregation, to offset points\n gridOrigin: [-1 * translation[0], -1 * translation[1]],\n width,\n height,\n numCol,\n numRow\n });\n }\n\n const aggregationDataDirty =\n positionsChanged ||\n gpuAggregationChanged ||\n this.isAggregationDirty(opts, {\n dimension: data,\n compareAll: gpuAggregation // check for all (including extentions props) when using gpu aggregation\n });\n const aggregationWeightsDirty = this.isAggregationDirty(opts, {\n dimension: weights\n });\n\n if (aggregationWeightsDirty) {\n this._updateAccessors(opts);\n }\n if (aggregationDataDirty || aggregationWeightsDirty) {\n this._resetResults();\n }\n this.setState({\n aggregationDataDirty,\n aggregationWeightsDirty\n });\n }\n /* eslint-enable max-statements, complexity */\n\n // Private (Aggregation)\n\n private _updateAccessors(opts: UpdateParameters<this>) {\n const {getWeight, aggregation, data} = opts.props;\n const {count} = this.state.weights;\n if (count) {\n count.getWeight = getWeight;\n count.operation = AGGREGATION_OPERATION[aggregation];\n }\n this.setState({getValue: getValueFunc(aggregation, getWeight, {data})});\n }\n\n private _resetResults() {\n const {count} = this.state.weights;\n if (count) {\n count.aggregationData = null;\n }\n }\n\n // Private (Contours)\n\n private _generateContours() {\n const {numCol, numRow, gridOrigin, gridOffset, thresholdData} = this.state;\n const {count} = this.state.weights;\n let {aggregationData} = count;\n if (!aggregationData) {\n aggregationData = count.aggregationBuffer!.getData() as Float32Array;\n count.aggregationData = aggregationData;\n }\n\n const {cellWeights} = GPUGridAggregator.getCellData({countsData: aggregationData});\n const contourData = generateContours({\n thresholdData,\n cellWeights,\n gridSize: [numCol, numRow],\n gridOrigin,\n cellSize: [gridOffset.xOffset, gridOffset.yOffset]\n });\n\n // contourData contains both iso-lines and iso-bands if requested.\n this.setState({contourData});\n }\n\n private _updateThresholdData(props) {\n const {contours, zOffset} = props;\n const count = contours.length;\n const thresholdData = new Array(count);\n for (let i = 0; i < count; i++) {\n const contour = contours[i];\n thresholdData[i] = {\n contour,\n zIndex: contour.zIndex || i,\n zOffset\n };\n }\n this.setState({thresholdData});\n }\n}\n"],"file":"contour-layer.js"}
|
|
@@ -17,6 +17,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
17
17
|
|
|
18
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
19
|
|
|
20
|
+
var _constants = require("@luma.gl/constants");
|
|
21
|
+
|
|
20
22
|
var _layers = require("@deck.gl/layers");
|
|
21
23
|
|
|
22
24
|
var _colorUtils = require("../utils/color-utils");
|
|
@@ -123,8 +125,17 @@ var CPUGridLayer = function (_AggregationLayer) {
|
|
|
123
125
|
var _super = _createSuper(CPUGridLayer);
|
|
124
126
|
|
|
125
127
|
function CPUGridLayer() {
|
|
128
|
+
var _this;
|
|
129
|
+
|
|
126
130
|
(0, _classCallCheck2.default)(this, CPUGridLayer);
|
|
127
|
-
|
|
131
|
+
|
|
132
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
133
|
+
args[_key] = arguments[_key];
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
137
|
+
_this.state = void 0;
|
|
138
|
+
return _this;
|
|
128
139
|
}
|
|
129
140
|
|
|
130
141
|
var _proto = CPUGridLayer.prototype;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":["nop","defaultProps","colorDomain","colorRange","defaultColorRange","getColorValue","type","value","getColorWeight","colorAggregation","lowerPercentile","min","max","upperPercentile","colorScaleType","onSetColorDomain","elevationDomain","elevationRange","getElevationValue","getElevationWeight","elevationAggregation","elevationLowerPercentile","elevationUpperPercentile","elevationScale","elevationScaleType","onSetElevationDomain","gridAggregator","pointToDensityGridDataCPU","cellSize","coverage","getPosition","x","position","extruded","material","_filterData","optional","CPUGridLayer","initializeState","cpuAggregator","CPUAggregator","getAggregator","props","getCellSize","state","aggregatorState","attributeManager","getAttributeManager","add","positions","size","accessor","updateState","opts","setState","viewport","context","attributes","getAttributes","numInstances","getNumInstances","getPickingInfo","info","_onGetSublayerColor","cell","getAccessor","_onGetSublayerElevation","_getSublayerUpdateTriggers","getUpdateTriggers","renderLayers","transitions","SubLayerClass","getSubLayerClass","GridCellLayer","updateTriggers","getFillColor","bind","getElevation","getSubLayerProps","id","data","layerData","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 GL from '@luma.gl/constants';\nimport {GridCellLayer} from '@deck.gl/layers';\nimport {Accessor, AccessorFunction, Color, Position, Material, DefaultProps} from '@deck.gl/core';\n\nimport {defaultColorRange} from '../utils/color-utils';\nimport {pointToDensityGridDataCPU} from './grid-aggregator';\nimport CPUAggregator from '../utils/cpu-aggregator';\nimport AggregationLayer, {AggregationLayerProps} from '../aggregation-layer';\n\nimport {Layer, UpdateParameters, GetPickingInfoParams, PickingInfo} from '@deck.gl/core';\nimport {AggregateAccessor} from '../types';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction nop() {}\n\nconst defaultProps: DefaultProps<CPUGridLayerProps> = {\n // color\n colorDomain: null,\n colorRange: defaultColorRange,\n getColorValue: {type: 'accessor', value: null}, // default value is calculated from `getColorWeight` and `colorAggregation`\n getColorWeight: {type: 'accessor', value: 1},\n colorAggregation: 'SUM',\n lowerPercentile: {type: 'number', min: 0, max: 100, value: 0},\n upperPercentile: {type: 'number', min: 0, max: 100, value: 100},\n colorScaleType: 'quantize',\n onSetColorDomain: nop,\n\n // elevation\n elevationDomain: null,\n elevationRange: [0, 1000],\n getElevationValue: {type: 'accessor', value: null}, // default value is calculated from `getElevationWeight` and `elevationAggregation`\n getElevationWeight: {type: 'accessor', value: 1},\n elevationAggregation: 'SUM',\n elevationLowerPercentile: {type: 'number', min: 0, max: 100, value: 0},\n elevationUpperPercentile: {type: 'number', min: 0, max: 100, value: 100},\n elevationScale: {type: 'number', min: 0, value: 1},\n elevationScaleType: 'linear',\n onSetElevationDomain: nop,\n\n gridAggregator: pointToDensityGridDataCPU,\n\n // grid\n cellSize: {type: 'number', min: 0, max: 1000, value: 1000},\n coverage: {type: 'number', min: 0, max: 1, value: 1},\n getPosition: {type: 'accessor', value: x => x.position},\n extruded: false,\n\n // Optional material for 'lighting' shader module\n material: true,\n\n // data filter\n _filterData: {type: 'function', value: null, optional: true}\n};\n\n/** All properties supported by CPUGridLayer. */\nexport type CPUGridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> &\n AggregationLayerProps<DataT>;\n\n/** Properties added by CPUGridLayer. */\ntype _CPUGridLayerProps<DataT> = {\n /**\n * Size of each cell in meters.\n * @default 1000\n */\n cellSize?: number;\n\n /**\n * Color scale domain, default is set to the extent of aggregated weights in each cell.\n * @default [min(colorWeight), max(colorWeight)]\n */\n colorDomain?: [number, number] | null;\n\n /**\n * Default: [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6) `6-class YlOrRd`\n */\n colorRange?: Color[];\n\n /**\n * Cell size multiplier, clamped between 0 - 1.\n * @default 1\n */\n coverage?: number;\n\n /**\n * Elevation scale input domain, default is set to between 0 and the max of aggregated weights in each cell.\n * @default [0, max(elevationWeight)]\n */\n elevationDomain?: [number, number] | null;\n\n /**\n * Elevation scale output range.\n * @default [0, 1000]\n */\n elevationRange?: [number, number];\n\n /**\n * Cell elevation multiplier.\n * @default 1\n */\n elevationScale?: number;\n\n /**\n * Whether to enable cell elevation. If set to false, all cell will be flat.\n * @default true\n */\n extruded?: boolean;\n\n /**\n * Filter cells and re-calculate color by `upperPercentile`.\n * Cells with value arger than the upperPercentile will be hidden.\n * @default 100\n */\n upperPercentile?: number;\n\n /**\n * Filter cells and re-calculate color by `lowerPercentile`.\n * Cells with value smaller than the lowerPercentile will be hidden.\n * @default 0\n */\n lowerPercentile?: number;\n\n /**\n * Filter cells and re-calculate elevation by `elevationUpperPercentile`.\n * Cells with elevation value larger than the `elevationUpperPercentile` will be hidden.\n * @default 100\n */\n elevationUpperPercentile?: number;\n\n /**\n * Filter cells and re-calculate elevation by `elevationLowerPercentile`.\n * Cells with elevation value larger than the `elevationLowerPercentile` will be hidden.\n * @default 0\n */\n elevationLowerPercentile?: number;\n\n /**\n * Scaling function used to determine the color of the grid cell, default value is 'quantize'.\n * Supported Values are 'quantize', 'linear', 'quantile' and 'ordinal'.\n * @default 'quantize'\n */\n colorScaleType?: 'quantize' | 'linear' | 'quantile' | 'ordinal';\n\n /**\n * Scaling function used to determine the elevation of the grid cell, only supports 'linear'.\n */\n elevationScaleType?: 'linear';\n\n // TODO - document\n gridAggregator?: (props: any, params: any) => any;\n\n /**\n * Material settings for lighting effect. Applies if `extruded: true`.\n *\n * @default true\n * @see https://deck.gl/docs/developer-guide/using-lighting\n */\n material?: Material;\n\n /**\n * Defines the operation used to aggregate all data object weights to calculate a cell's color value.\n * @default 'SUM'\n */\n colorAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Defines the operation used to aggregate all data object weights to calculate a cell's elevation value.\n * @default 'SUM'\n */\n elevationAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Method called to retrieve the position of each object.\n * @default object => object.position\n */\n getPosition?: AccessorFunction<DataT, Position>;\n\n /**\n * The weight of a data object used to calculate the color value for a cell.\n * @default 1\n */\n getColorWeight?: Accessor<DataT, number>;\n\n /**\n * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its color is based on.\n * @default null\n */\n getColorValue?: AggregateAccessor<DataT> | null;\n\n /**\n * The weight of a data object used to calculate the elevation value for a cell.\n * @default 1\n */\n getElevationWeight?: Accessor<DataT, number>;\n\n /**\n * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its elevation is based on.\n * @default null\n */\n getElevationValue?: AggregateAccessor<DataT> | null;\n\n /**\n * This callback will be called when bin color domain has been calculated.\n * @default () => {}\n */\n onSetColorDomain?: (minMax: [number, number]) => void;\n\n /**\n * This callback will be called when bin elevation domain has been calculated.\n * @default () => {}\n */\n onSetElevationDomain?: (minMax: [number, number]) => void;\n\n /**\n * (Experimental) Filter data objects\n */\n _filterData: null | ((d: DataT) => boolean);\n};\n\n/** Aggregate data into a grid-based heatmap. Aggregation is performed on CPU. */\nexport default class CPUGridLayer<\n DataT = any,\n ExtraPropsT extends {} = {}\n> extends AggregationLayer<DataT, ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {\n static layerName = 'CPUGridLayer';\n static defaultProps = defaultProps;\n\n initializeState(): void {\n const cpuAggregator = new CPUAggregator({\n getAggregator: props => props.gridAggregator,\n getCellSize: props => props.cellSize\n });\n\n this.state = {\n cpuAggregator,\n aggregatorState: cpuAggregator.state\n };\n const attributeManager = this.getAttributeManager()!;\n attributeManager.add({\n positions: {size: 3, type: GL.DOUBLE, accessor: 'getPosition'}\n });\n // color and elevation attributes can't be added as attributes\n // they are calcualted using 'getValue' accessor that takes an array of pints.\n }\n\n updateState(opts: UpdateParameters<this>) {\n super.updateState(opts);\n this.setState({\n // make a copy of the internal state of cpuAggregator for testing\n aggregatorState: this.state.cpuAggregator.updateState(opts, {\n viewport: this.context.viewport,\n attributes: this.getAttributes(),\n numInstances: this.getNumInstances()\n })\n });\n }\n\n getPickingInfo({info}: GetPickingInfoParams): PickingInfo {\n return this.state.cpuAggregator.getPickingInfo({info});\n }\n\n // create a method for testing\n _onGetSublayerColor(cell) {\n return this.state.cpuAggregator.getAccessor('fillColor')(cell);\n }\n\n // create a method for testing\n _onGetSublayerElevation(cell) {\n return this.state.cpuAggregator.getAccessor('elevation')(cell);\n }\n\n _getSublayerUpdateTriggers() {\n return this.state.cpuAggregator.getUpdateTriggers(this.props);\n }\n\n renderLayers(): Layer {\n const {elevationScale, extruded, cellSize, coverage, material, transitions} = this.props;\n const {cpuAggregator} = this.state;\n const SubLayerClass = this.getSubLayerClass('grid-cell', GridCellLayer);\n const updateTriggers = this._getSublayerUpdateTriggers();\n\n return new SubLayerClass(\n {\n cellSize,\n coverage,\n material,\n elevationScale,\n extruded,\n\n getFillColor: this._onGetSublayerColor.bind(this),\n getElevation: this._onGetSublayerElevation.bind(this),\n transitions: transitions && {\n getFillColor: transitions.getColorValue || transitions.getColorWeight,\n getElevation: transitions.getElevationValue || transitions.getElevationWeight\n }\n },\n this.getSubLayerProps({\n id: 'grid-cell',\n updateTriggers\n }),\n {\n data: cpuAggregator.state.layerData.data\n }\n );\n }\n}\n"],"file":"cpu-grid-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":["nop","defaultProps","colorDomain","colorRange","defaultColorRange","getColorValue","type","value","getColorWeight","colorAggregation","lowerPercentile","min","max","upperPercentile","colorScaleType","onSetColorDomain","elevationDomain","elevationRange","getElevationValue","getElevationWeight","elevationAggregation","elevationLowerPercentile","elevationUpperPercentile","elevationScale","elevationScaleType","onSetElevationDomain","gridAggregator","pointToDensityGridDataCPU","cellSize","coverage","getPosition","x","position","extruded","material","_filterData","optional","CPUGridLayer","state","initializeState","cpuAggregator","CPUAggregator","getAggregator","props","getCellSize","aggregatorState","attributeManager","getAttributeManager","add","positions","size","accessor","updateState","opts","setState","viewport","context","attributes","getAttributes","numInstances","getNumInstances","getPickingInfo","info","_onGetSublayerColor","cell","getAccessor","_onGetSublayerElevation","_getSublayerUpdateTriggers","getUpdateTriggers","renderLayers","transitions","SubLayerClass","getSubLayerClass","GridCellLayer","updateTriggers","getFillColor","bind","getElevation","getSubLayerProps","id","data","layerData","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 {GL} from '@luma.gl/constants';\nimport {GridCellLayer} from '@deck.gl/layers';\nimport {Accessor, AccessorFunction, Color, Position, Material, DefaultProps} from '@deck.gl/core';\n\nimport {defaultColorRange} from '../utils/color-utils';\nimport {pointToDensityGridDataCPU} from './grid-aggregator';\nimport CPUAggregator from '../utils/cpu-aggregator';\nimport AggregationLayer, {AggregationLayerProps} from '../aggregation-layer';\n\nimport {Layer, UpdateParameters, GetPickingInfoParams, PickingInfo} from '@deck.gl/core';\nimport {AggregateAccessor} from '../types';\n\n// eslint-disable-next-line @typescript-eslint/no-empty-function\nfunction nop() {}\n\nconst defaultProps: DefaultProps<CPUGridLayerProps> = {\n // color\n colorDomain: null,\n colorRange: defaultColorRange,\n getColorValue: {type: 'accessor', value: null}, // default value is calculated from `getColorWeight` and `colorAggregation`\n getColorWeight: {type: 'accessor', value: 1},\n colorAggregation: 'SUM',\n lowerPercentile: {type: 'number', min: 0, max: 100, value: 0},\n upperPercentile: {type: 'number', min: 0, max: 100, value: 100},\n colorScaleType: 'quantize',\n onSetColorDomain: nop,\n\n // elevation\n elevationDomain: null,\n elevationRange: [0, 1000],\n getElevationValue: {type: 'accessor', value: null}, // default value is calculated from `getElevationWeight` and `elevationAggregation`\n getElevationWeight: {type: 'accessor', value: 1},\n elevationAggregation: 'SUM',\n elevationLowerPercentile: {type: 'number', min: 0, max: 100, value: 0},\n elevationUpperPercentile: {type: 'number', min: 0, max: 100, value: 100},\n elevationScale: {type: 'number', min: 0, value: 1},\n elevationScaleType: 'linear',\n onSetElevationDomain: nop,\n\n gridAggregator: pointToDensityGridDataCPU,\n\n // grid\n cellSize: {type: 'number', min: 0, max: 1000, value: 1000},\n coverage: {type: 'number', min: 0, max: 1, value: 1},\n getPosition: {type: 'accessor', value: (x: any) => x.position},\n extruded: false,\n\n // Optional material for 'lighting' shader module\n material: true,\n\n // data filter\n _filterData: {type: 'function', value: null, optional: true}\n};\n\n/** All properties supported by CPUGridLayer. */\nexport type CPUGridLayerProps<DataT = unknown> = _CPUGridLayerProps<DataT> &\n AggregationLayerProps<DataT>;\n\n/** Properties added by CPUGridLayer. */\ntype _CPUGridLayerProps<DataT> = {\n /**\n * Size of each cell in meters.\n * @default 1000\n */\n cellSize?: number;\n\n /**\n * Color scale domain, default is set to the extent of aggregated weights in each cell.\n * @default [min(colorWeight), max(colorWeight)]\n */\n colorDomain?: [number, number] | null;\n\n /**\n * Default: [colorbrewer](http://colorbrewer2.org/#type=sequential&scheme=YlOrRd&n=6) `6-class YlOrRd`\n */\n colorRange?: Color[];\n\n /**\n * Cell size multiplier, clamped between 0 - 1.\n * @default 1\n */\n coverage?: number;\n\n /**\n * Elevation scale input domain, default is set to between 0 and the max of aggregated weights in each cell.\n * @default [0, max(elevationWeight)]\n */\n elevationDomain?: [number, number] | null;\n\n /**\n * Elevation scale output range.\n * @default [0, 1000]\n */\n elevationRange?: [number, number];\n\n /**\n * Cell elevation multiplier.\n * @default 1\n */\n elevationScale?: number;\n\n /**\n * Whether to enable cell elevation. If set to false, all cell will be flat.\n * @default true\n */\n extruded?: boolean;\n\n /**\n * Filter cells and re-calculate color by `upperPercentile`.\n * Cells with value arger than the upperPercentile will be hidden.\n * @default 100\n */\n upperPercentile?: number;\n\n /**\n * Filter cells and re-calculate color by `lowerPercentile`.\n * Cells with value smaller than the lowerPercentile will be hidden.\n * @default 0\n */\n lowerPercentile?: number;\n\n /**\n * Filter cells and re-calculate elevation by `elevationUpperPercentile`.\n * Cells with elevation value larger than the `elevationUpperPercentile` will be hidden.\n * @default 100\n */\n elevationUpperPercentile?: number;\n\n /**\n * Filter cells and re-calculate elevation by `elevationLowerPercentile`.\n * Cells with elevation value larger than the `elevationLowerPercentile` will be hidden.\n * @default 0\n */\n elevationLowerPercentile?: number;\n\n /**\n * Scaling function used to determine the color of the grid cell, default value is 'quantize'.\n * Supported Values are 'quantize', 'linear', 'quantile' and 'ordinal'.\n * @default 'quantize'\n */\n colorScaleType?: 'quantize' | 'linear' | 'quantile' | 'ordinal';\n\n /**\n * Scaling function used to determine the elevation of the grid cell, only supports 'linear'.\n */\n elevationScaleType?: 'linear';\n\n // TODO - document\n gridAggregator?: (props: any, params: any) => any;\n\n /**\n * Material settings for lighting effect. Applies if `extruded: true`.\n *\n * @default true\n * @see https://deck.gl/docs/developer-guide/using-lighting\n */\n material?: Material;\n\n /**\n * Defines the operation used to aggregate all data object weights to calculate a cell's color value.\n * @default 'SUM'\n */\n colorAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Defines the operation used to aggregate all data object weights to calculate a cell's elevation value.\n * @default 'SUM'\n */\n elevationAggregation?: 'SUM' | 'MEAN' | 'MIN' | 'MAX';\n\n /**\n * Method called to retrieve the position of each object.\n * @default object => object.position\n */\n getPosition?: AccessorFunction<DataT, Position>;\n\n /**\n * The weight of a data object used to calculate the color value for a cell.\n * @default 1\n */\n getColorWeight?: Accessor<DataT, number>;\n\n /**\n * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its color is based on.\n * @default null\n */\n getColorValue?: AggregateAccessor<DataT> | null;\n\n /**\n * The weight of a data object used to calculate the elevation value for a cell.\n * @default 1\n */\n getElevationWeight?: Accessor<DataT, number>;\n\n /**\n * After data objects are aggregated into cells, this accessor is called on each cell to get the value that its elevation is based on.\n * @default null\n */\n getElevationValue?: AggregateAccessor<DataT> | null;\n\n /**\n * This callback will be called when bin color domain has been calculated.\n * @default () => {}\n */\n onSetColorDomain?: (minMax: [number, number]) => void;\n\n /**\n * This callback will be called when bin elevation domain has been calculated.\n * @default () => {}\n */\n onSetElevationDomain?: (minMax: [number, number]) => void;\n\n /**\n * (Experimental) Filter data objects\n */\n _filterData: null | ((d: DataT) => boolean);\n};\n\n/** Aggregate data into a grid-based heatmap. Aggregation is performed on CPU. */\nexport default class CPUGridLayer<\n DataT = any,\n ExtraPropsT extends {} = {}\n> extends AggregationLayer<DataT, ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {\n static layerName = 'CPUGridLayer';\n static defaultProps = defaultProps;\n\n state!: AggregationLayer<DataT>['state'] & {\n cpuAggregator: CPUAggregator;\n aggregatorState: CPUAggregator['state'];\n };\n\n initializeState(): void {\n const cpuAggregator = new CPUAggregator({\n getAggregator: props => props.gridAggregator,\n getCellSize: props => props.cellSize\n });\n\n this.state = {\n cpuAggregator,\n aggregatorState: cpuAggregator.state\n };\n const attributeManager = this.getAttributeManager()!;\n attributeManager.add({\n positions: {size: 3, type: GL.DOUBLE, accessor: 'getPosition'}\n });\n // color and elevation attributes can't be added as attributes\n // they are calcualted using 'getValue' accessor that takes an array of pints.\n }\n\n updateState(opts: UpdateParameters<this>) {\n super.updateState(opts);\n this.setState({\n // make a copy of the internal state of cpuAggregator for testing\n aggregatorState: this.state.cpuAggregator.updateState(opts, {\n viewport: this.context.viewport,\n attributes: this.getAttributes(),\n numInstances: this.getNumInstances()\n })\n });\n }\n\n getPickingInfo({info}: GetPickingInfoParams): PickingInfo {\n return this.state.cpuAggregator.getPickingInfo({info});\n }\n\n // create a method for testing\n _onGetSublayerColor(cell) {\n return this.state.cpuAggregator.getAccessor('fillColor')(cell);\n }\n\n // create a method for testing\n _onGetSublayerElevation(cell) {\n return this.state.cpuAggregator.getAccessor('elevation')(cell);\n }\n\n _getSublayerUpdateTriggers() {\n return this.state.cpuAggregator.getUpdateTriggers(this.props);\n }\n\n renderLayers(): Layer {\n const {elevationScale, extruded, cellSize, coverage, material, transitions} = this.props;\n const {cpuAggregator} = this.state;\n const SubLayerClass = this.getSubLayerClass('grid-cell', GridCellLayer);\n const updateTriggers = this._getSublayerUpdateTriggers();\n\n return new SubLayerClass(\n {\n cellSize,\n coverage,\n material,\n elevationScale,\n extruded,\n\n getFillColor: this._onGetSublayerColor.bind(this),\n getElevation: this._onGetSublayerElevation.bind(this),\n transitions: transitions && {\n getFillColor: transitions.getColorValue || transitions.getColorWeight,\n getElevation: transitions.getElevationValue || transitions.getElevationWeight\n }\n },\n this.getSubLayerProps({\n id: 'grid-cell',\n updateTriggers\n }),\n {\n data: cpuAggregator.state.layerData.data\n }\n );\n }\n}\n"],"file":"cpu-grid-layer.js"}
|
|
@@ -55,7 +55,8 @@ function pointsToGridHashing(props, aggregationParams) {
|
|
|
55
55
|
if (gridOffset.xOffset <= 0 || gridOffset.yOffset <= 0) {
|
|
56
56
|
return {
|
|
57
57
|
gridHash: {},
|
|
58
|
-
gridOffset: gridOffset
|
|
58
|
+
gridOffset: gridOffset,
|
|
59
|
+
offsets: [0, 0]
|
|
59
60
|
};
|
|
60
61
|
}
|
|
61
62
|
|
|
@@ -92,15 +93,17 @@ function pointsToGridHashing(props, aggregationParams) {
|
|
|
92
93
|
var xIndex = Math.floor((x + offsets[0]) / gridOffset.xOffset);
|
|
93
94
|
|
|
94
95
|
if (!projectPoints || xIndex >= 0 && xIndex < numCol && yIndex >= 0 && yIndex < numRow) {
|
|
95
|
-
var
|
|
96
|
-
|
|
96
|
+
var _key = "".concat(yIndex, "-").concat(xIndex);
|
|
97
|
+
|
|
98
|
+
gridHash[_key] = gridHash[_key] || {
|
|
97
99
|
count: 0,
|
|
98
100
|
points: [],
|
|
99
101
|
lonIdx: xIndex,
|
|
100
102
|
latIdx: yIndex
|
|
101
103
|
};
|
|
102
|
-
gridHash[
|
|
103
|
-
|
|
104
|
+
gridHash[_key].count += 1;
|
|
105
|
+
|
|
106
|
+
gridHash[_key].points.push({
|
|
104
107
|
source: pt,
|
|
105
108
|
index: objectInfo.index
|
|
106
109
|
});
|
|
@@ -127,15 +130,16 @@ function getGridLayerDataFromGridHash(_ref3) {
|
|
|
127
130
|
var data = new Array(Object.keys(gridHash).length);
|
|
128
131
|
var i = 0;
|
|
129
132
|
|
|
130
|
-
for (var
|
|
131
|
-
var idxs =
|
|
133
|
+
for (var _key2 in gridHash) {
|
|
134
|
+
var idxs = _key2.split('-');
|
|
135
|
+
|
|
132
136
|
var latIdx = parseInt(idxs[0], 10);
|
|
133
137
|
var lonIdx = parseInt(idxs[1], 10);
|
|
134
138
|
var index = i++;
|
|
135
139
|
data[index] = _objectSpread({
|
|
136
140
|
index: index,
|
|
137
141
|
position: [offsets[0] + gridOffset.xOffset * lonIdx, offsets[1] + gridOffset.yOffset * latIdx]
|
|
138
|
-
}, gridHash[
|
|
142
|
+
}, gridHash[_key2]);
|
|
139
143
|
}
|
|
140
144
|
|
|
141
145
|
return data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/cpu-grid-layer/grid-aggregator.js"],"names":["pointToDensityGridDataCPU","props","aggregationParams","hashInfo","pointsToGridHashing","result","getGridLayerDataFromGridHash","gridHash","gridOffset","data","cellSize","attributes","viewport","projectPoints","numInstances","positions","value","getAccessor","size","boundingBox","getPositionBoundingBox","offsets","posOffset","xOffset","yOffset","width","height","numCol","Math","ceil","numRow","iterable","objectInfo","position","Array","pt","index","project","x","y","Number","isFinite","yIndex","floor","xIndex","key","count","points","lonIdx","latIdx","push","source","Object","keys","length","i","idxs","split","parseInt","positionAttribute","numInstance","yMin","Infinity","yMax","xMin","xMax"],"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 {createIterable} from '@deck.gl/core';\nimport {getGridOffset} from '../utils/grid-aggregation-utils';\n\n/**\n * Calculate density grid from an array of points\n * @param {Object} props - object containing :\n * @param {Iterable} [props.data] - data objects to be aggregated\n * @param {Integer} [props.cellSize] - size of the grid cell\n *\n * @param {Object} aggregationParams - object containing :\n * @param {Object} gridOffset - {xOffset, yOffset} cell size in meters\n * @param {Integer} width - width of the grid\n * @param {Integer} height - height of the grid\n * @param {Boolean} projectPoints - `true` if doing screen space projection, `false` otherwise\n * @param {Array} attributes - attributes array containing position values\n * @param {Viewport} viewport - viewport to be used for projection\n * @param {Array} posOffset - [xOffset, yOffset] offset to be applied to positions to get cell index\n * @param {Object} boundingBox - {xMin, yMin, xMax, yMax} bounding box of input data\n *\n * @returns {object} - grid data, cell dimension\n */\nexport function pointToDensityGridDataCPU(props, aggregationParams) {\n const hashInfo = pointsToGridHashing(props, aggregationParams);\n const result = getGridLayerDataFromGridHash(hashInfo);\n\n return {\n gridHash: hashInfo.gridHash,\n gridOffset: hashInfo.gridOffset,\n data: result\n };\n}\n\n/**\n * Project points into each cell, return a hash table of cells\n * @param {Iterable} points\n * @param {number} cellSize - unit size in meters\n * @param {function} getPosition - position accessor\n * @returns {object} - grid hash and cell dimension\n */\n/* eslint-disable max-statements, complexity */\nfunction pointsToGridHashing(props, aggregationParams) {\n const {data = [], cellSize} = props;\n const {attributes, viewport, projectPoints, numInstances} = aggregationParams;\n const positions = attributes.positions.value;\n const {size} = attributes.positions.getAccessor();\n const boundingBox =\n aggregationParams.boundingBox || getPositionBoundingBox(attributes.positions, numInstances);\n const offsets = aggregationParams.posOffset || [180, 90];\n const gridOffset = aggregationParams.gridOffset || getGridOffset(boundingBox, cellSize);\n\n if (gridOffset.xOffset <= 0 || gridOffset.yOffset <= 0) {\n return {gridHash: {}, gridOffset};\n }\n\n const {width, height} = viewport;\n const numCol = Math.ceil(width / gridOffset.xOffset);\n const numRow = Math.ceil(height / gridOffset.yOffset);\n\n // calculate count per cell\n const gridHash = {};\n\n const {iterable, objectInfo} = createIterable(data);\n const position = new Array(3);\n for (const pt of iterable) {\n objectInfo.index++;\n position[0] = positions[objectInfo.index * size];\n position[1] = positions[objectInfo.index * size + 1];\n position[2] = size >= 3 ? positions[objectInfo.index * size + 2] : 0;\n const [x, y] = projectPoints ? viewport.project(position) : position;\n if (Number.isFinite(x) && Number.isFinite(y)) {\n const yIndex = Math.floor((y + offsets[1]) / gridOffset.yOffset);\n const xIndex = Math.floor((x + offsets[0]) / gridOffset.xOffset);\n if (\n !projectPoints ||\n // when doing screen space agggregation (projectPoints = true), filter points outside of the viewport range.\n (xIndex >= 0 && xIndex < numCol && yIndex >= 0 && yIndex < numRow)\n ) {\n const key = `${yIndex}-${xIndex}`;\n\n gridHash[key] = gridHash[key] || {count: 0, points: [], lonIdx: xIndex, latIdx: yIndex};\n gridHash[key].count += 1;\n gridHash[key].points.push({\n source: pt,\n index: objectInfo.index\n });\n }\n }\n }\n\n return {gridHash, gridOffset, offsets: [offsets[0] * -1, offsets[1] * -1]};\n}\n/* eslint-enable max-statements, complexity */\n\nfunction getGridLayerDataFromGridHash({gridHash, gridOffset, offsets}) {\n const data = new Array(Object.keys(gridHash).length);\n let i = 0;\n for (const key in gridHash) {\n const idxs = key.split('-');\n const latIdx = parseInt(idxs[0], 10);\n const lonIdx = parseInt(idxs[1], 10);\n const index = i++;\n\n data[index] = {\n index,\n position: [\n offsets[0] + gridOffset.xOffset * lonIdx,\n offsets[1] + gridOffset.yOffset * latIdx\n ],\n ...gridHash[key]\n };\n }\n return data;\n}\n\n// Calculate bounding box of position attribute\nfunction getPositionBoundingBox(positionAttribute, numInstance) {\n // TODO - value might not exist (e.g. attribute transition)\n const positions = positionAttribute.value;\n const {size} = positionAttribute.getAccessor();\n\n let yMin = Infinity;\n let yMax = -Infinity;\n let xMin = Infinity;\n let xMax = -Infinity;\n let y;\n let x;\n\n for (let i = 0; i < numInstance; i++) {\n x = positions[i * size];\n y = positions[i * size + 1];\n if (Number.isFinite(x) && Number.isFinite(y)) {\n yMin = y < yMin ? y : yMin;\n yMax = y > yMax ? y : yMax;\n xMin = x < xMin ? x : xMin;\n xMax = x > xMax ? x : xMax;\n }\n }\n\n return {xMin, xMax, yMin, yMax};\n}\n"],"file":"grid-aggregator.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/cpu-grid-layer/grid-aggregator.ts"],"names":["pointToDensityGridDataCPU","props","aggregationParams","hashInfo","pointsToGridHashing","result","getGridLayerDataFromGridHash","gridHash","gridOffset","data","cellSize","attributes","viewport","projectPoints","numInstances","positions","value","getAccessor","size","boundingBox","getPositionBoundingBox","offsets","posOffset","xOffset","yOffset","width","height","numCol","Math","ceil","numRow","iterable","objectInfo","position","Array","pt","index","project","x","y","Number","isFinite","yIndex","floor","xIndex","key","count","points","lonIdx","latIdx","push","source","Object","keys","length","i","idxs","split","parseInt","positionAttribute","numInstance","yMin","Infinity","yMax","xMin","xMax"],"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 {createIterable} from '@deck.gl/core';\nimport {getGridOffset} from '../utils/grid-aggregation-utils';\n\nexport type GridHash = {\n [key: string]: {\n count: number;\n points: unknown[];\n lonIdx: number;\n latIdx: number;\n };\n};\n\n/**\n * Calculate density grid from an array of points\n * @param {Object} props - object containing :\n * @param {Iterable} [props.data] - data objects to be aggregated\n * @param {Integer} [props.cellSize] - size of the grid cell\n *\n * @param {Object} aggregationParams - object containing :\n * @param {Object} gridOffset - {xOffset, yOffset} cell size in meters\n * @param {Integer} width - width of the grid\n * @param {Integer} height - height of the grid\n * @param {Boolean} projectPoints - `true` if doing screen space projection, `false` otherwise\n * @param {Array} attributes - attributes array containing position values\n * @param {Viewport} viewport - viewport to be used for projection\n * @param {Array} posOffset - [xOffset, yOffset] offset to be applied to positions to get cell index\n * @param {Object} boundingBox - {xMin, yMin, xMax, yMax} bounding box of input data\n *\n * @returns {object} - grid data, cell dimension\n */\nexport function pointToDensityGridDataCPU(props, aggregationParams) {\n const hashInfo = pointsToGridHashing(props, aggregationParams);\n const result = getGridLayerDataFromGridHash(hashInfo);\n\n return {\n gridHash: hashInfo.gridHash,\n gridOffset: hashInfo.gridOffset,\n data: result\n };\n}\n\n/**\n * Project points into each cell, return a hash table of cells\n * @param {Iterable} points\n * @param {number} cellSize - unit size in meters\n * @param {function} getPosition - position accessor\n * @returns {object} - grid hash and cell dimension\n */\n/* eslint-disable-next-line max-statements, complexity */\nfunction pointsToGridHashing(\n props,\n aggregationParams\n): {\n gridHash: GridHash;\n gridOffset: {xOffset: number; yOffset: number};\n offsets: [number, number];\n} {\n const {data = [], cellSize} = props;\n const {attributes, viewport, projectPoints, numInstances} = aggregationParams;\n const positions = attributes.positions.value;\n const {size} = attributes.positions.getAccessor();\n const boundingBox =\n aggregationParams.boundingBox || getPositionBoundingBox(attributes.positions, numInstances);\n const offsets = aggregationParams.posOffset || [180, 90];\n const gridOffset = aggregationParams.gridOffset || getGridOffset(boundingBox, cellSize);\n\n if (gridOffset.xOffset <= 0 || gridOffset.yOffset <= 0) {\n return {gridHash: {}, gridOffset, offsets: [0, 0]};\n }\n\n const {width, height} = viewport;\n const numCol = Math.ceil(width / gridOffset.xOffset);\n const numRow = Math.ceil(height / gridOffset.yOffset);\n\n // calculate count per cell\n const gridHash = {};\n\n const {iterable, objectInfo} = createIterable(data);\n const position = new Array(3);\n for (const pt of iterable) {\n objectInfo.index++;\n position[0] = positions[objectInfo.index * size];\n position[1] = positions[objectInfo.index * size + 1];\n position[2] = size >= 3 ? positions[objectInfo.index * size + 2] : 0;\n const [x, y] = projectPoints ? viewport.project(position) : position;\n if (Number.isFinite(x) && Number.isFinite(y)) {\n const yIndex = Math.floor((y + offsets[1]) / gridOffset.yOffset);\n const xIndex = Math.floor((x + offsets[0]) / gridOffset.xOffset);\n if (\n !projectPoints ||\n // when doing screen space agggregation (projectPoints = true), filter points outside of the viewport range.\n (xIndex >= 0 && xIndex < numCol && yIndex >= 0 && yIndex < numRow)\n ) {\n const key = `${yIndex}-${xIndex}`;\n\n gridHash[key] = gridHash[key] || {count: 0, points: [], lonIdx: xIndex, latIdx: yIndex};\n gridHash[key].count += 1;\n gridHash[key].points.push({\n source: pt,\n index: objectInfo.index\n });\n }\n }\n }\n\n return {gridHash, gridOffset, offsets: [offsets[0] * -1, offsets[1] * -1]};\n}\n/* eslint-enable max-statements, complexity */\n\nfunction getGridLayerDataFromGridHash({\n gridHash,\n gridOffset,\n offsets\n}: {\n gridHash: GridHash;\n gridOffset: {xOffset: number; yOffset: number};\n offsets: [number, number];\n}) {\n const data = new Array(Object.keys(gridHash).length);\n let i = 0;\n for (const key in gridHash) {\n const idxs = key.split('-');\n const latIdx = parseInt(idxs[0], 10);\n const lonIdx = parseInt(idxs[1], 10);\n const index = i++;\n\n data[index] = {\n index,\n position: [\n offsets[0] + gridOffset.xOffset * lonIdx,\n offsets[1] + gridOffset.yOffset * latIdx\n ],\n ...gridHash[key]\n };\n }\n return data;\n}\n\n// Calculate bounding box of position attribute\nfunction getPositionBoundingBox(positionAttribute, numInstance) {\n // TODO - value might not exist (e.g. attribute transition)\n const positions = positionAttribute.value;\n const {size} = positionAttribute.getAccessor();\n\n let yMin = Infinity;\n let yMax = -Infinity;\n let xMin = Infinity;\n let xMax = -Infinity;\n let y;\n let x;\n\n for (let i = 0; i < numInstance; i++) {\n x = positions[i * size];\n y = positions[i * size + 1];\n if (Number.isFinite(x) && Number.isFinite(y)) {\n yMin = y < yMin ? y : yMin;\n yMax = y > yMax ? y : yMax;\n xMin = x < xMin ? x : xMin;\n xMax = x > xMax ? x : xMax;\n }\n }\n\n return {xMin, xMax, yMin, yMax};\n}\n"],"file":"grid-aggregator.js"}
|
|
@@ -21,10 +21,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
21
21
|
|
|
22
22
|
var _core = require("@deck.gl/core");
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _engine = require("@luma.gl/engine");
|
|
25
25
|
|
|
26
26
|
var _shadertools = require("@luma.gl/shadertools");
|
|
27
27
|
|
|
28
|
+
var _constants = require("@luma.gl/constants");
|
|
29
|
+
|
|
28
30
|
var _colorUtils = require("../utils/color-utils");
|
|
29
31
|
|
|
30
32
|
var _gpuGridCellLayerVertex = _interopRequireDefault(require("./gpu-grid-cell-layer-vertex.glsl"));
|
|
@@ -89,8 +91,17 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
89
91
|
var _super = _createSuper(GPUGridCellLayer);
|
|
90
92
|
|
|
91
93
|
function GPUGridCellLayer() {
|
|
94
|
+
var _this;
|
|
95
|
+
|
|
92
96
|
(0, _classCallCheck2.default)(this, GPUGridCellLayer);
|
|
93
|
-
|
|
97
|
+
|
|
98
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
99
|
+
args[_key] = arguments[_key];
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
103
|
+
_this.state = void 0;
|
|
104
|
+
return _this;
|
|
94
105
|
}
|
|
95
106
|
|
|
96
107
|
var _proto = GPUGridCellLayer.prototype;
|
|
@@ -103,8 +114,7 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
103
114
|
});
|
|
104
115
|
};
|
|
105
116
|
|
|
106
|
-
_proto.initializeState = function initializeState(
|
|
107
|
-
var gl = _ref.gl;
|
|
117
|
+
_proto.initializeState = function initializeState() {
|
|
108
118
|
var attributeManager = this.getAttributeManager();
|
|
109
119
|
attributeManager.addInstanced({
|
|
110
120
|
colors: {
|
|
@@ -117,7 +127,7 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
117
127
|
}
|
|
118
128
|
});
|
|
119
129
|
|
|
120
|
-
var model = this._getModel(
|
|
130
|
+
var model = this._getModel();
|
|
121
131
|
|
|
122
132
|
this._setupUniformBuffer(model);
|
|
123
133
|
|
|
@@ -126,16 +136,16 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
126
136
|
});
|
|
127
137
|
};
|
|
128
138
|
|
|
129
|
-
_proto._getModel = function _getModel(
|
|
130
|
-
return new
|
|
139
|
+
_proto._getModel = function _getModel() {
|
|
140
|
+
return new _engine.Model(this.context.device, _objectSpread(_objectSpread({}, this.getShaders()), {}, {
|
|
131
141
|
id: this.props.id,
|
|
132
|
-
geometry: new
|
|
142
|
+
geometry: new _engine.CubeGeometry(),
|
|
133
143
|
isInstanced: true
|
|
134
144
|
}));
|
|
135
145
|
};
|
|
136
146
|
|
|
137
|
-
_proto.draw = function draw(
|
|
138
|
-
var uniforms =
|
|
147
|
+
_proto.draw = function draw(_ref) {
|
|
148
|
+
var uniforms = _ref.uniforms;
|
|
139
149
|
var _this$props = this.props,
|
|
140
150
|
cellSize = _this$props.cellSize,
|
|
141
151
|
offset = _this$props.offset,
|
|
@@ -148,12 +158,15 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
148
158
|
elevationRange = _this$props.elevationRange,
|
|
149
159
|
colorMaxMinBuffer = _this$props.colorMaxMinBuffer,
|
|
150
160
|
elevationMaxMinBuffer = _this$props.elevationMaxMinBuffer;
|
|
161
|
+
var model = this.state.model;
|
|
151
162
|
var gridOriginLow = [(0, _core.fp64LowPart)(gridOrigin[0]), (0, _core.fp64LowPart)(gridOrigin[1])];
|
|
152
163
|
var gridOffsetLow = [(0, _core.fp64LowPart)(gridOffset[0]), (0, _core.fp64LowPart)(gridOffset[1])];
|
|
153
164
|
var domainUniforms = this.getDomainUniforms();
|
|
154
165
|
var colorRange = (0, _colorUtils.colorRangeToFlatArray)(this.props.colorRange);
|
|
155
166
|
this.bindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer);
|
|
156
|
-
|
|
167
|
+
model.setUniforms(uniforms);
|
|
168
|
+
model.setUniforms(domainUniforms);
|
|
169
|
+
model.setUniforms({
|
|
157
170
|
cellSize: cellSize,
|
|
158
171
|
offset: offset,
|
|
159
172
|
extruded: extruded,
|
|
@@ -166,7 +179,8 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
166
179
|
gridOffsetLow: gridOffsetLow,
|
|
167
180
|
colorRange: colorRange,
|
|
168
181
|
elevationRange: elevationRange
|
|
169
|
-
})
|
|
182
|
+
});
|
|
183
|
+
model.draw(this.context.renderPass);
|
|
170
184
|
this.unbindUniformBuffers(colorMaxMinBuffer, elevationMaxMinBuffer);
|
|
171
185
|
};
|
|
172
186
|
|
|
@@ -216,8 +230,8 @@ var GPUGridCellLayer = function (_Layer) {
|
|
|
216
230
|
};
|
|
217
231
|
|
|
218
232
|
_proto._setupUniformBuffer = function _setupUniformBuffer(model) {
|
|
233
|
+
var programHandle = model.pipeline.handle;
|
|
219
234
|
var gl = this.context.gl;
|
|
220
|
-
var programHandle = model.program.handle;
|
|
221
235
|
var colorIndex = gl.getUniformBlockIndex(programHandle, 'ColorData');
|
|
222
236
|
var elevationIndex = gl.getUniformBlockIndex(programHandle, 'ElevationData');
|
|
223
237
|
gl.uniformBlockBinding(programHandle, colorIndex, COLOR_DATA_UBO_INDEX);
|