@deck.gl/aggregation-layers 8.6.3 → 8.7.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 +304 -272
- package/dist/es5/contour-layer/marching-squares-codes.js.map +1 -1
- package/dist/es5/heatmap-layer/heatmap-layer.js.map +1 -1
- package/dist/es5/heatmap-layer/triangle-layer.js.map +1 -1
- package/dist/es5/screen-grid-layer/screen-grid-cell-layer.js.map +1 -1
- package/dist/es5/utils/aggregation-operation-utils.js.map +1 -1
- package/dist/es5/utils/cpu-aggregator.js.map +1 -1
- package/dist/es5/utils/gpu-grid-aggregation/gpu-grid-aggregator.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/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@deck.gl/aggregation-layers",
|
|
3
3
|
"description": "deck.gl layers that aggregate the input data into alternative representations",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "8.
|
|
5
|
+
"version": "8.7.0-alpha.3",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"@deck.gl/core": "^8.0.0",
|
|
38
38
|
"@deck.gl/layers": "^8.0.0"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "03fd8c4caae96d66bd651cb76e11a6d05acf8f8c"
|
|
41
41
|
}
|
|
@@ -27,18 +27,48 @@ const NE_TRIANGLE = [OFFSET.E, OFFSET.NE, OFFSET.N];
|
|
|
27
27
|
const NW_TRIANGLE = [OFFSET.NW, OFFSET.W, OFFSET.N];
|
|
28
28
|
|
|
29
29
|
// Trapezoids
|
|
30
|
-
const SW_TRAPEZOID = [
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
const SW_TRAPEZOID = [
|
|
31
|
+
[-HALF, ONE6TH],
|
|
32
|
+
[-HALF, -ONE6TH],
|
|
33
|
+
[-ONE6TH, -HALF],
|
|
34
|
+
[ONE6TH, -HALF]
|
|
35
|
+
];
|
|
36
|
+
const SE_TRAPEZOID = [
|
|
37
|
+
[-ONE6TH, -HALF],
|
|
38
|
+
[ONE6TH, -HALF],
|
|
39
|
+
[HALF, -ONE6TH],
|
|
40
|
+
[HALF, ONE6TH]
|
|
41
|
+
];
|
|
42
|
+
const NE_TRAPEZOID = [
|
|
43
|
+
[HALF, -ONE6TH],
|
|
44
|
+
[HALF, ONE6TH],
|
|
45
|
+
[ONE6TH, HALF],
|
|
46
|
+
[-ONE6TH, HALF]
|
|
47
|
+
];
|
|
48
|
+
const NW_TRAPEZOID = [
|
|
49
|
+
[-HALF, ONE6TH],
|
|
50
|
+
[-HALF, -ONE6TH],
|
|
51
|
+
[ONE6TH, HALF],
|
|
52
|
+
[-ONE6TH, HALF]
|
|
53
|
+
];
|
|
34
54
|
|
|
35
55
|
// Rectangles
|
|
36
56
|
const S_RECTANGLE = [OFFSET.W, OFFSET.SW, OFFSET.SE, OFFSET.E];
|
|
37
57
|
const E_RECTANGLE = [OFFSET.S, OFFSET.SE, OFFSET.NE, OFFSET.N];
|
|
38
58
|
const N_RECTANGLE = [OFFSET.NW, OFFSET.W, OFFSET.E, OFFSET.NE];
|
|
39
59
|
const W_RECTANGLE = [OFFSET.NW, OFFSET.SW, OFFSET.S, OFFSET.N];
|
|
40
|
-
const EW_RECTANGEL = [
|
|
41
|
-
|
|
60
|
+
const EW_RECTANGEL = [
|
|
61
|
+
[-HALF, ONE6TH],
|
|
62
|
+
[-HALF, -ONE6TH],
|
|
63
|
+
[HALF, -ONE6TH],
|
|
64
|
+
[HALF, ONE6TH]
|
|
65
|
+
];
|
|
66
|
+
const SN_RECTANGEL = [
|
|
67
|
+
[-ONE6TH, -HALF],
|
|
68
|
+
[ONE6TH, -HALF],
|
|
69
|
+
[ONE6TH, HALF],
|
|
70
|
+
[-ONE6TH, HALF]
|
|
71
|
+
];
|
|
42
72
|
|
|
43
73
|
// Square
|
|
44
74
|
const SQUARE = [OFFSET.NW, OFFSET.SW, OFFSET.SE, OFFSET.NE];
|
|
@@ -131,16 +161,28 @@ export const ISOLINES_CODE_OFFSET_MAP = {
|
|
|
131
161
|
3: [[OFFSET.W, OFFSET.E]],
|
|
132
162
|
4: [[OFFSET.N, OFFSET.E]],
|
|
133
163
|
5: {
|
|
134
|
-
0: [
|
|
135
|
-
|
|
164
|
+
0: [
|
|
165
|
+
[OFFSET.W, OFFSET.S],
|
|
166
|
+
[OFFSET.N, OFFSET.E]
|
|
167
|
+
],
|
|
168
|
+
1: [
|
|
169
|
+
[OFFSET.W, OFFSET.N],
|
|
170
|
+
[OFFSET.S, OFFSET.E]
|
|
171
|
+
]
|
|
136
172
|
},
|
|
137
173
|
6: [[OFFSET.N, OFFSET.S]],
|
|
138
174
|
7: [[OFFSET.W, OFFSET.N]],
|
|
139
175
|
8: [[OFFSET.W, OFFSET.N]],
|
|
140
176
|
9: [[OFFSET.N, OFFSET.S]],
|
|
141
177
|
10: {
|
|
142
|
-
0: [
|
|
143
|
-
|
|
178
|
+
0: [
|
|
179
|
+
[OFFSET.W, OFFSET.N],
|
|
180
|
+
[OFFSET.S, OFFSET.E]
|
|
181
|
+
],
|
|
182
|
+
1: [
|
|
183
|
+
[OFFSET.W, OFFSET.S],
|
|
184
|
+
[OFFSET.N, OFFSET.E]
|
|
185
|
+
]
|
|
144
186
|
},
|
|
145
187
|
11: [[OFFSET.N, OFFSET.E]],
|
|
146
188
|
12: [[OFFSET.W, OFFSET.E]],
|
|
@@ -270,9 +270,7 @@ export default class HeatmapLayer extends AggregationLayer {
|
|
|
270
270
|
this.setState({textureSize, format, type, weightsScale});
|
|
271
271
|
if (!floatTargetSupport) {
|
|
272
272
|
log.warn(
|
|
273
|
-
`HeatmapLayer: ${
|
|
274
|
-
this.id
|
|
275
|
-
} rendering to float texture not supported, fallingback to low precession format`
|
|
273
|
+
`HeatmapLayer: ${this.id} rendering to float texture not supported, fallingback to low precession format`
|
|
276
274
|
)();
|
|
277
275
|
}
|
|
278
276
|
}
|
|
@@ -414,12 +412,8 @@ export default class HeatmapLayer extends AggregationLayer {
|
|
|
414
412
|
|
|
415
413
|
_updateTextureRenderingBounds() {
|
|
416
414
|
// Just render visible portion of the texture
|
|
417
|
-
const {
|
|
418
|
-
|
|
419
|
-
triTexCoordBuffer,
|
|
420
|
-
normalizedCommonBounds,
|
|
421
|
-
viewportCorners
|
|
422
|
-
} = this.state;
|
|
415
|
+
const {triPositionBuffer, triTexCoordBuffer, normalizedCommonBounds, viewportCorners} =
|
|
416
|
+
this.state;
|
|
423
417
|
|
|
424
418
|
const {viewport} = this.context;
|
|
425
419
|
|
|
@@ -57,15 +57,8 @@ export default class TriangleLayer extends Layer {
|
|
|
57
57
|
draw({uniforms}) {
|
|
58
58
|
const {model} = this.state;
|
|
59
59
|
|
|
60
|
-
const {
|
|
61
|
-
|
|
62
|
-
maxTexture,
|
|
63
|
-
colorTexture,
|
|
64
|
-
intensity,
|
|
65
|
-
threshold,
|
|
66
|
-
aggregationMode,
|
|
67
|
-
colorDomain
|
|
68
|
-
} = this.props;
|
|
60
|
+
const {texture, maxTexture, colorTexture, intensity, threshold, aggregationMode, colorDomain} =
|
|
61
|
+
this.props;
|
|
69
62
|
|
|
70
63
|
model
|
|
71
64
|
.setUniforms({
|
|
@@ -104,6 +104,9 @@ function wrapAccessor(accessor, context = {}) {
|
|
|
104
104
|
export function wrapGetValueFunc(getValue, context = {}) {
|
|
105
105
|
return pts => {
|
|
106
106
|
context.indices = pts.map(pt => pt.index);
|
|
107
|
-
return getValue(
|
|
107
|
+
return getValue(
|
|
108
|
+
pts.map(pt => pt.source),
|
|
109
|
+
context
|
|
110
|
+
);
|
|
108
111
|
};
|
|
109
112
|
}
|