@deck.gl/geo-layers 9.0.0-beta.2 → 9.0.0-beta.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 +2796 -7199
- package/dist/geo-cell-layer/GeoCellLayer.js +51 -0
- package/dist/geohash-layer/geohash-layer.js +19 -0
- package/dist/geohash-layer/geohash-utils.js +50 -0
- package/dist/great-circle-layer/great-circle-layer.js +12 -0
- package/dist/h3-layers/h3-cluster-layer.js +47 -0
- package/dist/h3-layers/h3-hexagon-layer.js +204 -0
- package/dist/h3-layers/h3-utils.js +56 -0
- package/dist/index.cjs +3199 -0
- package/dist/index.cjs.map +7 -0
- package/{typed → dist}/index.d.ts +5 -5
- package/{typed → dist}/index.d.ts.map +1 -1
- package/dist/index.js +36 -0
- package/dist/{esm/mesh-layer → mesh-layer}/mesh-layer-fragment.glsl.js +0 -1
- package/dist/{esm/mesh-layer → mesh-layer}/mesh-layer-vertex.glsl.js +0 -1
- package/dist/mesh-layer/mesh-layer.js +129 -0
- package/{typed → dist}/mvt-layer/coordinate-transform.d.ts +1 -1
- package/{typed → dist}/mvt-layer/coordinate-transform.d.ts.map +1 -1
- package/dist/mvt-layer/coordinate-transform.js +41 -0
- package/dist/mvt-layer/find-index-binary.d.ts +11 -0
- package/dist/mvt-layer/find-index-binary.d.ts.map +1 -0
- package/dist/mvt-layer/find-index-binary.js +96 -0
- package/{typed → dist}/mvt-layer/mvt-layer.d.ts +6 -5
- package/dist/mvt-layer/mvt-layer.d.ts.map +1 -0
- package/dist/mvt-layer/mvt-layer.js +305 -0
- package/dist/quadkey-layer/quadkey-layer.js +22 -0
- package/dist/quadkey-layer/quadkey-utils.js +26 -0
- package/dist/s2-layer/s2-geometry.js +123 -0
- package/dist/s2-layer/s2-layer.js +38 -0
- package/dist/s2-layer/s2-utils.js +87 -0
- package/{typed → dist}/terrain-layer/terrain-layer.d.ts +3 -3
- package/dist/terrain-layer/terrain-layer.d.ts.map +1 -0
- package/dist/terrain-layer/terrain-layer.js +233 -0
- package/dist/tile-3d-layer/tile-3d-layer.js +302 -0
- package/{typed → dist}/tile-layer/tile-layer.d.ts +3 -3
- package/dist/tile-layer/tile-layer.d.ts.map +1 -0
- package/dist/tile-layer/tile-layer.js +204 -0
- package/dist/tileset-2d/index.js +4 -0
- package/dist/tileset-2d/memoize.js +41 -0
- package/{typed → dist}/tileset-2d/tile-2d-header.d.ts +2 -1
- package/dist/tileset-2d/tile-2d-header.d.ts.map +1 -0
- package/dist/tileset-2d/tile-2d-header.js +135 -0
- package/{typed → dist}/tileset-2d/tile-2d-traversal.d.ts +1 -1
- package/{typed → dist}/tileset-2d/tile-2d-traversal.d.ts.map +1 -1
- package/dist/tileset-2d/tile-2d-traversal.js +182 -0
- package/{typed → dist}/tileset-2d/tileset-2d.d.ts +4 -4
- package/{typed → dist}/tileset-2d/tileset-2d.d.ts.map +1 -1
- package/dist/tileset-2d/tileset-2d.js +456 -0
- package/dist/tileset-2d/types.js +1 -0
- package/{typed → dist}/tileset-2d/utils.d.ts +2 -2
- package/dist/tileset-2d/utils.d.ts.map +1 -0
- package/dist/tileset-2d/utils.js +234 -0
- package/dist/trips-layer/trips-layer.js +93 -0
- package/dist/wms-layer/utils.js +13 -0
- package/dist/wms-layer/wms-layer.js +192 -0
- package/dist.min.js +27 -162
- package/package.json +32 -18
- package/src/index.ts +5 -5
- package/src/mvt-layer/coordinate-transform.ts +1 -1
- package/src/mvt-layer/find-index-binary.ts +5 -9
- package/src/mvt-layer/mvt-layer.ts +19 -15
- package/src/terrain-layer/terrain-layer.ts +13 -3
- package/src/tile-layer/tile-layer.ts +8 -9
- package/src/tileset-2d/tile-2d-header.ts +2 -1
- package/src/tileset-2d/tile-2d-traversal.ts +1 -1
- package/src/tileset-2d/tileset-2d.ts +7 -3
- package/src/tileset-2d/utils.ts +2 -2
- package/src/wms-layer/wms-layer.ts +1 -1
- package/dist/es5/geo-cell-layer/GeoCellLayer.js +0 -118
- package/dist/es5/geo-cell-layer/GeoCellLayer.js.map +0 -1
- package/dist/es5/geohash-layer/geohash-layer.js +0 -67
- package/dist/es5/geohash-layer/geohash-layer.js.map +0 -1
- package/dist/es5/geohash-layer/geohash-utils.js +0 -77
- package/dist/es5/geohash-layer/geohash-utils.js.map +0 -1
- package/dist/es5/great-circle-layer/great-circle-layer.js +0 -48
- package/dist/es5/great-circle-layer/great-circle-layer.js.map +0 -1
- package/dist/es5/h3-layers/h3-cluster-layer.js +0 -162
- package/dist/es5/h3-layers/h3-cluster-layer.js.map +0 -1
- package/dist/es5/h3-layers/h3-hexagon-layer.js +0 -351
- package/dist/es5/h3-layers/h3-hexagon-layer.js.map +0 -1
- package/dist/es5/h3-layers/h3-utils.js +0 -111
- package/dist/es5/h3-layers/h3-utils.js.map +0 -1
- package/dist/es5/index.js +0 -132
- package/dist/es5/index.js.map +0 -1
- package/dist/es5/mesh-layer/mesh-layer-fragment.glsl.js +0 -9
- package/dist/es5/mesh-layer/mesh-layer-fragment.glsl.js.map +0 -1
- package/dist/es5/mesh-layer/mesh-layer-vertex.glsl.js +0 -9
- package/dist/es5/mesh-layer/mesh-layer-vertex.glsl.js.map +0 -1
- package/dist/es5/mesh-layer/mesh-layer.js +0 -217
- package/dist/es5/mesh-layer/mesh-layer.js.map +0 -1
- package/dist/es5/mvt-layer/coordinate-transform.js +0 -83
- package/dist/es5/mvt-layer/coordinate-transform.js.map +0 -1
- package/dist/es5/mvt-layer/find-index-binary.js +0 -127
- package/dist/es5/mvt-layer/find-index-binary.js.map +0 -1
- package/dist/es5/mvt-layer/mvt-layer.js +0 -533
- package/dist/es5/mvt-layer/mvt-layer.js.map +0 -1
- package/dist/es5/quadkey-layer/quadkey-layer.js +0 -72
- package/dist/es5/quadkey-layer/quadkey-layer.js.map +0 -1
- package/dist/es5/quadkey-layer/quadkey-utils.js +0 -53
- package/dist/es5/quadkey-layer/quadkey-utils.js.map +0 -1
- package/dist/es5/s2-layer/s2-geometry.js +0 -158
- package/dist/es5/s2-layer/s2-geometry.js.map +0 -1
- package/dist/es5/s2-layer/s2-layer.js +0 -67
- package/dist/es5/s2-layer/s2-layer.js.map +0 -1
- package/dist/es5/s2-layer/s2-utils.js +0 -80
- package/dist/es5/s2-layer/s2-utils.js.map +0 -1
- package/dist/es5/terrain-layer/terrain-layer.js +0 -347
- package/dist/es5/terrain-layer/terrain-layer.js.map +0 -1
- package/dist/es5/tile-3d-layer/tile-3d-layer.js +0 -511
- package/dist/es5/tile-3d-layer/tile-3d-layer.js.map +0 -1
- package/dist/es5/tile-layer/tile-layer.js +0 -363
- package/dist/es5/tile-layer/tile-layer.js.map +0 -1
- package/dist/es5/tileset-2d/index.js +0 -66
- package/dist/es5/tileset-2d/index.js.map +0 -1
- package/dist/es5/tileset-2d/memoize.js +0 -47
- package/dist/es5/tileset-2d/memoize.js.map +0 -1
- package/dist/es5/tileset-2d/tile-2d-header.js +0 -250
- package/dist/es5/tileset-2d/tile-2d-header.js.map +0 -1
- package/dist/es5/tileset-2d/tile-2d-traversal.js +0 -256
- package/dist/es5/tileset-2d/tile-2d-traversal.js.map +0 -1
- package/dist/es5/tileset-2d/tileset-2d.js +0 -757
- package/dist/es5/tileset-2d/tileset-2d.js.map +0 -1
- package/dist/es5/tileset-2d/types.js +0 -2
- package/dist/es5/tileset-2d/types.js.map +0 -1
- package/dist/es5/tileset-2d/utils.js +0 -302
- package/dist/es5/tileset-2d/utils.js.map +0 -1
- package/dist/es5/trips-layer/trips-layer.js +0 -114
- package/dist/es5/trips-layer/trips-layer.js.map +0 -1
- package/dist/es5/wms-layer/utils.js +0 -18
- package/dist/es5/wms-layer/utils.js.map +0 -1
- package/dist/es5/wms-layer/wms-layer.js +0 -376
- package/dist/es5/wms-layer/wms-layer.js.map +0 -1
- package/dist/esm/geo-cell-layer/GeoCellLayer.js +0 -72
- package/dist/esm/geo-cell-layer/GeoCellLayer.js.map +0 -1
- package/dist/esm/geohash-layer/geohash-layer.js +0 -26
- package/dist/esm/geohash-layer/geohash-layer.js.map +0 -1
- package/dist/esm/geohash-layer/geohash-utils.js +0 -56
- package/dist/esm/geohash-layer/geohash-utils.js.map +0 -1
- package/dist/esm/great-circle-layer/great-circle-layer.js +0 -12
- package/dist/esm/great-circle-layer/great-circle-layer.js.map +0 -1
- package/dist/esm/h3-layers/h3-cluster-layer.js +0 -79
- package/dist/esm/h3-layers/h3-cluster-layer.js.map +0 -1
- package/dist/esm/h3-layers/h3-hexagon-layer.js +0 -280
- package/dist/esm/h3-layers/h3-hexagon-layer.js.map +0 -1
- package/dist/esm/h3-layers/h3-utils.js +0 -54
- package/dist/esm/h3-layers/h3-utils.js.map +0 -1
- package/dist/esm/index.js +0 -17
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/mesh-layer/mesh-layer-fragment.glsl.js.map +0 -1
- package/dist/esm/mesh-layer/mesh-layer-vertex.glsl.js.map +0 -1
- package/dist/esm/mesh-layer/mesh-layer.js +0 -178
- package/dist/esm/mesh-layer/mesh-layer.js.map +0 -1
- package/dist/esm/mvt-layer/coordinate-transform.js +0 -49
- package/dist/esm/mvt-layer/coordinate-transform.js.map +0 -1
- package/dist/esm/mvt-layer/find-index-binary.js +0 -99
- package/dist/esm/mvt-layer/find-index-binary.js.map +0 -1
- package/dist/esm/mvt-layer/mvt-layer.js +0 -427
- package/dist/esm/mvt-layer/mvt-layer.js.map +0 -1
- package/dist/esm/quadkey-layer/quadkey-layer.js +0 -31
- package/dist/esm/quadkey-layer/quadkey-layer.js.map +0 -1
- package/dist/esm/quadkey-layer/quadkey-utils.js +0 -24
- package/dist/esm/quadkey-layer/quadkey-utils.js.map +0 -1
- package/dist/esm/s2-layer/s2-geometry.js +0 -126
- package/dist/esm/s2-layer/s2-geometry.js.map +0 -1
- package/dist/esm/s2-layer/s2-layer.js +0 -26
- package/dist/esm/s2-layer/s2-layer.js.map +0 -1
- package/dist/esm/s2-layer/s2-utils.js +0 -69
- package/dist/esm/s2-layer/s2-utils.js.map +0 -1
- package/dist/esm/terrain-layer/terrain-layer.js +0 -292
- package/dist/esm/terrain-layer/terrain-layer.js.map +0 -1
- package/dist/esm/tile-3d-layer/tile-3d-layer.js +0 -438
- package/dist/esm/tile-3d-layer/tile-3d-layer.js.map +0 -1
- package/dist/esm/tile-layer/tile-layer.js +0 -299
- package/dist/esm/tile-layer/tile-layer.js.map +0 -1
- package/dist/esm/tileset-2d/index.js +0 -4
- package/dist/esm/tileset-2d/index.js.map +0 -1
- package/dist/esm/tileset-2d/memoize.js +0 -40
- package/dist/esm/tileset-2d/memoize.js.map +0 -1
- package/dist/esm/tileset-2d/tile-2d-header.js +0 -179
- package/dist/esm/tileset-2d/tile-2d-header.js.map +0 -1
- package/dist/esm/tileset-2d/tile-2d-traversal.js +0 -184
- package/dist/esm/tileset-2d/tile-2d-traversal.js.map +0 -1
- package/dist/esm/tileset-2d/tileset-2d.js +0 -509
- package/dist/esm/tileset-2d/tileset-2d.js.map +0 -1
- package/dist/esm/tileset-2d/types.js +0 -2
- package/dist/esm/tileset-2d/types.js.map +0 -1
- package/dist/esm/tileset-2d/utils.js +0 -233
- package/dist/esm/tileset-2d/utils.js.map +0 -1
- package/dist/esm/trips-layer/trips-layer.js +0 -88
- package/dist/esm/trips-layer/trips-layer.js.map +0 -1
- package/dist/esm/wms-layer/utils.js +0 -9
- package/dist/esm/wms-layer/utils.js.map +0 -1
- package/dist/esm/wms-layer/wms-layer.js +0 -231
- package/dist/esm/wms-layer/wms-layer.js.map +0 -1
- package/typed/mvt-layer/find-index-binary.d.ts +0 -12
- package/typed/mvt-layer/find-index-binary.d.ts.map +0 -1
- package/typed/mvt-layer/mvt-layer.d.ts.map +0 -1
- package/typed/terrain-layer/terrain-layer.d.ts.map +0 -1
- package/typed/tile-layer/tile-layer.d.ts.map +0 -1
- package/typed/tileset-2d/tile-2d-header.d.ts.map +0 -1
- package/typed/tileset-2d/utils.d.ts.map +0 -1
- /package/{typed → dist}/geo-cell-layer/GeoCellLayer.d.ts +0 -0
- /package/{typed → dist}/geo-cell-layer/GeoCellLayer.d.ts.map +0 -0
- /package/{typed → dist}/geohash-layer/geohash-layer.d.ts +0 -0
- /package/{typed → dist}/geohash-layer/geohash-layer.d.ts.map +0 -0
- /package/{typed → dist}/geohash-layer/geohash-utils.d.ts +0 -0
- /package/{typed → dist}/geohash-layer/geohash-utils.d.ts.map +0 -0
- /package/{typed → dist}/great-circle-layer/great-circle-layer.d.ts +0 -0
- /package/{typed → dist}/great-circle-layer/great-circle-layer.d.ts.map +0 -0
- /package/{typed → dist}/h3-layers/h3-cluster-layer.d.ts +0 -0
- /package/{typed → dist}/h3-layers/h3-cluster-layer.d.ts.map +0 -0
- /package/{typed → dist}/h3-layers/h3-hexagon-layer.d.ts +0 -0
- /package/{typed → dist}/h3-layers/h3-hexagon-layer.d.ts.map +0 -0
- /package/{typed → dist}/h3-layers/h3-utils.d.ts +0 -0
- /package/{typed → dist}/h3-layers/h3-utils.d.ts.map +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer-fragment.glsl.d.ts +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer-fragment.glsl.d.ts.map +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer-vertex.glsl.d.ts +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer-vertex.glsl.d.ts.map +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer.d.ts +0 -0
- /package/{typed → dist}/mesh-layer/mesh-layer.d.ts.map +0 -0
- /package/{typed → dist}/quadkey-layer/quadkey-layer.d.ts +0 -0
- /package/{typed → dist}/quadkey-layer/quadkey-layer.d.ts.map +0 -0
- /package/{typed → dist}/quadkey-layer/quadkey-utils.d.ts +0 -0
- /package/{typed → dist}/quadkey-layer/quadkey-utils.d.ts.map +0 -0
- /package/{typed → dist}/s2-layer/s2-geometry.d.ts +0 -0
- /package/{typed → dist}/s2-layer/s2-geometry.d.ts.map +0 -0
- /package/{typed → dist}/s2-layer/s2-layer.d.ts +0 -0
- /package/{typed → dist}/s2-layer/s2-layer.d.ts.map +0 -0
- /package/{typed → dist}/s2-layer/s2-utils.d.ts +0 -0
- /package/{typed → dist}/s2-layer/s2-utils.d.ts.map +0 -0
- /package/{typed → dist}/tile-3d-layer/tile-3d-layer.d.ts +0 -0
- /package/{typed → dist}/tile-3d-layer/tile-3d-layer.d.ts.map +0 -0
- /package/{typed → dist}/tileset-2d/index.d.ts +0 -0
- /package/{typed → dist}/tileset-2d/index.d.ts.map +0 -0
- /package/{typed → dist}/tileset-2d/memoize.d.ts +0 -0
- /package/{typed → dist}/tileset-2d/memoize.d.ts.map +0 -0
- /package/{typed → dist}/tileset-2d/types.d.ts +0 -0
- /package/{typed → dist}/tileset-2d/types.d.ts.map +0 -0
- /package/{typed → dist}/trips-layer/trips-layer.d.ts +0 -0
- /package/{typed → dist}/trips-layer/trips-layer.d.ts.map +0 -0
- /package/{typed → dist}/wms-layer/utils.d.ts +0 -0
- /package/{typed → dist}/wms-layer/utils.d.ts.map +0 -0
- /package/{typed → dist}/wms-layer/wms-layer.d.ts +0 -0
- /package/{typed → dist}/wms-layer/wms-layer.d.ts.map +0 -0
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { parsePBRMaterial } from '@luma.gl/gltf';
|
|
2
|
+
import { pbr } from '@luma.gl/shadertools';
|
|
3
|
+
import { Model } from '@luma.gl/engine';
|
|
4
|
+
import { GL } from '@luma.gl/constants';
|
|
5
|
+
import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
|
|
6
|
+
import vs from "./mesh-layer-vertex.glsl.js";
|
|
7
|
+
import fs from "./mesh-layer-fragment.glsl.js";
|
|
8
|
+
function validateGeometryAttributes(attributes) {
|
|
9
|
+
const positionAttribute = attributes.positions || attributes.POSITION;
|
|
10
|
+
const vertexCount = positionAttribute.value.length / positionAttribute.size;
|
|
11
|
+
const hasColorAttribute = attributes.COLOR_0 || attributes.colors;
|
|
12
|
+
if (!hasColorAttribute) {
|
|
13
|
+
attributes.colors = {
|
|
14
|
+
size: 4,
|
|
15
|
+
value: new Uint8Array(vertexCount * 4).fill(255),
|
|
16
|
+
normalized: true
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const defaultProps = {
|
|
21
|
+
pbrMaterial: { type: 'object', value: null },
|
|
22
|
+
featureIds: { type: 'array', value: null, optional: true }
|
|
23
|
+
};
|
|
24
|
+
export default class MeshLayer extends SimpleMeshLayer {
|
|
25
|
+
static { this.layerName = 'MeshLayer'; }
|
|
26
|
+
static { this.defaultProps = defaultProps; }
|
|
27
|
+
getShaders() {
|
|
28
|
+
const shaders = super.getShaders();
|
|
29
|
+
const modules = shaders.modules;
|
|
30
|
+
modules.push(pbr);
|
|
31
|
+
return { ...shaders, vs, fs };
|
|
32
|
+
}
|
|
33
|
+
initializeState() {
|
|
34
|
+
const { featureIds } = this.props;
|
|
35
|
+
super.initializeState();
|
|
36
|
+
const attributeManager = this.getAttributeManager();
|
|
37
|
+
if (featureIds) {
|
|
38
|
+
// attributeManager is always defined in a primitive layer
|
|
39
|
+
attributeManager.add({
|
|
40
|
+
featureIdsPickingColors: {
|
|
41
|
+
type: GL.UNSIGNED_BYTE,
|
|
42
|
+
size: 3,
|
|
43
|
+
noAlloc: true,
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
45
|
+
update: this.calculateFeatureIdsPickingColors
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
updateState(params) {
|
|
51
|
+
super.updateState(params);
|
|
52
|
+
const { props, oldProps } = params;
|
|
53
|
+
if (props.pbrMaterial !== oldProps.pbrMaterial) {
|
|
54
|
+
this.updatePbrMaterialUniforms(props.pbrMaterial);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
draw(opts) {
|
|
58
|
+
const { featureIds } = this.props;
|
|
59
|
+
if (!this.state.model) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
this.state.model.setUniforms({
|
|
63
|
+
// Needed for PBR (TODO: find better way to get it)
|
|
64
|
+
// eslint-disable-next-line camelcase
|
|
65
|
+
u_Camera: this.state.model.uniforms.project_uCameraPosition,
|
|
66
|
+
pickFeatureIds: Boolean(featureIds)
|
|
67
|
+
});
|
|
68
|
+
super.draw(opts);
|
|
69
|
+
}
|
|
70
|
+
getModel(mesh) {
|
|
71
|
+
const { id, pbrMaterial } = this.props;
|
|
72
|
+
const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh);
|
|
73
|
+
// Keep material to explicitly remove textures
|
|
74
|
+
this.setState({ parsedPBRMaterial });
|
|
75
|
+
const shaders = this.getShaders();
|
|
76
|
+
validateGeometryAttributes(mesh.attributes);
|
|
77
|
+
const model = new Model(this.context.device, {
|
|
78
|
+
...this.getShaders(),
|
|
79
|
+
id,
|
|
80
|
+
geometry: mesh,
|
|
81
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
82
|
+
defines: {
|
|
83
|
+
...shaders.defines,
|
|
84
|
+
...parsedPBRMaterial?.defines,
|
|
85
|
+
HAS_UV_REGIONS: mesh.attributes.uvRegions ? 1 : 0
|
|
86
|
+
},
|
|
87
|
+
parameters: parsedPBRMaterial?.parameters,
|
|
88
|
+
isInstanced: true
|
|
89
|
+
});
|
|
90
|
+
return model;
|
|
91
|
+
}
|
|
92
|
+
updatePbrMaterialUniforms(pbrMaterial) {
|
|
93
|
+
const { model } = this.state;
|
|
94
|
+
if (model) {
|
|
95
|
+
const { mesh } = this.props;
|
|
96
|
+
const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh);
|
|
97
|
+
// Keep material to explicitly remove textures
|
|
98
|
+
this.setState({ parsedPBRMaterial });
|
|
99
|
+
model.setBindings(parsedPBRMaterial.bindings);
|
|
100
|
+
model.setUniforms(parsedPBRMaterial.uniforms);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
parseMaterial(pbrMaterial, mesh) {
|
|
104
|
+
const unlit = Boolean(pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorTexture);
|
|
105
|
+
return parsePBRMaterial(this.context.device, { unlit, ...pbrMaterial }, { NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords }, {
|
|
106
|
+
pbrDebug: false,
|
|
107
|
+
lights: true,
|
|
108
|
+
useTangents: false
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
calculateFeatureIdsPickingColors(attribute) {
|
|
112
|
+
// This updater is only called if featureIds is not null
|
|
113
|
+
const featureIds = this.props.featureIds;
|
|
114
|
+
const value = new Uint8ClampedArray(featureIds.length * attribute.size);
|
|
115
|
+
const pickingColor = [];
|
|
116
|
+
for (let index = 0; index < featureIds.length; index++) {
|
|
117
|
+
this.encodePickingColor(featureIds[index], pickingColor);
|
|
118
|
+
value[index * 3] = pickingColor[0];
|
|
119
|
+
value[index * 3 + 1] = pickingColor[1];
|
|
120
|
+
value[index * 3 + 2] = pickingColor[2];
|
|
121
|
+
}
|
|
122
|
+
attribute.value = value;
|
|
123
|
+
}
|
|
124
|
+
finalizeState(context) {
|
|
125
|
+
super.finalizeState(context);
|
|
126
|
+
this.state.parsedPBRMaterial?.generatedTextures.forEach(texture => texture.destroy());
|
|
127
|
+
this.setState({ parsedPBRMaterial: null });
|
|
128
|
+
}
|
|
129
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Viewport } from '@deck.gl/core';
|
|
2
|
-
import { GeoBoundingBox } from '../tileset-2d';
|
|
2
|
+
import { GeoBoundingBox } from '../tileset-2d/index';
|
|
3
3
|
export declare function transform(geometry: any, bbox: GeoBoundingBox, viewport: Viewport): any;
|
|
4
4
|
//# sourceMappingURL=coordinate-transform.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinate-transform.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/coordinate-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"coordinate-transform.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/coordinate-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AA0CnD,wBAAgB,SAAS,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,OAa3E"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { lerp } from '@math.gl/core';
|
|
2
|
+
const availableTransformations = {
|
|
3
|
+
Point,
|
|
4
|
+
MultiPoint,
|
|
5
|
+
LineString,
|
|
6
|
+
MultiLineString,
|
|
7
|
+
Polygon,
|
|
8
|
+
MultiPolygon
|
|
9
|
+
};
|
|
10
|
+
function Point([pointX, pointY], [nw, se], viewport) {
|
|
11
|
+
const x = lerp(nw[0], se[0], pointX);
|
|
12
|
+
const y = lerp(nw[1], se[1], pointY);
|
|
13
|
+
return viewport.unprojectFlat([x, y]);
|
|
14
|
+
}
|
|
15
|
+
function getPoints(geometry, bbox, viewport) {
|
|
16
|
+
return geometry.map(g => Point(g, bbox, viewport));
|
|
17
|
+
}
|
|
18
|
+
function MultiPoint(multiPoint, bbox, viewport) {
|
|
19
|
+
return getPoints(multiPoint, bbox, viewport);
|
|
20
|
+
}
|
|
21
|
+
function LineString(line, bbox, viewport) {
|
|
22
|
+
return getPoints(line, bbox, viewport);
|
|
23
|
+
}
|
|
24
|
+
function MultiLineString(multiLineString, bbox, viewport) {
|
|
25
|
+
return multiLineString.map(lineString => LineString(lineString, bbox, viewport));
|
|
26
|
+
}
|
|
27
|
+
function Polygon(polygon, bbox, viewport) {
|
|
28
|
+
return polygon.map(polygonRing => getPoints(polygonRing, bbox, viewport));
|
|
29
|
+
}
|
|
30
|
+
function MultiPolygon(multiPolygon, bbox, viewport) {
|
|
31
|
+
return multiPolygon.map(polygon => Polygon(polygon, bbox, viewport));
|
|
32
|
+
}
|
|
33
|
+
export function transform(geometry, bbox, viewport) {
|
|
34
|
+
const nw = viewport.projectFlat([bbox.west, bbox.north]);
|
|
35
|
+
const se = viewport.projectFlat([bbox.east, bbox.south]);
|
|
36
|
+
const projectedBbox = [nw, se];
|
|
37
|
+
return {
|
|
38
|
+
...geometry,
|
|
39
|
+
coordinates: availableTransformations[geometry.type](geometry.coordinates, projectedBbox, viewport)
|
|
40
|
+
};
|
|
41
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { BinaryFeatureCollection } from '@loaders.gl/schema';
|
|
2
|
+
/**
|
|
3
|
+
* Return the index of feature (numericProps or featureIds) for given feature id
|
|
4
|
+
* Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
|
|
5
|
+
* of the feature 33.
|
|
6
|
+
*/
|
|
7
|
+
export default function findIndexBinary(data: BinaryFeatureCollection, // The data in binary format
|
|
8
|
+
uniqueIdProperty: string, // Name of the unique id property
|
|
9
|
+
featureId: string | number, // feature id to find
|
|
10
|
+
layerName: string | null): number;
|
|
11
|
+
//# sourceMappingURL=find-index-binary.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"find-index-binary.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/find-index-binary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EAIxB,MAAM,oBAAoB,CAAC;AAK5B;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,IAAI,EAAE,uBAAuB,EAAE,4BAA4B;AAC3D,gBAAgB,EAAE,MAAM,EAAE,iCAAiC;AAC3D,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,qBAAqB;AACjD,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,MAAM,CASR"}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
const GEOM_TYPES = ['points', 'lines', 'polygons'];
|
|
2
|
+
/**
|
|
3
|
+
* Return the index of feature (numericProps or featureIds) for given feature id
|
|
4
|
+
* Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
|
|
5
|
+
* of the feature 33.
|
|
6
|
+
*/
|
|
7
|
+
export default function findIndexBinary(data, // The data in binary format
|
|
8
|
+
uniqueIdProperty, // Name of the unique id property
|
|
9
|
+
featureId, // feature id to find
|
|
10
|
+
layerName // the layer to search in
|
|
11
|
+
) {
|
|
12
|
+
for (const gt of GEOM_TYPES) {
|
|
13
|
+
const index = data[gt] && findIndexByType(data[gt], uniqueIdProperty, featureId, layerName);
|
|
14
|
+
if (index >= 0) {
|
|
15
|
+
return index;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return -1;
|
|
19
|
+
}
|
|
20
|
+
function findIndexByType(geomData, uniqueIdProperty, featureId, layerName) {
|
|
21
|
+
const featureIds = geomData.featureIds.value;
|
|
22
|
+
if (!featureIds.length) {
|
|
23
|
+
return -1;
|
|
24
|
+
}
|
|
25
|
+
let startFeatureIndex = 0;
|
|
26
|
+
let endFeatureIndex = featureIds[featureIds.length - 1] + 1;
|
|
27
|
+
if (layerName) {
|
|
28
|
+
const layerRange = getLayerRange(geomData, layerName);
|
|
29
|
+
if (layerRange) {
|
|
30
|
+
startFeatureIndex = layerRange[0];
|
|
31
|
+
endFeatureIndex = layerRange[1] + 1;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
return -1;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
// Look for the uniqueIdProperty
|
|
38
|
+
let featureIndex = -1;
|
|
39
|
+
if (uniqueIdProperty in geomData.numericProps) {
|
|
40
|
+
const vertexIndex = geomData.numericProps[uniqueIdProperty].value.findIndex((x, i) => x === featureId && featureIds[i] >= startFeatureIndex && featureIds[i] < endFeatureIndex);
|
|
41
|
+
return vertexIndex >= 0 ? geomData.globalFeatureIds.value[vertexIndex] : -1;
|
|
42
|
+
}
|
|
43
|
+
else if (uniqueIdProperty) {
|
|
44
|
+
featureIndex = findIndex(geomData.properties, elem => elem[uniqueIdProperty] === featureId, startFeatureIndex, endFeatureIndex);
|
|
45
|
+
}
|
|
46
|
+
else if (geomData.fields) {
|
|
47
|
+
featureIndex = findIndex(geomData.fields, (elem) => elem.id === featureId, startFeatureIndex, endFeatureIndex);
|
|
48
|
+
}
|
|
49
|
+
return featureIndex >= 0 ? getGlobalFeatureId(geomData, featureIndex) : -1;
|
|
50
|
+
}
|
|
51
|
+
// Returns [firstFeatureIndex, lastFeatureIndex]
|
|
52
|
+
// MVTLoader parses tiles layer-by-layer, so each layer is a continuous range
|
|
53
|
+
function getLayerRange(geomData, layerName) {
|
|
54
|
+
if (!geomData.__layers) {
|
|
55
|
+
// Cache a map from properties.layerName to index ranges
|
|
56
|
+
const layerNames = {};
|
|
57
|
+
const { properties } = geomData;
|
|
58
|
+
for (let i = 0; i < properties.length; i++) {
|
|
59
|
+
const { layerName: key } = properties[i];
|
|
60
|
+
if (!key) {
|
|
61
|
+
// ignore
|
|
62
|
+
}
|
|
63
|
+
else if (layerNames[key]) {
|
|
64
|
+
layerNames[key][1] = i;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
layerNames[key] = [i, i];
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
geomData.__layers = layerNames;
|
|
71
|
+
}
|
|
72
|
+
return geomData.__layers[layerName];
|
|
73
|
+
}
|
|
74
|
+
// Returns global feature id
|
|
75
|
+
function getGlobalFeatureId(geomData, featureIndex) {
|
|
76
|
+
if (!geomData.__ids) {
|
|
77
|
+
// Cache a map from featureId to globalFeatureId
|
|
78
|
+
const result = [];
|
|
79
|
+
const featureIds = geomData.featureIds.value;
|
|
80
|
+
const globalFeatureIds = geomData.globalFeatureIds.value;
|
|
81
|
+
for (let i = 0; i < featureIds.length; i++) {
|
|
82
|
+
result[featureIds[i]] = globalFeatureIds[i];
|
|
83
|
+
}
|
|
84
|
+
geomData.__ids = result;
|
|
85
|
+
}
|
|
86
|
+
return geomData.__ids[featureIndex];
|
|
87
|
+
}
|
|
88
|
+
// Like array.findIndex, but only search within a range
|
|
89
|
+
function findIndex(array, predicate, startIndex, endIndex) {
|
|
90
|
+
for (let i = startIndex; i < endIndex; i++) {
|
|
91
|
+
if (predicate(array[i], i)) {
|
|
92
|
+
return i;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return -1;
|
|
96
|
+
}
|
|
@@ -4,8 +4,8 @@ import type { Loader } from '@loaders.gl/loader-utils';
|
|
|
4
4
|
import type { BinaryFeatureCollection } from '@loaders.gl/schema';
|
|
5
5
|
import type { Feature } from 'geojson';
|
|
6
6
|
import TileLayer, { TiledPickingInfo, TileLayerProps } from '../tile-layer/tile-layer';
|
|
7
|
-
import type { Tileset2DProps, TileLoadProps } from '../tileset-2d';
|
|
8
|
-
import { Tile2DHeader, URLTemplate } from '../tileset-2d';
|
|
7
|
+
import type { Tileset2DProps, TileLoadProps } from '../tileset-2d/index';
|
|
8
|
+
import { Tile2DHeader, URLTemplate } from '../tileset-2d/index';
|
|
9
9
|
export type TileJson = {
|
|
10
10
|
tilejson: string;
|
|
11
11
|
tiles: string[];
|
|
@@ -18,9 +18,10 @@ export type TileJson = {
|
|
|
18
18
|
};
|
|
19
19
|
type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
|
|
20
20
|
/** All props supported by the MVTLayer */
|
|
21
|
-
export type MVTLayerProps = _MVTLayerProps & Omit<GeoJsonLayerProps, 'data'> & TileLayerProps<ParsedMvtTile>;
|
|
21
|
+
export type MVTLayerProps = _MVTLayerProps & Omit<GeoJsonLayerProps, 'data'> & Omit<TileLayerProps<ParsedMvtTile>, 'data'>;
|
|
22
22
|
/** Props added by the MVTLayer */
|
|
23
23
|
export type _MVTLayerProps = {
|
|
24
|
+
data: TileJson | URLTemplate;
|
|
24
25
|
/** Called if `data` is a TileJSON URL when it is successfully fetched. */
|
|
25
26
|
onDataLoad?: ((tilejson: TileJson | null) => void) | null;
|
|
26
27
|
/** Needed for highlighting a feature split across two or more tiles. */
|
|
@@ -47,8 +48,8 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<Pars
|
|
|
47
48
|
state: TileLayer<ParsedMvtTile>['state'] & {
|
|
48
49
|
binary: boolean;
|
|
49
50
|
data: URLTemplate;
|
|
50
|
-
tileJSON:
|
|
51
|
-
highlightColor
|
|
51
|
+
tileJSON: TileJson | null;
|
|
52
|
+
highlightColor?: number[];
|
|
52
53
|
hoveredFeatureId: number | string | null;
|
|
53
54
|
hoveredFeatureLayerName: string | null;
|
|
54
55
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mvt-layer.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/mvt-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,305 @@
|
|
|
1
|
+
import { log, COORDINATE_SYSTEM } from '@deck.gl/core';
|
|
2
|
+
import { GeoJsonLayer } from '@deck.gl/layers';
|
|
3
|
+
import { ClipExtension } from '@deck.gl/extensions';
|
|
4
|
+
import { Matrix4 } from '@math.gl/core';
|
|
5
|
+
import { MVTWorkerLoader } from '@loaders.gl/mvt';
|
|
6
|
+
import { binaryToGeojson } from '@loaders.gl/gis';
|
|
7
|
+
import { transform } from "./coordinate-transform.js";
|
|
8
|
+
import findIndexBinary from "./find-index-binary.js";
|
|
9
|
+
import TileLayer from "../tile-layer/tile-layer.js";
|
|
10
|
+
import { urlType, getURLFromTemplate, isGeoBoundingBox, isURLTemplate } from "../tileset-2d/index.js";
|
|
11
|
+
const WORLD_SIZE = 512;
|
|
12
|
+
const defaultProps = {
|
|
13
|
+
...GeoJsonLayer.defaultProps,
|
|
14
|
+
data: urlType,
|
|
15
|
+
onDataLoad: { type: 'function', value: null, optional: true, compare: false },
|
|
16
|
+
uniqueIdProperty: '',
|
|
17
|
+
highlightedFeatureId: null,
|
|
18
|
+
loaders: [MVTWorkerLoader],
|
|
19
|
+
binary: true
|
|
20
|
+
};
|
|
21
|
+
/** Render data formatted as [Mapbox Vector Tiles](https://docs.mapbox.com/vector-tiles/specification/). */
|
|
22
|
+
export default class MVTLayer extends TileLayer {
|
|
23
|
+
static { this.layerName = 'MVTLayer'; }
|
|
24
|
+
static { this.defaultProps = defaultProps; }
|
|
25
|
+
initializeState() {
|
|
26
|
+
super.initializeState();
|
|
27
|
+
// GlobeView doesn't work well with binary data
|
|
28
|
+
const binary = this.context.viewport.resolution !== undefined ? false : this.props.binary;
|
|
29
|
+
this.setState({
|
|
30
|
+
binary,
|
|
31
|
+
data: null,
|
|
32
|
+
tileJSON: null,
|
|
33
|
+
hoveredFeatureId: null,
|
|
34
|
+
hoveredFeatureLayerName: null
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
get isLoaded() {
|
|
38
|
+
return Boolean(this.state?.data && super.isLoaded);
|
|
39
|
+
}
|
|
40
|
+
updateState({ props, oldProps, context, changeFlags }) {
|
|
41
|
+
if (changeFlags.dataChanged) {
|
|
42
|
+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
43
|
+
this._updateTileData();
|
|
44
|
+
}
|
|
45
|
+
if (this.state?.data) {
|
|
46
|
+
super.updateState({ props, oldProps, context, changeFlags });
|
|
47
|
+
this._setWGS84PropertyForTiles();
|
|
48
|
+
}
|
|
49
|
+
const { highlightColor } = props;
|
|
50
|
+
if (highlightColor !== oldProps.highlightColor && Array.isArray(highlightColor)) {
|
|
51
|
+
this.setState({ highlightColor });
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
/* eslint-disable complexity */
|
|
55
|
+
async _updateTileData() {
|
|
56
|
+
let data = this.props.data;
|
|
57
|
+
let tileJSON = null;
|
|
58
|
+
if (typeof data === 'string' && !isURLTemplate(data)) {
|
|
59
|
+
const { onDataLoad, fetch } = this.props;
|
|
60
|
+
this.setState({ data: null, tileJSON: null });
|
|
61
|
+
try {
|
|
62
|
+
tileJSON = await fetch(data, { propName: 'data', layer: this, loaders: [] });
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
this.raiseError(error, 'loading TileJSON');
|
|
66
|
+
data = null;
|
|
67
|
+
}
|
|
68
|
+
if (onDataLoad) {
|
|
69
|
+
onDataLoad(tileJSON, { propName: 'data', layer: this });
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
else if (data && typeof data === 'object' && 'tilejson' in data) {
|
|
73
|
+
tileJSON = data;
|
|
74
|
+
}
|
|
75
|
+
if (tileJSON) {
|
|
76
|
+
data = tileJSON.tiles;
|
|
77
|
+
}
|
|
78
|
+
this.setState({ data, tileJSON });
|
|
79
|
+
}
|
|
80
|
+
_getTilesetOptions() {
|
|
81
|
+
const opts = super._getTilesetOptions();
|
|
82
|
+
const tileJSON = this.state.tileJSON;
|
|
83
|
+
const { minZoom, maxZoom } = this.props;
|
|
84
|
+
if (tileJSON) {
|
|
85
|
+
if (Number.isFinite(tileJSON.minzoom) && tileJSON.minzoom > minZoom) {
|
|
86
|
+
opts.minZoom = tileJSON.minzoom;
|
|
87
|
+
}
|
|
88
|
+
if (Number.isFinite(tileJSON.maxzoom) &&
|
|
89
|
+
(!Number.isFinite(maxZoom) || tileJSON.maxzoom < maxZoom)) {
|
|
90
|
+
opts.maxZoom = tileJSON.maxzoom;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return opts;
|
|
94
|
+
}
|
|
95
|
+
/* eslint-disable complexity */
|
|
96
|
+
renderLayers() {
|
|
97
|
+
if (!this.state?.data)
|
|
98
|
+
return null;
|
|
99
|
+
return super.renderLayers();
|
|
100
|
+
}
|
|
101
|
+
getTileData(loadProps) {
|
|
102
|
+
const { data, binary } = this.state;
|
|
103
|
+
const { index, signal } = loadProps;
|
|
104
|
+
const url = getURLFromTemplate(data, loadProps);
|
|
105
|
+
if (!url) {
|
|
106
|
+
return Promise.reject('Invalid URL');
|
|
107
|
+
}
|
|
108
|
+
let loadOptions = this.getLoadOptions();
|
|
109
|
+
const { fetch } = this.props;
|
|
110
|
+
loadOptions = {
|
|
111
|
+
...loadOptions,
|
|
112
|
+
mimeType: 'application/x-protobuf',
|
|
113
|
+
mvt: {
|
|
114
|
+
...loadOptions?.mvt,
|
|
115
|
+
coordinates: this.context.viewport.resolution ? 'wgs84' : 'local',
|
|
116
|
+
tileIndex: index
|
|
117
|
+
// Local worker debug
|
|
118
|
+
// workerUrl: `modules/mvt/dist/mvt-loader.worker.js`
|
|
119
|
+
// Set worker to null to skip web workers
|
|
120
|
+
// workerUrl: null
|
|
121
|
+
},
|
|
122
|
+
gis: binary ? { format: 'binary' } : {}
|
|
123
|
+
};
|
|
124
|
+
return fetch(url, { propName: 'data', layer: this, loadOptions, signal });
|
|
125
|
+
}
|
|
126
|
+
renderSubLayers(props) {
|
|
127
|
+
const { x, y, z } = props.tile.index;
|
|
128
|
+
const worldScale = Math.pow(2, z);
|
|
129
|
+
const xScale = WORLD_SIZE / worldScale;
|
|
130
|
+
const yScale = -xScale;
|
|
131
|
+
const xOffset = (WORLD_SIZE * x) / worldScale;
|
|
132
|
+
const yOffset = WORLD_SIZE * (1 - y / worldScale);
|
|
133
|
+
const modelMatrix = new Matrix4().scale([xScale, yScale, 1]);
|
|
134
|
+
props.autoHighlight = false;
|
|
135
|
+
if (!this.context.viewport.resolution) {
|
|
136
|
+
props.modelMatrix = modelMatrix;
|
|
137
|
+
props.coordinateOrigin = [xOffset, yOffset, 0];
|
|
138
|
+
props.coordinateSystem = COORDINATE_SYSTEM.CARTESIAN;
|
|
139
|
+
props.extensions = [...(props.extensions || []), new ClipExtension()];
|
|
140
|
+
}
|
|
141
|
+
const subLayers = super.renderSubLayers(props);
|
|
142
|
+
if (this.state.binary && !(subLayers instanceof GeoJsonLayer)) {
|
|
143
|
+
log.warn('renderSubLayers() must return GeoJsonLayer when using binary:true')();
|
|
144
|
+
}
|
|
145
|
+
return subLayers;
|
|
146
|
+
}
|
|
147
|
+
_updateAutoHighlight(info) {
|
|
148
|
+
const { uniqueIdProperty } = this.props;
|
|
149
|
+
const { hoveredFeatureId, hoveredFeatureLayerName } = this.state;
|
|
150
|
+
const hoveredFeature = info.object;
|
|
151
|
+
let newHoveredFeatureId = null;
|
|
152
|
+
let newHoveredFeatureLayerName = null;
|
|
153
|
+
if (hoveredFeature) {
|
|
154
|
+
newHoveredFeatureId = getFeatureUniqueId(hoveredFeature, uniqueIdProperty);
|
|
155
|
+
newHoveredFeatureLayerName = getFeatureLayerName(hoveredFeature);
|
|
156
|
+
}
|
|
157
|
+
let { highlightColor } = this.props;
|
|
158
|
+
if (typeof highlightColor === 'function') {
|
|
159
|
+
highlightColor = highlightColor(info);
|
|
160
|
+
}
|
|
161
|
+
if (hoveredFeatureId !== newHoveredFeatureId ||
|
|
162
|
+
hoveredFeatureLayerName !== newHoveredFeatureLayerName) {
|
|
163
|
+
this.setState({
|
|
164
|
+
highlightColor,
|
|
165
|
+
hoveredFeatureId: newHoveredFeatureId,
|
|
166
|
+
hoveredFeatureLayerName: newHoveredFeatureLayerName
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
getPickingInfo(params) {
|
|
171
|
+
const info = super.getPickingInfo(params);
|
|
172
|
+
const isWGS84 = Boolean(this.context.viewport.resolution);
|
|
173
|
+
if (this.state.binary && info.index !== -1) {
|
|
174
|
+
const { data } = params.sourceLayer.props;
|
|
175
|
+
info.object = binaryToGeojson(data, {
|
|
176
|
+
globalFeatureId: info.index
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
if (info.object && !isWGS84) {
|
|
180
|
+
info.object = transformTileCoordsToWGS84(info.object, info.tile.bbox, // eslint-disable-line
|
|
181
|
+
this.context.viewport);
|
|
182
|
+
}
|
|
183
|
+
return info;
|
|
184
|
+
}
|
|
185
|
+
getSubLayerPropsByTile(tile) {
|
|
186
|
+
return {
|
|
187
|
+
highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
|
|
188
|
+
highlightColor: this.state.highlightColor
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
getHighlightedObjectIndex(tile) {
|
|
192
|
+
const { hoveredFeatureId, hoveredFeatureLayerName, binary } = this.state;
|
|
193
|
+
const { uniqueIdProperty, highlightedFeatureId } = this.props;
|
|
194
|
+
const data = tile.content;
|
|
195
|
+
const isHighlighted = isFeatureIdDefined(highlightedFeatureId);
|
|
196
|
+
const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId) || isHighlighted;
|
|
197
|
+
if (!isFeatureIdPresent) {
|
|
198
|
+
return -1;
|
|
199
|
+
}
|
|
200
|
+
const featureIdToHighlight = isHighlighted ? highlightedFeatureId : hoveredFeatureId;
|
|
201
|
+
// Iterable data
|
|
202
|
+
if (Array.isArray(data)) {
|
|
203
|
+
return data.findIndex(feature => {
|
|
204
|
+
const isMatchingId = getFeatureUniqueId(feature, uniqueIdProperty) === featureIdToHighlight;
|
|
205
|
+
const isMatchingLayer = isHighlighted || getFeatureLayerName(feature) === hoveredFeatureLayerName;
|
|
206
|
+
return isMatchingId && isMatchingLayer;
|
|
207
|
+
});
|
|
208
|
+
// Non-iterable data
|
|
209
|
+
}
|
|
210
|
+
else if (data && binary) {
|
|
211
|
+
// Get the feature index of the selected item to highlight
|
|
212
|
+
return findIndexBinary(data, uniqueIdProperty, featureIdToHighlight, isHighlighted ? '' : hoveredFeatureLayerName);
|
|
213
|
+
}
|
|
214
|
+
return -1;
|
|
215
|
+
}
|
|
216
|
+
_pickObjects(maxObjects) {
|
|
217
|
+
const { deck, viewport } = this.context;
|
|
218
|
+
const width = viewport.width;
|
|
219
|
+
const height = viewport.height;
|
|
220
|
+
const x = viewport.x;
|
|
221
|
+
const y = viewport.y;
|
|
222
|
+
const layerIds = [this.id];
|
|
223
|
+
return deck.pickObjects({ x, y, width, height, layerIds, maxObjects });
|
|
224
|
+
}
|
|
225
|
+
/** Get the rendered features in the current viewport. */
|
|
226
|
+
getRenderedFeatures(maxFeatures = null) {
|
|
227
|
+
const features = this._pickObjects(maxFeatures);
|
|
228
|
+
const featureCache = new Set();
|
|
229
|
+
const renderedFeatures = [];
|
|
230
|
+
for (const f of features) {
|
|
231
|
+
const featureId = getFeatureUniqueId(f.object, this.props.uniqueIdProperty);
|
|
232
|
+
if (featureId === undefined) {
|
|
233
|
+
// we have no id for the feature, we just add to the list
|
|
234
|
+
renderedFeatures.push(f.object);
|
|
235
|
+
}
|
|
236
|
+
else if (!featureCache.has(featureId)) {
|
|
237
|
+
// Add removing duplicates
|
|
238
|
+
featureCache.add(featureId);
|
|
239
|
+
renderedFeatures.push(f.object);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
return renderedFeatures;
|
|
243
|
+
}
|
|
244
|
+
_setWGS84PropertyForTiles() {
|
|
245
|
+
const propName = 'dataInWGS84';
|
|
246
|
+
const tileset = this.state.tileset;
|
|
247
|
+
// @ts-expect-error selectedTiles are always initialized when tile is being processed
|
|
248
|
+
tileset.selectedTiles.forEach((tile) => {
|
|
249
|
+
if (!tile.hasOwnProperty(propName)) {
|
|
250
|
+
// eslint-disable-next-line accessor-pairs
|
|
251
|
+
Object.defineProperty(tile, propName, {
|
|
252
|
+
get: () => {
|
|
253
|
+
// Still loading or encountered an error
|
|
254
|
+
if (!tile.content) {
|
|
255
|
+
return null;
|
|
256
|
+
}
|
|
257
|
+
if (this.state.binary && Array.isArray(tile.content) && !tile.content.length) {
|
|
258
|
+
// TODO: @loaders.gl/mvt returns [] when no content. It should return a valid empty binary.
|
|
259
|
+
// https://github.com/visgl/loaders.gl/pull/1137
|
|
260
|
+
return [];
|
|
261
|
+
}
|
|
262
|
+
const { bbox } = tile;
|
|
263
|
+
if (tile._contentWGS84 === undefined && isGeoBoundingBox(bbox)) {
|
|
264
|
+
// Create a cache to transform only once
|
|
265
|
+
const content = this.state.binary ? binaryToGeojson(tile.content) : tile.content;
|
|
266
|
+
tile._contentWGS84 = content.map(feature => transformTileCoordsToWGS84(feature, bbox, this.context.viewport));
|
|
267
|
+
}
|
|
268
|
+
return tile._contentWGS84;
|
|
269
|
+
}
|
|
270
|
+
});
|
|
271
|
+
}
|
|
272
|
+
});
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
function getFeatureUniqueId(feature, uniqueIdProperty) {
|
|
276
|
+
if (feature.properties && uniqueIdProperty) {
|
|
277
|
+
return feature.properties[uniqueIdProperty];
|
|
278
|
+
}
|
|
279
|
+
if ('id' in feature) {
|
|
280
|
+
return feature.id;
|
|
281
|
+
}
|
|
282
|
+
return undefined;
|
|
283
|
+
}
|
|
284
|
+
function getFeatureLayerName(feature) {
|
|
285
|
+
return feature.properties?.layerName || null;
|
|
286
|
+
}
|
|
287
|
+
function isFeatureIdDefined(value) {
|
|
288
|
+
return value !== undefined && value !== null && value !== '';
|
|
289
|
+
}
|
|
290
|
+
function transformTileCoordsToWGS84(object, bbox, viewport) {
|
|
291
|
+
const feature = {
|
|
292
|
+
...object,
|
|
293
|
+
geometry: {
|
|
294
|
+
type: object.geometry.type
|
|
295
|
+
}
|
|
296
|
+
};
|
|
297
|
+
// eslint-disable-next-line accessor-pairs
|
|
298
|
+
Object.defineProperty(feature.geometry, 'coordinates', {
|
|
299
|
+
get: () => {
|
|
300
|
+
const wgs84Geom = transform(object.geometry, bbox, viewport);
|
|
301
|
+
return wgs84Geom.coordinates;
|
|
302
|
+
}
|
|
303
|
+
});
|
|
304
|
+
return feature;
|
|
305
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import GeoCellLayer from "../geo-cell-layer/GeoCellLayer.js";
|
|
2
|
+
import { getQuadkeyPolygon } from "./quadkey-utils.js";
|
|
3
|
+
const defaultProps = {
|
|
4
|
+
getQuadkey: { type: 'accessor', value: (d) => d.quadkey }
|
|
5
|
+
};
|
|
6
|
+
/** Render filled and/or stroked polygons based on the [Quadkey](https://towardsdatascience.com/geospatial-indexing-with-quadkeys-d933dff01496) geospatial indexing system. */
|
|
7
|
+
export default class QuadkeyLayer extends GeoCellLayer {
|
|
8
|
+
static { this.layerName = 'QuadkeyLayer'; }
|
|
9
|
+
static { this.defaultProps = defaultProps; }
|
|
10
|
+
indexToBounds() {
|
|
11
|
+
const { data, extruded, getQuadkey } = this.props;
|
|
12
|
+
// To avoid z-fighting reduce polygon footprint when extruding
|
|
13
|
+
const coverage = extruded ? 0.99 : 1;
|
|
14
|
+
return {
|
|
15
|
+
data,
|
|
16
|
+
_normalize: false,
|
|
17
|
+
positionFormat: 'XY',
|
|
18
|
+
getPolygon: (x, objectInfo) => getQuadkeyPolygon(getQuadkey(x, objectInfo), coverage),
|
|
19
|
+
updateTriggers: { getPolygon: coverage }
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
}
|