@flowmap.gl/layers 8.0.0-alpha.0
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/LICENSE +199 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayer.d.ts +76 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayer.d.ts.map +1 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayer.js +139 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerFragment.glsl.d.ts +3 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerFragment.glsl.d.ts.map +1 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerFragment.glsl.js +37 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerVertex.glsl.d.ts +3 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerVertex.glsl.d.ts.map +1 -0
- package/dist/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerVertex.glsl.js +91 -0
- package/dist/AnimatedFlowLinesLayer/index.d.ts +3 -0
- package/dist/AnimatedFlowLinesLayer/index.d.ts.map +1 -0
- package/dist/AnimatedFlowLinesLayer/index.js +3 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts +59 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayer.d.ts.map +1 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayer.js +115 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts +3 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.d.ts.map +1 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.js +73 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.d.ts +3 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.d.ts.map +1 -0
- package/dist/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.js +63 -0
- package/dist/FlowCirclesLayer/index.d.ts +3 -0
- package/dist/FlowCirclesLayer/index.d.ts.map +1 -0
- package/dist/FlowCirclesLayer/index.js +3 -0
- package/dist/FlowLinesLayer/FlowLinesLayer.d.ts +64 -0
- package/dist/FlowLinesLayer/FlowLinesLayer.d.ts.map +1 -0
- package/dist/FlowLinesLayer/FlowLinesLayer.js +182 -0
- package/dist/FlowLinesLayer/FlowLinesLayerFragment.glsl.d.ts +3 -0
- package/dist/FlowLinesLayer/FlowLinesLayerFragment.glsl.d.ts.map +1 -0
- package/dist/FlowLinesLayer/FlowLinesLayerFragment.glsl.js +36 -0
- package/dist/FlowLinesLayer/FlowLinesLayerVertex.glsl.d.ts +3 -0
- package/dist/FlowLinesLayer/FlowLinesLayerVertex.glsl.d.ts.map +1 -0
- package/dist/FlowLinesLayer/FlowLinesLayerVertex.glsl.js +102 -0
- package/dist/FlowLinesLayer/index.d.ts +3 -0
- package/dist/FlowLinesLayer/index.d.ts.map +1 -0
- package/dist/FlowLinesLayer/index.js +3 -0
- package/dist/FlowMapLayer.d.ts +70 -0
- package/dist/FlowMapLayer.d.ts.map +1 -0
- package/dist/FlowMapLayer.js +304 -0
- package/dist/index.d.ts +7 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +6 -0
- package/dist/types.d.ts +31 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +20 -0
- package/package.json +24 -0
- package/src/AnimatedFlowLinesLayer/AnimatedFlowLinesLayer.ts +189 -0
- package/src/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerFragment.glsl.ts +37 -0
- package/src/AnimatedFlowLinesLayer/AnimatedFlowLinesLayerVertex.glsl.ts +90 -0
- package/src/AnimatedFlowLinesLayer/index.ts +3 -0
- package/src/FlowCirclesLayer/FlowCirclesLayer.ts +150 -0
- package/src/FlowCirclesLayer/FlowCirclesLayerFragment.glsl.ts +72 -0
- package/src/FlowCirclesLayer/FlowCirclesLayerVertex.glsl.ts +62 -0
- package/src/FlowCirclesLayer/index.ts +3 -0
- package/src/FlowLinesLayer/FlowLinesLayer.ts +238 -0
- package/src/FlowLinesLayer/FlowLinesLayerFragment.glsl.ts +35 -0
- package/src/FlowLinesLayer/FlowLinesLayerVertex.glsl.ts +101 -0
- package/src/FlowLinesLayer/index.ts +3 -0
- package/src/FlowMapLayer.ts +448 -0
- package/src/index.ts +7 -0
- package/src/types.ts +67 -0
- package/tsconfig.json +11 -0
- package/typings.d.ts +4 -0
|
@@ -0,0 +1,304 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
/*
|
|
11
|
+
* Copyright 2022 FlowmapBlue
|
|
12
|
+
*
|
|
13
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
14
|
+
* you may not use this file except in compliance with the License.
|
|
15
|
+
* You may obtain a copy of the License at
|
|
16
|
+
*
|
|
17
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
18
|
+
*
|
|
19
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
20
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
21
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
22
|
+
* See the License for the specific language governing permissions and
|
|
23
|
+
* limitations under the License.
|
|
24
|
+
*
|
|
25
|
+
*/
|
|
26
|
+
import { CompositeLayer } from '@deck.gl/core';
|
|
27
|
+
import { ScatterplotLayer } from '@deck.gl/layers';
|
|
28
|
+
import { colorAsRgba, getFlowLineAttributesByIndex, getFlowMapColors, getOuterCircleRadiusByIndex, getLocationCentroidByIndex, isFlowMapData, isFlowMapDataProvider, LocalFlowMapDataProvider, LocationFilterMode, FlowMapAggregateAccessors, } from '@flowmap.gl/data';
|
|
29
|
+
import AnimatedFlowLinesLayer from './AnimatedFlowLinesLayer';
|
|
30
|
+
import FlowCirclesLayer from './FlowCirclesLayer';
|
|
31
|
+
import FlowLinesLayer from './FlowLinesLayer';
|
|
32
|
+
import { PickingType, } from './types';
|
|
33
|
+
var HighlightType;
|
|
34
|
+
(function (HighlightType) {
|
|
35
|
+
HighlightType["LOCATION"] = "location";
|
|
36
|
+
HighlightType["FLOW"] = "flow";
|
|
37
|
+
})(HighlightType || (HighlightType = {}));
|
|
38
|
+
export default class FlowMapLayer extends CompositeLayer {
|
|
39
|
+
constructor(props) {
|
|
40
|
+
super(Object.assign(Object.assign({}, props), { onHover: (info, event) => {
|
|
41
|
+
// TODO: if (lastHoverEventStartTimeRef > startTime) {
|
|
42
|
+
// // Skipping, because this is not the latest hover event
|
|
43
|
+
// return;
|
|
44
|
+
// }
|
|
45
|
+
this.setState({ highlightedObject: this._getHighlightedObject(info) });
|
|
46
|
+
const { onHover } = props;
|
|
47
|
+
if (onHover) {
|
|
48
|
+
this._getFlowLayerPickingInfo(info).then((info) => onHover(info, event));
|
|
49
|
+
}
|
|
50
|
+
}, onClick: (info, event) => {
|
|
51
|
+
const { onClick } = props;
|
|
52
|
+
if (onClick) {
|
|
53
|
+
this._getFlowLayerPickingInfo(info).then((info) => {
|
|
54
|
+
if (info) {
|
|
55
|
+
onClick(info, event);
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
} }));
|
|
60
|
+
}
|
|
61
|
+
initializeState() {
|
|
62
|
+
this.state = {
|
|
63
|
+
accessors: new FlowMapAggregateAccessors(this.props),
|
|
64
|
+
dataProvider: this._makeDataProvider(),
|
|
65
|
+
layersData: undefined,
|
|
66
|
+
highlightedObject: undefined,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
_updateAccessors() {
|
|
70
|
+
var _a, _b;
|
|
71
|
+
(_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.dataProvider) === null || _b === void 0 ? void 0 : _b.setAccessors(this.props);
|
|
72
|
+
this.setState({ accessors: new FlowMapAggregateAccessors(this.props) });
|
|
73
|
+
}
|
|
74
|
+
_makeDataProvider() {
|
|
75
|
+
const { data } = this.props;
|
|
76
|
+
if (isFlowMapDataProvider(data)) {
|
|
77
|
+
return data;
|
|
78
|
+
}
|
|
79
|
+
else if (isFlowMapData(data)) {
|
|
80
|
+
const dataProvider = new LocalFlowMapDataProvider(this.props);
|
|
81
|
+
dataProvider.setFlowMapData(data);
|
|
82
|
+
return dataProvider;
|
|
83
|
+
}
|
|
84
|
+
throw new Error('FlowMapLayer: data must be a FlowMapDataProvider or FlowMapData');
|
|
85
|
+
}
|
|
86
|
+
_updateDataProvider() {
|
|
87
|
+
this.setState({ dataProvider: this._makeDataProvider() });
|
|
88
|
+
}
|
|
89
|
+
shouldUpdateState(params) {
|
|
90
|
+
const { changeFlags } = params;
|
|
91
|
+
// if (this._viewportChanged()) {
|
|
92
|
+
// return true;
|
|
93
|
+
// }
|
|
94
|
+
if (changeFlags.viewportChanged) {
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
return super.shouldUpdateState(params);
|
|
98
|
+
// TODO: be smarter on when to update
|
|
99
|
+
// (e.g. ignore viewport changes when adaptiveScalesEnabled and clustering are false)
|
|
100
|
+
}
|
|
101
|
+
updateState({ oldProps, props, changeFlags }) {
|
|
102
|
+
const { dataProvider, highlightedObject } = this.state || {};
|
|
103
|
+
if (!dataProvider) {
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
if (changeFlags.propsChanged) {
|
|
107
|
+
this._updateAccessors();
|
|
108
|
+
}
|
|
109
|
+
if (changeFlags.dataChanged) {
|
|
110
|
+
this._updateDataProvider();
|
|
111
|
+
}
|
|
112
|
+
if (changeFlags.viewportChanged || changeFlags.propsOrDataChanged) {
|
|
113
|
+
dataProvider.setFlowMapState(this._getFlowMapState());
|
|
114
|
+
(() => __awaiter(this, void 0, void 0, function* () {
|
|
115
|
+
const layersData = yield dataProvider.getLayersData();
|
|
116
|
+
this.setState({ layersData });
|
|
117
|
+
}))();
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
_getSettingsState() {
|
|
121
|
+
const { locationTotalsEnabled, adaptiveScalesEnabled, animationEnabled, clusteringEnabled, clusteringLevel, fadeEnabled, clusteringAuto, darkMode, fadeAmount, colorScheme, } = this.props;
|
|
122
|
+
return {
|
|
123
|
+
locationTotalsEnabled,
|
|
124
|
+
adaptiveScalesEnabled,
|
|
125
|
+
animationEnabled,
|
|
126
|
+
clusteringEnabled,
|
|
127
|
+
clusteringLevel,
|
|
128
|
+
fadeEnabled,
|
|
129
|
+
clusteringAuto,
|
|
130
|
+
darkMode,
|
|
131
|
+
fadeAmount,
|
|
132
|
+
colorScheme,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
_getFlowMapState() {
|
|
136
|
+
return {
|
|
137
|
+
viewport: asViewState(this.context.viewport),
|
|
138
|
+
filterState: {
|
|
139
|
+
selectedLocations: undefined,
|
|
140
|
+
locationFilterMode: LocationFilterMode.ALL,
|
|
141
|
+
selectedTimeRange: undefined,
|
|
142
|
+
},
|
|
143
|
+
settingsState: this._getSettingsState(),
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
_getFlowLayerPickingInfo(info) {
|
|
147
|
+
var _a;
|
|
148
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
149
|
+
const { index, sourceLayer } = info;
|
|
150
|
+
const { dataProvider, accessors } = this.state || {};
|
|
151
|
+
if (!dataProvider || !accessors) {
|
|
152
|
+
return undefined;
|
|
153
|
+
}
|
|
154
|
+
const commonInfo = {
|
|
155
|
+
// ...info,
|
|
156
|
+
layer: info.layer,
|
|
157
|
+
index: info.index,
|
|
158
|
+
x: info.x,
|
|
159
|
+
y: info.y,
|
|
160
|
+
coordinate: info.coordinate,
|
|
161
|
+
};
|
|
162
|
+
if (sourceLayer instanceof FlowLinesLayer ||
|
|
163
|
+
sourceLayer instanceof AnimatedFlowLinesLayer) {
|
|
164
|
+
const flow = index === -1 ? undefined : yield dataProvider.getFlowByIndex(index);
|
|
165
|
+
if (flow) {
|
|
166
|
+
const origin = yield dataProvider.getLocationById(accessors.getFlowOriginId(flow));
|
|
167
|
+
const dest = yield dataProvider.getLocationById(accessors.getFlowDestId(flow));
|
|
168
|
+
if (origin && dest) {
|
|
169
|
+
return Object.assign(Object.assign({}, commonInfo), { type: PickingType.FLOW, object: flow, origin: origin, dest: dest, count: accessors.getFlowMagnitude(flow) });
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else if (sourceLayer instanceof FlowCirclesLayer) {
|
|
174
|
+
const location = index === -1 ? undefined : yield dataProvider.getLocationByIndex(index);
|
|
175
|
+
if (location) {
|
|
176
|
+
const id = accessors.getLocationId(location);
|
|
177
|
+
const name = accessors.getLocationName(location);
|
|
178
|
+
const totals = yield dataProvider.getTotalsForLocation(id);
|
|
179
|
+
const { circleAttributes } = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.layersData) || {};
|
|
180
|
+
if (totals && circleAttributes) {
|
|
181
|
+
const circleRadius = getOuterCircleRadiusByIndex(circleAttributes, info.index);
|
|
182
|
+
return Object.assign(Object.assign({}, commonInfo), { type: PickingType.LOCATION, object: location, id,
|
|
183
|
+
name,
|
|
184
|
+
totals, circleRadius: circleRadius, event: undefined });
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
return undefined;
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
_getHighlightedObject(info) {
|
|
192
|
+
var _a, _b;
|
|
193
|
+
const { index, sourceLayer } = info;
|
|
194
|
+
if (index < 0)
|
|
195
|
+
return undefined;
|
|
196
|
+
if (sourceLayer instanceof FlowLinesLayer ||
|
|
197
|
+
sourceLayer instanceof AnimatedFlowLinesLayer) {
|
|
198
|
+
const { lineAttributes } = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.layersData) || {};
|
|
199
|
+
if (lineAttributes) {
|
|
200
|
+
return {
|
|
201
|
+
type: HighlightType.FLOW,
|
|
202
|
+
lineAttributes: getFlowLineAttributesByIndex(lineAttributes, index),
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
else if (sourceLayer instanceof FlowCirclesLayer) {
|
|
207
|
+
const { circleAttributes } = ((_b = this.state) === null || _b === void 0 ? void 0 : _b.layersData) || {};
|
|
208
|
+
if (circleAttributes) {
|
|
209
|
+
return {
|
|
210
|
+
type: HighlightType.LOCATION,
|
|
211
|
+
centroid: getLocationCentroidByIndex(circleAttributes, index),
|
|
212
|
+
radius: getOuterCircleRadiusByIndex(circleAttributes, index),
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return undefined;
|
|
217
|
+
}
|
|
218
|
+
renderLayers() {
|
|
219
|
+
var _a;
|
|
220
|
+
const layers = [];
|
|
221
|
+
if ((_a = this.state) === null || _a === void 0 ? void 0 : _a.layersData) {
|
|
222
|
+
const { layersData, highlightedObject } = this.state;
|
|
223
|
+
const { circleAttributes, lineAttributes } = layersData || {};
|
|
224
|
+
if (circleAttributes && lineAttributes) {
|
|
225
|
+
const flowMapColors = getFlowMapColors(this._getSettingsState());
|
|
226
|
+
const outlineColor = colorAsRgba(flowMapColors.outlineColor || (this.props.darkMode ? '#000' : '#fff'));
|
|
227
|
+
const commonLineLayerProps = {
|
|
228
|
+
data: lineAttributes,
|
|
229
|
+
parameters: {
|
|
230
|
+
// prevent z-fighting at non-zero bearing/pitch
|
|
231
|
+
depthTest: false,
|
|
232
|
+
},
|
|
233
|
+
};
|
|
234
|
+
if (this.props.animationEnabled) {
|
|
235
|
+
layers.push(
|
|
236
|
+
// @ts-ignore
|
|
237
|
+
new AnimatedFlowLinesLayer(Object.assign({}, this.getSubLayerProps(Object.assign(Object.assign({}, commonLineLayerProps), { id: 'animated-flow-lines', drawOutline: false, thicknessUnit: 20 })))));
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
layers.push(new FlowLinesLayer(Object.assign({}, this.getSubLayerProps(Object.assign(Object.assign({}, commonLineLayerProps), { id: 'flow-lines', drawOutline: true, outlineColor: outlineColor })))));
|
|
241
|
+
}
|
|
242
|
+
layers.push(new FlowCirclesLayer(this.getSubLayerProps({
|
|
243
|
+
id: 'circles',
|
|
244
|
+
data: circleAttributes,
|
|
245
|
+
emptyColor: [0, 0, 0, 255],
|
|
246
|
+
emptyOutlineColor: [0, 0, 0, 255],
|
|
247
|
+
})));
|
|
248
|
+
if (highlightedObject) {
|
|
249
|
+
switch (highlightedObject.type) {
|
|
250
|
+
case HighlightType.LOCATION:
|
|
251
|
+
layers.push(new ScatterplotLayer({
|
|
252
|
+
id: 'location-highlight',
|
|
253
|
+
data: [highlightedObject],
|
|
254
|
+
stroked: true,
|
|
255
|
+
filled: false,
|
|
256
|
+
lineWidthUnits: 'pixels',
|
|
257
|
+
getLineWidth: 2,
|
|
258
|
+
radiusUnits: 'pixels',
|
|
259
|
+
getRadius: (d) => d.radius,
|
|
260
|
+
getLineColor: (d) => colorAsRgba('orange'),
|
|
261
|
+
getPosition: (d) => d.centroid,
|
|
262
|
+
}));
|
|
263
|
+
break;
|
|
264
|
+
case HighlightType.FLOW:
|
|
265
|
+
layers.push(new FlowLinesLayer({
|
|
266
|
+
id: 'flow-highlight',
|
|
267
|
+
data: highlightedObject.lineAttributes,
|
|
268
|
+
drawOutline: true,
|
|
269
|
+
outlineColor: colorAsRgba('orange'),
|
|
270
|
+
outlineThickness: 1,
|
|
271
|
+
}));
|
|
272
|
+
break;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
return layers;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
FlowMapLayer.defaultProps = {
|
|
281
|
+
darkMode: true,
|
|
282
|
+
fadeAmount: 50,
|
|
283
|
+
locationTotalsEnabled: true,
|
|
284
|
+
animationEnabled: false,
|
|
285
|
+
clusteringEnabled: true,
|
|
286
|
+
fadeEnabled: true,
|
|
287
|
+
clusteringAuto: true,
|
|
288
|
+
clusteringLevel: undefined,
|
|
289
|
+
adaptiveScalesEnabled: true,
|
|
290
|
+
colorScheme: 'Teal',
|
|
291
|
+
};
|
|
292
|
+
function asViewState(viewport) {
|
|
293
|
+
const { width, height, longitude, latitude, zoom, pitch, bearing } = viewport;
|
|
294
|
+
return {
|
|
295
|
+
width,
|
|
296
|
+
height,
|
|
297
|
+
longitude,
|
|
298
|
+
latitude,
|
|
299
|
+
zoom,
|
|
300
|
+
pitch,
|
|
301
|
+
bearing,
|
|
302
|
+
};
|
|
303
|
+
}
|
|
304
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FlowMapLayer.js","sourceRoot":"","sources":["../src/FlowMapLayer.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2022 FlowmapBlue\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n */\nimport {CompositeLayer} from '@deck.gl/core';\nimport {ScatterplotLayer} from '@deck.gl/layers';\nimport {\n  colorAsRgba,\n  FlowLinesLayerAttributes,\n  FlowMapData,\n  FlowMapDataAccessors,\n  FlowMapDataProvider,\n  getFlowLineAttributesByIndex,\n  getFlowMapColors,\n  getOuterCircleRadiusByIndex,\n  getLocationCentroidByIndex,\n  isFlowMapData,\n  isFlowMapDataProvider,\n  LayersData,\n  LocalFlowMapDataProvider,\n  LocationFilterMode,\n  ViewportProps,\n  FlowMapAggregateAccessors,\n  ClusterNode,\n  AggregateFlow,\n} from '@flowmap.gl/data';\nimport AnimatedFlowLinesLayer from './AnimatedFlowLinesLayer';\nimport FlowCirclesLayer from './FlowCirclesLayer';\nimport FlowLinesLayer from './FlowLinesLayer';\nimport {\n  FlowLayerPickingInfo,\n  LayerProps,\n  PickingInfo,\n  PickingType,\n} from './types';\n\nexport type FlowMapLayerProps<L, F> = {\n  data: FlowMapData<L, F> | FlowMapDataProvider<L, F>;\n  locationTotalsEnabled?: boolean;\n  adaptiveScalesEnabled?: boolean;\n  animationEnabled?: boolean;\n  clusteringEnabled?: boolean;\n  clusteringLevel?: number;\n  fadeEnabled?: boolean;\n  clusteringAuto?: boolean;\n  darkMode?: boolean;\n  fadeAmount?: number;\n  colorScheme?: string;\n  onHover?: (\n    info: FlowLayerPickingInfo<L, F> | undefined,\n    event: SourceEvent,\n  ) => void;\n  onClick?: (info: FlowLayerPickingInfo<L, F>, event: SourceEvent) => void;\n} & Partial<FlowMapDataAccessors<L, F>> &\n  LayerProps;\n\nenum HighlightType {\n  LOCATION = 'location',\n  FLOW = 'flow',\n}\n\ntype HighlightedLocationObject = {\n  type: HighlightType.LOCATION;\n  centroid: [number, number];\n  radius: number;\n};\n\ntype HighlightedFlowObject = {\n  type: HighlightType.FLOW;\n  lineAttributes: FlowLinesLayerAttributes;\n};\n\ntype HighlightedObject = HighlightedLocationObject | HighlightedFlowObject;\n\ntype State<L, F> = {\n  accessors: FlowMapAggregateAccessors<L, F>;\n  dataProvider: FlowMapDataProvider<L, F>;\n  layersData: LayersData | undefined;\n  highlightedObject: HighlightedObject | undefined;\n};\n\nexport type SourceEvent = {srcEvent: MouseEvent};\n\nexport default class FlowMapLayer<L, F> extends CompositeLayer {\n  static defaultProps = {\n    darkMode: true,\n    fadeAmount: 50,\n    locationTotalsEnabled: true,\n    animationEnabled: false,\n    clusteringEnabled: true,\n    fadeEnabled: true,\n    clusteringAuto: true,\n    clusteringLevel: undefined,\n    adaptiveScalesEnabled: true,\n    colorScheme: 'Teal',\n  };\n  state: State<L, F> | undefined;\n\n  public constructor(props: FlowMapLayerProps<L, F>) {\n    super({\n      ...props,\n      onHover: (info: PickingInfo<any>, event: SourceEvent) => {\n        // TODO: if (lastHoverEventStartTimeRef > startTime) {\n        //   // Skipping, because this is not the latest hover event\n        //   return;\n        // }\n        this.setState({highlightedObject: this._getHighlightedObject(info)});\n        const {onHover} = props;\n        if (onHover) {\n          this._getFlowLayerPickingInfo(info).then((info) =>\n            onHover(info, event),\n          );\n        }\n      },\n      onClick: (info: PickingInfo<any>, event: SourceEvent) => {\n        const {onClick} = props;\n        if (onClick) {\n          this._getFlowLayerPickingInfo(info).then((info) => {\n            if (info) {\n              onClick(info, event);\n            }\n          });\n        }\n      },\n    });\n  }\n\n  initializeState() {\n    this.state = {\n      accessors: new FlowMapAggregateAccessors<L, F>(this.props),\n      dataProvider: this._makeDataProvider(),\n      layersData: undefined,\n      highlightedObject: undefined,\n    };\n  }\n\n  private _updateAccessors() {\n    this.state?.dataProvider?.setAccessors(this.props);\n    this.setState({accessors: new FlowMapAggregateAccessors(this.props)});\n  }\n\n  private _makeDataProvider() {\n    const {data} = this.props;\n    if (isFlowMapDataProvider<L, F>(data)) {\n      return data;\n    } else if (isFlowMapData<L, F>(data)) {\n      const dataProvider = new LocalFlowMapDataProvider<L, F>(this.props);\n      dataProvider.setFlowMapData(data);\n      return dataProvider;\n    }\n    throw new Error(\n      'FlowMapLayer: data must be a FlowMapDataProvider or FlowMapData',\n    );\n  }\n\n  private _updateDataProvider() {\n    this.setState({dataProvider: this._makeDataProvider()});\n  }\n\n  shouldUpdateState(params: Record<string, any>): boolean {\n    const {changeFlags} = params;\n    // if (this._viewportChanged()) {\n    //   return true;\n    // }\n    if (changeFlags.viewportChanged) {\n      return true;\n    }\n    return super.shouldUpdateState(params);\n    // TODO: be smarter on when to update\n    // (e.g. ignore viewport changes when adaptiveScalesEnabled and clustering are false)\n  }\n\n  updateState({oldProps, props, changeFlags}: Record<string, any>): void {\n    const {dataProvider, highlightedObject} = this.state || {};\n    if (!dataProvider) {\n      return;\n    }\n\n    if (changeFlags.propsChanged) {\n      this._updateAccessors();\n    }\n    if (changeFlags.dataChanged) {\n      this._updateDataProvider();\n    }\n\n    if (changeFlags.viewportChanged || changeFlags.propsOrDataChanged) {\n      dataProvider.setFlowMapState(this._getFlowMapState());\n\n      (async () => {\n        const layersData = await dataProvider.getLayersData();\n        this.setState({layersData});\n      })();\n    }\n  }\n\n  private _getSettingsState() {\n    const {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n    } = this.props;\n    return {\n      locationTotalsEnabled,\n      adaptiveScalesEnabled,\n      animationEnabled,\n      clusteringEnabled,\n      clusteringLevel,\n      fadeEnabled,\n      clusteringAuto,\n      darkMode,\n      fadeAmount,\n      colorScheme,\n    };\n  }\n\n  private _getFlowMapState() {\n    return {\n      viewport: asViewState(this.context.viewport),\n      filterState: {\n        selectedLocations: undefined,\n        locationFilterMode: LocationFilterMode.ALL,\n        selectedTimeRange: undefined,\n      },\n      settingsState: this._getSettingsState(),\n    };\n  }\n\n  private async _getFlowLayerPickingInfo(\n    info: Record<string, any>,\n  ): Promise<FlowLayerPickingInfo<L, F> | undefined> {\n    const {index, sourceLayer} = info;\n    const {dataProvider, accessors} = this.state || {};\n    if (!dataProvider || !accessors) {\n      return undefined;\n    }\n    const commonInfo = {\n      // ...info,\n      layer: info.layer,\n      index: info.index,\n      x: info.x,\n      y: info.y,\n      coordinate: info.coordinate,\n    };\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const flow =\n        index === -1 ? undefined : await dataProvider.getFlowByIndex(index);\n      if (flow) {\n        const origin = await dataProvider.getLocationById(\n          accessors.getFlowOriginId(flow),\n        );\n        const dest = await dataProvider.getLocationById(\n          accessors.getFlowDestId(flow),\n        );\n        if (origin && dest) {\n          return {\n            ...commonInfo,\n            type: PickingType.FLOW,\n            object: flow,\n            origin: origin,\n            dest: dest,\n            count: accessors.getFlowMagnitude(flow),\n          };\n        }\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const location =\n        index === -1 ? undefined : await dataProvider.getLocationByIndex(index);\n\n      if (location) {\n        const id = accessors.getLocationId(location);\n        const name = accessors.getLocationName(location);\n        const totals = await dataProvider.getTotalsForLocation(id);\n        const {circleAttributes} = this.state?.layersData || {};\n        if (totals && circleAttributes) {\n          const circleRadius = getOuterCircleRadiusByIndex(\n            circleAttributes,\n            info.index,\n          );\n          return {\n            ...commonInfo,\n            type: PickingType.LOCATION,\n            object: location,\n            id,\n            name,\n            totals,\n            circleRadius: circleRadius,\n            event: undefined,\n          };\n        }\n      }\n    }\n\n    return undefined;\n  }\n\n  private _getHighlightedObject(\n    info: Record<string, any>,\n  ): HighlightedObject | undefined {\n    const {index, sourceLayer} = info;\n    if (index < 0) return undefined;\n    if (\n      sourceLayer instanceof FlowLinesLayer ||\n      sourceLayer instanceof AnimatedFlowLinesLayer\n    ) {\n      const {lineAttributes} = this.state?.layersData || {};\n      if (lineAttributes) {\n        return {\n          type: HighlightType.FLOW,\n          lineAttributes: getFlowLineAttributesByIndex(lineAttributes, index),\n        };\n      }\n    } else if (sourceLayer instanceof FlowCirclesLayer) {\n      const {circleAttributes} = this.state?.layersData || {};\n      if (circleAttributes) {\n        return {\n          type: HighlightType.LOCATION,\n          centroid: getLocationCentroidByIndex(circleAttributes, index),\n          radius: getOuterCircleRadiusByIndex(circleAttributes, index),\n        };\n      }\n    }\n    return undefined;\n  }\n\n  renderLayers(): Array<any> {\n    const layers = [];\n    if (this.state?.layersData) {\n      const {layersData, highlightedObject} = this.state;\n      const {circleAttributes, lineAttributes} = layersData || {};\n      if (circleAttributes && lineAttributes) {\n        const flowMapColors = getFlowMapColors(this._getSettingsState());\n        const outlineColor = colorAsRgba(\n          flowMapColors.outlineColor || (this.props.darkMode ? '#000' : '#fff'),\n        );\n        const commonLineLayerProps = {\n          data: lineAttributes,\n          parameters: {\n            // prevent z-fighting at non-zero bearing/pitch\n            depthTest: false,\n          },\n        };\n        if (this.props.animationEnabled) {\n          layers.push(\n            // @ts-ignore\n            new AnimatedFlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'animated-flow-lines',\n                drawOutline: false,\n                thicknessUnit: 20,\n              }),\n            }),\n          );\n        } else {\n          layers.push(\n            new FlowLinesLayer({\n              ...this.getSubLayerProps({\n                ...commonLineLayerProps,\n                id: 'flow-lines',\n                drawOutline: true,\n                outlineColor: outlineColor,\n              }),\n            }),\n          );\n        }\n        layers.push(\n          new FlowCirclesLayer(\n            this.getSubLayerProps({\n              id: 'circles',\n              data: circleAttributes,\n              emptyColor: [0, 0, 0, 255],\n              emptyOutlineColor: [0, 0, 0, 255],\n            }),\n          ),\n        );\n        if (highlightedObject) {\n          switch (highlightedObject.type) {\n            case HighlightType.LOCATION:\n              layers.push(\n                new ScatterplotLayer({\n                  id: 'location-highlight',\n                  data: [highlightedObject],\n                  stroked: true,\n                  filled: false,\n                  lineWidthUnits: 'pixels',\n                  getLineWidth: 2,\n                  radiusUnits: 'pixels',\n                  getRadius: (d: HighlightedLocationObject) => d.radius,\n                  getLineColor: (d: HighlightedLocationObject) =>\n                    colorAsRgba('orange'),\n                  getPosition: (d: HighlightedLocationObject) => d.centroid,\n                }),\n              );\n              break;\n            case HighlightType.FLOW:\n              layers.push(\n                new FlowLinesLayer({\n                  id: 'flow-highlight',\n                  data: highlightedObject.lineAttributes,\n                  drawOutline: true,\n                  outlineColor: colorAsRgba('orange'),\n                  outlineThickness: 1,\n                }),\n              );\n              break;\n          }\n        }\n      }\n    }\n\n    return layers;\n  }\n}\n\nfunction asViewState(viewport: Record<string, any>): ViewportProps {\n  const {width, height, longitude, latitude, zoom, pitch, bearing} = viewport;\n  return {\n    width,\n    height,\n    longitude,\n    latitude,\n    zoom,\n    pitch,\n    bearing,\n  };\n}\n"]}
|
package/dist/index.d.ts
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export { default as AnimatedFlowLinesLayer } from './AnimatedFlowLinesLayer';
|
|
2
|
+
export { default as FlowLinesLayer } from './FlowLinesLayer';
|
|
3
|
+
export { default as FlowCirclesLayer } from './FlowCirclesLayer';
|
|
4
|
+
export { default as FlowMapLayer } from './FlowMapLayer';
|
|
5
|
+
export type { FlowMapLayerProps } from './FlowMapLayer';
|
|
6
|
+
export * from './types';
|
|
7
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,gBAAgB,CAAC;AACvD,YAAY,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAEtD,cAAc,SAAS,CAAC"}
|
package/dist/index.js
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export { default as AnimatedFlowLinesLayer } from './AnimatedFlowLinesLayer';
|
|
2
|
+
export { default as FlowLinesLayer } from './FlowLinesLayer';
|
|
3
|
+
export { default as FlowCirclesLayer } from './FlowCirclesLayer';
|
|
4
|
+
export { default as FlowMapLayer } from './FlowMapLayer';
|
|
5
|
+
export * from './types';
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLE9BQU8sSUFBSSxzQkFBc0IsRUFBQyxNQUFNLDBCQUEwQixDQUFDO0FBQzNFLE9BQU8sRUFBQyxPQUFPLElBQUksY0FBYyxFQUFDLE1BQU0sa0JBQWtCLENBQUM7QUFDM0QsT0FBTyxFQUFDLE9BQU8sSUFBSSxnQkFBZ0IsRUFBQyxNQUFNLG9CQUFvQixDQUFDO0FBQy9ELE9BQU8sRUFBQyxPQUFPLElBQUksWUFBWSxFQUFDLE1BQU0sZ0JBQWdCLENBQUM7QUFHdkQsY0FBYyxTQUFTLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQge2RlZmF1bHQgYXMgQW5pbWF0ZWRGbG93TGluZXNMYXllcn0gZnJvbSAnLi9BbmltYXRlZEZsb3dMaW5lc0xheWVyJztcbmV4cG9ydCB7ZGVmYXVsdCBhcyBGbG93TGluZXNMYXllcn0gZnJvbSAnLi9GbG93TGluZXNMYXllcic7XG5leHBvcnQge2RlZmF1bHQgYXMgRmxvd0NpcmNsZXNMYXllcn0gZnJvbSAnLi9GbG93Q2lyY2xlc0xheWVyJztcbmV4cG9ydCB7ZGVmYXVsdCBhcyBGbG93TWFwTGF5ZXJ9IGZyb20gJy4vRmxvd01hcExheWVyJztcbmV4cG9ydCB0eXBlIHtGbG93TWFwTGF5ZXJQcm9wc30gZnJvbSAnLi9GbG93TWFwTGF5ZXInO1xuXG5leHBvcnQgKiBmcm9tICcuL3R5cGVzJztcbiJdfQ==
|
package/dist/types.d.ts
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { AggregateFlow, ClusterNode, LocationTotals } from '@flowmap.gl/data';
|
|
2
|
+
export declare type LayerProps = Record<string, unknown>;
|
|
3
|
+
export declare enum PickingType {
|
|
4
|
+
LOCATION = "location",
|
|
5
|
+
FLOW = "flow"
|
|
6
|
+
}
|
|
7
|
+
export declare type DeckGLLayer = Record<string, any>;
|
|
8
|
+
export interface PickingInfo<T> {
|
|
9
|
+
layer: DeckGLLayer;
|
|
10
|
+
index: number;
|
|
11
|
+
object: T | undefined;
|
|
12
|
+
x: number;
|
|
13
|
+
y: number;
|
|
14
|
+
coordinate: [number, number];
|
|
15
|
+
}
|
|
16
|
+
export interface LocationPickingInfo<L> extends PickingInfo<L | ClusterNode> {
|
|
17
|
+
type: PickingType.LOCATION;
|
|
18
|
+
id: string;
|
|
19
|
+
name: string;
|
|
20
|
+
totals: LocationTotals;
|
|
21
|
+
circleRadius: number;
|
|
22
|
+
event: MouseEvent | undefined;
|
|
23
|
+
}
|
|
24
|
+
export interface FlowPickingInfo<L, F> extends PickingInfo<F | AggregateFlow> {
|
|
25
|
+
type: PickingType.FLOW;
|
|
26
|
+
origin: L | ClusterNode;
|
|
27
|
+
dest: L | ClusterNode;
|
|
28
|
+
count: number;
|
|
29
|
+
}
|
|
30
|
+
export declare type FlowLayerPickingInfo<L, F> = LocationPickingInfo<L> | FlowPickingInfo<L, F>;
|
|
31
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,WAAW,EACX,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,oBAAY,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,oBAAY,WAAW;IACrB,QAAQ,aAAa;IACrB,IAAI,SAAS;CAEd;AAED,oBAAY,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE9C,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC;IACtB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,GAAG,WAAW,CAAC;IAC1E,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,UAAU,GAAG,SAAS,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,WAAW,CAAC,CAAC,GAAG,aAAa,CAAC;IAC3E,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;IACvB,MAAM,EAAE,CAAC,GAAG,WAAW,CAAC;IACxB,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,oBAAY,oBAAoB,CAAC,CAAC,EAAE,CAAC,IACjC,mBAAmB,CAAC,CAAC,CAAC,GAEtB,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
package/dist/types.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export var PickingType;
|
|
2
|
+
(function (PickingType) {
|
|
3
|
+
PickingType["LOCATION"] = "location";
|
|
4
|
+
PickingType["FLOW"] = "flow";
|
|
5
|
+
// LOCATION_AREA = 'location-area',
|
|
6
|
+
})(PickingType || (PickingType = {}));
|
|
7
|
+
// import {FeatureCollection, GeometryObject} from 'geojson';
|
|
8
|
+
// export type LocationProperties = Record<string, unknown>;
|
|
9
|
+
// export type Locations =
|
|
10
|
+
// | FeatureCollection<GeometryObject, LocationProperties>
|
|
11
|
+
// | FlowLocation[];
|
|
12
|
+
// export function isFeatureCollection(
|
|
13
|
+
// locations: Locations,
|
|
14
|
+
// ): locations is FeatureCollection<GeometryObject, LocationProperties> {
|
|
15
|
+
// return (
|
|
16
|
+
// (locations as FeatureCollection<GeometryObject, LocationProperties>)
|
|
17
|
+
// .type === 'FeatureCollection'
|
|
18
|
+
// );
|
|
19
|
+
// }
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsTUFBTSxDQUFOLElBQVksV0FJWDtBQUpELFdBQVksV0FBVztJQUNyQixvQ0FBcUIsQ0FBQTtJQUNyQiw0QkFBYSxDQUFBO0lBQ2IsbUNBQW1DO0FBQ3JDLENBQUMsRUFKVyxXQUFXLEtBQVgsV0FBVyxRQUl0QjtBQXVDRCw2REFBNkQ7QUFDN0QsNERBQTREO0FBRTVELDBCQUEwQjtBQUMxQiw0REFBNEQ7QUFDNUQsc0JBQXNCO0FBRXRCLHVDQUF1QztBQUN2QywwQkFBMEI7QUFDMUIsMEVBQTBFO0FBQzFFLGFBQWE7QUFDYiwyRUFBMkU7QUFDM0Usc0NBQXNDO0FBQ3RDLE9BQU87QUFDUCxJQUFJIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWdncmVnYXRlRmxvdyxcbiAgQ2x1c3RlcixcbiAgQ2x1c3Rlck5vZGUsXG4gIExvY2F0aW9uVG90YWxzLFxufSBmcm9tICdAZmxvd21hcC5nbC9kYXRhJztcblxuZXhwb3J0IHR5cGUgTGF5ZXJQcm9wcyA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuXG5leHBvcnQgZW51bSBQaWNraW5nVHlwZSB7XG4gIExPQ0FUSU9OID0gJ2xvY2F0aW9uJyxcbiAgRkxPVyA9ICdmbG93JyxcbiAgLy8gTE9DQVRJT05fQVJFQSA9ICdsb2NhdGlvbi1hcmVhJyxcbn1cblxuZXhwb3J0IHR5cGUgRGVja0dMTGF5ZXIgPSBSZWNvcmQ8c3RyaW5nLCBhbnk+O1xuXG5leHBvcnQgaW50ZXJmYWNlIFBpY2tpbmdJbmZvPFQ+IHtcbiAgbGF5ZXI6IERlY2tHTExheWVyO1xuICBpbmRleDogbnVtYmVyO1xuICBvYmplY3Q6IFQgfCB1bmRlZmluZWQ7XG4gIHg6IG51bWJlcjtcbiAgeTogbnVtYmVyO1xuICBjb29yZGluYXRlOiBbbnVtYmVyLCBudW1iZXJdO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIExvY2F0aW9uUGlja2luZ0luZm88TD4gZXh0ZW5kcyBQaWNraW5nSW5mbzxMIHwgQ2x1c3Rlck5vZGU+IHtcbiAgdHlwZTogUGlja2luZ1R5cGUuTE9DQVRJT047XG4gIGlkOiBzdHJpbmc7XG4gIG5hbWU6IHN0cmluZztcbiAgdG90YWxzOiBMb2NhdGlvblRvdGFscztcbiAgY2lyY2xlUmFkaXVzOiBudW1iZXI7XG4gIGV2ZW50OiBNb3VzZUV2ZW50IHwgdW5kZWZpbmVkO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEZsb3dQaWNraW5nSW5mbzxMLCBGPiBleHRlbmRzIFBpY2tpbmdJbmZvPEYgfCBBZ2dyZWdhdGVGbG93PiB7XG4gIHR5cGU6IFBpY2tpbmdUeXBlLkZMT1c7XG4gIG9yaWdpbjogTCB8IENsdXN0ZXJOb2RlO1xuICBkZXN0OiBMIHwgQ2x1c3Rlck5vZGU7XG4gIGNvdW50OiBudW1iZXI7XG59XG5cbi8vIGV4cG9ydCBpbnRlcmZhY2UgTG9jYXRpb25BcmVhUGlja2luZ0luZm8gZXh0ZW5kcyBQaWNraW5nSW5mbzxQaWNraW5nSW5mb0RhdGE+IHtcbi8vICAgdHlwZTogUGlja2luZ1R5cGUuTE9DQVRJT05fQVJFQTtcbi8vICAgb2JqZWN0OiBGbG93TG9jYXRpb247XG4vLyB9XG5cbmV4cG9ydCB0eXBlIEZsb3dMYXllclBpY2tpbmdJbmZvPEwsIEY+ID1cbiAgfCBMb2NhdGlvblBpY2tpbmdJbmZvPEw+XG4gIC8vIHwgTG9jYXRpb25BcmVhUGlja2luZ0luZm9cbiAgfCBGbG93UGlja2luZ0luZm88TCwgRj47XG5cbi8vIGltcG9ydCB7RmVhdHVyZUNvbGxlY3Rpb24sIEdlb21ldHJ5T2JqZWN0fSBmcm9tICdnZW9qc29uJztcbi8vIGV4cG9ydCB0eXBlIExvY2F0aW9uUHJvcGVydGllcyA9IFJlY29yZDxzdHJpbmcsIHVua25vd24+O1xuXG4vLyBleHBvcnQgdHlwZSBMb2NhdGlvbnMgPVxuLy8gICB8IEZlYXR1cmVDb2xsZWN0aW9uPEdlb21ldHJ5T2JqZWN0LCBMb2NhdGlvblByb3BlcnRpZXM+XG4vLyAgIHwgRmxvd0xvY2F0aW9uW107XG5cbi8vIGV4cG9ydCBmdW5jdGlvbiBpc0ZlYXR1cmVDb2xsZWN0aW9uKFxuLy8gICBsb2NhdGlvbnM6IExvY2F0aW9ucyxcbi8vICk6IGxvY2F0aW9ucyBpcyBGZWF0dXJlQ29sbGVjdGlvbjxHZW9tZXRyeU9iamVjdCwgTG9jYXRpb25Qcm9wZXJ0aWVzPiB7XG4vLyAgIHJldHVybiAoXG4vLyAgICAgKGxvY2F0aW9ucyBhcyBGZWF0dXJlQ29sbGVjdGlvbjxHZW9tZXRyeU9iamVjdCwgTG9jYXRpb25Qcm9wZXJ0aWVzPilcbi8vICAgICAgIC50eXBlID09PSAnRmVhdHVyZUNvbGxlY3Rpb24nXG4vLyAgICk7XG4vLyB9XG4iXX0=
|
package/package.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@flowmap.gl/layers",
|
|
3
|
+
"version": "8.0.0-alpha.0",
|
|
4
|
+
"main": "dist/index.js",
|
|
5
|
+
"module": "dist/index.js",
|
|
6
|
+
"types": "dist/index.d.ts",
|
|
7
|
+
"repository": "git@github.com:FlowmapBlue/flowmap.gl.git",
|
|
8
|
+
"author": "Ilya Boyandin <ilya@boyandin.me>",
|
|
9
|
+
"license": "Apache-2.0",
|
|
10
|
+
"scripts": {
|
|
11
|
+
"dev": "tsc --watch",
|
|
12
|
+
"build": "rm -rf dist && tsc"
|
|
13
|
+
},
|
|
14
|
+
"peerDependencies": {
|
|
15
|
+
"@deck.gl/core": "^8.6.5",
|
|
16
|
+
"@deck.gl/layers": "^8.6.5",
|
|
17
|
+
"@luma.gl/constants": "^8.5.10",
|
|
18
|
+
"@luma.gl/core": "^8.5.10"
|
|
19
|
+
},
|
|
20
|
+
"gitHead": "1fdf13de65d27b7de34e6b6fa37ab5b249c05aeb",
|
|
21
|
+
"publishConfig": {
|
|
22
|
+
"access": "public"
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright 2022 FlowmapBlue
|
|
3
|
+
* Copyright 2018-2020 Teralytics, modified by FlowmapBlue
|
|
4
|
+
*
|
|
5
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
|
+
* you may not use this file except in compliance with the License.
|
|
7
|
+
* You may obtain a copy of the License at
|
|
8
|
+
*
|
|
9
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
10
|
+
*
|
|
11
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
12
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
13
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
14
|
+
* See the License for the specific language governing permissions and
|
|
15
|
+
* limitations under the License.
|
|
16
|
+
*
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import {Layer, picking, project32} from '@deck.gl/core';
|
|
20
|
+
import GL from '@luma.gl/constants';
|
|
21
|
+
import {Geometry, Model} from '@luma.gl/core';
|
|
22
|
+
import FragmentShader from './AnimatedFlowLinesLayerFragment.glsl';
|
|
23
|
+
import VertexShader from './AnimatedFlowLinesLayerVertex.glsl';
|
|
24
|
+
import {FlowLinesLayerAttributes, RGBA} from '@flowmap.gl/data';
|
|
25
|
+
import {LayerProps} from '../types';
|
|
26
|
+
export interface Props<F> extends LayerProps {
|
|
27
|
+
id: string;
|
|
28
|
+
opacity?: number;
|
|
29
|
+
pickable?: boolean;
|
|
30
|
+
updateTriggers?: {[key: string]: Record<string, unknown>};
|
|
31
|
+
data: F[] | FlowLinesLayerAttributes;
|
|
32
|
+
drawOutline: boolean;
|
|
33
|
+
outlineColor?: RGBA;
|
|
34
|
+
outlineThickness?: number;
|
|
35
|
+
currentTime?: number;
|
|
36
|
+
thicknessUnit?: number;
|
|
37
|
+
animationTailLength?: number;
|
|
38
|
+
getSourcePosition?: (d: F) => [number, number];
|
|
39
|
+
getTargetPosition?: (d: F) => [number, number];
|
|
40
|
+
getStaggering?: (d: F, info: AccessorObjectInfo) => number;
|
|
41
|
+
getPickable?: (d: F, {index}: {index: number}) => number; // >= 1.0 -> true
|
|
42
|
+
getColor?: (d: F) => RGBA;
|
|
43
|
+
getThickness?: (d: F) => number;
|
|
44
|
+
getEndpointOffsets?: (d: F) => [number, number];
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// https://deck.gl/#/documentation/developer-guide/using-layers?section=accessors
|
|
48
|
+
export interface AccessorObjectInfo {
|
|
49
|
+
index: number;
|
|
50
|
+
data: any;
|
|
51
|
+
target: any;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
const DEFAULT_COLOR: RGBA = [0, 132, 193, 255];
|
|
55
|
+
const loopLength = 1800;
|
|
56
|
+
const animationSpeed = 20;
|
|
57
|
+
const loopTime = loopLength / animationSpeed;
|
|
58
|
+
|
|
59
|
+
export default class AnimatedFlowLinesLayer<F> extends Layer {
|
|
60
|
+
static defaultProps = {
|
|
61
|
+
currentTime: 0,
|
|
62
|
+
animationTailLength: 0.7,
|
|
63
|
+
getSourcePosition: {type: 'accessor', value: (d: any) => [0, 0]},
|
|
64
|
+
getTargetPosition: {type: 'accessor', value: (d: any) => [0, 0]},
|
|
65
|
+
getPickable: {type: 'accessor', value: (d: any) => 1.0},
|
|
66
|
+
getStaggering: {
|
|
67
|
+
type: 'accessor',
|
|
68
|
+
value: (d: any, {index}: {index: number}) => Math.random(),
|
|
69
|
+
},
|
|
70
|
+
getColor: {type: 'accessor', value: DEFAULT_COLOR},
|
|
71
|
+
getThickness: {type: 'accessor', value: 1},
|
|
72
|
+
thicknessUnit: 15 * 2,
|
|
73
|
+
parameters: {
|
|
74
|
+
depthTest: false,
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
constructor(props: Props<F>) {
|
|
79
|
+
super(props);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
getShaders(): Record<string, unknown> {
|
|
83
|
+
return super.getShaders({
|
|
84
|
+
vs: VertexShader,
|
|
85
|
+
fs: FragmentShader,
|
|
86
|
+
modules: [project32, picking],
|
|
87
|
+
shaderCache: this.context.shaderCache,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
initializeState(): void {
|
|
92
|
+
const attributeManager = this.getAttributeManager();
|
|
93
|
+
|
|
94
|
+
/* eslint-disable max-len */
|
|
95
|
+
attributeManager.addInstanced({
|
|
96
|
+
instanceSourcePositions: {
|
|
97
|
+
size: 3,
|
|
98
|
+
transition: true,
|
|
99
|
+
accessor: 'getSourcePosition',
|
|
100
|
+
},
|
|
101
|
+
instanceTargetPositions: {
|
|
102
|
+
size: 3,
|
|
103
|
+
transition: true,
|
|
104
|
+
accessor: 'getTargetPosition',
|
|
105
|
+
},
|
|
106
|
+
instanceColors: {
|
|
107
|
+
size: 4,
|
|
108
|
+
type: GL.UNSIGNED_BYTE,
|
|
109
|
+
transition: true,
|
|
110
|
+
accessor: 'getColor',
|
|
111
|
+
defaultValue: [0, 0, 0, 255],
|
|
112
|
+
},
|
|
113
|
+
instanceWidths: {
|
|
114
|
+
size: 1,
|
|
115
|
+
transition: true,
|
|
116
|
+
accessor: 'getThickness',
|
|
117
|
+
defaultValue: 1,
|
|
118
|
+
},
|
|
119
|
+
instanceStaggering: {
|
|
120
|
+
accessor: 'getStaggering',
|
|
121
|
+
size: 1,
|
|
122
|
+
transition: false,
|
|
123
|
+
},
|
|
124
|
+
instancePickable: {
|
|
125
|
+
accessor: 'getPickable',
|
|
126
|
+
size: 1,
|
|
127
|
+
transition: false,
|
|
128
|
+
},
|
|
129
|
+
});
|
|
130
|
+
/* eslint-enable max-len */
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
getNeedsRedraw(): boolean {
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
updateState({props, oldProps, changeFlags}: Record<string, any>): void {
|
|
138
|
+
super.updateState({props, oldProps, changeFlags});
|
|
139
|
+
|
|
140
|
+
if (changeFlags.extensionsChanged) {
|
|
141
|
+
const {gl} = this.context;
|
|
142
|
+
if (this.state.model) {
|
|
143
|
+
this.state.model.delete();
|
|
144
|
+
}
|
|
145
|
+
this.setState({model: this._getModel(gl)});
|
|
146
|
+
this.getAttributeManager().invalidateAll();
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
draw({uniforms}: Record<string, any>): void {
|
|
151
|
+
const {thicknessUnit, animationTailLength} = this.props;
|
|
152
|
+
const timestamp = Date.now() / 1000;
|
|
153
|
+
const animationTime = ((timestamp % loopTime) / loopTime) * loopLength;
|
|
154
|
+
|
|
155
|
+
this.state.model
|
|
156
|
+
.setUniforms({
|
|
157
|
+
...uniforms,
|
|
158
|
+
thicknessUnit: thicknessUnit * 4,
|
|
159
|
+
animationTailLength,
|
|
160
|
+
currentTime: animationTime,
|
|
161
|
+
})
|
|
162
|
+
.draw();
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
_getModel(gl: WebGLRenderingContext): Record<string, unknown> {
|
|
166
|
+
/*
|
|
167
|
+
* (0, -1)-------------_(1, -1)
|
|
168
|
+
* | _,-" |
|
|
169
|
+
* o _,-" o
|
|
170
|
+
* | _,-" |
|
|
171
|
+
* (0, 1)"-------------(1, 1)
|
|
172
|
+
*/
|
|
173
|
+
const positions = [0, -1, 0, 0, 1, 0, 1, -1, 0, 1, 1, 0];
|
|
174
|
+
|
|
175
|
+
return new Model(
|
|
176
|
+
gl,
|
|
177
|
+
Object.assign({}, this.getShaders(), {
|
|
178
|
+
id: this.props.id,
|
|
179
|
+
geometry: new Geometry({
|
|
180
|
+
drawMode: GL.TRIANGLE_STRIP,
|
|
181
|
+
attributes: {
|
|
182
|
+
positions: new Float32Array(positions),
|
|
183
|
+
},
|
|
184
|
+
}),
|
|
185
|
+
isInstanced: true,
|
|
186
|
+
}),
|
|
187
|
+
);
|
|
188
|
+
}
|
|
189
|
+
}
|