@loaders.gl/tile-converter 4.3.0-alpha.3 → 4.3.0-alpha.5
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 +4 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/converter-cli.js +6 -14
- package/dist/converter.min.cjs +94 -95
- package/dist/deps-installer/deps-installer.js +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts +2 -2
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +9 -5
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +4 -2
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +6 -14
- package/dist/i3s-converter/helpers/node-pages.d.ts +1 -1
- package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-pages.js +14 -40
- package/dist/i3s-converter/i3s-converter.d.ts +24 -22
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +67 -132
- package/dist/i3s-server/app.d.ts +2 -1
- package/dist/i3s-server/app.d.ts.map +1 -1
- package/dist/i3s-server/app.js +7 -10
- package/dist/i3s-server/bin/i3s-server.min.cjs +71 -71
- package/dist/i3s-server/bin/www.js +5 -0
- package/dist/i3s-server/routes/slpk-router.js +7 -1
- package/dist/index.cjs +98 -200
- package/dist/index.cjs.map +2 -2
- package/dist/lib/utils/statistic-utills.d.ts +4 -1
- package/dist/lib/utils/statistic-utills.d.ts.map +1 -1
- package/dist/lib/utils/statistic-utills.js +4 -23
- package/dist/pgm-loader.js +1 -1
- package/package.json +19 -20
- package/src/3d-tiles-converter/3d-tiles-converter.ts +2 -1
- package/src/converter-cli.ts +8 -20
- package/src/i3s-converter/helpers/coordinate-converter.ts +13 -7
- package/src/i3s-converter/helpers/geometry-converter.ts +6 -4
- package/src/i3s-converter/helpers/node-index-document.ts +16 -26
- package/src/i3s-converter/helpers/node-pages.ts +20 -46
- package/src/i3s-converter/i3s-converter.ts +101 -161
- package/src/i3s-server/app.ts +7 -10
- package/src/i3s-server/bin/www.ts +6 -0
- package/src/i3s-server/routes/slpk-router.ts +6 -1
- package/src/lib/utils/statistic-utills.ts +5 -27
- package/bin/slpk-extractor.js +0 -2
- package/dist/i3s-server/controllers/index-controller.d.ts +0 -8
- package/dist/i3s-server/controllers/index-controller.d.ts.map +0 -1
- package/dist/i3s-server/controllers/index-controller.js +0 -31
- package/dist/i3s-server/routes/index.d.ts +0 -2
- package/dist/i3s-server/routes/index.d.ts.map +0 -1
- package/dist/i3s-server/routes/index.js +0 -17
- package/dist/slpk-extractor/slpk-extractor.d.ts +0 -23
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +0 -1
- package/dist/slpk-extractor/slpk-extractor.js +0 -73
- package/dist/slpk-extractor-cli.d.ts +0 -17
- package/dist/slpk-extractor-cli.d.ts.map +0 -1
- package/dist/slpk-extractor-cli.js +0 -105
- package/dist/slpk-extractor.min.cjs +0 -344
- package/src/i3s-server/controllers/index-controller.ts +0 -32
- package/src/i3s-server/routes/index.ts +0 -18
- package/src/slpk-extractor/slpk-extractor.ts +0 -102
- package/src/slpk-extractor-cli.ts +0 -136
|
@@ -4,6 +4,7 @@ import { I3SLoaderOptions } from '@loaders.gl/i3s/src/i3s-loader';
|
|
|
4
4
|
import { ZipFileSystem } from "../../../zip/src.js";
|
|
5
5
|
import { ConversionDump } from "../lib/utils/conversion-dump.js";
|
|
6
6
|
import { Progress } from "../i3s-converter/helpers/progress.js";
|
|
7
|
+
import { PromptModule } from 'inquirer';
|
|
7
8
|
/**
|
|
8
9
|
* Converter from i3s to 3d-tiles
|
|
9
10
|
*/
|
|
@@ -38,7 +39,9 @@ export default class Tiles3DConverter {
|
|
|
38
39
|
tilesetName: string;
|
|
39
40
|
maxDepth?: number;
|
|
40
41
|
egmFilePath: string;
|
|
41
|
-
inquirer?:
|
|
42
|
+
inquirer?: {
|
|
43
|
+
prompt: PromptModule;
|
|
44
|
+
};
|
|
42
45
|
analyze?: boolean;
|
|
43
46
|
}): Promise<string | undefined>;
|
|
44
47
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAcrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;
|
|
1
|
+
{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAcrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAItC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IACrD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IAC3C,cAAc,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC5C,aAAa,EAAE,gBAAgB,CAU7B;IACF,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;;IAenB;;;;;;;;OAQG;IAEU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE;YAAC,MAAM,EAAE,YAAY,CAAA;SAAC,CAAC;QAClC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoG/B;;;OAGG;YACW,oBAAoB;IA8BlC;;;;;;OAMG;YAEW,gBAAgB;IAyE9B;;;;;OAKG;YACW,YAAY;IAa1B;;;;;OAKG;YACW,cAAc;IA4B5B;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;CAgBhC"}
|
package/dist/converter-cli.js
CHANGED
|
@@ -86,11 +86,10 @@ function printHelp() {
|
|
|
86
86
|
console.log('--output [Output folder, default: "data" folder]');
|
|
87
87
|
console.log('--instant-node-writing [Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed]');
|
|
88
88
|
console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
|
|
89
|
-
console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
|
|
90
89
|
console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
|
|
91
90
|
console.log('--input-type [tileset input type: I3S or 3DTILES]');
|
|
92
|
-
console.log('--7zExe [location of 7z.exe archiver to create slpk on Windows, default: "C:\\Program Files\\7-Zip\\7z.exe"]');
|
|
93
91
|
console.log('--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"');
|
|
92
|
+
console.log('--no-egm [Disable Geod transformation via the EGM file]');
|
|
94
93
|
console.log('--token [Token for Cesium ION tilesets authentication]');
|
|
95
94
|
console.log('--no-draco [Disable draco compression for geometry]');
|
|
96
95
|
console.log('--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]');
|
|
@@ -130,8 +129,6 @@ async function convert(options) {
|
|
|
130
129
|
outputPath: options.output,
|
|
131
130
|
tilesetName: options.name,
|
|
132
131
|
maxDepth: options.maxDepth,
|
|
133
|
-
slpk: options.slpk,
|
|
134
|
-
sevenZipExe: options.sevenZipExe,
|
|
135
132
|
egmFilePath: options.egm,
|
|
136
133
|
token: options.token,
|
|
137
134
|
draco: options.draco,
|
|
@@ -162,7 +159,6 @@ function validateOptions(options, addHash) {
|
|
|
162
159
|
condition: (value) => addHash || Boolean(value) || Boolean(options.analyze)
|
|
163
160
|
},
|
|
164
161
|
output: { getMessage: () => console.log('Missed: --output [Output path name]') },
|
|
165
|
-
sevenZipExe: { getMessage: () => console.log('Missed: --7zExe [7z archiver executable path]') },
|
|
166
162
|
egm: { getMessage: () => console.log('Missed: --egm [*.pgm earth gravity model file path]') },
|
|
167
163
|
tileset: { getMessage: () => console.log('Missed: --tileset [tileset.json file]') },
|
|
168
164
|
inputType: {
|
|
@@ -195,16 +191,15 @@ function parseOptions(args) {
|
|
|
195
191
|
output: 'data',
|
|
196
192
|
instantNodeWriting: false,
|
|
197
193
|
mergeMaterials: true,
|
|
198
|
-
sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
|
|
199
194
|
egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
|
|
200
195
|
draco: true,
|
|
201
196
|
installDependencies: false,
|
|
202
197
|
generateTextures: false,
|
|
203
198
|
generateBoundingVolumes: false,
|
|
204
199
|
validate: false,
|
|
205
|
-
slpk: false,
|
|
206
200
|
addHash: false,
|
|
207
|
-
quiet: false
|
|
201
|
+
quiet: false,
|
|
202
|
+
noEgm: false
|
|
208
203
|
};
|
|
209
204
|
// eslint-disable-next-line complexity
|
|
210
205
|
args.forEach((arg, index) => {
|
|
@@ -231,18 +226,15 @@ function parseOptions(args) {
|
|
|
231
226
|
case '--max-depth':
|
|
232
227
|
opts.maxDepth = getIntegerValue(index, args);
|
|
233
228
|
break;
|
|
234
|
-
case '--slpk':
|
|
235
|
-
opts.slpk = getBooleanValue(index, args);
|
|
236
|
-
break;
|
|
237
229
|
case '--add-hash':
|
|
238
230
|
opts.addHash = getBooleanValue(index, args);
|
|
239
231
|
break;
|
|
240
|
-
case '--7zExe':
|
|
241
|
-
opts.sevenZipExe = getStringValue(index, args);
|
|
242
|
-
break;
|
|
243
232
|
case '--egm':
|
|
244
233
|
opts.egm = getStringValue(index, args);
|
|
245
234
|
break;
|
|
235
|
+
case '--no-egm':
|
|
236
|
+
opts.noEgm = getBooleanValue(index, args);
|
|
237
|
+
break;
|
|
246
238
|
case '--token':
|
|
247
239
|
opts.token = getStringValue(index, args);
|
|
248
240
|
break;
|