@loaders.gl/tile-converter 3.3.0-alpha.8 → 3.4.0-alpha.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.
Files changed (125) hide show
  1. package/dist/3d-tiles-attributes-worker.js +1 -1
  2. package/dist/converter-cli.js +14 -2
  3. package/dist/converter.min.js +22 -22
  4. package/dist/deps-installer/deps-installer.d.ts.map +1 -1
  5. package/dist/deps-installer/deps-installer.js +8 -0
  6. package/dist/dist.min.js +1014 -693
  7. package/dist/es5/3d-tiles-attributes-worker.js +1 -1
  8. package/dist/es5/converter-cli.js +14 -2
  9. package/dist/es5/converter-cli.js.map +1 -1
  10. package/dist/es5/deps-installer/deps-installer.js +13 -2
  11. package/dist/es5/deps-installer/deps-installer.js.map +1 -1
  12. package/dist/es5/i3s-attributes-worker.js +1 -1
  13. package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
  14. package/dist/es5/i3s-converter/helpers/geometry-attributes.js +16 -7
  15. package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
  16. package/dist/es5/i3s-converter/helpers/geometry-converter.js +363 -113
  17. package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
  18. package/dist/es5/i3s-converter/helpers/gltf-attributes.js +6 -11
  19. package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
  20. package/dist/es5/i3s-converter/helpers/node-index-document.js +517 -0
  21. package/dist/es5/i3s-converter/helpers/node-index-document.js.map +1 -0
  22. package/dist/es5/i3s-converter/helpers/node-pages.js +455 -173
  23. package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
  24. package/dist/es5/i3s-converter/i3s-converter.js +549 -618
  25. package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
  26. package/dist/es5/i3s-converter/json-templates/geometry-definitions.js +107 -0
  27. package/dist/es5/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
  28. package/dist/es5/i3s-converter/json-templates/layers.js +2 -93
  29. package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
  30. package/dist/es5/i3s-converter/json-templates/shared-resources.js +3 -3
  31. package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
  32. package/dist/es5/i3s-converter/types.js.map +1 -1
  33. package/dist/es5/lib/utils/file-utils.js +93 -9
  34. package/dist/es5/lib/utils/file-utils.js.map +1 -1
  35. package/dist/es5/lib/utils/write-queue.js +38 -25
  36. package/dist/es5/lib/utils/write-queue.js.map +1 -1
  37. package/dist/es5/pgm-loader.js +1 -1
  38. package/dist/es5/workers/i3s-attributes-worker.js +1 -1
  39. package/dist/es5/workers/i3s-attributes-worker.js.map +1 -1
  40. package/dist/esm/3d-tiles-attributes-worker.js +1 -1
  41. package/dist/esm/converter-cli.js +14 -2
  42. package/dist/esm/converter-cli.js.map +1 -1
  43. package/dist/esm/deps-installer/deps-installer.js +9 -1
  44. package/dist/esm/deps-installer/deps-installer.js.map +1 -1
  45. package/dist/esm/i3s-attributes-worker.js +1 -1
  46. package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
  47. package/dist/esm/i3s-converter/helpers/geometry-attributes.js +16 -7
  48. package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
  49. package/dist/esm/i3s-converter/helpers/geometry-converter.js +150 -40
  50. package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
  51. package/dist/esm/i3s-converter/helpers/gltf-attributes.js +6 -9
  52. package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
  53. package/dist/esm/i3s-converter/helpers/node-index-document.js +202 -0
  54. package/dist/esm/i3s-converter/helpers/node-index-document.js.map +1 -0
  55. package/dist/esm/i3s-converter/helpers/node-pages.js +162 -76
  56. package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
  57. package/dist/esm/i3s-converter/i3s-converter.js +115 -220
  58. package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
  59. package/dist/esm/i3s-converter/json-templates/geometry-definitions.js +89 -0
  60. package/dist/esm/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
  61. package/dist/esm/i3s-converter/json-templates/layers.js +2 -85
  62. package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
  63. package/dist/esm/i3s-converter/json-templates/shared-resources.js +3 -3
  64. package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
  65. package/dist/esm/i3s-converter/types.js.map +1 -1
  66. package/dist/esm/lib/utils/file-utils.js +44 -3
  67. package/dist/esm/lib/utils/file-utils.js.map +1 -1
  68. package/dist/esm/lib/utils/write-queue.js +19 -10
  69. package/dist/esm/lib/utils/write-queue.js.map +1 -1
  70. package/dist/esm/pgm-loader.js +1 -1
  71. package/dist/esm/workers/i3s-attributes-worker.js +1 -1
  72. package/dist/esm/workers/i3s-attributes-worker.js.map +1 -1
  73. package/dist/i3s-attributes-worker.js +2 -2
  74. package/dist/i3s-attributes-worker.js.map +2 -2
  75. package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +3 -3
  76. package/dist/i3s-converter/helpers/batch-ids-extensions.js +3 -3
  77. package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
  78. package/dist/i3s-converter/helpers/geometry-attributes.js +16 -10
  79. package/dist/i3s-converter/helpers/geometry-converter.d.ts +8 -4
  80. package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
  81. package/dist/i3s-converter/helpers/geometry-converter.js +200 -44
  82. package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
  83. package/dist/i3s-converter/helpers/gltf-attributes.js +2 -3
  84. package/dist/i3s-converter/helpers/node-index-document.d.ts +95 -0
  85. package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -0
  86. package/dist/i3s-converter/helpers/node-index-document.js +250 -0
  87. package/dist/i3s-converter/helpers/node-pages.d.ts +78 -43
  88. package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
  89. package/dist/i3s-converter/helpers/node-pages.js +194 -93
  90. package/dist/i3s-converter/i3s-converter.d.ts +33 -58
  91. package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
  92. package/dist/i3s-converter/i3s-converter.js +122 -233
  93. package/dist/i3s-converter/json-templates/geometry-definitions.d.ts +7 -0
  94. package/dist/i3s-converter/json-templates/geometry-definitions.d.ts.map +1 -0
  95. package/dist/i3s-converter/json-templates/geometry-definitions.js +87 -0
  96. package/dist/i3s-converter/json-templates/layers.d.ts +1 -30
  97. package/dist/i3s-converter/json-templates/layers.d.ts.map +1 -1
  98. package/dist/i3s-converter/json-templates/layers.js +2 -86
  99. package/dist/i3s-converter/json-templates/shared-resources.js +3 -3
  100. package/dist/i3s-converter/types.d.ts +28 -2
  101. package/dist/i3s-converter/types.d.ts.map +1 -1
  102. package/dist/lib/utils/file-utils.d.ts +17 -1
  103. package/dist/lib/utils/file-utils.d.ts.map +1 -1
  104. package/dist/lib/utils/file-utils.js +64 -7
  105. package/dist/lib/utils/write-queue.d.ts +18 -2
  106. package/dist/lib/utils/write-queue.d.ts.map +1 -1
  107. package/dist/lib/utils/write-queue.js +18 -12
  108. package/dist/workers/i3s-attributes-worker.js +1 -1
  109. package/package.json +23 -19
  110. package/src/converter-cli.ts +22 -2
  111. package/src/deps-installer/deps-installer.ts +9 -0
  112. package/src/i3s-converter/helpers/batch-ids-extensions.ts +3 -3
  113. package/src/i3s-converter/helpers/geometry-attributes.ts +16 -11
  114. package/src/i3s-converter/helpers/geometry-converter.ts +217 -48
  115. package/src/i3s-converter/helpers/gltf-attributes.ts +2 -3
  116. package/src/i3s-converter/helpers/node-index-document.ts +315 -0
  117. package/src/i3s-converter/helpers/node-pages.ts +215 -110
  118. package/src/i3s-converter/i3s-converter.ts +170 -312
  119. package/src/i3s-converter/json-templates/geometry-definitions.ts +83 -0
  120. package/src/i3s-converter/json-templates/layers.ts +2 -91
  121. package/src/i3s-converter/json-templates/shared-resources.ts +3 -3
  122. package/src/i3s-converter/types.ts +29 -2
  123. package/src/lib/utils/file-utils.ts +62 -7
  124. package/src/lib/utils/write-queue.ts +36 -15
  125. package/src/workers/i3s-attributes-worker.ts +2 -1
@@ -0,0 +1,315 @@
1
+ import {join} from 'path';
2
+ import {
3
+ BoundingVolumes,
4
+ LodSelection,
5
+ Node3DIndexDocument,
6
+ NodeInPage,
7
+ NodeReference
8
+ } from '@loaders.gl/i3s';
9
+ import transform from 'json-map-transform';
10
+ import {v4 as uuidv4} from 'uuid';
11
+ import {openJson, writeFile, writeFileForSlpk} from '../../lib/utils/file-utils';
12
+ import I3SConverter from '../i3s-converter';
13
+ import {NODE as nodeTemplate} from '../json-templates/node';
14
+ import {I3SConvertedResources} from '../types';
15
+
16
+ /**
17
+ * Wrapper for https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md data
18
+ * The class allows working with 3DNodeIndexDocument in 2 modes:
19
+ * in memory: the data is stored in `data` field
20
+ * on disk: the data is written on disk in a file. The file can be rewritten when new childrend or neighbors have to be added
21
+ */
22
+ export class NodeIndexDocument {
23
+ /** Node id */
24
+ public id: string;
25
+ /** Id in node pages */
26
+ public inPageId: number;
27
+ /** 3DNodeIndexDocument data */
28
+ public data: Node3DIndexDocument | null = null;
29
+ /** children */
30
+ public children: NodeIndexDocument[] = [];
31
+ /** converter instance */
32
+ private converter: I3SConverter;
33
+
34
+ /**
35
+ * Constructor
36
+ * @param id - id of the node in node pages
37
+ * @param converter - converter instance
38
+ */
39
+ constructor(id: number, converter: I3SConverter) {
40
+ this.inPageId = id;
41
+ this.id = id === 0 ? 'root' : id.toString();
42
+ this.converter = converter;
43
+ }
44
+
45
+ /**
46
+ * Add Node3DIndexDocument data to the node
47
+ * @param data Node3DIndexDocument data
48
+ * @returns this NodeIndexDocument instance (to recurring with constructor)
49
+ */
50
+ public async addData(data: Node3DIndexDocument): Promise<NodeIndexDocument> {
51
+ if (this.converter.options.instantNodeWriting) {
52
+ await this.write(data);
53
+ } else {
54
+ this.data = data;
55
+ }
56
+ return this;
57
+ }
58
+
59
+ /**
60
+ * Add child node references
61
+ * @param childNodes - child NodeIndexDocument instances
62
+ */
63
+ public async addChildren(childNodes: NodeIndexDocument[]): Promise<void> {
64
+ const newChildren: NodeReference[] = [];
65
+ for (const node of childNodes) {
66
+ const nodeData = await node.load();
67
+ newChildren.push({
68
+ id: node.id,
69
+ href: `../${node.id}`,
70
+ obb: nodeData.obb,
71
+ mbs: nodeData.mbs
72
+ });
73
+ }
74
+ this.children = this.children.concat(childNodes);
75
+
76
+ let data: Node3DIndexDocument | null = this.data;
77
+ if (this.converter.options.instantNodeWriting) {
78
+ data = (await this.load()) as Node3DIndexDocument;
79
+ }
80
+ if (data) {
81
+ data.children = data.children ?? [];
82
+ data.children = data.children.concat(newChildren);
83
+ }
84
+ if (this.converter.options.instantNodeWriting && data) {
85
+ await this.write(data);
86
+ }
87
+ }
88
+
89
+ /**
90
+ * Add neighbors to child nodes of this node
91
+ */
92
+ public async addNeighbors(): Promise<void> {
93
+ const nodeData = await this.load();
94
+ for (const childNode of this.children) {
95
+ const childNodeData = await childNode.load();
96
+ childNodeData.neighbors = childNodeData.neighbors ?? [];
97
+
98
+ // Don't do large amount of "neightbors" to avoid big memory consumption
99
+ if (Number(nodeData?.children?.length) < 1000) {
100
+ for (const neighbor of nodeData.children || []) {
101
+ if (childNode.id === neighbor.id) {
102
+ continue; // eslint-disable-line
103
+ }
104
+
105
+ childNodeData.neighbors.push({...neighbor});
106
+ }
107
+ } else {
108
+ // eslint-disable-next-line no-console, no-undef
109
+ console.warn(
110
+ `Node ${childNode.id}: neighbors attribute is omited because of large number of neigbors`
111
+ );
112
+ delete childNodeData.neighbors;
113
+ }
114
+
115
+ if (this.converter.options.instantNodeWriting && childNodeData) {
116
+ await childNode.write(childNodeData);
117
+ }
118
+ await childNode.save();
119
+ // The save after adding neighbors is the last one. Flush the the node
120
+ childNode.flush();
121
+ }
122
+ }
123
+
124
+ /** Save 3DNodeIndexDocument in file on disk */
125
+ public async save(): Promise<void> {
126
+ if (this.data) {
127
+ await this.write(this.data);
128
+ }
129
+ }
130
+
131
+ /**
132
+ * Write 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md
133
+ * @param node - Node3DIndexDocument object
134
+ */
135
+ private async write(node: Node3DIndexDocument): Promise<void> {
136
+ const path = join(this.converter.layers0Path, 'nodes', this.id);
137
+ if (this.converter.options.slpk) {
138
+ await this.converter.writeQueue.enqueue(
139
+ {
140
+ archiveKey: `nodes/${this.id}/3dNodeIndexDocument.json.gz`,
141
+ writePromise: () =>
142
+ writeFileForSlpk(
143
+ path,
144
+ JSON.stringify(node),
145
+ '3dNodeIndexDocument.json',
146
+ true,
147
+ this.converter.compressList
148
+ )
149
+ },
150
+ true
151
+ );
152
+ } else {
153
+ await this.converter.writeQueue.enqueue(
154
+ {writePromise: () => writeFile(path, JSON.stringify(node))},
155
+ true
156
+ );
157
+ }
158
+ }
159
+
160
+ /**
161
+ * Load 3DNodeIndexDocument data from file on disk
162
+ * @returns 3DNodeIndexDocument object
163
+ */
164
+ private async load(): Promise<Node3DIndexDocument> {
165
+ if (this.data) {
166
+ return this.data;
167
+ }
168
+ const path = this.id;
169
+ const parentNodePath = join(this.converter.layers0Path, 'nodes', path);
170
+ let parentNodeFileName = 'index.json';
171
+ if (this.converter.options.slpk) {
172
+ parentNodeFileName = '3dNodeIndexDocument.json';
173
+ }
174
+ return (await openJson(parentNodePath, parentNodeFileName)) as Node3DIndexDocument;
175
+ }
176
+
177
+ /**
178
+ * Unload the Node data
179
+ */
180
+ private flush(): void {
181
+ this.data = null;
182
+ }
183
+
184
+ /**
185
+ * Create root node of the tree
186
+ * @param boundingVolumes - MBS and OOB bounding volumes data
187
+ * @param converter - I3SConverter instance
188
+ * @returns instance of NodeIndexDocument
189
+ */
190
+ static async createRootNode(
191
+ boundingVolumes: BoundingVolumes,
192
+ converter: I3SConverter
193
+ ): Promise<NodeIndexDocument> {
194
+ const rootData = NodeIndexDocument.createRootNodeIndexDocument(boundingVolumes);
195
+ const rootNode = await new NodeIndexDocument(0, converter).addData(rootData);
196
+ return rootNode;
197
+ }
198
+
199
+ /**
200
+ * Create NodeIndexDocument instance
201
+ * @param parentNode - parent NodeIndexDocument
202
+ * @param boundingVolumes - MBS and OOB bounding volumes data
203
+ * @param lodSelection - LOD metrics data
204
+ * @param nodeInPage - node data in node pages
205
+ * @param resources - resources extracted from gltf/b3dm file
206
+ * @param converter - I3SConverter instance
207
+ * @returns NodeIndexDocument instance
208
+ */
209
+ static async createNode(
210
+ parentNode: NodeIndexDocument,
211
+ boundingVolumes: BoundingVolumes,
212
+ lodSelection: LodSelection[],
213
+ nodeInPage: NodeInPage,
214
+ resources: I3SConvertedResources,
215
+ converter: I3SConverter
216
+ ): Promise<NodeIndexDocument> {
217
+ const data = await NodeIndexDocument.createNodeIndexDocument(
218
+ parentNode,
219
+ boundingVolumes,
220
+ lodSelection,
221
+ nodeInPage,
222
+ resources
223
+ );
224
+ const node = await new NodeIndexDocument(nodeInPage.index, converter).addData(data);
225
+ return node;
226
+ }
227
+
228
+ /**
229
+ * Form 3DNodeIndexDocument data for the root node
230
+ * @param boundingVolumes - mbs and obb data about node's bounding volume
231
+ * @return 3DNodeIndexDocument data https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md
232
+ */
233
+ static createRootNodeIndexDocument(boundingVolumes: BoundingVolumes): Node3DIndexDocument {
234
+ const root0data = {
235
+ version: `{${uuidv4().toUpperCase()}}`,
236
+ id: 'root',
237
+ level: 0,
238
+ lodSelection: [
239
+ {
240
+ metricType: 'maxScreenThresholdSQ',
241
+ maxError: 0
242
+ },
243
+ {
244
+ metricType: 'maxScreenThreshold',
245
+ maxError: 0
246
+ }
247
+ ],
248
+ ...boundingVolumes,
249
+ children: []
250
+ };
251
+ return transform(root0data, nodeTemplate());
252
+ }
253
+
254
+ /**
255
+ * Create a new Node3DIndexDocument
256
+ * @param parentNode - 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md object of the parent node
257
+ * @param boundingVolumes - Bounding volumes
258
+ * @param lodSelection - Level of Details (LOD) metrics
259
+ * @param nodeInPage - corresponding node object in a node page
260
+ * @param resources - the node resources data
261
+ * @param resources.texture - texture image
262
+ * @param resources.attributes - feature attributes
263
+ * @return 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md object
264
+ */
265
+ static async createNodeIndexDocument(
266
+ parentNode: NodeIndexDocument,
267
+ boundingVolumes: BoundingVolumes,
268
+ lodSelection: LodSelection[],
269
+ nodeInPage: NodeInPage,
270
+ resources: I3SConvertedResources
271
+ ): Promise<Node3DIndexDocument> {
272
+ const {texture, attributes} = resources;
273
+ const nodeId = nodeInPage.index!;
274
+ const parentNodeData = await parentNode.load();
275
+ const nodeData = {
276
+ version: parentNodeData.version,
277
+ id: nodeId.toString(),
278
+ level: parentNodeData.level! + 1,
279
+ ...boundingVolumes,
280
+ lodSelection,
281
+ parentNode: {
282
+ id: parentNode.id,
283
+ href: `../${parentNode.id}`,
284
+ mbs: parentNodeData.mbs,
285
+ obb: parentNodeData.obb
286
+ },
287
+ children: [],
288
+ neighbors: []
289
+ };
290
+ const node = transform(nodeData, nodeTemplate());
291
+
292
+ if (nodeInPage.mesh) {
293
+ node.geometryData = [{href: './geometries/0'}];
294
+ node.sharedResource = {href: './shared'};
295
+
296
+ if (texture) {
297
+ node.textureData = [{href: './textures/0'}, {href: './textures/1'}];
298
+ }
299
+
300
+ if (
301
+ attributes &&
302
+ attributes.length &&
303
+ parentNode.converter.layers0?.attributeStorageInfo?.length
304
+ ) {
305
+ node.attributeData = [];
306
+ for (let index = 0; index < attributes.length; index++) {
307
+ const folderName = parentNode.converter.layers0.attributeStorageInfo[index].key;
308
+ node.attributeData.push({href: `./attributes/${folderName}/0`});
309
+ }
310
+ }
311
+ }
312
+
313
+ return node;
314
+ }
315
+ }