@loaders.gl/tile-converter 3.3.0-alpha.3 → 3.3.0-alpha.4

package/dist/i3s-converter/helpers/node-pages.js

@@ -71,6 +71,13 @@ class NodePages {
         const nodeIndex = id % this.nodesPerPage;
         return this.nodePages[pageIndex].nodes[nodeIndex];
     }
+    /**
+     * Update all fields in the node excluding id
+     */
+    updateAll(id, data) {
+        const node = this.getNodeById(id);
+        Object.assign(node, data, { index: node.index });
+    }
     /**
      * Update material in node.mesh object by node id
      * @param id - end-to-end index of the node
@@ -104,7 +111,7 @@ class NodePages {
      */
     updateNodeAttributeByNodeId(id) {
         const node = this.getNodeById(id);
-        if (!node.mesh) {
+        if (!node.mesh || !node.index) {
             return;
         }
         node.mesh.attribute.resource = node.index;
@@ -150,7 +157,7 @@ class NodePages {
      * @param node - node object
      */
     updateResourceInMesh(node) {
-        if (node.mesh) {
+        if (node.mesh && isFinite(node.index)) {
             node.mesh.geometry.resource = node.index;
         }
     }

package/dist/i3s-converter/i3s-converter.d.ts

@@ -112,6 +112,26 @@ export default class I3SConverter {
      * @param data.level - level of node (distanse to root node in the tree)
      */
     private _addChildrenWithNeighborsAndWriteFile;
+    /**
+     * Convert nested subtree of 3DTiles dataset
+     * @param param0
+     * @param param0.sourceTile - source 3DTile data
+     * @param param0.parentNode - parent I3S node
+     * @param param0.childNodes - child I3S nodes
+     * @param param0.parentId - parent node ID
+     * @param param0.level - tree level
+     */
+    private convertNestedTileset;
+    /**
+     * Convert 3DTiles tile to I3S node
+     * @param param0
+     * @param param0.sourceTile - source 3DTile data
+     * @param param0.parentNode - parent I3S node
+     * @param param0.childNodes - child I3S nodes
+     * @param param0.parentId - parent node ID
+     * @param param0.level - tree level
+     */
+    private convertNode;
     /**
      * Add child nodes recursively and write them to files
      * @param data - arguments
@@ -139,6 +159,8 @@ export default class I3SConverter {
     /**
      * Convert tile to one or more I3S nodes
      * @param sourceTile - source tile (3DTile)
+     * @param parentId - id of parent node in node pages
+     * @param propertyTable - batch table from b3dm / feature properties from EXT_FEATURE_METADATA
      * result.geometry - ArrayBuffer with geometry attributes
      * result.compressedGeometry - ArrayBuffer with compressed (draco) geometry
      * result.texture - texture image
@@ -150,7 +172,7 @@ export default class I3SConverter {
      */
     private _convertResources;
     /**
-     * Create a new node object (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/node.cmn.md)
+     * Update node object (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/node.cmn.md)
      * in node pages (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodePage.cmn.md)
      * @param maxScreenThresholdSQ - Level of Details (LOD) metric
      * @param boundingVolumes - Bounding volumes
@@ -163,7 +185,7 @@ export default class I3SConverter {
      * @param resources.featureCount - number of features
      * @return the node object in node pages
      */
-    private _createNodeInNodePages;
+    private _updateNodeInNodePages;
     /**
      * Create a new node page object in node pages
      * @param parentNode - 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md object of the parent node
@@ -237,57 +259,11 @@ export default class I3SConverter {
      * @return material id
      */
     private _findOrCreateMaterial;
-    /**
-     * Generate storage attribute for map segmentation.
-     * @param attributeIndex - order index of attribute (f_0, f_1 ...).
-     * @param key - attribute key from propertyTable.
-     * @param attributeType - attribute type.
-     * @return Updated storageAttribute.
-     */
-    private _createdStorageAttribute;
-    /**
-     * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
-     * @param key - attribute's key
-     * @param attribute - attribute's type in propertyTable
-     */
-    private getAttributeType;
-    /**
-     * Setup storage attribute as string.
-     * @param storageAttribute - attribute for map segmentation.
-     */
-    private _setupStringAttribute;
-    /**
-     * Setup Id attribute for map segmentation.
-     * @param storageAttribute - attribute for map segmentation .
-     */
-    private _setupIdAttribute;
-    /**
-     * Setup double attribute for map segmentation.
-     * @param storageAttribute - attribute for map segmentation .
-     */
-    private _setupDoubleAttribute;
-    /**
-     * Setup field attribute for map segmentation.
-     * @param key - attribute for map segmentation.
-     * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').
-     */
-    private _createFieldAttribute;
     /**
      * Do conversion of 3DTiles property table to I3s node attributes.
      * @param propertyTable - Table with layer meta data.
      */
     private _convertPropertyTableToNodeAttributes;
-    /**
-     * Find and return attribute type based on key form propertyTable.
-     * @param attributeType
-     */
-    private _getFieldAttributeType;
-    /**
-     * Generate popup info to show metadata on the map.
-     * @param propertyTable - table data with OBJECTID.
-     * @return data for correct rendering of popup.
-     */
-    private _createPopupInfo;
     /**
      * Print statistics in the end of conversion
      * @param params - output files data

package/dist/i3s-converter/i3s-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}

package/dist/i3s-converter/i3s-converter.js

@@ -50,15 +50,12 @@ const draco_1 = require("@loaders.gl/draco");
 const write_queue_1 = __importDefault(require("../lib/utils/write-queue"));
 const i3s_attributes_worker_1 = require("../i3s-attributes-worker");
 const constants_1 = require("../constants");
+const feature_attributes_1 = require("./helpers/feature-attributes");
 const ION_DEFAULT_TOKEN = process_1.default.env?.IonToken || // eslint-disable-line
     'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ'; // eslint-disable-line
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';
 const _3D_OBJECT_LAYER_TYPE = '3DObject';
-const STRING_TYPE = 'string';
-const SHORT_INT_TYPE = 'Int32';
-const DOUBLE_TYPE = 'double';
-const OBJECT_ID_TYPE = 'OBJECTID';
 const REFRESH_TOKEN_TIMEOUT = 1800; // 30 minutes in seconds
 const CESIUM_DATASET_PREFIX = 'https://';
 // const FS_FILE_TOO_LARGE = 'ERR_FS_FILE_TOO_LARGE';
@@ -129,7 +126,18 @@ class I3SConverter {
         await this.loadWorkers();
         try {
             const preloadOptions = await this._fetchPreloadOptions();
-            const tilesetOptions = { loadOptions: { basis: { format: 'rgba32' } } };
+            const tilesetOptions = {
+                loadOptions: {
+                    _nodeWorkers: true,
+                    reuseWorkers: true,
+                    basis: { format: 'rgba32' },
+                    'basis-nodejs': {
+                        format: 'rgba32',
+                        workerUrl: './modules/textures/dist/basis-nodejs-worker.js'
+                    },
+                    'draco-nodejs': { workerUrl: './modules/draco/dist/draco-nodejs-worker.js' }
+                }
+            };
             if (preloadOptions.headers) {
                 tilesetOptions.loadOptions.fetch = { headers: preloadOptions.headers };
             }
@@ -356,6 +364,48 @@ class I3SConverter {
         await this._addChildren({ ...data, childNodes });
         await this._addNeighborsAndWriteFile(data.parentNode, childNodes);
     }
+    /**
+     * Convert nested subtree of 3DTiles dataset
+     * @param param0
+     * @param param0.sourceTile - source 3DTile data
+     * @param param0.parentNode - parent I3S node
+     * @param param0.childNodes - child I3S nodes
+     * @param param0.parentId - parent node ID
+     * @param param0.level - tree level
+     */
+    async convertNestedTileset({ sourceTile, parentNode, childNodes, parentId, level }) {
+        await this.sourceTileset._loadTile(sourceTile);
+        await this._addChildren({
+            parentNode,
+            sourceTiles: sourceTile.children,
+            childNodes,
+            parentId,
+            level: level + 1
+        });
+        await sourceTile.unloadContent();
+    }
+    /**
+     * Convert 3DTiles tile to I3S node
+     * @param param0
+     * @param param0.sourceTile - source 3DTile data
+     * @param param0.parentNode - parent I3S node
+     * @param param0.childNodes - child I3S nodes
+     * @param param0.parentId - parent node ID
+     * @param param0.level - tree level
+     */
+    async convertNode({ sourceTile, parentNode, childNodes, parentId, level }) {
+        const children = await this._createNode(parentNode, sourceTile, parentId, level);
+        parentNode.children = parentNode.children || [];
+        for (const child of children) {
+            parentNode.children.push({
+                id: child.id,
+                href: `../${child.path}`,
+                obb: child.obb,
+                mbs: child.mbs
+            });
+            childNodes.push(child);
+        }
+    }
     /**
      * Add child nodes recursively and write them to files
      * @param data - arguments
@@ -370,31 +420,15 @@ class I3SConverter {
         if (this.options.maxDepth && level > this.options.maxDepth) {
             return;
         }
+        const promises = [];
         for (const sourceTile of sourceTiles) {
             if (sourceTile.type === 'json') {
-                await this.sourceTileset._loadTile(sourceTile);
-                await this._addChildren({
-                    parentNode,
-                    sourceTiles: sourceTile.children,
-                    childNodes,
-                    parentId,
-                    level: level + 1
-                });
-                await sourceTile.unloadContent();
+                promises.push(this.convertNestedTileset({ sourceTile, parentNode, childNodes, parentId, level }));
             }
             else {
-                const children = await this._createNode(parentNode, sourceTile, parentId, level);
-                parentNode.children = parentNode.children || [];
-                for (const child of children) {
-                    parentNode.children.push({
-                        id: child.id,
-                        href: `../${child.path}`,
-                        obb: child.obb,
-                        mbs: child.mbs
-                    });
-                    childNodes.push(child);
-                }
+                promises.push(this.convertNode({ sourceTile, parentNode, childNodes, parentId, level }));
             }
+            await Promise.all(promises);
             if (sourceTile.id) {
                 console.log(sourceTile.id); // eslint-disable-line
             }
@@ -445,11 +479,11 @@ class I3SConverter {
         await this._updateTilesetOptions();
         await this.sourceTileset._loadTile(sourceTile);
         let boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceTile, this.geoidHeightModel);
-        const propertyTable = (0, geometry_converter_1.getPropertyTable)(sourceTile);
+        const propertyTable = (0, geometry_converter_1.getPropertyTable)(sourceTile.content);
         if (propertyTable && !this.layers0?.attributeStorageInfo?.length) {
             this._convertPropertyTableToNodeAttributes(propertyTable);
         }
-        const resourcesData = await this._convertResources(sourceTile, propertyTable);
+        const resourcesData = await this._convertResources(sourceTile, parentId, propertyTable);
         const nodes = [];
         const nodesInPage = [];
         const emptyResources = {
@@ -470,7 +504,7 @@ class I3SConverter {
             }
             const lodSelection = (0, lod_conversion_utils_1.convertGeometricErrorToScreenThreshold)(sourceTile, boundingVolumes);
             const maxScreenThresholdSQ = lodSelection.find((val) => val.metricType === 'maxScreenThresholdSQ') || { maxError: 0 };
-            const nodeInPage = this._createNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources);
+            const nodeInPage = this._updateNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources);
             const node = this._createNodeIndexDocument(parentTile, boundingVolumes, lodSelection, nodeInPage, resources);
             if (nodeInPage.mesh) {
                 await this._writeResources(resources, node.path);
@@ -496,6 +530,8 @@ class I3SConverter {
     /**
      * Convert tile to one or more I3S nodes
      * @param sourceTile - source tile (3DTile)
+     * @param parentId - id of parent node in node pages
+     * @param propertyTable - batch table from b3dm / feature properties from EXT_FEATURE_METADATA
      * result.geometry - ArrayBuffer with geometry attributes
      * result.compressedGeometry - ArrayBuffer with compressed (draco) geometry
      * result.texture - texture image
@@ -505,15 +541,20 @@ class I3SConverter {
      * result.attributes - feature attributes
      * result.featureCount - number of features
      */
-    async _convertResources(sourceTile, propertyTable) {
+    async _convertResources(sourceTile, parentId, propertyTable) {
         if (!this.isContentSupported(sourceTile)) {
             return null;
         }
-        const resourcesData = await (0, geometry_converter_1.default)(sourceTile.content, Number(this.nodePages.nodesCounter), propertyTable, this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
+        const draftObb = {
+            center: [],
+            halfSize: [],
+            quaternion: []
+        };
+        const resourcesData = await (0, geometry_converter_1.default)(sourceTile.content, () => this.nodePages.push({ index: 0, obb: draftObb }, parentId), propertyTable, this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.geoidHeightModel, this.workerSource);
         return resourcesData;
     }
     /**
-     * Create a new node object (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/node.cmn.md)
+     * Update node object (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/node.cmn.md)
      * in node pages (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodePage.cmn.md)
      * @param maxScreenThresholdSQ - Level of Details (LOD) metric
      * @param boundingVolumes - Bounding volumes
@@ -526,7 +567,7 @@ class I3SConverter {
      * @param resources.featureCount - number of features
      * @return the node object in node pages
      */
-    _createNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources) {
+    _updateNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentId, resources) {
         const { meshMaterial, texture, vertexCount, featureCount, geometry } = resources;
         const nodeInPage = {
             index: 0,
@@ -548,7 +589,15 @@ class I3SConverter {
                 }
             };
         }
-        const nodeId = this.nodePages.push(nodeInPage, parentId);
+        let nodeId = resources.nodeId;
+        if (nodeId) {
+            this.nodePages.updateAll(nodeId, nodeInPage);
+            const node = this.nodePages.getNodeById(nodeId);
+            this.nodePages.updateResourceInMesh(node);
+        }
+        else {
+            nodeId = this.nodePages.push(nodeInPage, parentId);
+        }
         if (meshMaterial) {
             this.nodePages.updateMaterialByNodeId(nodeId, this._findOrCreateMaterial(meshMaterial));
         }
@@ -564,7 +613,7 @@ class I3SConverter {
         if (featureCount) {
             this.nodePages.updateFeatureCountByNodeId(nodeId, featureCount);
         }
-        return nodeInPage;
+        return this.nodePages.getNodeById(nodeId);
     }
     /**
      * Create a new node page object in node pages
@@ -822,104 +871,6 @@ class I3SConverter {
         this.materialMap.set(hash, newMaterialId);
         return newMaterialId;
     }
-    /**
-     * Generate storage attribute for map segmentation.
-     * @param attributeIndex - order index of attribute (f_0, f_1 ...).
-     * @param key - attribute key from propertyTable.
-     * @param attributeType - attribute type.
-     * @return Updated storageAttribute.
-     */
-    _createdStorageAttribute(attributeIndex, key, attributeType) {
-        const storageAttribute = {
-            key: `f_${attributeIndex}`,
-            name: key,
-            ordering: ['attributeValues'],
-            header: [{ property: 'count', valueType: 'UInt32' }],
-            attributeValues: { valueType: 'Int32', valuesPerElement: 1 }
-        };
-        switch (attributeType) {
-            case OBJECT_ID_TYPE:
-                this._setupIdAttribute(storageAttribute);
-                break;
-            case STRING_TYPE:
-                this._setupStringAttribute(storageAttribute);
-                break;
-            case DOUBLE_TYPE:
-                this._setupDoubleAttribute(storageAttribute);
-                break;
-            case SHORT_INT_TYPE:
-                break;
-            default:
-                this._setupStringAttribute(storageAttribute);
-        }
-        return storageAttribute;
-    }
-    /**
-     * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
-     * @param key - attribute's key
-     * @param attribute - attribute's type in propertyTable
-     */
-    getAttributeType(key, attribute) {
-        if (key === OBJECT_ID_TYPE) {
-            return OBJECT_ID_TYPE;
-        }
-        if (typeof attribute === STRING_TYPE) {
-            return STRING_TYPE;
-        }
-        else if (typeof attribute === 'number') {
-            return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
-        }
-        return STRING_TYPE;
-    }
-    /**
-     * Setup storage attribute as string.
-     * @param storageAttribute - attribute for map segmentation.
-     */
-    _setupStringAttribute(storageAttribute) {
-        storageAttribute.ordering.unshift('attributeByteCounts');
-        storageAttribute.header.push({ property: 'attributeValuesByteCount', valueType: 'UInt32' });
-        storageAttribute.attributeValues = {
-            valueType: 'String',
-            encoding: 'UTF-8',
-            valuesPerElement: 1
-        };
-        storageAttribute.attributeByteCounts = {
-            valueType: 'UInt32',
-            valuesPerElement: 1
-        };
-    }
-    /**
-     * Setup Id attribute for map segmentation.
-     * @param storageAttribute - attribute for map segmentation .
-     */
-    _setupIdAttribute(storageAttribute) {
-        storageAttribute.attributeValues = {
-            valueType: 'Oid32',
-            valuesPerElement: 1
-        };
-    }
-    /**
-     * Setup double attribute for map segmentation.
-     * @param storageAttribute - attribute for map segmentation .
-     */
-    _setupDoubleAttribute(storageAttribute) {
-        storageAttribute.attributeValues = {
-            valueType: 'Float64',
-            valuesPerElement: 1
-        };
-    }
-    /**
-     * Setup field attribute for map segmentation.
-     * @param key - attribute for map segmentation.
-     * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').
-     */
-    _createFieldAttribute(key, fieldAttributeType) {
-        return {
-            name: key,
-            type: fieldAttributeType,
-            alias: key
-        };
-    }
     /**
      * Do conversion of 3DTiles property table to I3s node attributes.
      * @param propertyTable - Table with layer meta data.
@@ -932,11 +883,11 @@ class I3SConverter {
         };
         for (const key in propertyTableWithObjectId) {
             const firstAttribute = propertyTableWithObjectId[key][0];
-            const attributeType = this.getAttributeType(key, firstAttribute);
-            const storageAttribute = this._createdStorageAttribute(attributeIndex, key, attributeType);
-            const fieldAttributeType = this._getFieldAttributeType(attributeType);
-            const fieldAttribute = this._createFieldAttribute(key, fieldAttributeType);
-            const popupInfo = this._createPopupInfo(propertyTableWithObjectId);
+            const attributeType = (0, feature_attributes_1.getAttributeType)(key, firstAttribute);
+            const storageAttribute = (0, feature_attributes_1.createdStorageAttribute)(attributeIndex, key, attributeType);
+            const fieldAttributeType = (0, feature_attributes_1.getFieldAttributeType)(attributeType);
+            const fieldAttribute = (0, feature_attributes_1.createFieldAttribute)(key, fieldAttributeType);
+            const popupInfo = (0, feature_attributes_1.createPopupInfo)(propertyTableWithObjectId);
             this.layers0.attributeStorageInfo.push(storageAttribute);
             this.layers0.fields.push(fieldAttribute);
             this.layers0.popupInfo = popupInfo;
@@ -944,55 +895,6 @@ class I3SConverter {
             attributeIndex += 1;
         }
     }
-    /**
-     * Find and return attribute type based on key form propertyTable.
-     * @param attributeType
-     */
-    _getFieldAttributeType(attributeType) {
-        switch (attributeType) {
-            case OBJECT_ID_TYPE:
-                return 'esriFieldTypeOID';
-            case STRING_TYPE:
-                return 'esriFieldTypeString';
-            case SHORT_INT_TYPE:
-                return 'esriFieldTypeInteger';
-            case DOUBLE_TYPE:
-                return 'esriFieldTypeDouble';
-            default:
-                return 'esriFieldTypeString';
-        }
-    }
-    /**
-     * Generate popup info to show metadata on the map.
-     * @param propertyTable - table data with OBJECTID.
-     * @return data for correct rendering of popup.
-     */
-    _createPopupInfo(propertyTable) {
-        const title = '{OBJECTID}';
-        const mediaInfos = [];
-        const fieldInfos = [];
-        const popupElements = [];
-        const expressionInfos = [];
-        for (const key in propertyTable) {
-            fieldInfos.push({
-                fieldName: key,
-                visible: true,
-                isEditable: false,
-                label: key
-            });
-        }
-        popupElements.push({
-            fieldInfos,
-            type: 'fields'
-        });
-        return {
-            title,
-            mediaInfos,
-            popupElements,
-            fieldInfos,
-            expressionInfos
-        };
-    }
     /**
      * Print statistics in the end of conversion
      * @param params - output files data

package/dist/i3s-converter/types.d.ts

@@ -2,6 +2,10 @@ import { BoundingVolumes, I3SMaterialDefinition, MaterialDefinitionInfo, Texture
 import { ImageDataType } from '@loaders.gl/images';
 /** Converted resources for specific node */
 export declare type I3SConvertedResources = {
+    /**
+     * Node id
+     */
+    nodeId?: number;
     /** Non-compressed geometry buffer that have structure met
      * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md
      * (Geometry buffer)

package/dist/i3s-converter/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,4CAA4C;AAC5C,oBAAY,qBAAqB,GAAG;IAClC;;;OAGG;IACH,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACjD;;OAEG;IACH,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;OAEG;IACH,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjC;;OAEG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;OAEG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,mBAAmB,GAAG;IAChC,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,eAAe,EAAE,IAAI,GAAG,eAAe,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,kBAAkB,GAAG;IAC/B,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,oBAAY,4BAA4B,GAAG;IACzC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,+CAA+C;AAC/C,oBAAY,qBAAqB,GAAG;IAClC,oHAAoH;IACpH,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACnD,kHAAkH;IAClH,sBAAsB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2EAA2E;AAC3E,oBAAY,sBAAsB,GAAG;IACnC,2GAA2G;IAC3G,QAAQ,EAAE,qBAAqB,CAAC;IAChC,8BAA8B;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,4CAA4C;AAC5C,oBAAY,qBAAqB,GAAG;IAClC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACjD;;OAEG;IACH,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;OAEG;IACH,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjC;;OAEG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;OAEG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,mBAAmB,GAAG;IAChC,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,eAAe,EAAE,IAAI,GAAG,eAAe,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,oBAAY,kBAAkB,GAAG;IAC/B,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,oBAAY,4BAA4B,GAAG;IACzC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,+CAA+C;AAC/C,oBAAY,qBAAqB,GAAG;IAClC,oHAAoH;IACpH,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACnD,kHAAkH;IAClH,sBAAsB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2EAA2E;AAC3E,oBAAY,sBAAsB,GAAG;IACnC,2GAA2G;IAC3G,QAAQ,EAAE,qBAAqB,CAAC;IAChC,8BAA8B;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.0-alpha.3",
+  "version": "3.3.0-alpha.4",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -43,19 +43,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,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.0-alpha.3",
-    "@loaders.gl/crypto": "3.3.0-alpha.3",
-    "@loaders.gl/draco": "3.3.0-alpha.3",
-    "@loaders.gl/gltf": "3.3.0-alpha.3",
-    "@loaders.gl/i3s": "3.3.0-alpha.3",
-    "@loaders.gl/images": "3.3.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.3",
-    "@loaders.gl/polyfills": "3.3.0-alpha.3",
-    "@loaders.gl/schema": "3.3.0-alpha.3",
-    "@loaders.gl/textures": "3.3.0-alpha.3",
-    "@loaders.gl/tiles": "3.3.0-alpha.3",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.3",
-    "@loaders.gl/zip": "3.3.0-alpha.3",
+    "@loaders.gl/3d-tiles": "3.3.0-alpha.4",
+    "@loaders.gl/crypto": "3.3.0-alpha.4",
+    "@loaders.gl/draco": "3.3.0-alpha.4",
+    "@loaders.gl/gltf": "3.3.0-alpha.4",
+    "@loaders.gl/i3s": "3.3.0-alpha.4",
+    "@loaders.gl/images": "3.3.0-alpha.4",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.4",
+    "@loaders.gl/polyfills": "3.3.0-alpha.4",
+    "@loaders.gl/schema": "3.3.0-alpha.4",
+    "@loaders.gl/textures": "3.3.0-alpha.4",
+    "@loaders.gl/tiles": "3.3.0-alpha.4",
+    "@loaders.gl/worker-utils": "3.3.0-alpha.4",
+    "@loaders.gl/zip": "3.3.0-alpha.4",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -75,5 +75,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "232fdc52fcbee10d8322fd8a4589680943f10517"
+  "gitHead": "d1c524fd3cb9296ecd1bf7d185765c4f6aaef6a1"
 }