@loaders.gl/tile-converter 4.2.0-alpha.5 → 4.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +42 -22
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +4 -0
- package/dist/3d-tiles-converter/helpers/load-i3s.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/load-i3s.js +3 -28
- package/dist/converter-cli.js +4 -2
- package/dist/converter.min.cjs +95 -95
- package/dist/deps-installer/deps-installer.d.ts.map +1 -1
- package/dist/deps-installer/deps-installer.js +9 -1
- package/dist/i3s-converter/helpers/attribute-metadata-info.js +4 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +2 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +2 -2
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/feature-attributes.js +4 -2
- package/dist/i3s-converter/helpers/geometry-attributes.js +6 -5
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +15 -1
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +52 -12
- package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/gltf-attributes.js +12 -14
- package/dist/i3s-converter/helpers/node-index-document.d.ts +8 -1
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +18 -11
- package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-pages.js +27 -26
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/progress.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/progress.js +23 -18
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts +8 -1
- package/dist/i3s-converter/helpers/tileset-traversal.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/tileset-traversal.js +12 -3
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +190 -66
- package/dist/i3s-converter/json-templates/node.js +1 -1
- package/dist/i3s-server/bin/i3s-server.min.cjs +76 -76
- package/dist/i3s-server/bin/www.js +6 -4
- package/dist/i3s-server/controllers/slpk-controller.d.ts.map +1 -1
- package/dist/i3s-server/controllers/slpk-controller.js +3 -1
- package/dist/i3s-server/routes/index.js +11 -8
- package/dist/i3s-server/routes/slpk-router.d.ts.map +1 -1
- package/dist/i3s-server/routes/slpk-router.js +24 -18
- package/dist/i3s-server/utils/server-utils.d.ts.map +1 -1
- package/dist/i3s-server/utils/server-utils.js +8 -5
- package/dist/index.cjs +421 -211
- package/dist/index.cjs.map +3 -3
- package/dist/lib/utils/cli-utils.d.ts.map +1 -1
- package/dist/lib/utils/cli-utils.js +2 -0
- package/dist/lib/utils/conversion-dump.d.ts +9 -1
- package/dist/lib/utils/conversion-dump.d.ts.map +1 -1
- package/dist/lib/utils/conversion-dump.js +44 -21
- package/dist/lib/utils/file-utils.d.ts +1 -1
- package/dist/lib/utils/file-utils.d.ts.map +1 -1
- package/dist/lib/utils/file-utils.js +10 -12
- package/dist/lib/utils/statistic-utills.d.ts.map +1 -1
- package/dist/lib/utils/statistic-utills.js +5 -7
- package/dist/lib/utils/write-queue.d.ts.map +1 -1
- package/dist/lib/utils/write-queue.js +7 -3
- package/dist/pgm-loader.d.ts +17 -2
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/pgm-loader.js +3 -1
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
- package/dist/slpk-extractor/slpk-extractor.js +2 -1
- package/dist/slpk-extractor-cli.d.ts.map +1 -1
- package/dist/slpk-extractor-cli.js +16 -8
- package/dist/slpk-extractor.min.cjs +36 -36
- package/package.json +23 -22
- package/src/3d-tiles-converter/3d-tiles-converter.ts +21 -10
- package/src/3d-tiles-converter/helpers/b3dm-converter.ts +1 -0
- package/src/3d-tiles-converter/helpers/load-i3s.ts +3 -27
- package/src/converter-cli.ts +4 -2
- package/src/deps-installer/deps-installer.ts +11 -0
- package/src/i3s-converter/helpers/attribute-metadata-info.ts +1 -1
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +3 -1
- package/src/i3s-converter/helpers/coordinate-converter.ts +2 -2
- package/src/i3s-converter/helpers/feature-attributes.ts +5 -2
- package/src/i3s-converter/helpers/geometry-attributes.ts +6 -5
- package/src/i3s-converter/helpers/geometry-converter.ts +118 -72
- package/src/i3s-converter/helpers/gltf-attributes.ts +12 -13
- package/src/i3s-converter/helpers/node-index-document.ts +18 -10
- package/src/i3s-converter/helpers/node-pages.ts +27 -29
- package/src/i3s-converter/helpers/preprocess-3d-tiles.ts +1 -0
- package/src/i3s-converter/helpers/progress.ts +1 -0
- package/src/i3s-converter/helpers/tileset-traversal.ts +22 -13
- package/src/i3s-converter/i3s-converter.ts +173 -114
- package/src/i3s-converter/json-templates/node.ts +1 -1
- package/src/i3s-server/bin/www.ts +6 -4
- package/src/i3s-server/controllers/slpk-controller.ts +4 -2
- package/src/i3s-server/routes/index.ts +10 -7
- package/src/i3s-server/routes/slpk-router.ts +22 -16
- package/src/i3s-server/utils/server-utils.ts +6 -4
- package/src/lib/utils/cli-utils.ts +2 -0
- package/src/lib/utils/conversion-dump.ts +35 -20
- package/src/lib/utils/file-utils.ts +11 -11
- package/src/lib/utils/statistic-utills.ts +5 -6
- package/src/lib/utils/write-queue.ts +2 -2
- package/src/pgm-loader.ts +5 -2
- package/src/slpk-extractor/slpk-extractor.ts +2 -1
- package/src/slpk-extractor-cli.ts +16 -8
- package/src/lib/utils/statistic-utills.d.ts +0 -25
|
@@ -13,13 +13,15 @@ import { formErrorHandler, formListeningHandler, normalizePort } from "../utils/
|
|
|
13
13
|
/** Get port from environment and store in Express. */
|
|
14
14
|
const httpPort = normalizePort(process.env.PORT || '80');
|
|
15
15
|
if (httpPort === false) {
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
// eslint-disable-next-line no-console
|
|
17
|
+
console.error('Incorrect HTTP port');
|
|
18
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
18
19
|
}
|
|
19
20
|
const httpsPort = normalizePort(process.env.HTTPS_PORT || '443');
|
|
20
21
|
if (httpsPort === false) {
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
// eslint-disable-next-line no-console
|
|
23
|
+
console.error('Incorrect HTTPs port');
|
|
24
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
23
25
|
}
|
|
24
26
|
/** Create HTTP server. */
|
|
25
27
|
const options = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slpk-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/slpk-controller.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAM/B;;;GAGG;AACH,wBAAsB,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"slpk-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/slpk-controller.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAM/B;;;GAGG;AACH,wBAAsB,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtE;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAW3E"}
|
|
@@ -7,7 +7,9 @@ let slpkArchive;
|
|
|
7
7
|
* @param fullLayerPath - full path to SLPK file
|
|
8
8
|
*/
|
|
9
9
|
export async function loadArchive(fullLayerPath) {
|
|
10
|
-
slpkArchive = await parseSLPKArchive(new FileHandleFile(fullLayerPath), (msg) => console.log(msg)
|
|
10
|
+
slpkArchive = await parseSLPKArchive(new FileHandleFile(fullLayerPath), (msg) => console.log(msg) // eslint-disable-line no-console
|
|
11
|
+
);
|
|
12
|
+
// eslint-disable-next-line no-console
|
|
11
13
|
console.log('The server is ready to use');
|
|
12
14
|
}
|
|
13
15
|
/**
|
|
@@ -2,13 +2,16 @@ import express from 'express';
|
|
|
2
2
|
import { getFileNameByUrl } from "../controllers/index-controller.js";
|
|
3
3
|
export const router = express.Router();
|
|
4
4
|
/* GET home page. */
|
|
5
|
-
router.get('*',
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
router.get('*', (req, res, next) => {
|
|
6
|
+
async function routerCallback(req, res, next) {
|
|
7
|
+
const fileName = await getFileNameByUrl(req.path);
|
|
8
|
+
if (fileName) {
|
|
9
|
+
res.sendFile(fileName);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
res.status(404);
|
|
13
|
+
res.send('File not found');
|
|
14
|
+
}
|
|
13
15
|
}
|
|
16
|
+
routerCallback(req, res, next);
|
|
14
17
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slpk-router.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/slpk-router.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,4CAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"slpk-router.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/slpk-router.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,4CAAmB,CAAC;AAgBlD,eAAO,MAAM,MAAM,4CAAmB,CAAC"}
|
|
@@ -3,26 +3,32 @@ import { getFileByUrl } from "../controllers/slpk-controller.js";
|
|
|
3
3
|
import { createSceneServer } from "../utils/create-scene-server.js";
|
|
4
4
|
const textDecoder = new TextDecoder();
|
|
5
5
|
export const sceneServerRouter = express.Router();
|
|
6
|
-
sceneServerRouter.get('*',
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
sceneServerRouter.get('*', (req, res, next) => {
|
|
7
|
+
async function routerCallback(req, res, next) {
|
|
8
|
+
const file = await getFileByUrl('/');
|
|
9
|
+
if (file) {
|
|
10
|
+
const layer = JSON.parse(textDecoder.decode(file));
|
|
11
|
+
const sceneServerResponse = createSceneServer(layer.name, layer);
|
|
12
|
+
res.send(sceneServerResponse);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
res.status(404);
|
|
16
|
+
res.send('File not found');
|
|
17
|
+
}
|
|
16
18
|
}
|
|
19
|
+
routerCallback(req, res, next);
|
|
17
20
|
});
|
|
18
21
|
export const router = express.Router();
|
|
19
|
-
router.get('*',
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
router.get('*', (req, res, next) => {
|
|
23
|
+
async function routerCallback(req, res, next) {
|
|
24
|
+
const file = await getFileByUrl(req.path.replace(/\/+$/, ''));
|
|
25
|
+
if (file) {
|
|
26
|
+
res.send(Buffer.from(file));
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
res.status(404);
|
|
30
|
+
res.send('File not found');
|
|
31
|
+
}
|
|
27
32
|
}
|
|
33
|
+
routerCallback(req, res, next);
|
|
28
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-utils.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/server-utils.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAK/C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAclE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"server-utils.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/server-utils.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,WAAW,EAAC,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAK/C;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAclE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,GAAG,MAAM,GAE5B,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAuBxC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,IAAI,CAMzF"}
|
|
@@ -22,7 +22,10 @@ export function normalizePort(val) {
|
|
|
22
22
|
* @param optionalPort - the port/named pipe the server is started on
|
|
23
23
|
* @return callback to handle server errors
|
|
24
24
|
*/
|
|
25
|
-
export function formErrorHandler(optionalPort
|
|
25
|
+
export function formErrorHandler(optionalPort
|
|
26
|
+
// eslint-disable-next-line no-undef
|
|
27
|
+
) {
|
|
28
|
+
// eslint-disable-next-line no-undef
|
|
26
29
|
return function onError(error) {
|
|
27
30
|
if (error.syscall !== 'listen') {
|
|
28
31
|
throw error;
|
|
@@ -31,12 +34,12 @@ export function formErrorHandler(optionalPort) {
|
|
|
31
34
|
// handle specific listen errors with friendly messages
|
|
32
35
|
switch (error.code) {
|
|
33
36
|
case 'EACCES':
|
|
34
|
-
console.error(`${bind} requires elevated privileges`); // eslint-disable-line no-console
|
|
35
|
-
process.exit(1); // eslint-disable-line no-process-exit
|
|
37
|
+
console.error(`${bind} requires elevated privileges`); // eslint-disable-line no-console
|
|
38
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
36
39
|
break;
|
|
37
40
|
case 'EADDRINUSE':
|
|
38
|
-
console.error(`${bind} is already in use`); // eslint-disable-line no-console
|
|
39
|
-
process.exit(1); // eslint-disable-line no-process-exit
|
|
41
|
+
console.error(`${bind} is already in use`); // eslint-disable-line no-console
|
|
42
|
+
process.exit(1); // eslint-disable-line no-process-exit
|
|
40
43
|
break;
|
|
41
44
|
default:
|
|
42
45
|
throw error;
|