@loaders.gl/tile-converter 3.4.10 → 3.4.12

package/dist/dist.min.js

@@ -48032,33 +48032,18 @@ __export(fs_exports, {
   writeFileSync: () => writeFileSync
 });
 var import_fs = __toModule(require("fs"));
-var readdir;
-var stat;
-var readFile;
-var readFileSync;
-var writeFile;
-var writeFileSync;
-var open;
-var close;
-var read;
-var fstat;
-var createWriteStream;
+var readdir = promisify2(import_fs.default.readdir);
+var stat = promisify2(import_fs.default.stat);
+var readFile = import_fs.default.readFile;
+var readFileSync = import_fs.default.readFileSync;
+var writeFile = promisify3(import_fs.default.writeFile);
+var writeFileSync = import_fs.default.writeFileSync;
+var open = import_fs.default.open;
+var close = (fd) => new Promise((resolve2, reject) => import_fs.default.close(fd, (err) => err ? reject(err) : resolve2()));
+var read = import_fs.default.read;
+var fstat = import_fs.default.fstat;
+var createWriteStream = import_fs.default.createWriteStream;
 var isSupported = Boolean(import_fs.default);
-try {
-  readdir = promisify2(import_fs.default.readdir);
-  stat = promisify2(import_fs.default.stat);
-  readFile = import_fs.default.readFile;
-  readFileSync = import_fs.default.readFileSync;
-  writeFile = promisify3(import_fs.default.writeFile);
-  writeFileSync = import_fs.default.writeFileSync;
-  open = import_fs.default.open;
-  close = (fd) => new Promise((resolve2, reject) => import_fs.default.close(fd, (err) => err ? reject(err) : resolve2()));
-  read = import_fs.default.read;
-  fstat = import_fs.default.fstat;
-  createWriteStream = import_fs.default.createWriteStream;
-  isSupported = Boolean(import_fs.default);
-} catch {
-}
 async function _readToArrayBuffer(fd, start, length) {
   const buffer = Buffer.alloc(length);
   const { bytesRead } = await read(fd, buffer, 0, length, start);
@@ -50610,7 +50595,7 @@ var TilesetTraverser = class {
           }
           stack2.push(child);
         }
-      } else if (!tile.contentAvailable) {
+      } else if (!tile.contentAvailable && !tile.hasEmptyContent) {
         allDescendantsLoaded = false;
       }
     }

package/dist/es5/3d-tiles-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
 exports.transform3DTilesAttributesOnWorker = transform3DTilesAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+var VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 var Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/es5/deps-installer/deps-installer.js

@@ -14,7 +14,7 @@ var _zip = require("@loaders.gl/zip");
 var _fileUtils = require("../lib/utils/file-utils");
 var _path = require("path");
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+var VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 var DepsInstaller = function () {
   function DepsInstaller() {

package/dist/es5/i3s-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
 exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+var VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/es5/pgm-loader.js

@@ -8,7 +8,7 @@ exports.PGMLoader = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _geoid = require("@math.gl/geoid");
-var VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+var VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 var PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',

package/dist/esm/3d-tiles-attributes-worker.js

@@ -1,5 +1,5 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
-const VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+const VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 export const Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/esm/deps-installer/deps-installer.js

@@ -3,7 +3,7 @@ import { ZipLoader } from '@loaders.gl/zip';
 import { writeFile } from '../lib/utils/file-utils';
 import { join } from 'path';
 import { ChildProcessProxy } from '@loaders.gl/worker-utils';
-const VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+const VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 export class DepsInstaller {
   async install() {

package/dist/esm/i3s-attributes-worker.js

@@ -1,5 +1,5 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
-const VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+const VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 export const I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

package/dist/esm/pgm-loader.js

@@ -1,5 +1,5 @@
 import { parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+const VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.4.10",
+  "version": "3.4.12",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -44,19 +44,19 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.4.10",
-    "@loaders.gl/crypto": "3.4.10",
-    "@loaders.gl/draco": "3.4.10",
-    "@loaders.gl/gltf": "3.4.10",
-    "@loaders.gl/i3s": "3.4.10",
-    "@loaders.gl/images": "3.4.10",
-    "@loaders.gl/loader-utils": "3.4.10",
-    "@loaders.gl/polyfills": "3.4.10",
-    "@loaders.gl/schema": "3.4.10",
-    "@loaders.gl/textures": "3.4.10",
-    "@loaders.gl/tiles": "3.4.10",
-    "@loaders.gl/worker-utils": "3.4.10",
-    "@loaders.gl/zip": "3.4.10",
+    "@loaders.gl/3d-tiles": "3.4.12",
+    "@loaders.gl/crypto": "3.4.12",
+    "@loaders.gl/draco": "3.4.12",
+    "@loaders.gl/gltf": "3.4.12",
+    "@loaders.gl/i3s": "3.4.12",
+    "@loaders.gl/images": "3.4.12",
+    "@loaders.gl/loader-utils": "3.4.12",
+    "@loaders.gl/polyfills": "3.4.12",
+    "@loaders.gl/schema": "3.4.12",
+    "@loaders.gl/textures": "3.4.12",
+    "@loaders.gl/tiles": "3.4.12",
+    "@loaders.gl/worker-utils": "3.4.12",
+    "@loaders.gl/zip": "3.4.12",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -79,5 +79,5 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "4568459c96eaf0480a50ab77cace355307f61f04"
+  "gitHead": "85254762ae3082f608a863291deef09f2b40c6cf"
 }

package/dist/3d-tiles-converter/3d-tiles-converter.js

@@ -1,287 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const process_1 = __importDefault(require("process"));
-const json_map_transform_1 = __importDefault(require("json-map-transform"));
-const core_1 = require("@loaders.gl/core");
-const i3s_1 = require("@loaders.gl/i3s");
-const tiles_1 = require("@loaders.gl/tiles");
-const pgm_loader_1 = require("../pgm-loader");
-const i3s_obb_to_3d_tiles_obb_1 = require("./helpers/i3s-obb-to-3d-tiles-obb");
-const lod_conversion_utils_1 = require("../lib/utils/lod-conversion-utils");
-const file_utils_1 = require("../lib/utils/file-utils");
-const statistic_utills_1 = require("../lib/utils/statistic-utills");
-const tileset_1 = require("./json-templates/tileset");
-const coordinate_converter_1 = require("../i3s-converter/helpers/coordinate-converter");
-const _3d_tiles_attributes_worker_1 = require("../3d-tiles-attributes-worker");
-const worker_utils_1 = require("@loaders.gl/worker-utils");
-const constants_1 = require("../constants");
-const I3S = 'I3S';
-/**
- * Converter from i3s to 3d-tiles
- */
-class Tiles3DConverter {
-    constructor() {
-        this.workerSource = {};
-        this.options = {};
-        this.tilesetPath = '';
-        this.vertexCounter = 0;
-        this.conversionStartTime = [0, 0];
-        this.geoidHeightModel = null;
-        this.sourceTileset = null;
-        this.attributeStorageInfo = null;
-        this.workerSource = {};
-    }
-    /**
-     * Convert i3s format data to 3dTiles
-     * @param options
-     * @param options.inputUrl the url to read the tileset from
-     * @param options.outputPath the output filename
-     * @param options.tilesetName the output name of the tileset
-     * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format
-     * @param options.maxDepth The max tree depth of conversion
-     */
-    async convert(options) {
-        if (core_1.isBrowser) {
-            console.log(constants_1.BROWSER_ERROR_MESSAGE);
-            return constants_1.BROWSER_ERROR_MESSAGE;
-        }
-        const { inputUrl, outputPath, tilesetName, maxDepth, egmFilePath } = options;
-        this.conversionStartTime = process_1.default.hrtime();
-        this.options = { maxDepth };
-        console.log('Loading egm file...'); // eslint-disable-line
-        this.geoidHeightModel = await (0, core_1.load)(egmFilePath, pgm_loader_1.PGMLoader);
-        console.log('Loading egm file completed!'); // eslint-disable-line
-        await this.loadWorkers();
-        const sourceTilesetJson = await (0, core_1.load)(inputUrl, i3s_1.I3SLoader, {});
-        this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, {
-            loadOptions: {
-                _nodeWorkers: true,
-                reuseWorkers: true,
-                'i3s-content-nodejs': {
-                    workerUrl: './modules/i3s/dist/i3s-content-nodejs-worker.js'
-                },
-                i3s: { coordinateSystem: i3s_1.COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false }
-            }
-        });
-        await this.sourceTileset.tilesetInitializationPromise;
-        const rootNode = this.sourceTileset.root;
-        if (!rootNode.header.obb) {
-            rootNode.header.obb = (0, coordinate_converter_1.createObbFromMbs)(rootNode.header.mbs);
-        }
-        this.tilesetPath = (0, path_1.join)(`${outputPath}`, `${tilesetName}`);
-        this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;
-        // Removing the tilesetPath needed to exclude erroneous files after conversion
-        try {
-            await (0, file_utils_1.removeDir)(this.tilesetPath);
-        }
-        catch (e) {
-            // do nothing
-        }
-        const rootTile = {
-            boundingVolume: {
-                box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(rootNode.header.obb, this.geoidHeightModel)
-            },
-            geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(rootNode),
-            children: []
-        };
-        await this._addChildren(rootNode, rootTile, 1);
-        const tileset = (0, json_map_transform_1.default)({ root: rootTile }, (0, tileset_1.TILESET)());
-        await (0, file_utils_1.writeFile)(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
-        this._finishConversion({ slpk: false, outputPath, tilesetName });
-        // Clean up worker pools
-        const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
-        workerFarm.destroy();
-    }
-    /**
-     * Convert particular I3S Node
-     * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
-     * @param parentNode object in resulting tileset
-     * @param level a current level of a tree depth
-     * @param childNodeInfo child node to convert
-     */
-    async convertChildNode(parentSourceNode, parentNode, level, childNodeInfo) {
-        const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
-        parentSourceNode.children.push(sourceChild);
-        if (sourceChild.contentUrl) {
-            await this.sourceTileset._loadTile(sourceChild);
-            this.vertexCounter += sourceChild.content.vertexCount;
-            let featureAttributes = null;
-            if (this.attributeStorageInfo) {
-                featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
-            }
-            if (!sourceChild.header.obb) {
-                sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
-            }
-            const boundingVolume = {
-                box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(sourceChild.header.obb, this.geoidHeightModel)
-            };
-            const child = {
-                boundingVolume,
-                geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
-                children: []
-            };
-            const i3sAttributesData = {
-                tileContent: sourceChild.content,
-                textureFormat: sourceChild?.header?.textureFormat
-            };
-            const b3dm = await (0, _3d_tiles_attributes_worker_1.transform3DTilesAttributesOnWorker)(i3sAttributesData, {
-                source: this.workerSource.tile3dWorkerSource,
-                featureAttributes
-            });
-            child.content = {
-                uri: `${sourceChild.id}.b3dm`,
-                boundingVolume
-            };
-            await (0, file_utils_1.writeFile)(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
-            parentNode.children.push(child);
-            sourceChild.unloadContent();
-            await this._addChildren(sourceChild, child, level + 1);
-        }
-        else {
-            await this._addChildren(sourceChild, parentNode, level + 1);
-        }
-    }
-    /**
-     * The recursive function of traversal of a nodes tree
-     * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
-     * @param parentNode object in resulting tileset
-     * @param level a current level of a tree depth
-     */
-    async _addChildren(parentSourceNode, parentNode, level) {
-        if (this.options.maxDepth && level > this.options.maxDepth) {
-            return;
-        }
-        const promises = [];
-        for (const childNodeInfo of parentSourceNode.header.children || []) {
-            promises.push(this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo));
-        }
-        await Promise.all(promises);
-    }
-    /**
-     * Load a child node having information from the node header
-     * @param parentNode a parent node tile object (@loaders.gl/tiles/Tile3D)
-     * @param childNodeInfo child information from 3DNodeIndexDocument
-     *   (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodeReference.cmn.md)
-     */
-    async _loadChildNode(parentNode, childNodeInfo) {
-        let header;
-        if (this.sourceTileset.tileset.nodePages) {
-            console.log(`Node conversion: ${childNodeInfo.id}`); // eslint-disable-line no-console,no-undef
-            header = await this.sourceTileset.tileset.nodePagesTile.formTileFromNodePages(childNodeInfo.id);
-        }
-        else {
-            const { loader } = this.sourceTileset;
-            const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href);
-            // load metadata
-            const options = {
-                i3s: {
-                    ...this.sourceTileset.loadOptions,
-                    isTileHeader: true,
-                    loadContent: false
-                }
-            };
-            console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef
-            header = await (0, core_1.load)(nodeUrl, loader, options);
-        }
-        return new tiles_1.Tile3D(this.sourceTileset, header, parentNode);
-    }
-    /**
-     * Make an url of a resource from its relative url having the base url
-     * @param baseUrl the base url. A resulting url will be related from this url
-     * @param relativeUrl a realtive url of a resource
-     */
-    _relativeUrlToFullUrl(baseUrl, relativeUrl) {
-        let resultArray = baseUrl.split('/');
-        const relativeUrlArray = relativeUrl.split('/');
-        for (const folder of relativeUrlArray) {
-            switch (folder) {
-                case '.':
-                    continue; // eslint-disable-line no-continue
-                case '..':
-                    resultArray = resultArray.slice(0, -1);
-                    break;
-                default:
-                    resultArray.push(folder);
-            }
-        }
-        return resultArray.join('/');
-    }
-    /**
-     * Do loading all attributes related to particular node.
-     * @param sourceChild
-     * @param attributeStorageInfo
-     * @returns Promise of attributes object.
-     */
-    async _loadChildAttributes(sourceChild, attributeStorageInfo) {
-        const promises = [];
-        const { attributeUrls } = sourceChild.header;
-        for (let index = 0; index < attributeUrls.length; index++) {
-            const inputUrl = attributeUrls[index];
-            const attribute = attributeStorageInfo[index];
-            const options = {
-                attributeName: attribute.name,
-                attributeType: this._getAttributeType(attribute)
-            };
-            promises.push((0, core_1.load)(inputUrl, i3s_1.I3SAttributeLoader, options));
-        }
-        const attributesList = await Promise.all(promises);
-        this._replaceNestedArrays(attributesList);
-        return Object.assign({}, ...attributesList);
-    }
-    /**
-     * Returns attribute type for loading attributes
-     * @param attribute
-     * Workaround for I3S v1.6. There is no attribute.attributeValues.valueType field in attribute.
-     * There is an 'Oid32' type if attribute has objectIds property.
-     * Doc: https://github.com/Esri/i3s-spec/blob/master/docs/1.6/attributeStorageInfo.cmn.md
-     */
-    _getAttributeType(attribute) {
-        if (attribute.attributeValues) {
-            return attribute.attributeValues.valueType;
-        }
-        else if (attribute.objectIds) {
-            return 'Oid32';
-        }
-        return '';
-    }
-    /**
-     * Make simple arrays from attribute typed arrays.
-     * @param attributesList
-     */
-    _replaceNestedArrays(attributesList) {
-        for (let index = 0; index < attributesList.length; index++) {
-            const attributeObject = attributesList[index];
-            for (const key in attributeObject) {
-                attributeObject[key] = Array.from(attributeObject[key]);
-            }
-        }
-    }
-    /**
-     * Print statistics in the end of conversion
-     * @param params - output files data
-     */
-    async _finishConversion(params) {
-        const filesSize = await (0, statistic_utills_1.calculateFilesSize)(params);
-        const diff = process_1.default.hrtime(this.conversionStartTime);
-        const conversionTime = (0, statistic_utills_1.timeConverter)(diff);
-        console.log(`------------------------------------------------`); // eslint-disable-line
-        console.log(`Finish conversion of ${I3S}`); // eslint-disable-line
-        console.log(`Total conversion time: ${conversionTime}`); // eslint-disable-line
-        console.log(`Vertex count: `, this.vertexCounter); // eslint-disable-line
-        console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line
-        console.log(`------------------------------------------------`); // eslint-disable-line
-    }
-    async loadWorkers() {
-        console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console
-        const tile3dAttributesWorkerUrl = (0, worker_utils_1.getWorkerURL)(_3d_tiles_attributes_worker_1.Tile3dAttributesWorker, { ...(0, core_1.getLoaderOptions)() });
-        const sourceResponse = await (0, core_1.fetchFile)(tile3dAttributesWorkerUrl);
-        const source = await sourceResponse.text();
-        this.workerSource.tile3dWorkerSource = source;
-        console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console
-    }
-}
-exports.default = Tiles3DConverter;