@deck.gl/aggregation-layers 8.7.0-alpha.1 → 8.7.0-alpha.2
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 +61 -29
- package/dist/es5/aggregation-layer.js +109 -163
- package/dist/es5/aggregation-layer.js.map +1 -1
- package/dist/es5/contour-layer/contour-layer.js +240 -260
- package/dist/es5/contour-layer/contour-layer.js.map +1 -1
- package/dist/es5/contour-layer/contour-utils.js +65 -86
- package/dist/es5/contour-layer/contour-utils.js.map +1 -1
- package/dist/es5/contour-layer/marching-squares-codes.js +181 -106
- package/dist/es5/contour-layer/marching-squares-codes.js.map +1 -1
- package/dist/es5/contour-layer/marching-squares.js +56 -59
- package/dist/es5/contour-layer/marching-squares.js.map +1 -1
- package/dist/es5/cpu-grid-layer/cpu-grid-layer.js +85 -121
- package/dist/es5/cpu-grid-layer/cpu-grid-layer.js.map +1 -1
- package/dist/es5/cpu-grid-layer/grid-aggregator.js +93 -119
- package/dist/es5/cpu-grid-layer/grid-aggregator.js.map +1 -1
- package/dist/es5/gpu-grid-layer/gpu-grid-cell-layer.js +131 -167
- package/dist/es5/gpu-grid-layer/gpu-grid-cell-layer.js.map +1 -1
- package/dist/es5/gpu-grid-layer/gpu-grid-layer.js +319 -322
- package/dist/es5/gpu-grid-layer/gpu-grid-layer.js.map +1 -1
- package/dist/es5/grid-aggregation-layer.js +202 -230
- package/dist/es5/grid-aggregation-layer.js.map +1 -1
- package/dist/es5/grid-layer/grid-layer.js +61 -91
- package/dist/es5/grid-layer/grid-layer.js.map +1 -1
- package/dist/es5/heatmap-layer/heatmap-layer-utils.js +24 -59
- package/dist/es5/heatmap-layer/heatmap-layer-utils.js.map +1 -1
- package/dist/es5/heatmap-layer/heatmap-layer.js +515 -533
- package/dist/es5/heatmap-layer/heatmap-layer.js.map +1 -1
- package/dist/es5/heatmap-layer/triangle-layer.js +64 -91
- package/dist/es5/heatmap-layer/triangle-layer.js.map +1 -1
- package/dist/es5/hexagon-layer/hexagon-aggregator.js +59 -77
- package/dist/es5/hexagon-layer/hexagon-aggregator.js.map +1 -1
- package/dist/es5/hexagon-layer/hexagon-layer.js +121 -164
- package/dist/es5/hexagon-layer/hexagon-layer.js.map +1 -1
- package/dist/es5/index.js +12 -12
- package/dist/es5/screen-grid-layer/screen-grid-cell-layer.js +168 -193
- package/dist/es5/screen-grid-layer/screen-grid-cell-layer.js.map +1 -1
- package/dist/es5/screen-grid-layer/screen-grid-layer.js +235 -250
- package/dist/es5/screen-grid-layer/screen-grid-layer.js.map +1 -1
- package/dist/es5/utils/aggregation-operation-utils.js +16 -31
- package/dist/es5/utils/aggregation-operation-utils.js.map +1 -1
- package/dist/es5/utils/bin-sorter.js +118 -198
- package/dist/es5/utils/bin-sorter.js.map +1 -1
- package/dist/es5/utils/color-utils.js +8 -10
- package/dist/es5/utils/color-utils.js.map +1 -1
- package/dist/es5/utils/cpu-aggregator.js +323 -342
- package/dist/es5/utils/cpu-aggregator.js.map +1 -1
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator-constants.js +20 -18
- 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 +545 -545
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator.js.map +1 -1
- package/dist/es5/utils/grid-aggregation-utils.js +50 -44
- package/dist/es5/utils/grid-aggregation-utils.js.map +1 -1
- package/dist/es5/utils/prop-utils.js +2 -2
- package/dist/es5/utils/prop-utils.js.map +1 -1
- package/dist/es5/utils/resource-utils.js +32 -39
- package/dist/es5/utils/resource-utils.js.map +1 -1
- package/dist/es5/utils/scale-utils.js +36 -66
- package/dist/es5/utils/scale-utils.js.map +1 -1
- package/dist/esm/contour-layer/marching-squares-codes.js.map +1 -1
- package/dist/esm/heatmap-layer/heatmap-layer.js.map +1 -1
- package/dist/esm/heatmap-layer/triangle-layer.js.map +1 -1
- package/dist/esm/screen-grid-layer/screen-grid-cell-layer.js.map +1 -1
- package/dist/esm/utils/aggregation-operation-utils.js.map +1 -1
- package/dist/esm/utils/cpu-aggregator.js.map +1 -1
- package/dist/esm/utils/gpu-grid-aggregation/gpu-grid-aggregator.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +2 -2
- package/src/contour-layer/marching-squares-codes.js +52 -10
- package/src/heatmap-layer/heatmap-layer.js +3 -9
- package/src/heatmap-layer/triangle-layer.js +2 -9
- package/src/utils/aggregation-operation-utils.js +4 -1
package/dist/dist.dev.js
CHANGED
|
@@ -15996,18 +15996,48 @@ const NE_TRIANGLE = [OFFSET.E, OFFSET.NE, OFFSET.N];
|
|
|
15996
15996
|
const NW_TRIANGLE = [OFFSET.NW, OFFSET.W, OFFSET.N];
|
|
15997
15997
|
|
|
15998
15998
|
// Trapezoids
|
|
15999
|
-
const SW_TRAPEZOID = [
|
|
16000
|
-
|
|
16001
|
-
|
|
16002
|
-
|
|
15999
|
+
const SW_TRAPEZOID = [
|
|
16000
|
+
[-HALF, ONE6TH],
|
|
16001
|
+
[-HALF, -ONE6TH],
|
|
16002
|
+
[-ONE6TH, -HALF],
|
|
16003
|
+
[ONE6TH, -HALF]
|
|
16004
|
+
];
|
|
16005
|
+
const SE_TRAPEZOID = [
|
|
16006
|
+
[-ONE6TH, -HALF],
|
|
16007
|
+
[ONE6TH, -HALF],
|
|
16008
|
+
[HALF, -ONE6TH],
|
|
16009
|
+
[HALF, ONE6TH]
|
|
16010
|
+
];
|
|
16011
|
+
const NE_TRAPEZOID = [
|
|
16012
|
+
[HALF, -ONE6TH],
|
|
16013
|
+
[HALF, ONE6TH],
|
|
16014
|
+
[ONE6TH, HALF],
|
|
16015
|
+
[-ONE6TH, HALF]
|
|
16016
|
+
];
|
|
16017
|
+
const NW_TRAPEZOID = [
|
|
16018
|
+
[-HALF, ONE6TH],
|
|
16019
|
+
[-HALF, -ONE6TH],
|
|
16020
|
+
[ONE6TH, HALF],
|
|
16021
|
+
[-ONE6TH, HALF]
|
|
16022
|
+
];
|
|
16003
16023
|
|
|
16004
16024
|
// Rectangles
|
|
16005
16025
|
const S_RECTANGLE = [OFFSET.W, OFFSET.SW, OFFSET.SE, OFFSET.E];
|
|
16006
16026
|
const E_RECTANGLE = [OFFSET.S, OFFSET.SE, OFFSET.NE, OFFSET.N];
|
|
16007
16027
|
const N_RECTANGLE = [OFFSET.NW, OFFSET.W, OFFSET.E, OFFSET.NE];
|
|
16008
16028
|
const W_RECTANGLE = [OFFSET.NW, OFFSET.SW, OFFSET.S, OFFSET.N];
|
|
16009
|
-
const EW_RECTANGEL = [
|
|
16010
|
-
|
|
16029
|
+
const EW_RECTANGEL = [
|
|
16030
|
+
[-HALF, ONE6TH],
|
|
16031
|
+
[-HALF, -ONE6TH],
|
|
16032
|
+
[HALF, -ONE6TH],
|
|
16033
|
+
[HALF, ONE6TH]
|
|
16034
|
+
];
|
|
16035
|
+
const SN_RECTANGEL = [
|
|
16036
|
+
[-ONE6TH, -HALF],
|
|
16037
|
+
[ONE6TH, -HALF],
|
|
16038
|
+
[ONE6TH, HALF],
|
|
16039
|
+
[-ONE6TH, HALF]
|
|
16040
|
+
];
|
|
16011
16041
|
|
|
16012
16042
|
// Square
|
|
16013
16043
|
const SQUARE = [OFFSET.NW, OFFSET.SW, OFFSET.SE, OFFSET.NE];
|
|
@@ -16100,16 +16130,28 @@ const ISOLINES_CODE_OFFSET_MAP = {
|
|
|
16100
16130
|
3: [[OFFSET.W, OFFSET.E]],
|
|
16101
16131
|
4: [[OFFSET.N, OFFSET.E]],
|
|
16102
16132
|
5: {
|
|
16103
|
-
0: [
|
|
16104
|
-
|
|
16133
|
+
0: [
|
|
16134
|
+
[OFFSET.W, OFFSET.S],
|
|
16135
|
+
[OFFSET.N, OFFSET.E]
|
|
16136
|
+
],
|
|
16137
|
+
1: [
|
|
16138
|
+
[OFFSET.W, OFFSET.N],
|
|
16139
|
+
[OFFSET.S, OFFSET.E]
|
|
16140
|
+
]
|
|
16105
16141
|
},
|
|
16106
16142
|
6: [[OFFSET.N, OFFSET.S]],
|
|
16107
16143
|
7: [[OFFSET.W, OFFSET.N]],
|
|
16108
16144
|
8: [[OFFSET.W, OFFSET.N]],
|
|
16109
16145
|
9: [[OFFSET.N, OFFSET.S]],
|
|
16110
16146
|
10: {
|
|
16111
|
-
0: [
|
|
16112
|
-
|
|
16147
|
+
0: [
|
|
16148
|
+
[OFFSET.W, OFFSET.N],
|
|
16149
|
+
[OFFSET.S, OFFSET.E]
|
|
16150
|
+
],
|
|
16151
|
+
1: [
|
|
16152
|
+
[OFFSET.W, OFFSET.S],
|
|
16153
|
+
[OFFSET.N, OFFSET.E]
|
|
16154
|
+
]
|
|
16113
16155
|
},
|
|
16114
16156
|
11: [[OFFSET.N, OFFSET.E]],
|
|
16115
16157
|
12: [[OFFSET.W, OFFSET.E]],
|
|
@@ -18324,9 +18366,7 @@ class HeatmapLayer extends _aggregation_layer__WEBPACK_IMPORTED_MODULE_5__["defa
|
|
|
18324
18366
|
this.setState({textureSize, format, type, weightsScale});
|
|
18325
18367
|
if (!floatTargetSupport) {
|
|
18326
18368
|
_deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].warn(
|
|
18327
|
-
`HeatmapLayer: ${
|
|
18328
|
-
this.id
|
|
18329
|
-
} rendering to float texture not supported, fallingback to low precession format`
|
|
18369
|
+
`HeatmapLayer: ${this.id} rendering to float texture not supported, fallingback to low precession format`
|
|
18330
18370
|
)();
|
|
18331
18371
|
}
|
|
18332
18372
|
}
|
|
@@ -18468,12 +18508,8 @@ class HeatmapLayer extends _aggregation_layer__WEBPACK_IMPORTED_MODULE_5__["defa
|
|
|
18468
18508
|
|
|
18469
18509
|
_updateTextureRenderingBounds() {
|
|
18470
18510
|
// Just render visible portion of the texture
|
|
18471
|
-
const {
|
|
18472
|
-
|
|
18473
|
-
triTexCoordBuffer,
|
|
18474
|
-
normalizedCommonBounds,
|
|
18475
|
-
viewportCorners
|
|
18476
|
-
} = this.state;
|
|
18511
|
+
const {triPositionBuffer, triTexCoordBuffer, normalizedCommonBounds, viewportCorners} =
|
|
18512
|
+
this.state;
|
|
18477
18513
|
|
|
18478
18514
|
const {viewport} = this.context;
|
|
18479
18515
|
|
|
@@ -18898,15 +18934,8 @@ class TriangleLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["Layer"]
|
|
|
18898
18934
|
draw({uniforms}) {
|
|
18899
18935
|
const {model} = this.state;
|
|
18900
18936
|
|
|
18901
|
-
const {
|
|
18902
|
-
|
|
18903
|
-
maxTexture,
|
|
18904
|
-
colorTexture,
|
|
18905
|
-
intensity,
|
|
18906
|
-
threshold,
|
|
18907
|
-
aggregationMode,
|
|
18908
|
-
colorDomain
|
|
18909
|
-
} = this.props;
|
|
18937
|
+
const {texture, maxTexture, colorTexture, intensity, threshold, aggregationMode, colorDomain} =
|
|
18938
|
+
this.props;
|
|
18910
18939
|
|
|
18911
18940
|
model
|
|
18912
18941
|
.setUniforms({
|
|
@@ -20189,7 +20218,10 @@ function wrapAccessor(accessor, context = {}) {
|
|
|
20189
20218
|
function wrapGetValueFunc(getValue, context = {}) {
|
|
20190
20219
|
return pts => {
|
|
20191
20220
|
context.indices = pts.map(pt => pt.index);
|
|
20192
|
-
return getValue(
|
|
20221
|
+
return getValue(
|
|
20222
|
+
pts.map(pt => pt.source),
|
|
20223
|
+
context
|
|
20224
|
+
);
|
|
20193
20225
|
};
|
|
20194
20226
|
}
|
|
20195
20227
|
|
|
@@ -1,211 +1,157 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
8
6
|
exports.default = void 0;
|
|
9
7
|
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
|
-
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
15
|
-
|
|
16
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
17
|
-
|
|
18
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
19
|
-
|
|
20
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
21
|
-
|
|
22
8
|
var _core = require("@deck.gl/core");
|
|
23
9
|
|
|
24
10
|
var _core2 = require("@luma.gl/core");
|
|
25
11
|
|
|
26
12
|
var _propUtils = require("./utils/prop-utils");
|
|
27
13
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
14
|
+
class AggregationLayer extends _core.CompositeLayer {
|
|
15
|
+
initializeState(dimensions) {
|
|
16
|
+
super.initializeState();
|
|
17
|
+
this.setState({
|
|
18
|
+
ignoreProps: (0, _propUtils.filterProps)(this.constructor._propTypes, dimensions.data.props),
|
|
19
|
+
dimensions
|
|
20
|
+
});
|
|
21
|
+
}
|
|
33
22
|
|
|
34
|
-
|
|
23
|
+
updateState(opts) {
|
|
24
|
+
super.updateState(opts);
|
|
25
|
+
const {
|
|
26
|
+
changeFlags
|
|
27
|
+
} = opts;
|
|
35
28
|
|
|
36
|
-
|
|
29
|
+
if (changeFlags.extensionsChanged) {
|
|
30
|
+
const shaders = this.getShaders({});
|
|
37
31
|
|
|
38
|
-
|
|
39
|
-
|
|
32
|
+
if (shaders && shaders.defines) {
|
|
33
|
+
shaders.defines.NON_INSTANCED_MODEL = 1;
|
|
34
|
+
}
|
|
40
35
|
|
|
41
|
-
|
|
36
|
+
this.updateShaders(shaders);
|
|
37
|
+
}
|
|
42
38
|
|
|
43
|
-
|
|
44
|
-
(0, _classCallCheck2.default)(this, AggregationLayer);
|
|
45
|
-
return _super.apply(this, arguments);
|
|
39
|
+
this._updateAttributes(opts.props);
|
|
46
40
|
}
|
|
47
41
|
|
|
48
|
-
(
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
ignoreProps: (0, _propUtils.filterProps)(this.constructor._propTypes, dimensions.data.props),
|
|
54
|
-
dimensions: dimensions
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
}, {
|
|
58
|
-
key: "updateState",
|
|
59
|
-
value: function updateState(opts) {
|
|
60
|
-
(0, _get2.default)((0, _getPrototypeOf2.default)(AggregationLayer.prototype), "updateState", this).call(this, opts);
|
|
61
|
-
var changeFlags = opts.changeFlags;
|
|
62
|
-
|
|
63
|
-
if (changeFlags.extensionsChanged) {
|
|
64
|
-
var shaders = this.getShaders({});
|
|
42
|
+
updateAttributes(changedAttributes) {
|
|
43
|
+
this.setState({
|
|
44
|
+
changedAttributes
|
|
45
|
+
});
|
|
46
|
+
}
|
|
65
47
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
48
|
+
getAttributes() {
|
|
49
|
+
return this.getAttributeManager().getShaderAttributes();
|
|
50
|
+
}
|
|
69
51
|
|
|
70
|
-
|
|
71
|
-
|
|
52
|
+
getModuleSettings() {
|
|
53
|
+
const {
|
|
54
|
+
viewport,
|
|
55
|
+
mousePosition,
|
|
56
|
+
gl
|
|
57
|
+
} = this.context;
|
|
58
|
+
const moduleSettings = Object.assign(Object.create(this.props), {
|
|
59
|
+
viewport,
|
|
60
|
+
mousePosition,
|
|
61
|
+
pickingActive: 0,
|
|
62
|
+
devicePixelRatio: (0, _core2.cssToDeviceRatio)(gl)
|
|
63
|
+
});
|
|
64
|
+
return moduleSettings;
|
|
65
|
+
}
|
|
72
66
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
devicePixelRatio: (0, _core2.cssToDeviceRatio)(gl)
|
|
99
|
-
});
|
|
100
|
-
return moduleSettings;
|
|
67
|
+
updateShaders(shaders) {}
|
|
68
|
+
|
|
69
|
+
isAggregationDirty(updateOpts, params = {}) {
|
|
70
|
+
const {
|
|
71
|
+
props,
|
|
72
|
+
oldProps,
|
|
73
|
+
changeFlags
|
|
74
|
+
} = updateOpts;
|
|
75
|
+
const {
|
|
76
|
+
compareAll = false,
|
|
77
|
+
dimension
|
|
78
|
+
} = params;
|
|
79
|
+
const {
|
|
80
|
+
ignoreProps
|
|
81
|
+
} = this.state;
|
|
82
|
+
const {
|
|
83
|
+
props: dataProps,
|
|
84
|
+
accessors = []
|
|
85
|
+
} = dimension;
|
|
86
|
+
const {
|
|
87
|
+
updateTriggersChanged
|
|
88
|
+
} = changeFlags;
|
|
89
|
+
|
|
90
|
+
if (changeFlags.dataChanged) {
|
|
91
|
+
return true;
|
|
101
92
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}, {
|
|
106
|
-
key: "isAggregationDirty",
|
|
107
|
-
value: function isAggregationDirty(updateOpts) {
|
|
108
|
-
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
109
|
-
var props = updateOpts.props,
|
|
110
|
-
oldProps = updateOpts.oldProps,
|
|
111
|
-
changeFlags = updateOpts.changeFlags;
|
|
112
|
-
var _params$compareAll = params.compareAll,
|
|
113
|
-
compareAll = _params$compareAll === void 0 ? false : _params$compareAll,
|
|
114
|
-
dimension = params.dimension;
|
|
115
|
-
var ignoreProps = this.state.ignoreProps;
|
|
116
|
-
var dataProps = dimension.props,
|
|
117
|
-
_dimension$accessors = dimension.accessors,
|
|
118
|
-
accessors = _dimension$accessors === void 0 ? [] : _dimension$accessors;
|
|
119
|
-
var updateTriggersChanged = changeFlags.updateTriggersChanged;
|
|
120
|
-
|
|
121
|
-
if (changeFlags.dataChanged) {
|
|
93
|
+
|
|
94
|
+
if (updateTriggersChanged) {
|
|
95
|
+
if (updateTriggersChanged.all) {
|
|
122
96
|
return true;
|
|
123
97
|
}
|
|
124
98
|
|
|
125
|
-
|
|
126
|
-
if (updateTriggersChanged
|
|
99
|
+
for (const accessor of accessors) {
|
|
100
|
+
if (updateTriggersChanged[accessor]) {
|
|
127
101
|
return true;
|
|
128
102
|
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
129
105
|
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
try {
|
|
134
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
135
|
-
var accessor = _step.value;
|
|
136
|
-
|
|
137
|
-
if (updateTriggersChanged[accessor]) {
|
|
138
|
-
return true;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
} catch (err) {
|
|
142
|
-
_iterator.e(err);
|
|
143
|
-
} finally {
|
|
144
|
-
_iterator.f();
|
|
145
|
-
}
|
|
106
|
+
if (compareAll) {
|
|
107
|
+
if (changeFlags.extensionsChanged) {
|
|
108
|
+
return true;
|
|
146
109
|
}
|
|
147
110
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
111
|
+
return (0, _core._compareProps)({
|
|
112
|
+
oldProps,
|
|
113
|
+
newProps: props,
|
|
114
|
+
ignoreProps,
|
|
115
|
+
propTypes: this.constructor._propTypes
|
|
116
|
+
});
|
|
117
|
+
}
|
|
152
118
|
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
ignoreProps: ignoreProps,
|
|
157
|
-
propTypes: this.constructor._propTypes
|
|
158
|
-
});
|
|
119
|
+
for (const name of dataProps) {
|
|
120
|
+
if (props[name] !== oldProps[name]) {
|
|
121
|
+
return true;
|
|
159
122
|
}
|
|
123
|
+
}
|
|
160
124
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
try {
|
|
165
|
-
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
166
|
-
var name = _step2.value;
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
167
127
|
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
} catch (err) {
|
|
173
|
-
_iterator2.e(err);
|
|
174
|
-
} finally {
|
|
175
|
-
_iterator2.f();
|
|
176
|
-
}
|
|
128
|
+
isAttributeChanged(name) {
|
|
129
|
+
const {
|
|
130
|
+
changedAttributes
|
|
131
|
+
} = this.state;
|
|
177
132
|
|
|
178
|
-
|
|
133
|
+
if (!name) {
|
|
134
|
+
return !isObjectEmpty(changedAttributes);
|
|
179
135
|
}
|
|
180
|
-
}, {
|
|
181
|
-
key: "isAttributeChanged",
|
|
182
|
-
value: function isAttributeChanged(name) {
|
|
183
|
-
var changedAttributes = this.state.changedAttributes;
|
|
184
136
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
}
|
|
137
|
+
return changedAttributes && changedAttributes[name] !== undefined;
|
|
138
|
+
}
|
|
188
139
|
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
});
|
|
198
|
-
}
|
|
199
|
-
}]);
|
|
200
|
-
return AggregationLayer;
|
|
201
|
-
}(_core.CompositeLayer);
|
|
140
|
+
_getAttributeManager() {
|
|
141
|
+
return new _core.AttributeManager(this.context.gl, {
|
|
142
|
+
id: this.props.id,
|
|
143
|
+
stats: this.context.stats
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
}
|
|
202
148
|
|
|
203
149
|
exports.default = AggregationLayer;
|
|
204
150
|
|
|
205
151
|
function isObjectEmpty(obj) {
|
|
206
|
-
|
|
152
|
+
let isEmpty = true;
|
|
207
153
|
|
|
208
|
-
for (
|
|
154
|
+
for (const key in obj) {
|
|
209
155
|
isEmpty = false;
|
|
210
156
|
break;
|
|
211
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/aggregation-layer.js"],"names":["AggregationLayer","dimensions","setState","ignoreProps","constructor","_propTypes","data","props","opts","changeFlags","extensionsChanged","shaders","getShaders","defines","NON_INSTANCED_MODEL","updateShaders","_updateAttributes","changedAttributes","getAttributeManager","getShaderAttributes","
|
|
1
|
+
{"version":3,"sources":["../../src/aggregation-layer.js"],"names":["AggregationLayer","CompositeLayer","initializeState","dimensions","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","context","moduleSettings","Object","assign","create","pickingActive","devicePixelRatio","isAggregationDirty","updateOpts","params","oldProps","compareAll","dimension","state","dataProps","accessors","updateTriggersChanged","dataChanged","all","accessor","newProps","propTypes","name","isAttributeChanged","isObjectEmpty","undefined","_getAttributeManager","AttributeManager","id","stats","obj","isEmpty","key","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 {CompositeLayer, AttributeManager, _compareProps as compareProps} from '@deck.gl/core';\nimport {cssToDeviceRatio} from '@luma.gl/core';\nimport {filterProps} from './utils/prop-utils';\n\nexport default class AggregationLayer extends CompositeLayer {\n initializeState(dimensions) {\n super.initializeState();\n\n this.setState({\n // Layer props , when changed doesn't require updating aggregation\n ignoreProps: filterProps(this.constructor._propTypes, dimensions.data.props),\n dimensions\n });\n }\n\n updateState(opts) {\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(opts.props);\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(updateOpts, params = {}) {\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._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) {\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 no-unused-vars */\n for (const key in obj) {\n isEmpty = false;\n break;\n }\n /* eslint-enable no-unused-vars */\n return isEmpty;\n}\n\nAggregationLayer.layerName = 'AggregationLayer';\n"],"file":"aggregation-layer.js"}
|