@deck.gl/geo-layers 8.8.0-alpha.4 → 8.8.0-beta.1
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 +32610 -62978
- package/dist/es5/geo-cell-layer/GeoCellLayer.js.map +1 -1
- package/dist/es5/index.js +8 -0
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/mvt-layer/coordinate-transform.js.map +1 -1
- package/dist/es5/mvt-layer/find-index-binary.js +7 -5
- package/dist/es5/mvt-layer/find-index-binary.js.map +1 -1
- package/dist/es5/mvt-layer/mvt-layer.js +35 -25
- package/dist/es5/mvt-layer/mvt-layer.js.map +1 -1
- package/dist/es5/quadkey-layer/quadkey-layer.js.map +1 -1
- package/dist/es5/tile-layer/tile-2d-header.js.map +1 -1
- package/dist/es5/tile-layer/tile-layer.js +0 -4
- package/dist/es5/tile-layer/tile-layer.js.map +1 -1
- package/dist/es5/tile-layer/tileset-2d.js +1 -6
- package/dist/es5/tile-layer/tileset-2d.js.map +1 -1
- package/dist/es5/tile-layer/utils.js +5 -0
- package/dist/es5/tile-layer/utils.js.map +1 -1
- package/dist/es5/trips-layer/trips-layer.js +6 -6
- package/dist/es5/trips-layer/trips-layer.js.map +1 -1
- package/dist/esm/geo-cell-layer/GeoCellLayer.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mvt-layer/coordinate-transform.js.map +1 -1
- package/dist/esm/mvt-layer/find-index-binary.js +1 -1
- package/dist/esm/mvt-layer/find-index-binary.js.map +1 -1
- package/dist/esm/mvt-layer/mvt-layer.js +40 -33
- package/dist/esm/mvt-layer/mvt-layer.js.map +1 -1
- package/dist/esm/quadkey-layer/quadkey-layer.js.map +1 -1
- package/dist/esm/tile-layer/tile-2d-header.js.map +1 -1
- package/dist/esm/tile-layer/tile-layer.js +1 -5
- package/dist/esm/tile-layer/tile-layer.js.map +1 -1
- package/dist/esm/tile-layer/tileset-2d.js +1 -5
- package/dist/esm/tile-layer/tileset-2d.js.map +1 -1
- package/dist/esm/tile-layer/utils.js +3 -0
- package/dist/esm/tile-layer/utils.js.map +1 -1
- package/dist/esm/trips-layer/trips-layer.js +7 -4
- package/dist/esm/trips-layer/trips-layer.js.map +1 -1
- package/dist.min.js +2 -2
- package/package.json +15 -12
- package/src/geo-cell-layer/GeoCellLayer.ts +3 -2
- package/src/index.ts +4 -1
- package/src/mvt-layer/{coordinate-transform.js → coordinate-transform.ts} +10 -8
- package/src/mvt-layer/{find-index-binary.js → find-index-binary.ts} +41 -10
- package/src/mvt-layer/{mvt-layer.js → mvt-layer.ts} +143 -58
- package/src/quadkey-layer/quadkey-layer.ts +7 -6
- package/src/tile-layer/tile-2d-header.ts +15 -14
- package/src/tile-layer/tile-layer.ts +29 -30
- package/src/tile-layer/tileset-2d.ts +14 -14
- package/src/tile-layer/types.ts +5 -1
- package/src/tile-layer/utils.ts +10 -1
- package/src/trips-layer/{trips-layer.js → trips-layer.ts} +39 -8
- package/typed/geo-cell-layer/GeoCellLayer.d.ts +47 -0
- package/typed/geo-cell-layer/GeoCellLayer.d.ts.map +1 -0
- package/typed/geo-cell-layer/GeoCellLayer.js +49 -0
- package/typed/great-circle-layer/great-circle-layer.d.ts +16 -0
- package/typed/great-circle-layer/great-circle-layer.d.ts.map +1 -0
- package/typed/great-circle-layer/great-circle-layer.js +29 -0
- package/typed/h3-layers/h3-cluster-layer.d.ts +16 -0
- package/typed/h3-layers/h3-cluster-layer.d.ts.map +1 -0
- package/typed/h3-layers/h3-cluster-layer.js +33 -0
- package/typed/h3-layers/h3-hexagon-layer.d.ts +107 -0
- package/typed/h3-layers/h3-hexagon-layer.d.ts.map +1 -0
- package/typed/h3-layers/h3-hexagon-layer.js +251 -0
- package/typed/index.d.ts +19 -0
- package/typed/index.d.ts.map +1 -0
- package/typed/index.js +33 -0
- package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts +3 -0
- package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts.map +1 -0
- package/typed/mesh-layer/mesh-layer-fragment.glsl.js +55 -0
- package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts +3 -0
- package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts.map +1 -0
- package/typed/mesh-layer/mesh-layer-vertex.glsl.js +80 -0
- package/typed/mesh-layer/mesh-layer.d.ts +27 -0
- package/typed/mesh-layer/mesh-layer.d.ts.map +1 -0
- package/typed/mesh-layer/mesh-layer.js +110 -0
- package/typed/mvt-layer/coordinate-transform.d.ts +4 -0
- package/typed/mvt-layer/coordinate-transform.d.ts.map +1 -0
- package/typed/mvt-layer/coordinate-transform.js +41 -0
- package/typed/mvt-layer/find-index-binary.d.ts +12 -0
- package/typed/mvt-layer/find-index-binary.d.ts.map +1 -0
- package/typed/mvt-layer/find-index-binary.js +96 -0
- package/typed/mvt-layer/mvt-layer.d.ts +102 -0
- package/typed/mvt-layer/mvt-layer.d.ts.map +1 -0
- package/typed/mvt-layer/mvt-layer.js +297 -0
- package/typed/package.json +6 -0
- package/typed/quadkey-layer/quadkey-layer.d.ts +20 -0
- package/typed/quadkey-layer/quadkey-layer.d.ts.map +1 -0
- package/typed/quadkey-layer/quadkey-layer.js +18 -0
- package/typed/quadkey-layer/quadkey-utils.d.ts +3 -0
- package/typed/quadkey-layer/quadkey-utils.d.ts.map +1 -0
- package/typed/quadkey-layer/quadkey-utils.js +26 -0
- package/typed/s2-layer/s2-geometry.d.ts +11 -0
- package/typed/s2-layer/s2-geometry.d.ts.map +1 -0
- package/typed/s2-layer/s2-geometry.js +123 -0
- package/typed/s2-layer/s2-layer.d.ts +16 -0
- package/typed/s2-layer/s2-layer.d.ts.map +1 -0
- package/typed/s2-layer/s2-layer.js +37 -0
- package/typed/s2-layer/s2-utils.d.ts +10 -0
- package/typed/s2-layer/s2-utils.d.ts.map +1 -0
- package/typed/s2-layer/s2-utils.js +88 -0
- package/typed/terrain-layer/terrain-layer.d.ts +28 -0
- package/typed/terrain-layer/terrain-layer.d.ts.map +1 -0
- package/typed/terrain-layer/terrain-layer.js +226 -0
- package/typed/tile-3d-layer/tile-3d-layer.d.ts +70 -0
- package/typed/tile-3d-layer/tile-3d-layer.d.ts.map +1 -0
- package/typed/tile-3d-layer/tile-3d-layer.js +294 -0
- package/typed/tile-layer/tile-2d-header.d.ts +40 -0
- package/typed/tile-layer/tile-2d-header.d.ts.map +1 -0
- package/typed/tile-layer/tile-2d-header.js +113 -0
- package/typed/tile-layer/tile-2d-traversal.d.ts +4 -0
- package/typed/tile-layer/tile-2d-traversal.d.ts.map +1 -0
- package/typed/tile-layer/tile-2d-traversal.js +181 -0
- package/typed/tile-layer/tile-layer.d.ts +118 -0
- package/typed/tile-layer/tile-layer.d.ts.map +1 -0
- package/typed/tile-layer/tile-layer.js +192 -0
- package/typed/tile-layer/tileset-2d.d.ts +87 -0
- package/typed/tile-layer/tileset-2d.d.ts.map +1 -0
- package/typed/tile-layer/tileset-2d.js +399 -0
- package/typed/tile-layer/types.d.ts +29 -0
- package/typed/tile-layer/types.d.ts.map +1 -0
- package/typed/tile-layer/types.js +1 -0
- package/typed/tile-layer/utils.d.ts +37 -0
- package/typed/tile-layer/utils.d.ts.map +1 -0
- package/typed/tile-layer/utils.js +197 -0
- package/typed/trips-layer/trips-layer.d.ts +36 -0
- package/typed/trips-layer/trips-layer.d.ts.map +1 -0
- package/typed/trips-layer/trips-layer.js +92 -0
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
declare class Tile3DLayer extends CompositeLayer<any> {
|
|
2
|
+
constructor(...propObjects: Partial<any>[]);
|
|
3
|
+
_loadTileset(tilesetUrl: any): Promise<void>;
|
|
4
|
+
_onTileLoad(tileHeader: any): void;
|
|
5
|
+
_onTileUnload(tileHeader: any): void;
|
|
6
|
+
_updateTileset(viewports: any): void;
|
|
7
|
+
_getSubLayer(tileHeader: any, oldLayer: any): PointCloudLayer<any, {}> | ScenegraphLayer<any, {}> | _MeshLayer | null;
|
|
8
|
+
_makePointCloudLayer(tileHeader: any, oldLayer: any): PointCloudLayer<any, {}> | null;
|
|
9
|
+
_make3DModelLayer(tileHeader: any): ScenegraphLayer<any, {}>;
|
|
10
|
+
_makeSimpleMeshLayer(tileHeader: any, oldLayer: any): _MeshLayer;
|
|
11
|
+
}
|
|
12
|
+
declare namespace Tile3DLayer {
|
|
13
|
+
export const layerName: string;
|
|
14
|
+
export { defaultProps };
|
|
15
|
+
}
|
|
16
|
+
export default Tile3DLayer;
|
|
17
|
+
import { CompositeLayer } from '@deck.gl/core/typed';
|
|
18
|
+
import { PointCloudLayer } from '@deck.gl/layers/typed';
|
|
19
|
+
import { ScenegraphLayer } from '@deck.gl/mesh-layers/typed';
|
|
20
|
+
import { default as _MeshLayer } from "../mesh-layer/mesh-layer";
|
|
21
|
+
declare namespace defaultProps {
|
|
22
|
+
export namespace getPointColor {
|
|
23
|
+
const type: string;
|
|
24
|
+
const value: number[];
|
|
25
|
+
}
|
|
26
|
+
export const pointSize: number;
|
|
27
|
+
export const data: null;
|
|
28
|
+
export { Tiles3DLoader as loader };
|
|
29
|
+
export namespace onTilesetLoad {
|
|
30
|
+
const type_1: string;
|
|
31
|
+
export { type_1 as type };
|
|
32
|
+
export function value_1(tileset3d: any): void;
|
|
33
|
+
export { value_1 as value };
|
|
34
|
+
export const compare: boolean;
|
|
35
|
+
}
|
|
36
|
+
export namespace onTileLoad {
|
|
37
|
+
const type_2: string;
|
|
38
|
+
export { type_2 as type };
|
|
39
|
+
export function value_2(tileHeader: any): void;
|
|
40
|
+
export { value_2 as value };
|
|
41
|
+
const compare_1: boolean;
|
|
42
|
+
export { compare_1 as compare };
|
|
43
|
+
}
|
|
44
|
+
export namespace onTileUnload {
|
|
45
|
+
const type_3: string;
|
|
46
|
+
export { type_3 as type };
|
|
47
|
+
export function value_3(tileHeader: any): void;
|
|
48
|
+
export { value_3 as value };
|
|
49
|
+
const compare_2: boolean;
|
|
50
|
+
export { compare_2 as compare };
|
|
51
|
+
}
|
|
52
|
+
export namespace onTileError {
|
|
53
|
+
const type_4: string;
|
|
54
|
+
export { type_4 as type };
|
|
55
|
+
export function value_4(tile: any, message: any, url: any): void;
|
|
56
|
+
export { value_4 as value };
|
|
57
|
+
const compare_3: boolean;
|
|
58
|
+
export { compare_3 as compare };
|
|
59
|
+
}
|
|
60
|
+
export namespace _getMeshColor {
|
|
61
|
+
const type_5: string;
|
|
62
|
+
export { type_5 as type };
|
|
63
|
+
export function value_5(tileHeader: any): number[];
|
|
64
|
+
export { value_5 as value };
|
|
65
|
+
const compare_4: boolean;
|
|
66
|
+
export { compare_4 as compare };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
import { Tiles3DLoader } from "@loaders.gl/3d-tiles";
|
|
70
|
+
//# sourceMappingURL=tile-3d-layer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile-3d-layer.d.ts","sourceRoot":"","sources":["../../src/tile-3d-layer/tile-3d-layer.js"],"names":[],"mappings":"AA4BA;IAboC,4CAG5B;IA4FN,6CAqCC;IAED,mCAKC;IAED,qCAIC;IAED,qCAaC;IAED,sHAeC;IAED,sFAuCC;IAED,6DA0BC;IAED,iEAyCC;CA4BF;;;;;;;;;;;;;;;;;;;;;QAvT0C,8CAAe;;;;;;;QAClB,+CAAgB;;;;;;;;QACd,+CAAgB;;;;;;;;QACjB,iEAA0B;;;;;;;;QACxB,mDAA6B"}
|
|
@@ -0,0 +1,294 @@
|
|
|
1
|
+
import GL from '@luma.gl/constants';
|
|
2
|
+
import { Geometry } from '@luma.gl/core';
|
|
3
|
+
import { COORDINATE_SYSTEM, CompositeLayer } from '@deck.gl/core';
|
|
4
|
+
import { PointCloudLayer } from '@deck.gl/layers';
|
|
5
|
+
import { ScenegraphLayer } from '@deck.gl/mesh-layers';
|
|
6
|
+
import { default as _MeshLayer } from '../mesh-layer/mesh-layer';
|
|
7
|
+
import { log } from '@deck.gl/core';
|
|
8
|
+
import { load } from '@loaders.gl/core';
|
|
9
|
+
import { Tileset3D, TILE_TYPE } from '@loaders.gl/tiles';
|
|
10
|
+
import { Tiles3DLoader } from '@loaders.gl/3d-tiles';
|
|
11
|
+
const SINGLE_DATA = [0];
|
|
12
|
+
const defaultProps = {
|
|
13
|
+
getPointColor: { type: 'accessor', value: [0, 0, 0, 255] },
|
|
14
|
+
pointSize: 1.0,
|
|
15
|
+
data: null,
|
|
16
|
+
loader: Tiles3DLoader,
|
|
17
|
+
onTilesetLoad: { type: 'function', value: tileset3d => { }, compare: false },
|
|
18
|
+
onTileLoad: { type: 'function', value: tileHeader => { }, compare: false },
|
|
19
|
+
onTileUnload: { type: 'function', value: tileHeader => { }, compare: false },
|
|
20
|
+
onTileError: { type: 'function', value: (tile, message, url) => { }, compare: false },
|
|
21
|
+
_getMeshColor: { type: 'function', value: tileHeader => [255, 255, 255], compare: false }
|
|
22
|
+
};
|
|
23
|
+
export default class Tile3DLayer extends CompositeLayer {
|
|
24
|
+
initializeState() {
|
|
25
|
+
if ('onTileLoadFail' in this.props) {
|
|
26
|
+
log.removed('onTileLoadFail', 'onTileError')();
|
|
27
|
+
}
|
|
28
|
+
// prop verification
|
|
29
|
+
this.state = {
|
|
30
|
+
layerMap: {},
|
|
31
|
+
tileset3d: null,
|
|
32
|
+
activeViewports: {},
|
|
33
|
+
lastUpdatedViewports: null
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
get isLoaded() {
|
|
37
|
+
const { tileset3d } = this.state;
|
|
38
|
+
return tileset3d && tileset3d.isLoaded();
|
|
39
|
+
}
|
|
40
|
+
shouldUpdateState({ changeFlags }) {
|
|
41
|
+
return changeFlags.somethingChanged;
|
|
42
|
+
}
|
|
43
|
+
updateState({ props, oldProps, changeFlags }) {
|
|
44
|
+
if (props.data && props.data !== oldProps.data) {
|
|
45
|
+
this._loadTileset(props.data);
|
|
46
|
+
}
|
|
47
|
+
if (changeFlags.viewportChanged) {
|
|
48
|
+
const { activeViewports } = this.state;
|
|
49
|
+
const viewportsNumber = Object.keys(activeViewports).length;
|
|
50
|
+
if (viewportsNumber) {
|
|
51
|
+
this._updateTileset(activeViewports);
|
|
52
|
+
this.state.lastUpdatedViewports = activeViewports;
|
|
53
|
+
this.state.activeViewports = {};
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (changeFlags.propsChanged) {
|
|
57
|
+
const { layerMap } = this.state;
|
|
58
|
+
for (const key in layerMap) {
|
|
59
|
+
layerMap[key].needsUpdate = true;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
activateViewport(viewport) {
|
|
64
|
+
const { activeViewports, lastUpdatedViewports } = this.state;
|
|
65
|
+
this.internalState.viewport = viewport;
|
|
66
|
+
activeViewports[viewport.id] = viewport;
|
|
67
|
+
const lastViewport = lastUpdatedViewports?.[viewport.id];
|
|
68
|
+
if (!lastViewport || !viewport.equals(lastViewport)) {
|
|
69
|
+
this.setChangeFlags({ viewportChanged: true });
|
|
70
|
+
this.setNeedsUpdate();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
getPickingInfo({ info, sourceLayer }) {
|
|
74
|
+
const { layerMap } = this.state;
|
|
75
|
+
const layerId = sourceLayer && sourceLayer.id;
|
|
76
|
+
if (layerId) {
|
|
77
|
+
// layerId: this.id-[scenegraph|pointcloud]-tileId
|
|
78
|
+
const substr = layerId.substring(this.id.length + 1);
|
|
79
|
+
const tileId = substr.substring(substr.indexOf('-') + 1);
|
|
80
|
+
info.object = layerMap[tileId] && layerMap[tileId].tile;
|
|
81
|
+
}
|
|
82
|
+
return info;
|
|
83
|
+
}
|
|
84
|
+
filterSubLayer({ layer, viewport }) {
|
|
85
|
+
const { tile } = layer.props;
|
|
86
|
+
const { id: viewportId } = viewport;
|
|
87
|
+
return tile.selected && tile.viewportIds.includes(viewportId);
|
|
88
|
+
}
|
|
89
|
+
_updateAutoHighlight(info) {
|
|
90
|
+
if (info.sourceLayer) {
|
|
91
|
+
info.sourceLayer.updateAutoHighlight(info);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
async _loadTileset(tilesetUrl) {
|
|
95
|
+
const { loadOptions = {} } = this.props;
|
|
96
|
+
// TODO: deprecate `loader` in v9.0
|
|
97
|
+
let loader = this.props.loader || this.props.loaders;
|
|
98
|
+
if (Array.isArray(loader)) {
|
|
99
|
+
loader = loader[0];
|
|
100
|
+
}
|
|
101
|
+
const options = { loadOptions: { ...loadOptions } };
|
|
102
|
+
if (loader.preload) {
|
|
103
|
+
const preloadOptions = await loader.preload(tilesetUrl, loadOptions);
|
|
104
|
+
if (preloadOptions.headers) {
|
|
105
|
+
options.loadOptions.fetch = {
|
|
106
|
+
...options.loadOptions.fetch,
|
|
107
|
+
headers: preloadOptions.headers
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
Object.assign(options, preloadOptions);
|
|
111
|
+
}
|
|
112
|
+
const tilesetJson = await load(tilesetUrl, loader, options.loadOptions);
|
|
113
|
+
const tileset3d = new Tileset3D(tilesetJson, {
|
|
114
|
+
onTileLoad: this._onTileLoad.bind(this),
|
|
115
|
+
onTileUnload: this._onTileUnload.bind(this),
|
|
116
|
+
onTileLoadFail: this.props.onTileError,
|
|
117
|
+
...options
|
|
118
|
+
});
|
|
119
|
+
this.setState({
|
|
120
|
+
tileset3d,
|
|
121
|
+
layerMap: {}
|
|
122
|
+
});
|
|
123
|
+
this._updateTileset(this.state.activeViewports);
|
|
124
|
+
this.props.onTilesetLoad(tileset3d);
|
|
125
|
+
}
|
|
126
|
+
_onTileLoad(tileHeader) {
|
|
127
|
+
const { lastUpdatedViewports } = this.state;
|
|
128
|
+
this.props.onTileLoad(tileHeader);
|
|
129
|
+
this._updateTileset(lastUpdatedViewports);
|
|
130
|
+
this.setNeedsUpdate();
|
|
131
|
+
}
|
|
132
|
+
_onTileUnload(tileHeader) {
|
|
133
|
+
// Was cleaned up from tileset cache. We no longer need to track it.
|
|
134
|
+
delete this.state.layerMap[tileHeader.id];
|
|
135
|
+
this.props.onTileUnload(tileHeader);
|
|
136
|
+
}
|
|
137
|
+
_updateTileset(viewports) {
|
|
138
|
+
const { tileset3d } = this.state;
|
|
139
|
+
const { timeline } = this.context;
|
|
140
|
+
const viewportsNumber = Object.keys(viewports).length;
|
|
141
|
+
if (!timeline || !viewportsNumber || !tileset3d) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
tileset3d.selectTiles(Object.values(viewports)).then(frameNumber => {
|
|
145
|
+
const tilesetChanged = this.state.frameNumber !== frameNumber;
|
|
146
|
+
if (tilesetChanged) {
|
|
147
|
+
this.setState({ frameNumber });
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
_getSubLayer(tileHeader, oldLayer) {
|
|
152
|
+
if (!tileHeader.content) {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
switch (tileHeader.type) {
|
|
156
|
+
case TILE_TYPE.POINTCLOUD:
|
|
157
|
+
return this._makePointCloudLayer(tileHeader, oldLayer);
|
|
158
|
+
case TILE_TYPE.SCENEGRAPH:
|
|
159
|
+
return this._make3DModelLayer(tileHeader, oldLayer);
|
|
160
|
+
case TILE_TYPE.MESH:
|
|
161
|
+
return this._makeSimpleMeshLayer(tileHeader, oldLayer);
|
|
162
|
+
default:
|
|
163
|
+
throw new Error(`Tile3DLayer: Failed to render layer of type ${tileHeader.content.type}`);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
_makePointCloudLayer(tileHeader, oldLayer) {
|
|
167
|
+
const { attributes, pointCount, constantRGBA, cartographicOrigin, modelMatrix } = tileHeader.content;
|
|
168
|
+
const { positions, normals, colors } = attributes;
|
|
169
|
+
if (!positions) {
|
|
170
|
+
return null;
|
|
171
|
+
}
|
|
172
|
+
const data = (oldLayer && oldLayer.props.data) || {
|
|
173
|
+
header: {
|
|
174
|
+
vertexCount: pointCount
|
|
175
|
+
},
|
|
176
|
+
attributes: {
|
|
177
|
+
POSITION: positions,
|
|
178
|
+
NORMAL: normals,
|
|
179
|
+
COLOR_0: colors
|
|
180
|
+
}
|
|
181
|
+
};
|
|
182
|
+
const { pointSize, getPointColor } = this.props;
|
|
183
|
+
const SubLayerClass = this.getSubLayerClass('pointcloud', PointCloudLayer);
|
|
184
|
+
return new SubLayerClass({
|
|
185
|
+
pointSize
|
|
186
|
+
}, this.getSubLayerProps({
|
|
187
|
+
id: 'pointcloud'
|
|
188
|
+
}), {
|
|
189
|
+
id: `${this.id}-pointcloud-${tileHeader.id}`,
|
|
190
|
+
tile: tileHeader,
|
|
191
|
+
data,
|
|
192
|
+
coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
|
|
193
|
+
coordinateOrigin: cartographicOrigin,
|
|
194
|
+
modelMatrix,
|
|
195
|
+
getColor: constantRGBA || getPointColor,
|
|
196
|
+
_offset: 0
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
_make3DModelLayer(tileHeader) {
|
|
200
|
+
const { gltf, instances, cartographicOrigin, modelMatrix } = tileHeader.content;
|
|
201
|
+
const SubLayerClass = this.getSubLayerClass('scenegraph', ScenegraphLayer);
|
|
202
|
+
return new SubLayerClass({
|
|
203
|
+
_lighting: 'pbr'
|
|
204
|
+
}, this.getSubLayerProps({
|
|
205
|
+
id: 'scenegraph'
|
|
206
|
+
}), {
|
|
207
|
+
id: `${this.id}-scenegraph-${tileHeader.id}`,
|
|
208
|
+
tile: tileHeader,
|
|
209
|
+
data: instances || SINGLE_DATA,
|
|
210
|
+
scenegraph: gltf,
|
|
211
|
+
coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
|
|
212
|
+
coordinateOrigin: cartographicOrigin,
|
|
213
|
+
modelMatrix,
|
|
214
|
+
getTransformMatrix: instance => instance.modelMatrix,
|
|
215
|
+
getPosition: [0, 0, 0],
|
|
216
|
+
_offset: 0
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
_makeSimpleMeshLayer(tileHeader, oldLayer) {
|
|
220
|
+
const content = tileHeader.content;
|
|
221
|
+
const { attributes, indices, modelMatrix, cartographicOrigin, coordinateSystem = COORDINATE_SYSTEM.METER_OFFSETS, material, featureIds } = content;
|
|
222
|
+
const { _getMeshColor } = this.props;
|
|
223
|
+
const geometry = (oldLayer && oldLayer.props.mesh) ||
|
|
224
|
+
new Geometry({
|
|
225
|
+
drawMode: GL.TRIANGLES,
|
|
226
|
+
attributes: getMeshGeometry(attributes),
|
|
227
|
+
indices
|
|
228
|
+
});
|
|
229
|
+
const SubLayerClass = this.getSubLayerClass('mesh', _MeshLayer);
|
|
230
|
+
return new SubLayerClass(this.getSubLayerProps({
|
|
231
|
+
id: 'mesh'
|
|
232
|
+
}), {
|
|
233
|
+
id: `${this.id}-mesh-${tileHeader.id}`,
|
|
234
|
+
tile: tileHeader,
|
|
235
|
+
mesh: geometry,
|
|
236
|
+
data: SINGLE_DATA,
|
|
237
|
+
getColor: _getMeshColor(tileHeader),
|
|
238
|
+
pbrMaterial: material,
|
|
239
|
+
modelMatrix,
|
|
240
|
+
coordinateOrigin: cartographicOrigin,
|
|
241
|
+
coordinateSystem,
|
|
242
|
+
featureIds,
|
|
243
|
+
_offset: 0
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
renderLayers() {
|
|
247
|
+
const { tileset3d, layerMap } = this.state;
|
|
248
|
+
if (!tileset3d) {
|
|
249
|
+
return null;
|
|
250
|
+
}
|
|
251
|
+
return tileset3d.tiles
|
|
252
|
+
.map(tile => {
|
|
253
|
+
const layerCache = (layerMap[tile.id] = layerMap[tile.id] || { tile });
|
|
254
|
+
let { layer } = layerCache;
|
|
255
|
+
if (tile.selected) {
|
|
256
|
+
// render selected tiles
|
|
257
|
+
if (!layer) {
|
|
258
|
+
// create layer
|
|
259
|
+
layer = this._getSubLayer(tile);
|
|
260
|
+
}
|
|
261
|
+
else if (layerCache.needsUpdate) {
|
|
262
|
+
// props have changed, rerender layer
|
|
263
|
+
layer = this._getSubLayer(tile, layer);
|
|
264
|
+
layerCache.needsUpdate = false;
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
layerCache.layer = layer;
|
|
268
|
+
return layer;
|
|
269
|
+
})
|
|
270
|
+
.filter(Boolean);
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
function getMeshGeometry(contentAttributes) {
|
|
274
|
+
const attributes = {};
|
|
275
|
+
attributes.positions = {
|
|
276
|
+
...contentAttributes.positions,
|
|
277
|
+
value: new Float32Array(contentAttributes.positions.value)
|
|
278
|
+
};
|
|
279
|
+
if (contentAttributes.normals) {
|
|
280
|
+
attributes.normals = contentAttributes.normals;
|
|
281
|
+
}
|
|
282
|
+
if (contentAttributes.texCoords) {
|
|
283
|
+
attributes.texCoords = contentAttributes.texCoords;
|
|
284
|
+
}
|
|
285
|
+
if (contentAttributes.colors) {
|
|
286
|
+
attributes.colors = contentAttributes.colors;
|
|
287
|
+
}
|
|
288
|
+
if (contentAttributes.uvRegions) {
|
|
289
|
+
attributes.uvRegions = contentAttributes.uvRegions;
|
|
290
|
+
}
|
|
291
|
+
return attributes;
|
|
292
|
+
}
|
|
293
|
+
Tile3DLayer.layerName = 'Tile3DLayer';
|
|
294
|
+
Tile3DLayer.defaultProps = defaultProps;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { Layer } from '@deck.gl/core/typed';
|
|
2
|
+
import { RequestScheduler } from '@loaders.gl/loader-utils';
|
|
3
|
+
import { TileBoundingBox, TileIndex, TileLoadProps } from './types';
|
|
4
|
+
export declare type TileLoadDataProps<DataT = any> = {
|
|
5
|
+
requestScheduler: RequestScheduler;
|
|
6
|
+
getData: (props: TileLoadProps) => Promise<DataT>;
|
|
7
|
+
onLoad: (tile: Tile2DHeader<DataT>) => void;
|
|
8
|
+
onError: (error: any, tile: Tile2DHeader<DataT>) => void;
|
|
9
|
+
};
|
|
10
|
+
export default class Tile2DHeader<DataT = any> {
|
|
11
|
+
index: TileIndex;
|
|
12
|
+
isVisible: boolean;
|
|
13
|
+
isSelected: boolean;
|
|
14
|
+
parent: Tile2DHeader | null;
|
|
15
|
+
children: Tile2DHeader[] | null;
|
|
16
|
+
content: DataT | null;
|
|
17
|
+
state?: number;
|
|
18
|
+
layers?: Layer[] | null;
|
|
19
|
+
id: string;
|
|
20
|
+
bbox: TileBoundingBox;
|
|
21
|
+
zoom: number;
|
|
22
|
+
userData?: Record<string, any>;
|
|
23
|
+
private _abortController;
|
|
24
|
+
private _loader;
|
|
25
|
+
private _loaderId;
|
|
26
|
+
private _isLoaded;
|
|
27
|
+
private _isCancelled;
|
|
28
|
+
private _needsReload;
|
|
29
|
+
constructor(index: TileIndex);
|
|
30
|
+
get data(): Promise<DataT | null> | DataT | null;
|
|
31
|
+
get isLoaded(): boolean;
|
|
32
|
+
get isLoading(): boolean;
|
|
33
|
+
get needsReload(): boolean;
|
|
34
|
+
get byteLength(): number;
|
|
35
|
+
private _loadData;
|
|
36
|
+
loadData(opts: TileLoadDataProps): Promise<void>;
|
|
37
|
+
setNeedsReload(): void;
|
|
38
|
+
abort(): void;
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=tile-2d-header.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile-2d-header.d.ts","sourceRoot":"","sources":["../../src/tile-layer/tile-2d-header.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAElE,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI;IAC3C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IAC5C,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;CAC1D,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG;IAC3C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,EAAE,KAAK,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAExB,EAAE,EAAG,MAAM,CAAC;IACZ,IAAI,EAAG,eAAe,CAAC;IACvB,IAAI,EAAG,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,YAAY,CAAU;gBAElB,KAAK,EAAE,SAAS;IAiB5B,IAAI,IAAI,IAAI,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,KAAK,GAAG,IAAI,CAE/C;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,UAAU,IAAI,MAAM,CAMvB;YAGa,SAAS;IA8DvB,QAAQ,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,cAAc,IAAI,IAAI;IAQtB,KAAK,IAAI,IAAI;CAQd"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/* eslint-env browser */
|
|
2
|
+
import { log } from '@deck.gl/core';
|
|
3
|
+
export default class Tile2DHeader {
|
|
4
|
+
constructor(index) {
|
|
5
|
+
this.index = index;
|
|
6
|
+
this.isVisible = false;
|
|
7
|
+
this.isSelected = false;
|
|
8
|
+
this.parent = null;
|
|
9
|
+
this.children = [];
|
|
10
|
+
this.content = null;
|
|
11
|
+
this._loader = undefined;
|
|
12
|
+
this._abortController = null;
|
|
13
|
+
this._loaderId = 0;
|
|
14
|
+
this._isLoaded = false;
|
|
15
|
+
this._isCancelled = false;
|
|
16
|
+
this._needsReload = false;
|
|
17
|
+
}
|
|
18
|
+
get data() {
|
|
19
|
+
return this.isLoading && this._loader ? this._loader.then(() => this.data) : this.content;
|
|
20
|
+
}
|
|
21
|
+
get isLoaded() {
|
|
22
|
+
return this._isLoaded && !this._needsReload;
|
|
23
|
+
}
|
|
24
|
+
get isLoading() {
|
|
25
|
+
return Boolean(this._loader) && !this._isCancelled;
|
|
26
|
+
}
|
|
27
|
+
get needsReload() {
|
|
28
|
+
return this._needsReload || this._isCancelled;
|
|
29
|
+
}
|
|
30
|
+
get byteLength() {
|
|
31
|
+
const result = this.content ? this.content.byteLength : 0;
|
|
32
|
+
if (!Number.isFinite(result)) {
|
|
33
|
+
log.error('byteLength not defined in tile data')();
|
|
34
|
+
}
|
|
35
|
+
return result;
|
|
36
|
+
}
|
|
37
|
+
/* eslint-disable max-statements */
|
|
38
|
+
async _loadData({ getData, requestScheduler, onLoad, onError }) {
|
|
39
|
+
const { index, id, bbox, userData, zoom } = this;
|
|
40
|
+
const loaderId = this._loaderId;
|
|
41
|
+
this._abortController = new AbortController();
|
|
42
|
+
const { signal } = this._abortController;
|
|
43
|
+
// @ts-expect-error (2345) Argument of type '(tile: any) => 1 | -1' is not assignable ...
|
|
44
|
+
const requestToken = await requestScheduler.scheduleRequest(this, tile => {
|
|
45
|
+
return tile.isSelected ? 1 : -1;
|
|
46
|
+
});
|
|
47
|
+
if (!requestToken) {
|
|
48
|
+
this._isCancelled = true;
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
// A tile can be cancelled while being scheduled
|
|
52
|
+
if (this._isCancelled) {
|
|
53
|
+
requestToken.done();
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
let tileData = null;
|
|
57
|
+
let error;
|
|
58
|
+
try {
|
|
59
|
+
tileData = await getData({ index, id, bbox, userData, zoom, signal });
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
error = err || true;
|
|
63
|
+
}
|
|
64
|
+
finally {
|
|
65
|
+
requestToken.done();
|
|
66
|
+
}
|
|
67
|
+
// If loadData has been called with a newer version, discard the result from this operation
|
|
68
|
+
if (loaderId !== this._loaderId) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
// Clear the `isLoading` flag
|
|
72
|
+
this._loader = undefined;
|
|
73
|
+
// Rewrite tile content with the result of getTileData if successful, or `null` in case of
|
|
74
|
+
// error or cancellation
|
|
75
|
+
this.content = tileData;
|
|
76
|
+
// If cancelled, do not invoke the callbacks
|
|
77
|
+
// Consider it loaded if we tried to cancel but `getTileData` still returned data
|
|
78
|
+
if (this._isCancelled && !tileData) {
|
|
79
|
+
this._isLoaded = false;
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
this._isLoaded = true;
|
|
83
|
+
this._isCancelled = false;
|
|
84
|
+
if (error) {
|
|
85
|
+
onError(error, this);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
onLoad(this);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
loadData(opts) {
|
|
92
|
+
this._isLoaded = false;
|
|
93
|
+
this._isCancelled = false;
|
|
94
|
+
this._needsReload = false;
|
|
95
|
+
this._loaderId++;
|
|
96
|
+
this._loader = this._loadData(opts);
|
|
97
|
+
return this._loader;
|
|
98
|
+
}
|
|
99
|
+
setNeedsReload() {
|
|
100
|
+
if (this.isLoading) {
|
|
101
|
+
this.abort();
|
|
102
|
+
this._loader = undefined;
|
|
103
|
+
}
|
|
104
|
+
this._needsReload = true;
|
|
105
|
+
}
|
|
106
|
+
abort() {
|
|
107
|
+
if (this.isLoaded) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
this._isCancelled = true;
|
|
111
|
+
this._abortController?.abort();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Viewport } from '@deck.gl/core/typed';
|
|
2
|
+
import { Bounds, TileIndex, ZRange } from './types';
|
|
3
|
+
export declare function getOSMTileIndices(viewport: Viewport, maxZ: number, zRange: ZRange | undefined, bounds?: Bounds): TileIndex[];
|
|
4
|
+
//# sourceMappingURL=tile-2d-traversal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile-2d-traversal.d.ts","sourceRoot":"","sources":["../../src/tile-layer/tile-2d-traversal.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAsC,MAAM,eAAe,CAAC;AAQ5E,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AA2KlD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,CAAC,EAAE,MAAM,GACd,SAAS,EAAE,CAiEb"}
|