@loaders.gl/tile-converter 4.1.1 → 4.2.0-alpha.2
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/3d-tiles-converter/3d-tiles-converter.d.ts +11 -0
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +77 -27
- package/dist/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.d.ts +22 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.js +49 -4
- package/dist/3d-tiles-converter/helpers/load-i3s.js.map +1 -1
- package/dist/converter-cli.js +2 -1
- package/dist/converter-cli.js.map +1 -1
- package/dist/converter.min.cjs +137 -130
- package/dist/deps-installer/deps-installer.js +1 -1
- package/dist/deps-installer/deps-installer.js.map +1 -1
- package/dist/i3s-converter/helpers/attribute-metadata-info.d.ts +10 -0
- package/dist/i3s-converter/helpers/attribute-metadata-info.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/attribute-metadata-info.js +5 -0
- package/dist/i3s-converter/helpers/attribute-metadata-info.js.map +1 -1
- package/dist/i3s-converter/helpers/load-3d-tiles.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/load-3d-tiles.js +22 -2
- package/dist/i3s-converter/helpers/load-3d-tiles.js.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.d.ts +2 -1
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +6 -8
- package/dist/i3s-converter/helpers/node-index-document.js.map +1 -1
- package/dist/i3s-converter/i3s-converter.d.ts +18 -0
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +121 -24
- package/dist/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/i3s-server/bin/i3s-server.min.cjs +86 -86
- package/dist/index.cjs +792 -101
- package/dist/lib/json-schemas/conversion-dump-json-schema.d.ts +463 -0
- package/dist/lib/json-schemas/conversion-dump-json-schema.d.ts.map +1 -0
- package/dist/lib/json-schemas/conversion-dump-json-schema.js +463 -0
- package/dist/lib/json-schemas/conversion-dump-json-schema.js.map +1 -0
- package/dist/lib/utils/conversion-dump.d.ts +65 -8
- package/dist/lib/utils/conversion-dump.d.ts.map +1 -1
- package/dist/lib/utils/conversion-dump.js +98 -18
- package/dist/lib/utils/conversion-dump.js.map +1 -1
- package/dist/lib/utils/file-utils.d.ts +6 -0
- package/dist/lib/utils/file-utils.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.js +7 -0
- package/dist/lib/utils/file-utils.js.map +1 -1
- package/dist/pgm-loader.js +1 -1
- package/dist/pgm-loader.js.map +1 -1
- package/package.json +15 -14
- package/src/3d-tiles-converter/3d-tiles-converter.ts +104 -31
- package/src/3d-tiles-converter/helpers/load-i3s.ts +86 -7
- package/src/converter-cli.ts +2 -1
- package/src/i3s-converter/helpers/attribute-metadata-info.ts +16 -0
- package/src/i3s-converter/helpers/load-3d-tiles.ts +52 -2
- package/src/i3s-converter/helpers/node-index-document.ts +18 -8
- package/src/i3s-converter/i3s-converter.ts +198 -41
- package/src/lib/json-schemas/conversion-dump-json-schema.ts +285 -0
- package/src/lib/utils/conversion-dump.ts +200 -26
- package/src/lib/utils/file-utils.ts +13 -0
|
@@ -1,13 +1,21 @@
|
|
|
1
|
+
import { isDeepStrictEqual } from 'util';
|
|
1
2
|
import { DUMP_FILE_SUFFIX } from "../../constants.js";
|
|
2
|
-
import { removeFile, writeFile } from "./file-utils.js";
|
|
3
|
+
import { isFileExists, openJson, removeFile, renameFile, writeFile } from "./file-utils.js";
|
|
3
4
|
import { join } from 'path';
|
|
5
|
+
import process from 'process';
|
|
6
|
+
import Ajv from 'ajv';
|
|
7
|
+
import { dumpJsonSchema } from "../json-schemas/conversion-dump-json-schema.js";
|
|
4
8
|
export class ConversionDump {
|
|
5
9
|
constructor() {
|
|
10
|
+
this.restored = false;
|
|
6
11
|
this.options = void 0;
|
|
7
12
|
this.tilesConverted = void 0;
|
|
13
|
+
this.textureSetDefinitions = void 0;
|
|
14
|
+
this.attributeMetadataInfo = void 0;
|
|
15
|
+
this.materialDefinitions = void 0;
|
|
8
16
|
this.tilesConverted = {};
|
|
9
17
|
}
|
|
10
|
-
async
|
|
18
|
+
async createDump(currentOptions) {
|
|
11
19
|
const {
|
|
12
20
|
tilesetName,
|
|
13
21
|
slpk,
|
|
@@ -22,7 +30,7 @@ export class ConversionDump {
|
|
|
22
30
|
mergeMaterials = true,
|
|
23
31
|
metadataClass,
|
|
24
32
|
analyze = false
|
|
25
|
-
} =
|
|
33
|
+
} = currentOptions;
|
|
26
34
|
this.options = {
|
|
27
35
|
tilesetName,
|
|
28
36
|
slpk,
|
|
@@ -38,22 +46,60 @@ export class ConversionDump {
|
|
|
38
46
|
metadataClass,
|
|
39
47
|
analyze
|
|
40
48
|
};
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
49
|
+
const dumpFilename = join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
|
|
50
|
+
if (await isFileExists(dumpFilename)) {
|
|
51
|
+
try {
|
|
52
|
+
const dump = await openJson(join(this.options.outputPath, this.options.tilesetName), `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
|
|
53
|
+
const {
|
|
54
|
+
options,
|
|
55
|
+
tilesConverted,
|
|
56
|
+
textureSetDefinitions,
|
|
57
|
+
attributeMetadataInfo,
|
|
58
|
+
materialDefinitions
|
|
59
|
+
} = dump;
|
|
60
|
+
const ajv = new Ajv();
|
|
61
|
+
const dumpJsonValidate = ajv.compile(dumpJsonSchema);
|
|
62
|
+
const isDumpValid = dumpJsonValidate(dump);
|
|
63
|
+
if (isDumpValid && isDeepStrictEqual(options, JSON.parse(JSON.stringify(this.options)))) {
|
|
64
|
+
this.tilesConverted = tilesConverted;
|
|
65
|
+
this.textureSetDefinitions = textureSetDefinitions;
|
|
66
|
+
this.attributeMetadataInfo = attributeMetadataInfo;
|
|
67
|
+
this.materialDefinitions = materialDefinitions;
|
|
68
|
+
this.restored = true;
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
} catch (error) {
|
|
72
|
+
console.log("Can't open dump file", error);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
await this.deleteDumpFile();
|
|
76
|
+
}
|
|
77
|
+
reset() {
|
|
78
|
+
this.restored = false;
|
|
79
|
+
this.tilesConverted = {};
|
|
80
|
+
if (this.textureSetDefinitions) {
|
|
81
|
+
delete this.textureSetDefinitions;
|
|
82
|
+
}
|
|
83
|
+
if (this.attributeMetadataInfo) {
|
|
84
|
+
delete this.attributeMetadataInfo;
|
|
85
|
+
}
|
|
86
|
+
if (this.materialDefinitions) {
|
|
87
|
+
delete this.materialDefinitions;
|
|
47
88
|
}
|
|
48
89
|
}
|
|
49
90
|
async updateDumpFile() {
|
|
50
91
|
var _this$options;
|
|
51
92
|
if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.outputPath && this.options.tilesetName) {
|
|
52
93
|
try {
|
|
53
|
-
|
|
94
|
+
const time = process.hrtime();
|
|
95
|
+
await writeFile(join(this.options.outputPath, this.options.tilesetName), JSON.stringify({
|
|
54
96
|
options: this.options,
|
|
55
|
-
tilesConverted: this.tilesConverted
|
|
56
|
-
|
|
97
|
+
tilesConverted: this.tilesConverted,
|
|
98
|
+
textureSetDefinitions: this.textureSetDefinitions,
|
|
99
|
+
attributeMetadataInfo: this.attributeMetadataInfo,
|
|
100
|
+
materialDefinitions: this.materialDefinitions
|
|
101
|
+
}), `${this.options.tilesetName}${DUMP_FILE_SUFFIX}.${time[0]}.${time[1]}`);
|
|
102
|
+
await renameFile(join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}.${time[0]}.${time[1]}`), join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`));
|
|
57
103
|
} catch (error) {
|
|
58
104
|
console.log("Can't update dump file", error);
|
|
59
105
|
}
|
|
@@ -61,8 +107,8 @@ export class ConversionDump {
|
|
|
61
107
|
}
|
|
62
108
|
async deleteDumpFile() {
|
|
63
109
|
var _this$options2;
|
|
64
|
-
if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.outputPath && this.options.tilesetName) {
|
|
65
|
-
await removeFile(join(this.options.outputPath, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`));
|
|
110
|
+
if ((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.outputPath && this.options.tilesetName && (await isFileExists(join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`)))) {
|
|
111
|
+
await removeFile(join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`));
|
|
66
112
|
}
|
|
67
113
|
}
|
|
68
114
|
getRecord(fileName) {
|
|
@@ -71,7 +117,7 @@ export class ConversionDump {
|
|
|
71
117
|
setRecord(fileName, object) {
|
|
72
118
|
this.tilesConverted[fileName] = object;
|
|
73
119
|
}
|
|
74
|
-
async addNode(filename, nodeId) {
|
|
120
|
+
async addNode(filename, nodeId, dumpMetadata) {
|
|
75
121
|
const {
|
|
76
122
|
nodes
|
|
77
123
|
} = this.getRecord(filename) || {
|
|
@@ -80,7 +126,7 @@ export class ConversionDump {
|
|
|
80
126
|
nodes.push({
|
|
81
127
|
nodeId,
|
|
82
128
|
done: false,
|
|
83
|
-
|
|
129
|
+
dumpMetadata
|
|
84
130
|
});
|
|
85
131
|
if (nodes.length === 1) {
|
|
86
132
|
this.setRecord(filename, {
|
|
@@ -89,10 +135,21 @@ export class ConversionDump {
|
|
|
89
135
|
}
|
|
90
136
|
await this.updateDumpFile();
|
|
91
137
|
}
|
|
138
|
+
clearDumpRecord(filename) {
|
|
139
|
+
this.setRecord(filename, {
|
|
140
|
+
nodes: []
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
addTexturesDefinitions(textureDefinitions) {
|
|
144
|
+
this.textureSetDefinitions = textureDefinitions;
|
|
145
|
+
}
|
|
92
146
|
updateDoneStatus(filename, nodeId, resourceType, value) {
|
|
93
147
|
var _this$tilesConverted$;
|
|
94
148
|
const nodeDump = (_this$tilesConverted$ = this.tilesConverted[filename]) === null || _this$tilesConverted$ === void 0 ? void 0 : _this$tilesConverted$.nodes.find(element => element.nodeId === nodeId);
|
|
95
149
|
if (nodeDump) {
|
|
150
|
+
if (!nodeDump.progress) {
|
|
151
|
+
nodeDump.progress = {};
|
|
152
|
+
}
|
|
96
153
|
nodeDump.progress[resourceType] = value;
|
|
97
154
|
if (!value) {
|
|
98
155
|
nodeDump.done = false;
|
|
@@ -109,7 +166,7 @@ export class ConversionDump {
|
|
|
109
166
|
} = changedRecords[i];
|
|
110
167
|
if (!sourceId || !resourceType || !outputId) continue;
|
|
111
168
|
for (const node of this.tilesConverted[sourceId].nodes) {
|
|
112
|
-
if (node.nodeId === outputId) {
|
|
169
|
+
if (node.nodeId === outputId && node.progress) {
|
|
113
170
|
node.progress[resourceType] = true;
|
|
114
171
|
let done = false;
|
|
115
172
|
for (const key in node.progress) {
|
|
@@ -118,7 +175,7 @@ export class ConversionDump {
|
|
|
118
175
|
}
|
|
119
176
|
node.done = done;
|
|
120
177
|
if (node.done) {
|
|
121
|
-
node.progress
|
|
178
|
+
delete node.progress;
|
|
122
179
|
}
|
|
123
180
|
break;
|
|
124
181
|
}
|
|
@@ -127,5 +184,28 @@ export class ConversionDump {
|
|
|
127
184
|
}
|
|
128
185
|
await this.updateDumpFile();
|
|
129
186
|
}
|
|
187
|
+
async updateConvertedNodesDumpFile(filename, nodeId, done) {
|
|
188
|
+
var _this$tilesConverted$2;
|
|
189
|
+
const nodeDump = (_this$tilesConverted$2 = this.tilesConverted[filename]) === null || _this$tilesConverted$2 === void 0 ? void 0 : _this$tilesConverted$2.nodes.find(element => element.nodeId === nodeId);
|
|
190
|
+
if (nodeDump) {
|
|
191
|
+
nodeDump.done = done;
|
|
192
|
+
await this.updateDumpFile();
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
isFileConversionComplete(filename) {
|
|
196
|
+
var _this$tilesConverted$4, _this$tilesConverted$5;
|
|
197
|
+
let result = true;
|
|
198
|
+
for (const node of ((_this$tilesConverted$3 = this.tilesConverted[filename]) === null || _this$tilesConverted$3 === void 0 ? void 0 : _this$tilesConverted$3.nodes) || []) {
|
|
199
|
+
var _this$tilesConverted$3;
|
|
200
|
+
if (!node.done) {
|
|
201
|
+
result = false;
|
|
202
|
+
break;
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
return result && ((_this$tilesConverted$4 = this.tilesConverted[filename]) === null || _this$tilesConverted$4 === void 0 ? void 0 : (_this$tilesConverted$5 = _this$tilesConverted$4.nodes) === null || _this$tilesConverted$5 === void 0 ? void 0 : _this$tilesConverted$5.length) > 0;
|
|
206
|
+
}
|
|
207
|
+
setMaterialsDefinitions(materialDefinitions) {
|
|
208
|
+
this.materialDefinitions = materialDefinitions;
|
|
209
|
+
}
|
|
130
210
|
}
|
|
131
211
|
//# sourceMappingURL=conversion-dump.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion-dump.js","names":["DUMP_FILE_SUFFIX","removeFile","writeFile","join","ConversionDump","constructor","options","tilesConverted","createDumpFile","tilesetName","slpk","egmFilePath","inputUrl","outputPath","draco","maxDepth","token","generateTextures","generateBoundingVolumes","mergeMaterials","metadataClass","analyze","JSON","stringify","error","console","log","updateDumpFile","_this$options","deleteDumpFile","_this$options2","getRecord","fileName","setRecord","object","addNode","filename","nodeId","nodes","push","done","progress","length","updateDoneStatus","resourceType","value","_this$tilesConverted$","nodeDump","find","element","updateConvertedTilesDump","changedRecords","writeResults","i","sourceId","outputId","node","key"],"sources":["../../../src/lib/utils/conversion-dump.ts"],"sourcesContent":["import {DUMP_FILE_SUFFIX} from '../../constants';\nimport {removeFile, writeFile} from './file-utils';\nimport {join} from 'path';\n\nexport type ConversionDumpOptions = {\n inputUrl: string;\n outputPath: string;\n tilesetName: string;\n maxDepth: number;\n slpk: boolean;\n egmFilePath: string;\n token: string;\n draco: boolean;\n mergeMaterials: boolean;\n generateTextures: boolean;\n generateBoundingVolumes: boolean;\n metadataClass: string;\n analyze: boolean;\n};\n\ntype NodeDoneStatus = {\n nodeId: number;\n done: boolean;\n progress: Record<string, boolean>;\n};\n\ntype TilesConverted = {\n nodes: NodeDoneStatus[];\n};\n\nexport class ConversionDump {\n /** Conversion options */\n private options?: ConversionDumpOptions;\n /** Tiles conversion progress status map */\n tilesConverted: Record<string, TilesConverted>;\n\n constructor() {\n this.tilesConverted = {};\n }\n\n /**\n * Create a dump file with convertion options\n * @param options - converter options\n */\n async createDumpFile(options: ConversionDumpOptions): Promise<void> {\n const {\n tilesetName,\n slpk,\n egmFilePath,\n inputUrl,\n outputPath,\n draco = true,\n maxDepth,\n token,\n generateTextures,\n generateBoundingVolumes,\n mergeMaterials = true,\n metadataClass,\n analyze = false\n } = options;\n this.options = {\n tilesetName,\n slpk,\n egmFilePath,\n inputUrl,\n outputPath,\n draco,\n maxDepth,\n token,\n generateTextures,\n generateBoundingVolumes,\n mergeMaterials,\n metadataClass,\n analyze\n };\n\n try {\n await writeFile(\n options.outputPath,\n JSON.stringify({options: this.options}),\n `${options.tilesetName}${DUMP_FILE_SUFFIX}`\n );\n } catch (error) {\n console.log(\"Can't create dump file\", error);\n }\n }\n\n /**\n * Update conversion status in the dump file\n */\n private async updateDumpFile(): Promise<void> {\n if (this.options?.outputPath && this.options.tilesetName) {\n try {\n await writeFile(\n this.options.outputPath,\n JSON.stringify({\n options: this.options,\n tilesConverted: this.tilesConverted\n }),\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n );\n } catch (error) {\n console.log(\"Can't update dump file\", error);\n }\n }\n }\n\n /**\n * Delete a dump file\n */\n async deleteDumpFile(): Promise<void> {\n if (this.options?.outputPath && this.options.tilesetName) {\n await removeFile(\n join(this.options.outputPath, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`)\n );\n }\n }\n\n /**\n * Get record from the tilesConverted Map\n * @param fileName - source filename\n * @returns existing object from the tilesConverted Map\n */\n private getRecord(fileName: string) {\n return this.tilesConverted[fileName];\n }\n\n /**\n * Set a record for the dump file\n * @param fileName - key - source filename\n * @param object - value\n */\n private setRecord(fileName: string, object: any) {\n this.tilesConverted[fileName] = object;\n }\n\n /**\n * Add a node into the dump file for the source file record\n * @param fileName - source filename\n * @param nodeId - nodeId of the node\n */\n async addNode(filename: string, nodeId: number) {\n const {nodes} = this.getRecord(filename) || {nodes: []};\n nodes.push({nodeId, done: false, progress: {}});\n if (nodes.length === 1) {\n this.setRecord(filename, {nodes});\n }\n await this.updateDumpFile();\n }\n\n /**\n * Update done status object for the writing resources\n * @param fileName - key - source filename\n * @param nodeId - nodeId for the source filename\n * @param resourceType - resource type to update status\n * @param value - value\n */\n updateDoneStatus(filename: string, nodeId: number, resourceType: string, value: boolean) {\n const nodeDump = this.tilesConverted[filename]?.nodes.find(\n (element) => element.nodeId === nodeId\n );\n if (nodeDump) {\n nodeDump.progress[resourceType] = value;\n if (!value) {\n nodeDump.done = false;\n }\n }\n }\n\n /**\n * Update dump file according to writing results\n * @param changedRecords - array of parameters ids for the written resources\n * @param writeResults - array of writing resource files results\n */\n async updateConvertedTilesDump(\n changedRecords: {outputId?: number; sourceId?: string; resourceType?: string}[],\n writeResults: PromiseSettledResult<string | null>[]\n ) {\n for (let i = 0; i < changedRecords.length; i++) {\n if (changedRecords[i] && 'value' in writeResults[i]) {\n const {sourceId, resourceType, outputId} = changedRecords[i];\n if (!sourceId || !resourceType || !outputId) continue;\n for (const node of this.tilesConverted[sourceId].nodes) {\n if (node.nodeId === outputId) {\n node.progress[resourceType] = true;\n\n let done = false;\n for (const key in node.progress) {\n done = node.progress[key];\n if (!done) break;\n }\n node.done = done;\n if (node.done) {\n node.progress = {};\n }\n break;\n }\n }\n }\n }\n await this.updateDumpFile();\n }\n}\n"],"mappings":"SAAQA,gBAAgB;AAAA,SAChBC,UAAU,EAAEC,SAAS;AAC7B,SAAQC,IAAI,QAAO,MAAM;AA4BzB,OAAO,MAAMC,cAAc,CAAC;EAM1BC,WAAWA,CAAA,EAAG;IAAA,KAJNC,OAAO;IAAA,KAEfC,cAAc;IAGZ,IAAI,CAACA,cAAc,GAAG,CAAC,CAAC;EAC1B;EAMA,MAAMC,cAAcA,CAACF,OAA8B,EAAiB;IAClE,MAAM;MACJG,WAAW;MACXC,IAAI;MACJC,WAAW;MACXC,QAAQ;MACRC,UAAU;MACVC,KAAK,GAAG,IAAI;MACZC,QAAQ;MACRC,KAAK;MACLC,gBAAgB;MAChBC,uBAAuB;MACvBC,cAAc,GAAG,IAAI;MACrBC,aAAa;MACbC,OAAO,GAAG;IACZ,CAAC,GAAGf,OAAO;IACX,IAAI,CAACA,OAAO,GAAG;MACbG,WAAW;MACXC,IAAI;MACJC,WAAW;MACXC,QAAQ;MACRC,UAAU;MACVC,KAAK;MACLC,QAAQ;MACRC,KAAK;MACLC,gBAAgB;MAChBC,uBAAuB;MACvBC,cAAc;MACdC,aAAa;MACbC;IACF,CAAC;IAED,IAAI;MACF,MAAMnB,SAAS,CACbI,OAAO,CAACO,UAAU,EAClBS,IAAI,CAACC,SAAS,CAAC;QAACjB,OAAO,EAAE,IAAI,CAACA;MAAO,CAAC,CAAC,EACtC,GAAEA,OAAO,CAACG,WAAY,GAAET,gBAAiB,EAC5C,CAAC;IACH,CAAC,CAAC,OAAOwB,KAAK,EAAE;MACdC,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAEF,KAAK,CAAC;IAC9C;EACF;EAKA,MAAcG,cAAcA,CAAA,EAAkB;IAAA,IAAAC,aAAA;IAC5C,IAAI,CAAAA,aAAA,OAAI,CAACtB,OAAO,cAAAsB,aAAA,eAAZA,aAAA,CAAcf,UAAU,IAAI,IAAI,CAACP,OAAO,CAACG,WAAW,EAAE;MACxD,IAAI;QACF,MAAMP,SAAS,CACb,IAAI,CAACI,OAAO,CAACO,UAAU,EACvBS,IAAI,CAACC,SAAS,CAAC;UACbjB,OAAO,EAAE,IAAI,CAACA,OAAO;UACrBC,cAAc,EAAE,IAAI,CAACA;QACvB,CAAC,CAAC,EACD,GAAE,IAAI,CAACD,OAAO,CAACG,WAAY,GAAET,gBAAiB,EACjD,CAAC;MACH,CAAC,CAAC,OAAOwB,KAAK,EAAE;QACdC,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAEF,KAAK,CAAC;MAC9C;IACF;EACF;EAKA,MAAMK,cAAcA,CAAA,EAAkB;IAAA,IAAAC,cAAA;IACpC,IAAI,CAAAA,cAAA,OAAI,CAACxB,OAAO,cAAAwB,cAAA,eAAZA,cAAA,CAAcjB,UAAU,IAAI,IAAI,CAACP,OAAO,CAACG,WAAW,EAAE;MACxD,MAAMR,UAAU,CACdE,IAAI,CAAC,IAAI,CAACG,OAAO,CAACO,UAAU,EAAG,GAAE,IAAI,CAACP,OAAO,CAACG,WAAY,GAAET,gBAAiB,EAAC,CAChF,CAAC;IACH;EACF;EAOQ+B,SAASA,CAACC,QAAgB,EAAE;IAClC,OAAO,IAAI,CAACzB,cAAc,CAACyB,QAAQ,CAAC;EACtC;EAOQC,SAASA,CAACD,QAAgB,EAAEE,MAAW,EAAE;IAC/C,IAAI,CAAC3B,cAAc,CAACyB,QAAQ,CAAC,GAAGE,MAAM;EACxC;EAOA,MAAMC,OAAOA,CAACC,QAAgB,EAAEC,MAAc,EAAE;IAC9C,MAAM;MAACC;IAAK,CAAC,GAAG,IAAI,CAACP,SAAS,CAACK,QAAQ,CAAC,IAAI;MAACE,KAAK,EAAE;IAAE,CAAC;IACvDA,KAAK,CAACC,IAAI,CAAC;MAACF,MAAM;MAAEG,IAAI,EAAE,KAAK;MAAEC,QAAQ,EAAE,CAAC;IAAC,CAAC,CAAC;IAC/C,IAAIH,KAAK,CAACI,MAAM,KAAK,CAAC,EAAE;MACtB,IAAI,CAACT,SAAS,CAACG,QAAQ,EAAE;QAACE;MAAK,CAAC,CAAC;IACnC;IACA,MAAM,IAAI,CAACX,cAAc,CAAC,CAAC;EAC7B;EASAgB,gBAAgBA,CAACP,QAAgB,EAAEC,MAAc,EAAEO,YAAoB,EAAEC,KAAc,EAAE;IAAA,IAAAC,qBAAA;IACvF,MAAMC,QAAQ,IAAAD,qBAAA,GAAG,IAAI,CAACvC,cAAc,CAAC6B,QAAQ,CAAC,cAAAU,qBAAA,uBAA7BA,qBAAA,CAA+BR,KAAK,CAACU,IAAI,CACvDC,OAAO,IAAKA,OAAO,CAACZ,MAAM,KAAKA,MAClC,CAAC;IACD,IAAIU,QAAQ,EAAE;MACZA,QAAQ,CAACN,QAAQ,CAACG,YAAY,CAAC,GAAGC,KAAK;MACvC,IAAI,CAACA,KAAK,EAAE;QACVE,QAAQ,CAACP,IAAI,GAAG,KAAK;MACvB;IACF;EACF;EAOA,MAAMU,wBAAwBA,CAC5BC,cAA+E,EAC/EC,YAAmD,EACnD;IACA,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,cAAc,CAACT,MAAM,EAAEW,CAAC,EAAE,EAAE;MAC9C,IAAIF,cAAc,CAACE,CAAC,CAAC,IAAI,OAAO,IAAID,YAAY,CAACC,CAAC,CAAC,EAAE;QACnD,MAAM;UAACC,QAAQ;UAAEV,YAAY;UAAEW;QAAQ,CAAC,GAAGJ,cAAc,CAACE,CAAC,CAAC;QAC5D,IAAI,CAACC,QAAQ,IAAI,CAACV,YAAY,IAAI,CAACW,QAAQ,EAAE;QAC7C,KAAK,MAAMC,IAAI,IAAI,IAAI,CAACjD,cAAc,CAAC+C,QAAQ,CAAC,CAAChB,KAAK,EAAE;UACtD,IAAIkB,IAAI,CAACnB,MAAM,KAAKkB,QAAQ,EAAE;YAC5BC,IAAI,CAACf,QAAQ,CAACG,YAAY,CAAC,GAAG,IAAI;YAElC,IAAIJ,IAAI,GAAG,KAAK;YAChB,KAAK,MAAMiB,GAAG,IAAID,IAAI,CAACf,QAAQ,EAAE;cAC/BD,IAAI,GAAGgB,IAAI,CAACf,QAAQ,CAACgB,GAAG,CAAC;cACzB,IAAI,CAACjB,IAAI,EAAE;YACb;YACAgB,IAAI,CAAChB,IAAI,GAAGA,IAAI;YAChB,IAAIgB,IAAI,CAAChB,IAAI,EAAE;cACbgB,IAAI,CAACf,QAAQ,GAAG,CAAC,CAAC;YACpB;YACA;UACF;QACF;MACF;IACF;IACA,MAAM,IAAI,CAACd,cAAc,CAAC,CAAC;EAC7B;AACF"}
|
|
1
|
+
{"version":3,"file":"conversion-dump.js","names":["isDeepStrictEqual","DUMP_FILE_SUFFIX","isFileExists","openJson","removeFile","renameFile","writeFile","join","process","Ajv","dumpJsonSchema","ConversionDump","constructor","restored","options","tilesConverted","textureSetDefinitions","attributeMetadataInfo","materialDefinitions","createDump","currentOptions","tilesetName","slpk","egmFilePath","inputUrl","outputPath","draco","maxDepth","token","generateTextures","generateBoundingVolumes","mergeMaterials","metadataClass","analyze","dumpFilename","dump","ajv","dumpJsonValidate","compile","isDumpValid","JSON","parse","stringify","error","console","log","deleteDumpFile","reset","updateDumpFile","_this$options","time","hrtime","_this$options2","getRecord","fileName","setRecord","object","addNode","filename","nodeId","dumpMetadata","nodes","push","done","length","clearDumpRecord","addTexturesDefinitions","textureDefinitions","updateDoneStatus","resourceType","value","_this$tilesConverted$","nodeDump","find","element","progress","updateConvertedTilesDump","changedRecords","writeResults","i","sourceId","outputId","node","key","updateConvertedNodesDumpFile","_this$tilesConverted$2","isFileConversionComplete","_this$tilesConverted$4","_this$tilesConverted$5","result","_this$tilesConverted$3","setMaterialsDefinitions"],"sources":["../../../src/lib/utils/conversion-dump.ts"],"sourcesContent":["import {isDeepStrictEqual} from 'util';\nimport {DUMP_FILE_SUFFIX} from '../../constants';\nimport {isFileExists, openJson, removeFile, renameFile, writeFile} from './file-utils';\nimport {join} from 'path';\nimport {BoundingVolumes, I3SMaterialDefinition, TextureSetDefinitionFormats} from '@loaders.gl/i3s';\nimport {AttributeMetadataInfoObject} from '../../i3s-converter/helpers/attribute-metadata-info';\nimport process from 'process';\nimport Ajv from 'ajv';\nimport {dumpJsonSchema} from '../json-schemas/conversion-dump-json-schema';\n\nexport type ConversionDumpOptions = {\n inputUrl: string;\n outputPath: string;\n tilesetName: string;\n maxDepth: number;\n slpk: boolean;\n egmFilePath: string;\n token: string;\n draco: boolean;\n mergeMaterials: boolean;\n generateTextures: boolean;\n generateBoundingVolumes: boolean;\n metadataClass: string;\n analyze: boolean;\n};\n\ntype NodeDoneStatus = {\n nodeId: number | string;\n done: boolean;\n progress?: Record<string, boolean>;\n dumpMetadata?: DumpMetadata;\n};\n\ntype TilesConverted = {\n nodes: NodeDoneStatus[];\n};\n\nexport type DumpMetadata = {\n boundingVolumes: BoundingVolumes | null;\n attributesCount?: number;\n featureCount: number | null;\n geometry: boolean;\n hasUvRegions: boolean;\n materialId: number | null;\n texelCountHint?: number;\n vertexCount: number | null;\n};\n\nexport type TextureSetDefinition = {\n formats: TextureSetDefinitionFormats;\n atlas?: boolean;\n};\n\nexport class ConversionDump {\n /**Restored/resumed dump indicator */\n restored: boolean = false;\n /** Conversion options */\n private options?: ConversionDumpOptions;\n /** Tiles conversion progress status map */\n tilesConverted: Record<string, TilesConverted>;\n /** Textures formats definitions */\n textureSetDefinitions?: TextureSetDefinition[];\n /** Attributes Metadata */\n attributeMetadataInfo?: AttributeMetadataInfoObject;\n /** Array of materials definitions */\n materialDefinitions?: I3SMaterialDefinition[];\n\n constructor() {\n this.tilesConverted = {};\n }\n\n /**\n * Create a dump with convertion options\n * @param currentOptions - converter options\n */\n async createDump(currentOptions: ConversionDumpOptions): Promise<void> {\n const {\n tilesetName,\n slpk,\n egmFilePath,\n inputUrl,\n outputPath,\n draco = true,\n maxDepth,\n token,\n generateTextures,\n generateBoundingVolumes,\n mergeMaterials = true,\n metadataClass,\n analyze = false\n } = currentOptions;\n this.options = {\n tilesetName,\n slpk,\n egmFilePath,\n inputUrl,\n outputPath,\n draco,\n maxDepth,\n token,\n generateTextures,\n generateBoundingVolumes,\n mergeMaterials,\n metadataClass,\n analyze\n };\n\n const dumpFilename = join(\n this.options.outputPath,\n this.options.tilesetName,\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n );\n if (await isFileExists(dumpFilename)) {\n try {\n const dump = await openJson(\n join(this.options.outputPath, this.options.tilesetName),\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n );\n\n const {\n options,\n tilesConverted,\n textureSetDefinitions,\n attributeMetadataInfo,\n materialDefinitions\n } = dump;\n\n const ajv = new Ajv();\n const dumpJsonValidate = ajv.compile(dumpJsonSchema);\n const isDumpValid = dumpJsonValidate(dump);\n\n if (isDumpValid && isDeepStrictEqual(options, JSON.parse(JSON.stringify(this.options)))) {\n this.tilesConverted = tilesConverted;\n this.textureSetDefinitions = textureSetDefinitions;\n this.attributeMetadataInfo = attributeMetadataInfo;\n this.materialDefinitions = materialDefinitions;\n this.restored = true;\n return;\n }\n } catch (error) {\n console.log(\"Can't open dump file\", error);\n }\n }\n await this.deleteDumpFile();\n }\n\n /**\n * Reset a dump\n */\n reset(): void {\n this.restored = false;\n this.tilesConverted = {};\n if (this.textureSetDefinitions) {\n delete this.textureSetDefinitions;\n }\n if (this.attributeMetadataInfo) {\n delete this.attributeMetadataInfo;\n }\n if (this.materialDefinitions) {\n delete this.materialDefinitions;\n }\n }\n\n /**\n * Update conversion status in the dump file\n */\n private async updateDumpFile(): Promise<void> {\n if (this.options?.outputPath && this.options.tilesetName) {\n try {\n const time = process.hrtime();\n await writeFile(\n join(this.options.outputPath, this.options.tilesetName),\n JSON.stringify({\n options: this.options,\n tilesConverted: this.tilesConverted,\n textureSetDefinitions: this.textureSetDefinitions,\n attributeMetadataInfo: this.attributeMetadataInfo,\n materialDefinitions: this.materialDefinitions\n }),\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}.${time[0]}.${time[1]}`\n );\n await renameFile(\n join(\n this.options.outputPath,\n this.options.tilesetName,\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}.${time[0]}.${time[1]}`\n ),\n join(\n this.options.outputPath,\n this.options.tilesetName,\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n )\n );\n } catch (error) {\n console.log(\"Can't update dump file\", error);\n }\n }\n }\n\n /**\n * Delete a dump file\n */\n async deleteDumpFile(): Promise<void> {\n if (\n this.options?.outputPath &&\n this.options.tilesetName &&\n (await isFileExists(\n join(\n this.options.outputPath,\n this.options.tilesetName,\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n )\n ))\n ) {\n await removeFile(\n join(\n this.options.outputPath,\n this.options.tilesetName,\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n )\n );\n }\n }\n\n /**\n * Get record from the tilesConverted Map\n * @param fileName - source filename\n * @returns existing object from the tilesConverted Map\n */\n private getRecord(fileName: string) {\n return this.tilesConverted[fileName];\n }\n\n /**\n * Set a record for the dump file\n * @param fileName - key - source filename\n * @param object - value\n */\n private setRecord(fileName: string, object: any) {\n this.tilesConverted[fileName] = object;\n }\n\n /**\n * Add a node into the dump file for the source file record\n * @param fileName - source filename\n * @param nodeId - nodeId of the node\n */\n async addNode(filename: string, nodeId: number | string, dumpMetadata?: DumpMetadata) {\n const {nodes} = this.getRecord(filename) || {nodes: []};\n nodes.push({nodeId, done: false, dumpMetadata});\n if (nodes.length === 1) {\n this.setRecord(filename, {nodes});\n }\n await this.updateDumpFile();\n }\n\n /**\n * Clear dump record got the source filename\n * @param fileName - source filename\n */\n clearDumpRecord(filename: string) {\n this.setRecord(filename, {nodes: []});\n }\n\n /**\n * Add textures definitions into the dump file\n * @param textureDefinitions - textures definitions array\n */\n addTexturesDefinitions(textureDefinitions: TextureSetDefinition[]) {\n this.textureSetDefinitions = textureDefinitions;\n }\n\n /**\n * Update done status object for the writing resources\n * @param fileName - key - source filename\n * @param nodeId - nodeId for the source filename\n * @param resourceType - resource type to update status\n * @param value - value\n */\n updateDoneStatus(\n filename: string,\n nodeId: number | string,\n resourceType: string,\n value: boolean\n ) {\n const nodeDump = this.tilesConverted[filename]?.nodes.find(\n (element) => element.nodeId === nodeId\n );\n if (nodeDump) {\n if (!nodeDump.progress) {\n nodeDump.progress = {};\n }\n nodeDump.progress[resourceType] = value;\n if (!value) {\n nodeDump.done = false;\n }\n }\n }\n\n /**\n * Update dump file according to writing results\n * @param changedRecords - array of parameters ids for the written resources\n * @param writeResults - array of writing resource files results\n */\n async updateConvertedTilesDump(\n changedRecords: {outputId?: number | string; sourceId?: string; resourceType?: string}[],\n writeResults: PromiseSettledResult<string | null>[]\n ) {\n for (let i = 0; i < changedRecords.length; i++) {\n if (changedRecords[i] && 'value' in writeResults[i]) {\n const {sourceId, resourceType, outputId} = changedRecords[i];\n if (!sourceId || !resourceType || !outputId) continue;\n for (const node of this.tilesConverted[sourceId].nodes) {\n if (node.nodeId === outputId && node.progress) {\n node.progress[resourceType] = true;\n\n let done = false;\n for (const key in node.progress) {\n done = node.progress[key];\n if (!done) break;\n }\n node.done = done;\n if (node.done) {\n delete node.progress;\n }\n break;\n }\n }\n }\n }\n await this.updateDumpFile();\n }\n\n /**\n * Update 3d-tiles-converter dump file\n * @param filename - source filename\n * @param nodeId - nodeId\n * @param done - conversion status\n */\n async updateConvertedNodesDumpFile(\n filename: string,\n nodeId: number | string,\n done: boolean\n ): Promise<void> {\n const nodeDump = this.tilesConverted[filename]?.nodes.find(\n (element) => element.nodeId === nodeId\n );\n if (nodeDump) {\n nodeDump.done = done;\n await this.updateDumpFile();\n }\n }\n\n /**\n * Check is source file conversion complete\n * @param filename - source filename\n * @returns true if source file conversion complete\n */\n isFileConversionComplete(filename: string): boolean {\n let result = true;\n for (const node of this.tilesConverted[filename]?.nodes || []) {\n if (!node.done) {\n result = false;\n break;\n }\n }\n return result && this.tilesConverted[filename]?.nodes?.length > 0;\n }\n\n /**\n * Set materialDefinitions into a dump\n * @param materialDefinitions - Array materialDefinitions\n */\n setMaterialsDefinitions(materialDefinitions: I3SMaterialDefinition[]): void {\n this.materialDefinitions = materialDefinitions;\n }\n}\n"],"mappings":"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"}
|
|
@@ -48,4 +48,10 @@ export declare function removeFile(path: string): Promise<void>;
|
|
|
48
48
|
* @param filePath
|
|
49
49
|
*/
|
|
50
50
|
export declare function getAbsoluteFilePath(filePath: string): string;
|
|
51
|
+
/**
|
|
52
|
+
* Rename file with old path by new path
|
|
53
|
+
* @param oldPath
|
|
54
|
+
* @param newPath
|
|
55
|
+
*/
|
|
56
|
+
export declare function renameFile(oldPath: string, newPath: string): Promise<void>;
|
|
51
57
|
//# sourceMappingURL=file-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,EACxB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAGrC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD"}
|
|
1
|
+
{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,EACxB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAGrC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhF"}
|
|
@@ -84,4 +84,11 @@ export function removeFile(path) {
|
|
|
84
84
|
export function getAbsoluteFilePath(filePath) {
|
|
85
85
|
return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath);
|
|
86
86
|
}
|
|
87
|
+
export async function renameFile(oldPath, newPath) {
|
|
88
|
+
try {
|
|
89
|
+
await fs.rename(oldPath, newPath);
|
|
90
|
+
} catch (err) {
|
|
91
|
+
console.log("Can't rename file", err);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
87
94
|
//# sourceMappingURL=file-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","names":["load","JSONLoader","promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","arguments","length","undefined","toWriteData","Promise","Uint8Array","ArrayBuffer","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","compressList","includes","push","pathGzFile","removeFile","openJson","resolve","reject","count","intervalId","setInterval","then","result","clearInterval","catch","Error","isFileExists","stat","removeDir","rm","unlink","getAbsoluteFilePath","filePath","process","cwd"],"sources":["../../../src/lib/utils/file-utils.ts"],"sourcesContent":["import {load} from '@loaders.gl/core';\nimport {JSONLoader} from '@loaders.gl/loader-utils';\nimport {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\n/**\n * Write a file with data and name fileName to path\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n */\nexport async function writeFile(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json'\n): Promise<string> {\n let toWriteData: string | Uint8Array;\n if (data instanceof Promise) {\n toWriteData = new Uint8Array(await data);\n } else if (data instanceof ArrayBuffer) {\n toWriteData = new Uint8Array(data as ArrayBuffer);\n } else {\n toWriteData = data;\n }\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, toWriteData);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\n/**\n * Write a file with data and name fileName to path - specific one for further packaging into slpk\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n * @param compress - if need to compress file with gzip (default: true)\n * @param compressList - if set - the file should be added to this list and compressed in the end of conversion\n */\nexport async function writeFileForSlpk(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json',\n compress: boolean = true,\n compressList?: string[] | null\n): Promise<string | null> {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n if (compressList) {\n if (!compressList.includes(pathFile)) {\n compressList.push(pathFile);\n return `${pathFile}.gz`;\n } else {\n return null;\n }\n } else {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n }\n return pathFile;\n}\n\n/**\n * Open json file\n * @param path - path to the file\n * @param fileName - file name\n * @returns object\n */\nexport async function openJson(path: string, fileName: string): Promise<{[key: string]: any}> {\n return new Promise((resolve, reject) => {\n let count = 0;\n console.log(`load ${path}/${fileName}.`); // eslint-disable-line\n const intervalId = setInterval(() => {\n const pathFile = join(path, fileName);\n load(pathFile, JSONLoader)\n .then((result) => {\n clearInterval(intervalId);\n resolve(result);\n })\n .catch(() => {\n count++;\n if (count > 100) {\n clearInterval(intervalId);\n reject(new Error(`Cannon load ${path}/${fileName}.`));\n }\n });\n }, 200);\n });\n}\n\n/**\n * Check if the file exists\n * @param fileName - full name of file\n * @returns true if file exists, otherwise - false\n */\nexport async function isFileExists(fileName: string): Promise<boolean> {\n try {\n await fs.stat(fileName);\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Remove dir with path\n *\n * @param path\n */\nexport function removeDir(path: string) {\n // (node:35607) [DEP0147] DeprecationWarning: In future versions of Node.js, fs.rmdir(path, { recursive: true }) will be removed. Use fs.rm(path, { recursive: true }) instead\n return fs.rm(path, {recursive: true});\n}\n\n/**\n * Remove file with path\n *\n * @param path\n */\nexport function removeFile(path: string) {\n return fs.unlink(path);\n}\n\n/**\n * Generates absolute file path\n * @param filePath\n */\nexport function getAbsoluteFilePath(filePath: string) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath);\n}\n"],"mappings":"AAAA,SAAQA,IAAI,QAAO,kBAAkB;AACrC,SAAQC,UAAU,QAAO,0BAA0B;AACnD,SAAQC,QAAQ,IAAIC,EAAE,QAAO,IAAI;AACjC,SAAQC,UAAU,EAAEC,IAAI,QAAO,MAAM;AAAC,SAC9BC,oBAAoB;AAS5B,OAAO,eAAeC,SAASA,CAC7BC,IAAY,EACZC,IAA8D,EAE7C;EAAA,IADjBC,QAAgB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,YAAY;EAE/B,IAAIG,WAAgC;EACpC,IAAIL,IAAI,YAAYM,OAAO,EAAE;IAC3BD,WAAW,GAAG,IAAIE,UAAU,CAAC,MAAMP,IAAI,CAAC;EAC1C,CAAC,MAAM,IAAIA,IAAI,YAAYQ,WAAW,EAAE;IACtCH,WAAW,GAAG,IAAIE,UAAU,CAACP,IAAmB,CAAC;EACnD,CAAC,MAAM;IACLK,WAAW,GAAGL,IAAI;EACpB;EACA,MAAMN,EAAE,CAACe,KAAK,CAACV,IAAI,EAAE;IAACW,SAAS,EAAE;EAAI,CAAC,CAAC;EACvC,MAAMC,QAAQ,GAAGf,IAAI,CAACG,IAAI,EAAEE,QAAQ,CAAC;EACrC,IAAI;IACF,MAAMP,EAAE,CAACI,SAAS,CAACa,QAAQ,EAAEN,WAAW,CAAC;EAC3C,CAAC,CAAC,OAAOO,GAAG,EAAE;IACZ,MAAMA,GAAG;EACX;EACAC,OAAO,CAACC,GAAG,CAAE,GAAEH,QAAS,SAAQ,CAAC;EACjC,OAAOA,QAAQ;AACjB;AAWA,OAAO,eAAeI,gBAAgBA,CACpChB,IAAY,EACZC,IAA8D,EAItC;EAAA,IAHxBC,QAAgB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,YAAY;EAAA,IAC/Bc,QAAiB,GAAAd,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,IACxBe,YAA8B,GAAAf,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAE9B,MAAMO,QAAQ,GAAG,MAAMb,SAAS,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,CAAC;EACtD,IAAIe,QAAQ,EAAE;IACZ,IAAIC,YAAY,EAAE;MAChB,IAAI,CAACA,YAAY,CAACC,QAAQ,CAACP,QAAQ,CAAC,EAAE;QACpCM,YAAY,CAACE,IAAI,CAACR,QAAQ,CAAC;QAC3B,OAAQ,GAAEA,QAAS,KAAI;MACzB,CAAC,MAAM;QACL,OAAO,IAAI;MACb;IACF,CAAC,MAAM;MACL,MAAMS,UAAU,GAAG,MAAMvB,oBAAoB,CAACc,QAAQ,CAAC;MAEvD,MAAMU,UAAU,CAACV,QAAQ,CAAC;MAC1B,OAAOS,UAAU;IACnB;EACF;EACA,OAAOT,QAAQ;AACjB;AAQA,OAAO,eAAeW,QAAQA,CAACvB,IAAY,EAAEE,QAAgB,EAAiC;EAC5F,OAAO,IAAIK,OAAO,CAAC,CAACiB,OAAO,EAAEC,MAAM,KAAK;IACtC,IAAIC,KAAK,GAAG,CAAC;IACbZ,OAAO,CAACC,GAAG,CAAE,QAAOf,IAAK,IAAGE,QAAS,GAAE,CAAC;IACxC,MAAMyB,UAAU,GAAGC,WAAW,CAAC,MAAM;MACnC,MAAMhB,QAAQ,GAAGf,IAAI,CAACG,IAAI,EAAEE,QAAQ,CAAC;MACrCV,IAAI,CAACoB,QAAQ,EAAEnB,UAAU,CAAC,CACvBoC,IAAI,CAAEC,MAAM,IAAK;QAChBC,aAAa,CAACJ,UAAU,CAAC;QACzBH,OAAO,CAACM,MAAM,CAAC;MACjB,CAAC,CAAC,CACDE,KAAK,CAAC,MAAM;QACXN,KAAK,EAAE;QACP,IAAIA,KAAK,GAAG,GAAG,EAAE;UACfK,aAAa,CAACJ,UAAU,CAAC;UACzBF,MAAM,CAAC,IAAIQ,KAAK,CAAE,eAAcjC,IAAK,IAAGE,QAAS,GAAE,CAAC,CAAC;QACvD;MACF,CAAC,CAAC;IACN,CAAC,EAAE,GAAG,CAAC;EACT,CAAC,CAAC;AACJ;AAOA,OAAO,eAAegC,YAAYA,CAAChC,QAAgB,EAAoB;EACrE,IAAI;IACF,MAAMP,EAAE,CAACwC,IAAI,CAACjC,QAAQ,CAAC;IACvB,OAAO,IAAI;EACb,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;AACF;AAOA,OAAO,SAASkC,SAASA,CAACpC,IAAY,EAAE;EAEtC,OAAOL,EAAE,CAAC0C,EAAE,CAACrC,IAAI,EAAE;IAACW,SAAS,EAAE;EAAI,CAAC,CAAC;AACvC;AAOA,OAAO,SAASW,UAAUA,CAACtB,IAAY,EAAE;EACvC,OAAOL,EAAE,CAAC2C,MAAM,CAACtC,IAAI,CAAC;AACxB;AAMA,OAAO,SAASuC,mBAAmBA,CAACC,QAAgB,EAAE;EACpD,OAAO5C,UAAU,CAAC4C,QAAQ,CAAC,GAAGA,QAAQ,GAAG3C,IAAI,CAAC4C,OAAO,CAACC,GAAG,CAAC,CAAC,EAAEF,QAAQ,CAAC;AACxE"}
|
|
1
|
+
{"version":3,"file":"file-utils.js","names":["load","JSONLoader","promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","arguments","length","undefined","toWriteData","Promise","Uint8Array","ArrayBuffer","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","compressList","includes","push","pathGzFile","removeFile","openJson","resolve","reject","count","intervalId","setInterval","then","result","clearInterval","catch","Error","isFileExists","stat","removeDir","rm","unlink","getAbsoluteFilePath","filePath","process","cwd","renameFile","oldPath","newPath","rename"],"sources":["../../../src/lib/utils/file-utils.ts"],"sourcesContent":["import {load} from '@loaders.gl/core';\nimport {JSONLoader} from '@loaders.gl/loader-utils';\nimport {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\n/**\n * Write a file with data and name fileName to path\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n */\nexport async function writeFile(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json'\n): Promise<string> {\n let toWriteData: string | Uint8Array;\n if (data instanceof Promise) {\n toWriteData = new Uint8Array(await data);\n } else if (data instanceof ArrayBuffer) {\n toWriteData = new Uint8Array(data as ArrayBuffer);\n } else {\n toWriteData = data;\n }\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, toWriteData);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\n/**\n * Write a file with data and name fileName to path - specific one for further packaging into slpk\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n * @param compress - if need to compress file with gzip (default: true)\n * @param compressList - if set - the file should be added to this list and compressed in the end of conversion\n */\nexport async function writeFileForSlpk(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json',\n compress: boolean = true,\n compressList?: string[] | null\n): Promise<string | null> {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n if (compressList) {\n if (!compressList.includes(pathFile)) {\n compressList.push(pathFile);\n return `${pathFile}.gz`;\n } else {\n return null;\n }\n } else {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n }\n return pathFile;\n}\n\n/**\n * Open json file\n * @param path - path to the file\n * @param fileName - file name\n * @returns object\n */\nexport async function openJson(path: string, fileName: string): Promise<{[key: string]: any}> {\n return new Promise((resolve, reject) => {\n let count = 0;\n console.log(`load ${path}/${fileName}.`); // eslint-disable-line\n const intervalId = setInterval(() => {\n const pathFile = join(path, fileName);\n load(pathFile, JSONLoader)\n .then((result) => {\n clearInterval(intervalId);\n resolve(result);\n })\n .catch(() => {\n count++;\n if (count > 100) {\n clearInterval(intervalId);\n reject(new Error(`Cannon load ${path}/${fileName}.`));\n }\n });\n }, 200);\n });\n}\n\n/**\n * Check if the file exists\n * @param fileName - full name of file\n * @returns true if file exists, otherwise - false\n */\nexport async function isFileExists(fileName: string): Promise<boolean> {\n try {\n await fs.stat(fileName);\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Remove dir with path\n *\n * @param path\n */\nexport function removeDir(path: string) {\n // (node:35607) [DEP0147] DeprecationWarning: In future versions of Node.js, fs.rmdir(path, { recursive: true }) will be removed. Use fs.rm(path, { recursive: true }) instead\n return fs.rm(path, {recursive: true});\n}\n\n/**\n * Remove file with path\n *\n * @param path\n */\nexport function removeFile(path: string) {\n return fs.unlink(path);\n}\n\n/**\n * Generates absolute file path\n * @param filePath\n */\nexport function getAbsoluteFilePath(filePath: string) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath);\n}\n\n/**\n * Rename file with old path by new path\n * @param oldPath\n * @param newPath\n */\nexport async function renameFile(oldPath: string, newPath: string): Promise<void> {\n try {\n await fs.rename(oldPath, newPath);\n } catch (err) {\n console.log(\"Can't rename file\", err);\n }\n}\n"],"mappings":"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"}
|
package/dist/pgm-loader.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Geoid, parsePGM } from '@math.gl/geoid';
|
|
2
|
-
const VERSION = typeof "4.
|
|
2
|
+
const VERSION = typeof "4.2.0-alpha.2" !== 'undefined' ? "4.2.0-alpha.2" : 'latest';
|
|
3
3
|
export { Geoid };
|
|
4
4
|
export const PGMLoader = {
|
|
5
5
|
name: 'PGM - Netpbm grayscale image format',
|
package/dist/pgm-loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pgm-loader.js","names":["Geoid","parsePGM","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","pgm","extensions","cubic"],"sources":["../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Geoid, parsePGM} from '@math.gl/geoid';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport {Geoid};\n\nexport type PGMLoaderOptions = LoaderOptions & {\n pgm?: {\n cubic?: boolean;\n };\n};\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser<Geoid, never, PGMLoaderOptions> = {\n name: 'PGM - Netpbm grayscale image format',\n id: 'pgm',\n module: 'tile-converter',\n version: VERSION,\n mimeTypes: ['image/x-portable-graymap'],\n parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options?.pgm || {}),\n extensions: ['pgm'],\n options: {\n pgm: {\n cubic: false\n }\n }\n};\n"],"mappings":"AACA,SAAQA,KAAK,EAAEC,QAAQ,QAAO,gBAAgB;AAI9C,MAAMC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"pgm-loader.js","names":["Geoid","parsePGM","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","pgm","extensions","cubic"],"sources":["../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Geoid, parsePGM} from '@math.gl/geoid';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport {Geoid};\n\nexport type PGMLoaderOptions = LoaderOptions & {\n pgm?: {\n cubic?: boolean;\n };\n};\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser<Geoid, never, PGMLoaderOptions> = {\n name: 'PGM - Netpbm grayscale image format',\n id: 'pgm',\n module: 'tile-converter',\n version: VERSION,\n mimeTypes: ['image/x-portable-graymap'],\n parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options?.pgm || {}),\n extensions: ['pgm'],\n options: {\n pgm: {\n cubic: false\n }\n }\n};\n"],"mappings":"AACA,SAAQA,KAAK,EAAEC,QAAQ,QAAO,gBAAgB;AAI9C,MAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAE3E,SAAQF,KAAK;AAWb,OAAO,MAAMG,SAA2D,GAAG;EACzEC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,MAAAA,CAAOC,WAAW,EAAEC,OAAO,KAAKV,QAAQ,CAAC,IAAIW,UAAU,CAACF,WAAW,CAAC,EAAE,CAAAC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEE,GAAG,KAAI,CAAC,CAAC,CAAC;EAChGC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBH,OAAO,EAAE;IACPE,GAAG,EAAE;MACHE,KAAK,EAAE;IACT;EACF;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0-alpha.2",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -52,22 +52,23 @@
|
|
|
52
52
|
"build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@loaders.gl/3d-tiles": "4.
|
|
56
|
-
"@loaders.gl/crypto": "4.
|
|
57
|
-
"@loaders.gl/draco": "4.
|
|
58
|
-
"@loaders.gl/gltf": "4.
|
|
59
|
-
"@loaders.gl/i3s": "4.
|
|
60
|
-
"@loaders.gl/images": "4.
|
|
61
|
-
"@loaders.gl/loader-utils": "4.
|
|
62
|
-
"@loaders.gl/polyfills": "4.
|
|
63
|
-
"@loaders.gl/textures": "4.
|
|
64
|
-
"@loaders.gl/tiles": "4.
|
|
65
|
-
"@loaders.gl/worker-utils": "4.
|
|
66
|
-
"@loaders.gl/zip": "4.
|
|
55
|
+
"@loaders.gl/3d-tiles": "4.2.0-alpha.2",
|
|
56
|
+
"@loaders.gl/crypto": "4.2.0-alpha.2",
|
|
57
|
+
"@loaders.gl/draco": "4.2.0-alpha.2",
|
|
58
|
+
"@loaders.gl/gltf": "4.2.0-alpha.2",
|
|
59
|
+
"@loaders.gl/i3s": "4.2.0-alpha.2",
|
|
60
|
+
"@loaders.gl/images": "4.2.0-alpha.2",
|
|
61
|
+
"@loaders.gl/loader-utils": "4.2.0-alpha.2",
|
|
62
|
+
"@loaders.gl/polyfills": "4.2.0-alpha.2",
|
|
63
|
+
"@loaders.gl/textures": "4.2.0-alpha.2",
|
|
64
|
+
"@loaders.gl/tiles": "4.2.0-alpha.2",
|
|
65
|
+
"@loaders.gl/worker-utils": "4.2.0-alpha.2",
|
|
66
|
+
"@loaders.gl/zip": "4.2.0-alpha.2",
|
|
67
67
|
"@math.gl/core": "^4.0.0",
|
|
68
68
|
"@math.gl/culling": "^4.0.0",
|
|
69
69
|
"@math.gl/geoid": "^4.0.0",
|
|
70
70
|
"@math.gl/geospatial": "^4.0.0",
|
|
71
|
+
"ajv": "^8.12.0",
|
|
71
72
|
"archiver": "^5.0.0",
|
|
72
73
|
"cors": "^2.8.5",
|
|
73
74
|
"crypt": "^0.0.2",
|
|
@@ -87,7 +88,7 @@
|
|
|
87
88
|
"join-images": "^1.1.3",
|
|
88
89
|
"sharp": "^0.31.3"
|
|
89
90
|
},
|
|
90
|
-
"gitHead": "
|
|
91
|
+
"gitHead": "d66a6a4626ea84c5f2cad5fa5cf7ebb6943c57c8",
|
|
91
92
|
"devDependencies": {
|
|
92
93
|
"@types/express": "^4.17.17",
|
|
93
94
|
"@types/node": "^20.4.2"
|