@loaders.gl/tile-converter 4.2.0-alpha.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/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-server/bin/i3s-server.min.cjs +86 -86
- package/dist/index.cjs +530 -66
- 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 +12 -5
- package/dist/lib/utils/conversion-dump.d.ts.map +1 -1
- package/dist/lib/utils/conversion-dump.js +44 -24
- 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/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/load-3d-tiles.ts +52 -2
- package/src/lib/json-schemas/conversion-dump-json-schema.ts +285 -0
- package/src/lib/utils/conversion-dump.ts +79 -27
- package/src/lib/utils/file-utils.ts +13 -0
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { isDeepStrictEqual } from 'util';
|
|
2
2
|
import { DUMP_FILE_SUFFIX } from "../../constants.js";
|
|
3
|
-
import { isFileExists, openJson, removeFile, writeFile } from "./file-utils.js";
|
|
3
|
+
import { isFileExists, openJson, removeFile, renameFile, writeFile } from "./file-utils.js";
|
|
4
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";
|
|
5
8
|
export class ConversionDump {
|
|
6
9
|
constructor() {
|
|
7
10
|
this.restored = false;
|
|
@@ -9,7 +12,7 @@ export class ConversionDump {
|
|
|
9
12
|
this.tilesConverted = void 0;
|
|
10
13
|
this.textureSetDefinitions = void 0;
|
|
11
14
|
this.attributeMetadataInfo = void 0;
|
|
12
|
-
this.materialDefinitions =
|
|
15
|
+
this.materialDefinitions = void 0;
|
|
13
16
|
this.tilesConverted = {};
|
|
14
17
|
}
|
|
15
18
|
async createDump(currentOptions) {
|
|
@@ -45,20 +48,28 @@ export class ConversionDump {
|
|
|
45
48
|
};
|
|
46
49
|
const dumpFilename = join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
|
|
47
50
|
if (await isFileExists(dumpFilename)) {
|
|
48
|
-
|
|
49
|
-
options,
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
this.
|
|
61
|
-
|
|
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);
|
|
62
73
|
}
|
|
63
74
|
}
|
|
64
75
|
await this.deleteDumpFile();
|
|
@@ -72,21 +83,23 @@ export class ConversionDump {
|
|
|
72
83
|
if (this.attributeMetadataInfo) {
|
|
73
84
|
delete this.attributeMetadataInfo;
|
|
74
85
|
}
|
|
75
|
-
if (this.materialDefinitions
|
|
76
|
-
this.materialDefinitions
|
|
86
|
+
if (this.materialDefinitions) {
|
|
87
|
+
delete this.materialDefinitions;
|
|
77
88
|
}
|
|
78
89
|
}
|
|
79
90
|
async updateDumpFile() {
|
|
80
91
|
var _this$options;
|
|
81
92
|
if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.outputPath && this.options.tilesetName) {
|
|
82
93
|
try {
|
|
94
|
+
const time = process.hrtime();
|
|
83
95
|
await writeFile(join(this.options.outputPath, this.options.tilesetName), JSON.stringify({
|
|
84
96
|
options: this.options,
|
|
85
97
|
tilesConverted: this.tilesConverted,
|
|
86
98
|
textureSetDefinitions: this.textureSetDefinitions,
|
|
87
99
|
attributeMetadataInfo: this.attributeMetadataInfo,
|
|
88
100
|
materialDefinitions: this.materialDefinitions
|
|
89
|
-
}), `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
|
|
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}`));
|
|
90
103
|
} catch (error) {
|
|
91
104
|
console.log("Can't update dump file", error);
|
|
92
105
|
}
|
|
@@ -113,7 +126,6 @@ export class ConversionDump {
|
|
|
113
126
|
nodes.push({
|
|
114
127
|
nodeId,
|
|
115
128
|
done: false,
|
|
116
|
-
progress: {},
|
|
117
129
|
dumpMetadata
|
|
118
130
|
});
|
|
119
131
|
if (nodes.length === 1) {
|
|
@@ -172,17 +184,25 @@ export class ConversionDump {
|
|
|
172
184
|
}
|
|
173
185
|
await this.updateDumpFile();
|
|
174
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
|
+
}
|
|
175
195
|
isFileConversionComplete(filename) {
|
|
176
|
-
var _this$tilesConverted$
|
|
196
|
+
var _this$tilesConverted$4, _this$tilesConverted$5;
|
|
177
197
|
let result = true;
|
|
178
|
-
for (const node of ((_this$tilesConverted$
|
|
179
|
-
var _this$tilesConverted$
|
|
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;
|
|
180
200
|
if (!node.done) {
|
|
181
201
|
result = false;
|
|
182
202
|
break;
|
|
183
203
|
}
|
|
184
204
|
}
|
|
185
|
-
return result && ((_this$tilesConverted$
|
|
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;
|
|
186
206
|
}
|
|
187
207
|
setMaterialsDefinitions(materialDefinitions) {
|
|
188
208
|
this.materialDefinitions = materialDefinitions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion-dump.js","names":["isDeepStrictEqual","DUMP_FILE_SUFFIX","isFileExists","openJson","removeFile","writeFile","join","ConversionDump","constructor","restored","options","tilesConverted","textureSetDefinitions","attributeMetadataInfo","materialDefinitions","createDump","currentOptions","tilesetName","slpk","egmFilePath","inputUrl","outputPath","draco","maxDepth","token","generateTextures","generateBoundingVolumes","mergeMaterials","metadataClass","analyze","dumpFilename","JSON","parse","stringify","deleteDumpFile","reset","length","updateDumpFile","_this$options","error","console","log","_this$options2","getRecord","fileName","setRecord","object","addNode","filename","nodeId","dumpMetadata","nodes","push","done","progress","clearDumpRecord","addTexturesDefinitions","textureDefinitions","updateDoneStatus","resourceType","value","_this$tilesConverted$","nodeDump","find","element","updateConvertedTilesDump","changedRecords","writeResults","i","sourceId","outputId","node","key","isFileConversionComplete","_this$tilesConverted$3","_this$tilesConverted$4","result","_this$tilesConverted$2","setMaterialsDefinitions"],"sources":["../../../src/lib/utils/conversion-dump.ts"],"sourcesContent":["import {isDeepStrictEqual} from 'util';\nimport {DUMP_FILE_SUFFIX} from '../../constants';\nimport {isFileExists, openJson, removeFile, 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';\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 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 const {\n options,\n tilesConverted,\n textureSetDefinitions,\n attributeMetadataInfo,\n materialDefinitions\n } = await openJson(\n join(this.options.outputPath, this.options.tilesetName),\n `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`\n );\n if (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 }\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.length > 0) {\n 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 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}`\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, dumpMetadata: DumpMetadata) {\n const {nodes} = this.getRecord(filename) || {nodes: []};\n nodes.push({nodeId, done: false, progress: {}, 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(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 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; 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 * 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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"}
|
|
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":"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"}
|
|
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.0-alpha.
|
|
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "4.2.0-alpha.
|
|
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.2.0-alpha.
|
|
56
|
-
"@loaders.gl/crypto": "4.2.0-alpha.
|
|
57
|
-
"@loaders.gl/draco": "4.2.0-alpha.
|
|
58
|
-
"@loaders.gl/gltf": "4.2.0-alpha.
|
|
59
|
-
"@loaders.gl/i3s": "4.2.0-alpha.
|
|
60
|
-
"@loaders.gl/images": "4.2.0-alpha.
|
|
61
|
-
"@loaders.gl/loader-utils": "4.2.0-alpha.
|
|
62
|
-
"@loaders.gl/polyfills": "4.2.0-alpha.
|
|
63
|
-
"@loaders.gl/textures": "4.2.0-alpha.
|
|
64
|
-
"@loaders.gl/tiles": "4.2.0-alpha.
|
|
65
|
-
"@loaders.gl/worker-utils": "4.2.0-alpha.
|
|
66
|
-
"@loaders.gl/zip": "4.2.0-alpha.
|
|
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"
|
|
@@ -4,7 +4,7 @@ import type {
|
|
|
4
4
|
NodeReference,
|
|
5
5
|
I3STilesetHeader
|
|
6
6
|
} from '@loaders.gl/i3s';
|
|
7
|
-
import type {Tiles3DTileJSON} from '@loaders.gl/3d-tiles';
|
|
7
|
+
import type {Tile3DBoundingVolume, Tiles3DTileJSON} from '@loaders.gl/3d-tiles';
|
|
8
8
|
|
|
9
9
|
import {join} from 'path';
|
|
10
10
|
import process from 'process';
|
|
@@ -24,8 +24,10 @@ import {WorkerFarm} from '@loaders.gl/worker-utils';
|
|
|
24
24
|
import {BROWSER_ERROR_MESSAGE} from '../constants';
|
|
25
25
|
import B3dmConverter, {I3SAttributesData} from './helpers/b3dm-converter';
|
|
26
26
|
import {I3STileHeader} from '@loaders.gl/i3s/src/types';
|
|
27
|
-
import {loadI3SContent} from './helpers/load-i3s';
|
|
27
|
+
import {loadFromArchive, loadI3SContent, openSLPK} from './helpers/load-i3s';
|
|
28
28
|
import {I3SLoaderOptions} from '@loaders.gl/i3s/src/i3s-loader';
|
|
29
|
+
import {ZipFileSystem} from '../../../zip/src';
|
|
30
|
+
import {ConversionDump, ConversionDumpOptions} from '../lib/utils/conversion-dump';
|
|
29
31
|
|
|
30
32
|
const I3S = 'I3S';
|
|
31
33
|
|
|
@@ -41,6 +43,7 @@ export default class Tiles3DConverter {
|
|
|
41
43
|
sourceTileset: I3STilesetHeader | null;
|
|
42
44
|
attributeStorageInfo?: AttributeStorageInfo[] | null;
|
|
43
45
|
workerSource: {[key: string]: string} = {};
|
|
46
|
+
slpkFilesystem: ZipFileSystem | null = null;
|
|
44
47
|
loaderOptions: I3SLoaderOptions = {
|
|
45
48
|
_nodeWorkers: true,
|
|
46
49
|
reuseWorkers: true,
|
|
@@ -52,6 +55,7 @@ export default class Tiles3DConverter {
|
|
|
52
55
|
workerUrl: './modules/i3s/dist/i3s-content-worker-node.js'
|
|
53
56
|
}
|
|
54
57
|
};
|
|
58
|
+
conversionDump: ConversionDump;
|
|
55
59
|
|
|
56
60
|
constructor() {
|
|
57
61
|
this.options = {};
|
|
@@ -62,6 +66,7 @@ export default class Tiles3DConverter {
|
|
|
62
66
|
this.sourceTileset = null;
|
|
63
67
|
this.attributeStorageInfo = null;
|
|
64
68
|
this.workerSource = {};
|
|
69
|
+
this.conversionDump = new ConversionDump();
|
|
65
70
|
}
|
|
66
71
|
|
|
67
72
|
/**
|
|
@@ -79,20 +84,32 @@ export default class Tiles3DConverter {
|
|
|
79
84
|
tilesetName: string;
|
|
80
85
|
maxDepth?: number;
|
|
81
86
|
egmFilePath: string;
|
|
87
|
+
inquirer?: Promise<unknown>;
|
|
82
88
|
}): Promise<any> {
|
|
83
89
|
if (isBrowser) {
|
|
84
90
|
console.log(BROWSER_ERROR_MESSAGE);
|
|
85
91
|
return BROWSER_ERROR_MESSAGE;
|
|
86
92
|
}
|
|
87
|
-
const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;
|
|
93
|
+
const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath, inquirer} = options;
|
|
88
94
|
this.conversionStartTime = process.hrtime();
|
|
89
|
-
this.options = {maxDepth};
|
|
95
|
+
this.options = {maxDepth, inquirer};
|
|
90
96
|
|
|
91
97
|
console.log('Loading egm file...'); // eslint-disable-line
|
|
92
98
|
this.geoidHeightModel = await load(egmFilePath, PGMLoader);
|
|
93
99
|
console.log('Loading egm file completed!'); // eslint-disable-line
|
|
94
100
|
|
|
95
|
-
this.
|
|
101
|
+
this.slpkFilesystem = await openSLPK(inputUrl);
|
|
102
|
+
|
|
103
|
+
this.sourceTileset = await loadFromArchive(
|
|
104
|
+
inputUrl,
|
|
105
|
+
I3SLoader,
|
|
106
|
+
{
|
|
107
|
+
...this.loaderOptions,
|
|
108
|
+
// @ts-expect-error `isTileset` can be boolean of 'auto' but TS expects a string
|
|
109
|
+
i3s: {...this.loaderOptions.i3s, isTileset: true}
|
|
110
|
+
},
|
|
111
|
+
this.slpkFilesystem
|
|
112
|
+
);
|
|
96
113
|
|
|
97
114
|
if (!this.sourceTileset) {
|
|
98
115
|
return;
|
|
@@ -105,11 +122,28 @@ export default class Tiles3DConverter {
|
|
|
105
122
|
|
|
106
123
|
this.tilesetPath = join(`${outputPath}`, `${tilesetName}`);
|
|
107
124
|
this.attributeStorageInfo = this.sourceTileset.attributeStorageInfo;
|
|
125
|
+
|
|
126
|
+
await this.conversionDump.createDump(options as ConversionDumpOptions);
|
|
127
|
+
if (this.conversionDump.restored && this.options.inquirer) {
|
|
128
|
+
const result = await this.options.inquirer.prompt([
|
|
129
|
+
{
|
|
130
|
+
name: 'resumeConversion',
|
|
131
|
+
type: 'confirm',
|
|
132
|
+
message:
|
|
133
|
+
'Dump file of the previous conversion exists, do you want to resume that conversion?'
|
|
134
|
+
}
|
|
135
|
+
]);
|
|
136
|
+
if (!result.resumeConversion) {
|
|
137
|
+
this.conversionDump.reset();
|
|
138
|
+
}
|
|
139
|
+
}
|
|
108
140
|
// Removing the tilesetPath needed to exclude erroneous files after conversion
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
141
|
+
if (!this.conversionDump.restored) {
|
|
142
|
+
try {
|
|
143
|
+
await removeDir(this.tilesetPath);
|
|
144
|
+
} catch (e) {
|
|
145
|
+
// do nothing
|
|
146
|
+
}
|
|
113
147
|
}
|
|
114
148
|
|
|
115
149
|
const rootTile: Tiles3DTileJSON = {
|
|
@@ -125,8 +159,13 @@ export default class Tiles3DConverter {
|
|
|
125
159
|
|
|
126
160
|
const tileset = transform({root: rootTile}, tilesetTemplate());
|
|
127
161
|
await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
|
|
162
|
+
await this.conversionDump.deleteDumpFile();
|
|
128
163
|
|
|
129
|
-
this._finishConversion({slpk: false, outputPath, tilesetName});
|
|
164
|
+
await this._finishConversion({slpk: false, outputPath, tilesetName});
|
|
165
|
+
|
|
166
|
+
if (this.slpkFilesystem) {
|
|
167
|
+
this.slpkFilesystem.destroy();
|
|
168
|
+
}
|
|
130
169
|
|
|
131
170
|
// Clean up worker pools
|
|
132
171
|
const workerFarm = WorkerFarm.getWorkerFarm({});
|
|
@@ -148,7 +187,22 @@ export default class Tiles3DConverter {
|
|
|
148
187
|
): Promise<void> {
|
|
149
188
|
const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
|
|
150
189
|
if (sourceChild.contentUrl) {
|
|
151
|
-
|
|
190
|
+
if (
|
|
191
|
+
this.conversionDump.restored &&
|
|
192
|
+
this.conversionDump.isFileConversionComplete(`${sourceChild.id}.b3dm`) &&
|
|
193
|
+
(sourceChild.obb || sourceChild.mbs)
|
|
194
|
+
) {
|
|
195
|
+
const {child} = this._createChildAndBoundingVolume(sourceChild);
|
|
196
|
+
parentNode.children.push(child);
|
|
197
|
+
await this._addChildren(sourceChild, child, level + 1);
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
const content = await loadI3SContent(
|
|
201
|
+
this.sourceTileset,
|
|
202
|
+
sourceChild,
|
|
203
|
+
this.loaderOptions,
|
|
204
|
+
this.slpkFilesystem
|
|
205
|
+
);
|
|
152
206
|
|
|
153
207
|
if (!content) {
|
|
154
208
|
await this._addChildren(sourceChild, parentNode, level + 1);
|
|
@@ -162,33 +216,24 @@ export default class Tiles3DConverter {
|
|
|
162
216
|
featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
|
|
163
217
|
}
|
|
164
218
|
|
|
165
|
-
|
|
166
|
-
sourceChild.obb = createObbFromMbs(sourceChild.mbs);
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
const boundingVolume = {
|
|
170
|
-
box: i3sObbTo3dTilesObb(sourceChild.obb, this.geoidHeightModel)
|
|
171
|
-
};
|
|
172
|
-
const child: Tiles3DTileJSON = {
|
|
173
|
-
boundingVolume,
|
|
174
|
-
geometricError: convertScreenThresholdToGeometricError(sourceChild),
|
|
175
|
-
children: []
|
|
176
|
-
};
|
|
219
|
+
const {child, boundingVolume} = this._createChildAndBoundingVolume(sourceChild);
|
|
177
220
|
|
|
178
221
|
const i3sAttributesData: I3SAttributesData = {
|
|
179
222
|
tileContent: content,
|
|
180
|
-
box: boundingVolume.box,
|
|
223
|
+
box: boundingVolume.box || [],
|
|
181
224
|
textureFormat: sourceChild.textureFormat
|
|
182
225
|
};
|
|
183
226
|
|
|
184
227
|
const b3dmConverter = new B3dmConverter();
|
|
185
228
|
const b3dm = await b3dmConverter.convert(i3sAttributesData, featureAttributes);
|
|
186
229
|
|
|
187
|
-
|
|
188
|
-
uri: `${sourceChild.id}.b3dm`,
|
|
189
|
-
boundingVolume
|
|
190
|
-
};
|
|
230
|
+
await this.conversionDump.addNode(`${sourceChild.id}.b3dm`, sourceChild.id);
|
|
191
231
|
await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
|
|
232
|
+
await this.conversionDump.updateConvertedNodesDumpFile(
|
|
233
|
+
`${sourceChild.id}.b3dm`,
|
|
234
|
+
sourceChild.id,
|
|
235
|
+
true
|
|
236
|
+
);
|
|
192
237
|
parentNode.children.push(child);
|
|
193
238
|
|
|
194
239
|
await this._addChildren(sourceChild, child, level + 1);
|
|
@@ -235,20 +280,48 @@ export default class Tiles3DConverter {
|
|
|
235
280
|
} else {
|
|
236
281
|
const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href!);
|
|
237
282
|
// load metadata
|
|
238
|
-
const options = {
|
|
283
|
+
const options: I3SLoaderOptions = {
|
|
239
284
|
i3s: {
|
|
240
285
|
...this.loaderOptions,
|
|
286
|
+
// @ts-expect-error
|
|
241
287
|
isTileHeader: true,
|
|
242
288
|
loadContent: false
|
|
243
289
|
}
|
|
244
290
|
};
|
|
245
291
|
|
|
246
292
|
console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef
|
|
247
|
-
header = await
|
|
293
|
+
header = await loadFromArchive(nodeUrl, I3SLoader, options, this.slpkFilesystem);
|
|
248
294
|
}
|
|
249
295
|
return header;
|
|
250
296
|
}
|
|
251
297
|
|
|
298
|
+
/**
|
|
299
|
+
* Create child and child's boundingVolume for the converted node
|
|
300
|
+
* @param sourceChild
|
|
301
|
+
* @returns child and child's boundingVolume
|
|
302
|
+
*/
|
|
303
|
+
private _createChildAndBoundingVolume(sourceChild: I3STileHeader): {
|
|
304
|
+
boundingVolume: Tile3DBoundingVolume;
|
|
305
|
+
child: Tiles3DTileJSON;
|
|
306
|
+
} {
|
|
307
|
+
if (!sourceChild.obb) {
|
|
308
|
+
sourceChild.obb = createObbFromMbs(sourceChild.mbs);
|
|
309
|
+
}
|
|
310
|
+
const boundingVolume: Tile3DBoundingVolume = {
|
|
311
|
+
box: i3sObbTo3dTilesObb(sourceChild.obb, this.geoidHeightModel)
|
|
312
|
+
};
|
|
313
|
+
const child: Tiles3DTileJSON = {
|
|
314
|
+
boundingVolume,
|
|
315
|
+
geometricError: convertScreenThresholdToGeometricError(sourceChild),
|
|
316
|
+
children: [],
|
|
317
|
+
content: {
|
|
318
|
+
uri: `${sourceChild.id}.b3dm`,
|
|
319
|
+
boundingVolume
|
|
320
|
+
}
|
|
321
|
+
};
|
|
322
|
+
return {boundingVolume, child};
|
|
323
|
+
}
|
|
324
|
+
|
|
252
325
|
/**
|
|
253
326
|
* Make an url of a resource from its relative url having the base url
|
|
254
327
|
* @param baseUrl the base url. A resulting url will be related from this url
|
|
@@ -292,7 +365,7 @@ export default class Tiles3DConverter {
|
|
|
292
365
|
attributeType: this._getAttributeType(attribute)
|
|
293
366
|
};
|
|
294
367
|
|
|
295
|
-
promises.push(
|
|
368
|
+
promises.push(loadFromArchive(inputUrl, I3SAttributeLoader, options, this.slpkFilesystem));
|
|
296
369
|
}
|
|
297
370
|
const attributesList = await Promise.all(promises);
|
|
298
371
|
this._replaceNestedArrays(attributesList);
|