@loaders.gl/tile-converter 4.0.4 → 4.0.6
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.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +2 -3
- package/dist/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/converter-cli.js +1 -1
- package/dist/converter-cli.js.map +1 -1
- package/dist/converter.min.cjs +2 -2
- package/dist/deps-installer/deps-installer.js +1 -1
- package/dist/deps-installer/deps-installer.js.map +1 -1
- package/dist/index.cjs +3 -3
- package/dist/lib/utils/statistic-utills.d.ts +23 -6
- package/dist/pgm-loader.js +1 -1
- package/dist/pgm-loader.js.map +1 -1
- package/package.json +14 -14
- package/src/3d-tiles-converter/3d-tiles-converter.ts +3 -3
- package/src/converter-cli.ts +1 -1
- package/dist/lib/utils/statistic-utills.d.js +0 -2
- package/dist/lib/utils/statistic-utills.d.js.map +0 -1
|
@@ -5,7 +5,7 @@ import { join } from 'path';
|
|
|
5
5
|
import { ChildProcessProxy } from '@loaders.gl/worker-utils';
|
|
6
6
|
import { DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS } from '@loaders.gl/draco';
|
|
7
7
|
import { BASIS_EXTERNAL_LIBRARIES } from '@loaders.gl/textures';
|
|
8
|
-
const VERSION = typeof
|
|
8
|
+
const VERSION = typeof "4.0.6" !== 'undefined' ? "4.0.6" : 'latest';
|
|
9
9
|
const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
10
10
|
export class DepsInstaller {
|
|
11
11
|
async install() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","DRACO_EXTERNAL_LIBRARIES","DRACO_EXTERNAL_LIBRARY_URLS","BASIS_EXTERNAL_LIBRARIES","VERSION","
|
|
1
|
+
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","DRACO_EXTERNAL_LIBRARIES","DRACO_EXTERNAL_LIBRARY_URLS","BASIS_EXTERNAL_LIBRARIES","VERSION","PGM_LINK","DepsInstaller","install","path","arguments","length","undefined","console","log","fileMap","depsPath","process","cwd","Uint8Array","installFromNpm","installFromUrl","DECODER","DECODER_WASM","ENCODER","TRANSCODER","TRANSCODER_WASM","ENCODER_WASM","childProcess","start","command","platform","wait","ignoreStderr","module","name","extraPath","fileResponse","fileData","arrayBuffer","url"],"sources":["../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport {DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS} from '@loaders.gl/draco';\nimport {BASIS_EXTERNAL_LIBRARIES} from '@loaders.gl/textures';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n /**\n * Run instalation\n * @param path destination folder\n * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = ''): Promise<void> {\n console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n let depsPath = process.cwd();\n if (path) {\n depsPath = join(depsPath, path);\n }\n\n await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n console.log('Installing \"I3S Content Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('i3s', 'i3s-content-worker-node.js');\n\n console.log('Installing \"Draco Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('draco', 'draco-worker-node.js');\n\n console.log('Installing \"Draco Writer\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('draco', 'draco-writer-worker-node.js');\n\n console.log('Installing \"Basis Loader\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('textures', 'basis-worker-node.js');\n\n console.log('Installing \"KTX2 Basis Writer\" worker'); // eslint-disable-line no-console\n await this.installFromNpm('textures', 'ktx2-basis-writer-worker-node.js');\n\n console.log('Installing \"Draco decoder\" library'); // eslint-disable-line no-console\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.DECODER\n );\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.DECODER_WASM\n );\n\n console.log('Installing \"Draco encoder\" library'); // eslint-disable-line no-console\n await this.installFromUrl(\n DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.ENCODER],\n 'draco',\n DRACO_EXTERNAL_LIBRARIES.ENCODER\n );\n\n console.log('Installing \"Basis transcoder\" library'); // eslint-disable-line no-console\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.TRANSCODER, 'libs');\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, 'libs');\n\n console.log('Installing \"Basis encoder\" library'); // eslint-disable-line no-console\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER, 'libs');\n await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, 'libs');\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: process.platform === 'win32' ? 'npm.cmd' : 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0,\n ignoreStderr: true\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installFromNpm(module: string, name: string, extraPath: string = '') {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${extraPath}/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), 'modules', module, 'dist', extraPath);\n await writeFile(path, fileData, name);\n }\n\n private async installFromUrl(url: string, module: string, name: string) {\n const fileResponse = await fetchFile(url);\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), 'modules', module, 'dist', 'libs');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"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"}
|
package/dist/index.cjs
CHANGED
|
@@ -5291,6 +5291,8 @@ var Tiles3DConverter = class {
|
|
|
5291
5291
|
this.loaderOptions = {
|
|
5292
5292
|
_nodeWorkers: true,
|
|
5293
5293
|
reuseWorkers: true,
|
|
5294
|
+
// TODO: converter freezes in the end because of i3s-content-worker
|
|
5295
|
+
worker: false,
|
|
5294
5296
|
i3s: { coordinateSystem: import_i3s2.COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false },
|
|
5295
5297
|
// We need to load local fs workers because nodejs can't load workers from the Internet
|
|
5296
5298
|
"i3s-content": {
|
|
@@ -5414,11 +5416,9 @@ var Tiles3DConverter = class {
|
|
|
5414
5416
|
if (this.options.maxDepth && level > this.options.maxDepth) {
|
|
5415
5417
|
return;
|
|
5416
5418
|
}
|
|
5417
|
-
const promises = [];
|
|
5418
5419
|
for (const childNodeInfo of parentSourceNode.children || []) {
|
|
5419
|
-
|
|
5420
|
+
await this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo);
|
|
5420
5421
|
}
|
|
5421
|
-
await Promise.all(promises);
|
|
5422
5422
|
}
|
|
5423
5423
|
/**
|
|
5424
5424
|
* Load a child node having information from the node header
|
|
@@ -1,8 +1,25 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
* @param
|
|
4
|
-
* @
|
|
2
|
+
* Do milliseconds time conversion to readable time string.
|
|
3
|
+
* @param tile - 3d-tiles tile Object
|
|
4
|
+
* @param coordinates - node converted coordinates
|
|
5
|
+
* @returns String which characterizes conversion time period
|
|
5
6
|
*/
|
|
6
|
-
export
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
export function timeConverter(time: [number, number]): String;
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Calculate files sizes after conversion.
|
|
11
|
+
* @param params - Object with params of conversion.
|
|
12
|
+
* @returns Promise with generated files size in bytes.
|
|
13
|
+
*/
|
|
14
|
+
export function calculateFilesSize(params: {
|
|
15
|
+
slpk: boolean;
|
|
16
|
+
outputPath: string;
|
|
17
|
+
tilesetName: string;
|
|
18
|
+
}): Number;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Reqursivelly calculate files sizes in directory.
|
|
22
|
+
* @param dirPath - Directory path.
|
|
23
|
+
* @returns Promise with files size in directory.
|
|
24
|
+
*/
|
|
25
|
+
export function getTotalFilesSize(dirPath: string): Number;
|
package/dist/pgm-loader.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Geoid, parsePGM } from '@math.gl/geoid';
|
|
2
|
-
const VERSION = typeof
|
|
2
|
+
const VERSION = typeof "4.0.6" !== 'undefined' ? "4.0.6" : '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","
|
|
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,cAAkB,KAAK,WAAW,aAAiB,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.0.
|
|
3
|
+
"version": "4.0.6",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -52,18 +52,18 @@
|
|
|
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.0.
|
|
56
|
-
"@loaders.gl/crypto": "4.0.
|
|
57
|
-
"@loaders.gl/draco": "4.0.
|
|
58
|
-
"@loaders.gl/gltf": "4.0.
|
|
59
|
-
"@loaders.gl/i3s": "4.0.
|
|
60
|
-
"@loaders.gl/images": "4.0.
|
|
61
|
-
"@loaders.gl/loader-utils": "4.0.
|
|
62
|
-
"@loaders.gl/polyfills": "4.0.
|
|
63
|
-
"@loaders.gl/textures": "4.0.
|
|
64
|
-
"@loaders.gl/tiles": "4.0.
|
|
65
|
-
"@loaders.gl/worker-utils": "4.0.
|
|
66
|
-
"@loaders.gl/zip": "4.0.
|
|
55
|
+
"@loaders.gl/3d-tiles": "4.0.6",
|
|
56
|
+
"@loaders.gl/crypto": "4.0.6",
|
|
57
|
+
"@loaders.gl/draco": "4.0.6",
|
|
58
|
+
"@loaders.gl/gltf": "4.0.6",
|
|
59
|
+
"@loaders.gl/i3s": "4.0.6",
|
|
60
|
+
"@loaders.gl/images": "4.0.6",
|
|
61
|
+
"@loaders.gl/loader-utils": "4.0.6",
|
|
62
|
+
"@loaders.gl/polyfills": "4.0.6",
|
|
63
|
+
"@loaders.gl/textures": "4.0.6",
|
|
64
|
+
"@loaders.gl/tiles": "4.0.6",
|
|
65
|
+
"@loaders.gl/worker-utils": "4.0.6",
|
|
66
|
+
"@loaders.gl/zip": "4.0.6",
|
|
67
67
|
"@math.gl/core": "^4.0.0",
|
|
68
68
|
"@math.gl/culling": "^4.0.0",
|
|
69
69
|
"@math.gl/geoid": "^4.0.0",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"join-images": "^1.1.3",
|
|
88
88
|
"sharp": "^0.31.3"
|
|
89
89
|
},
|
|
90
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "1582e06e4ac81b61091148f3d872f67478fe7511",
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@types/express": "^4.17.17",
|
|
93
93
|
"@types/node": "^20.4.2"
|
|
@@ -44,6 +44,8 @@ export default class Tiles3DConverter {
|
|
|
44
44
|
loaderOptions: I3SLoaderOptions = {
|
|
45
45
|
_nodeWorkers: true,
|
|
46
46
|
reuseWorkers: true,
|
|
47
|
+
// TODO: converter freezes in the end because of i3s-content-worker
|
|
48
|
+
worker: false,
|
|
47
49
|
i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false},
|
|
48
50
|
// We need to load local fs workers because nodejs can't load workers from the Internet
|
|
49
51
|
'i3s-content': {
|
|
@@ -208,11 +210,9 @@ export default class Tiles3DConverter {
|
|
|
208
210
|
if (this.options.maxDepth && level > this.options.maxDepth) {
|
|
209
211
|
return;
|
|
210
212
|
}
|
|
211
|
-
const promises: Promise<void>[] = [];
|
|
212
213
|
for (const childNodeInfo of parentSourceNode.children || []) {
|
|
213
|
-
|
|
214
|
+
await this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo);
|
|
214
215
|
}
|
|
215
|
-
await Promise.all(promises);
|
|
216
216
|
}
|
|
217
217
|
|
|
218
218
|
/**
|
package/src/converter-cli.ts
CHANGED
|
@@ -158,7 +158,7 @@ async function convert(options: ValidatedTileConversionOptions) {
|
|
|
158
158
|
switch (inputType) {
|
|
159
159
|
case TILESET_TYPE.I3S:
|
|
160
160
|
const tiles3DConverter = new Tiles3DConverter();
|
|
161
|
-
tiles3DConverter.convert({
|
|
161
|
+
await tiles3DConverter.convert({
|
|
162
162
|
inputUrl: options.tileset,
|
|
163
163
|
outputPath: options.output,
|
|
164
164
|
tilesetName: options.name,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"statistic-utills.d.js","names":[],"sources":["../../../src/lib/utils/statistic-utills.d.ts"],"sourcesContent":["/**\n * Do milliseconds time conversion to readable time string.\n * @param tile - 3d-tiles tile Object\n * @param coordinates - node converted coordinates\n * @returns String which characterizes conversion time period\n */\nexport function timeConverter(time: [number, number]): String;\n\n/**\n * Calculate files sizes after conversion.\n * @param params - Object with params of conversion.\n * @returns Promise with generated files size in bytes.\n */\nexport function calculateFilesSize(params: {\n slpk: boolean;\n outputPath: string;\n tilesetName: string;\n}): Number;\n\n/**\n * Reqursivelly calculate files sizes in directory.\n * @param dirPath - Directory path.\n * @returns Promise with files size in directory.\n */\nexport function getTotalFilesSize(dirPath: string): Number;\n"],"mappings":""}
|