@loaders.gl/tile-converter 4.0.0-alpha.7 → 4.0.0-alpha.9

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

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@loaders.gl/core");
-const tiles_1 = require("@loaders.gl/tiles");
 const _3d_tiles_1 = require("@loaders.gl/3d-tiles");
 const path_1 = require("path");
 const uuid_1 = require("uuid");
@@ -50,6 +49,7 @@ const shared_resources_1 = require("./json-templates/shared-resources");
 const node_debug_1 = require("./helpers/node-debug");
 const textures_1 = require("@loaders.gl/textures");
 const images_1 = require("@loaders.gl/images");
+const types_1 = require("./types");
 const worker_utils_1 = require("@loaders.gl/worker-utils");
 const draco_1 = require("@loaders.gl/draco");
 const write_queue_1 = __importDefault(require("../lib/utils/write-queue"));
@@ -57,6 +57,11 @@ const i3s_attributes_worker_1 = require("../i3s-attributes-worker");
 const constants_1 = require("../constants");
 const feature_attributes_1 = require("./helpers/feature-attributes");
 const node_index_document_1 = require("./helpers/node-index-document");
+const load_3d_tiles_1 = require("./helpers/load-3d-tiles");
+const core_2 = require("@math.gl/core");
+const tiles_1 = require("@loaders.gl/tiles");
+const tileset_traversal_1 = require("./helpers/tileset-traversal");
+const preprocess_3d_tiles_1 = require("./helpers/preprocess-3d-tiles");
 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;
@@ -74,11 +79,26 @@ class I3SConverter {
         this.conversionStartTime = [0, 0];
         this.refreshTokenTime = [0, 0];
         this.sourceTileset = null;
+        this.loadOptions = {
+            _nodeWorkers: true,
+            reuseWorkers: true,
+            basis: {
+                format: 'rgba32',
+                // We need to load local fs workers because nodejs can't load workers from the Internet
+                workerUrl: './modules/textures/dist/basis-worker-node.js'
+            },
+            // We need to load local fs workers because nodejs can't load workers from the Internet
+            draco: { workerUrl: './modules/draco/dist/draco-worker-node.js' },
+            fetch: {}
+        };
         this.geoidHeightModel = null;
         this.Loader = _3d_tiles_1.Tiles3DLoader;
         this.workerSource = {};
         this.writeQueue = new write_queue_1.default();
         this.compressList = null;
+        this.preprocessData = {
+            meshTopologyTypes: new Set()
+        };
         this.nodePages = new node_pages_1.default(file_utils_1.writeFile, HARDCODED_NODES_PER_PAGE, this);
         this.options = {};
         this.layers0Path = '';
@@ -150,45 +170,77 @@ class I3SConverter {
         await this.loadWorkers();
         try {
             const preloadOptions = await this._fetchPreloadOptions();
-            const tilesetOptions = {
-                loadOptions: {
-                    _nodeWorkers: true,
-                    reuseWorkers: true,
-                    basis: { format: 'rgba32' }
-                    // TODO - should no longer be needed with new Node workers
-                    // 'basis-nodejs': {
-                    //   format: 'rgba32',
-                    //   workerUrl: './modules/textures/dist/basis-worker-node.js'
-                    // },
-                    // 'draco-nodejs': {workerUrl: './modules/draco/dist/draco-worker-node.js'}
-                }
-            };
             if (preloadOptions.headers) {
-                tilesetOptions.loadOptions.fetch = { headers: preloadOptions.headers };
+                this.loadOptions.fetch = { headers: preloadOptions.headers };
+            }
+            this.sourceTileset = await (0, core_1.load)(inputUrl, this.Loader, this.loadOptions);
+            const preprocessResult = await this.preprocessConversion();
+            if (preprocessResult) {
+                await this._createAndSaveTileset(outputPath, tilesetName);
+                await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });
             }
-            Object.assign(tilesetOptions, preloadOptions);
-            const sourceTilesetJson = await (0, core_1.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
-            // console.log(tilesetJson); // eslint-disable-line
-            this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, tilesetOptions);
-            await this._createAndSaveTileset(outputPath, tilesetName, sourceTilesetJson?.root?.boundingVolume?.region);
-            await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });
-            return sourceTilesetJson;
         }
         catch (error) {
             throw error;
         }
         finally {
+            await this.writeQueue.finalize();
             // Clean up worker pools
             const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
             workerFarm.destroy();
         }
+        return 'success';
+    }
+    /**
+     * Preprocess stage of the tile converter. Traverse all the tiles tree and
+     * check a tile content to be sure that the data is supported
+     * @returns true - the conversion is possible, false - the tileset's content is not supported
+     */
+    async preprocessConversion() {
+        console.log(`Analyze source tileset`);
+        const sourceRootTile = this.sourceTileset.root;
+        await (0, tileset_traversal_1.traverseDatasetWith)(sourceRootTile, null, this.analyzeTile.bind(this), undefined, this.options.maxDepth);
+        const { meshTopologyTypes } = this.preprocessData;
+        console.log(`------------------------------------------------`);
+        console.log(`Preprocess results:`);
+        console.log(`glTF mesh topology types: ${Array.from(meshTopologyTypes).join(', ')}`);
+        console.log(`------------------------------------------------`);
+        if (!meshTopologyTypes.has(types_1.GltfPrimitiveModeString.TRIANGLES) &&
+            !meshTopologyTypes.has(types_1.GltfPrimitiveModeString.TRIANGLE_STRIP)) {
+            console.log('The tileset is of unsupported mesh topology types. The conversion will be interrupted.');
+            console.log(`------------------------------------------------`);
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Analyze a tile content. The callback for preprocess stage.
+     * @param sourceTile - 3DTiles tile JSON metadata
+     * @param traversalProps - mandatory argument but it is not used for the preprocess stage
+     * @returns - nothing
+     */
+    async analyzeTile(sourceTile, traversalProps) {
+        if (sourceTile.type === 'json') {
+            await (0, load_3d_tiles_1.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
+            return null;
+        }
+        if (sourceTile.id) {
+            console.log(`[analyze]: ${sourceTile.id}`); // eslint-disable-line
+        }
+        const tileContent = await (0, load_3d_tiles_1.loadTile3DContent)(this.sourceTileset, sourceTile, {
+            ...this.loadOptions,
+            '3d-tiles': { ...this.loadOptions['3d-tiles'], loadGLTF: false }
+        });
+        const tilePreprocessData = await (0, preprocess_3d_tiles_1.analyzeTileContent)(sourceTile, tileContent);
+        (0, preprocess_3d_tiles_1.mergePreprocessData)(this.preprocessData, tilePreprocessData);
+        return null;
     }
     /**
      * Convert and save the layer and embedded tiles
      * @param outputPath - path to save output data
      * @param tilesetName - new tileset path
      */
-    async _createAndSaveTileset(outputPath, tilesetName, boundingVolumeRegion) {
+    async _createAndSaveTileset(outputPath, tilesetName) {
         const tilesetPath = (0, path_1.join)(`${outputPath}`, `${tilesetName}`);
         // Removing the tilesetPath needed to exclude erroneous files after conversion
         try {
@@ -198,11 +250,12 @@ class I3SConverter {
             // do nothing
         }
         this.layers0Path = (0, path_1.join)(tilesetPath, 'SceneServer', 'layers', '0');
-        this._formLayers0(tilesetName, boundingVolumeRegion);
         this.materialDefinitions = [];
         this.materialMap = new Map();
         const sourceRootTile = this.sourceTileset.root;
-        const boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceRootTile, this.geoidHeightModel);
+        const sourceBoundingVolume = (0, tiles_1.createBoundingVolume)(sourceRootTile.boundingVolume, new core_2.Matrix4(sourceRootTile.transform), null);
+        this._formLayers0(tilesetName, sourceBoundingVolume, this.sourceTileset?.root?.boundingVolume?.region);
+        const boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceBoundingVolume, this.geoidHeightModel);
         await this.nodePages.push({
             index: 0,
             lodThreshold: 0,
@@ -210,7 +263,10 @@ class I3SConverter {
             children: []
         });
         const rootNode = await node_index_document_1.NodeIndexDocument.createRootNode(boundingVolumes, this);
-        await this._convertNodesTree(rootNode, sourceRootTile);
+        await (0, tileset_traversal_1.traverseDatasetWith)(sourceRootTile, {
+            transform: new core_2.Matrix4(sourceRootTile.transform),
+            parentNodes: [rootNode]
+        }, this.convertTile.bind(this), this.finalizeTile.bind(this), this.options.maxDepth);
         this.layers0.materialDefinitions = this.materialDefinitions;
         // @ts-ignore
         this.layers0.geometryDefinitions = (0, json_map_transform_1.default)(this.geometryConfigs.map((config) => ({
@@ -232,10 +288,15 @@ class I3SConverter {
     }
     /**
      * Form object of 3DSceneLayer https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DSceneLayer.cmn.md
-     * @param  tilesetName - Name of layer
+     * @param tilesetName - Name of layer
+     * @param sourceBoundingVolume - initialized bounding volume of the source root tile
+     * @param boundingVolumeRegion - region bounding volume of the source root tile
      */
-    _formLayers0(tilesetName, boundingVolumeRegion) {
-        const fullExtent = (0, coordinate_converter_1.convertBoundingVolumeToI3SFullExtent)(this.sourceTileset?.boundingVolume || this.sourceTileset?.root?.boundingVolume);
+    _formLayers0(tilesetName, sourceBoundingVolume, boundingVolumeRegion) {
+        if (!this.sourceTileset?.root) {
+            return;
+        }
+        const fullExtent = (0, coordinate_converter_1.convertBoundingVolumeToI3SFullExtent)(sourceBoundingVolume);
         if (boundingVolumeRegion) {
             fullExtent.zmin = boundingVolumeRegion[4];
             fullExtent.zmax = boundingVolumeRegion[5];
@@ -258,30 +319,6 @@ class I3SConverter {
         };
         this.layers0 = (0, json_map_transform_1.default)(layers0data, (0, layers_1.LAYERS)());
     }
-    /**
-     * Form object of 3DSceneLayer https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DSceneLayer.cmn.md
-     * @param rootNode - 3DNodeIndexDocument of root node https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md
-     * @param sourceRootTile - Source (3DTile) tile data
-     */
-    async _convertNodesTree(rootNode, sourceRootTile) {
-        await this.sourceTileset._loadTile(sourceRootTile);
-        if (this.isContentSupported(sourceRootTile)) {
-            const childNodes = await this._createNode(rootNode, sourceRootTile, 0);
-            for (const childNode of childNodes) {
-                await childNode.save();
-            }
-            await rootNode.addChildren(childNodes);
-        }
-        else {
-            await this._addChildrenWithNeighborsAndWriteFile({
-                parentNode: rootNode,
-                sourceTiles: sourceRootTile.children,
-                level: 1
-            });
-        }
-        await sourceRootTile.unloadContent();
-        await rootNode.save();
-    }
     /**
      * Write 3DSceneLayer https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DSceneLayer.cmn.md in file
      */
@@ -334,83 +371,73 @@ class I3SConverter {
         }
     }
     /**
-     * Add child nodes recursively and write them to files
-     * @param data - arguments
-     * @param data.parentNode - 3DNodeIndexDocument of parent node
-     * @param data.sourceTiles - array of source child nodes
-     * @param data.level - level of node (distanse to root node in the tree)
-     */
-    async _addChildrenWithNeighborsAndWriteFile(data) {
-        await this._addChildren(data);
-        await data.parentNode.addNeighbors();
-    }
-    /**
-     * Convert nested subtree of 3DTiles dataset
-     * @param param0
-     * @param data.parentNode - 3DNodeIndexDocument of parent node
-     * @param param0.sourceTile - source 3DTile data
-     * @param param0.level - tree level
+     * Convert the specific 3DTiles tile to I3S nodes.
+     * This is callback function for the traversal generic function
+     * @param sourceTile - current 3DTiles tile JSON metadata
+     * @param traversalProps - traversal properties calculated recursively
+     * @returns - traversal properties for the child tiles
      */
-    async convertNestedTileset({ parentNode, sourceTile, level }) {
-        await this.sourceTileset._loadTile(sourceTile);
-        await this._addChildren({
-            parentNode,
-            sourceTiles: sourceTile.children,
-            level: level + 1
-        });
-        await sourceTile.unloadContent();
-    }
-    /**
-     * Convert 3DTiles tile to I3S node
-     * @param param0
-     * @param param0.parentNode - 3DNodeIndexDocument of parent node
-     * @param param0.sourceTile - source 3DTile data
-     * @param param0.level - tree level
-     */
-    async convertNode({ parentNode, sourceTile, level }) {
-        const childNodes = await this._createNode(parentNode, sourceTile, level);
+    async convertTile(sourceTile, traversalProps) {
+        if (sourceTile.type === 'json' || sourceTile.type === 'empty') {
+            if (sourceTile.type === 'json') {
+                if (sourceTile.id) {
+                    console.log(`[load]: ${sourceTile.id}`); // eslint-disable-line
+                }
+                await (0, load_3d_tiles_1.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
+            }
+            return traversalProps;
+        }
+        if (sourceTile.id) {
+            console.log(`[convert]: ${sourceTile.id}`); // eslint-disable-line
+        }
+        const { parentNodes, transform } = traversalProps;
+        let transformationMatrix = transform.clone();
+        if (sourceTile.transform) {
+            transformationMatrix = transformationMatrix.multiplyRight(sourceTile.transform);
+        }
+        const parentNode = parentNodes[0];
+        const childNodes = await this._createNode(parentNode, sourceTile, transformationMatrix);
         await parentNode.addChildren(childNodes);
+        const newTraversalProps = {
+            transform: transformationMatrix,
+            parentNodes: childNodes
+        };
+        return newTraversalProps;
     }
     /**
-     * Add child nodes recursively and write them to files
-     * @param param0 - arguments
-     * @param param0.parentNode - 3DNodeIndexDocument of parent node
-     * @param param0.sourceTile - source 3DTile data
-     * @param param0.level - tree level
+     * Do final action with nodes after the current node and all child nodes been converted.
+     * @param conversionResults - array of conversion results of the current node
+     * @param currentTraversalProps - traversal properties of the current node
      */
-    async _addChildren(data) {
-        const { sourceTiles, parentNode, level } = data;
-        if (this.options.maxDepth && level > this.options.maxDepth) {
-            return;
-        }
-        for (const sourceTile of sourceTiles) {
-            if (sourceTile.type === 'json') {
-                await this.convertNestedTileset({ parentNode, sourceTile, level });
-            }
-            else {
-                await this.convertNode({ parentNode, sourceTile, level });
-            }
-            if (sourceTile.id) {
-                console.log(sourceTile.id); // eslint-disable-line
+    async finalizeTile(conversionResults, currentTraversalProps) {
+        for (const result of conversionResults) {
+            for (const node of result.parentNodes) {
+                await node.addNeighbors();
             }
         }
+        for (const node of currentTraversalProps.parentNodes) {
+            await node.save();
+        }
     }
     /**
      * Convert tile to one or more I3S nodes
      * @param parentNode - 3DNodeIndexDocument of parent node
      * @param sourceTile - source 3DTile data
+     * @param transformationMatrix - transformation matrix of the current tile, calculated recursively multiplying
+     *                               transform of all parent tiles and transform of the current tile
      * @param level - tree level
      */
-    async _createNode(parentNode, sourceTile, level) {
+    async _createNode(parentNode, sourceTile, transformationMatrix) {
         this._checkAddRefinementTypeForTile(sourceTile);
         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.content);
+        const tileContent = await (0, load_3d_tiles_1.loadTile3DContent)(this.sourceTileset, sourceTile, this.loadOptions);
+        const sourceBoundingVolume = (0, tiles_1.createBoundingVolume)(sourceTile.boundingVolume, transformationMatrix, null);
+        let boundingVolumes = (0, coordinate_converter_1.createBoundingVolumes)(sourceBoundingVolume, this.geoidHeightModel);
+        const propertyTable = (0, geometry_converter_1.getPropertyTable)(tileContent);
         if (propertyTable && !this.layers0?.attributeStorageInfo?.length) {
             this._convertPropertyTableToNodeAttributes(propertyTable);
         }
-        const resourcesData = await this._convertResources(sourceTile, parentNode.inPageId, propertyTable);
+        const resourcesData = await this._convertResources(sourceTile, transformationMatrix, sourceBoundingVolume, tileContent, parentNode.inPageId, propertyTable);
         const nodes = [];
         const nodeIds = [];
         const nodesInPage = [];
@@ -449,23 +476,21 @@ class I3SConverter {
             nodeIds.push(nodeInPage.index);
             nodesInPage.push(nodeInPage);
         }
-        sourceTile.unloadContent();
-        await this._addChildrenWithNeighborsAndWriteFile({
-            parentNode: nodes[0],
-            sourceTiles: sourceTile.children,
-            level: level + 1
-        });
         return nodes;
     }
     /**
      * Convert tile to one or more I3S nodes
      * @param sourceTile - source tile (3DTile)
+     * @param transformationMatrix - transformation matrix of the current tile, calculated recursively multiplying
+     *                               transform of all parent tiles and transform of the current tile
+     * @param boundingVolume - initialized bounding volume of the source tile
+     * @param tileContent - content of the source tile
      * @param parentId - id of parent node in node pages
      * @param propertyTable - batch table from b3dm / feature properties from EXT_FEATURE_METADATA
      * @returns - converted node resources
      */
-    async _convertResources(sourceTile, parentId, propertyTable) {
-        if (!this.isContentSupported(sourceTile)) {
+    async _convertResources(sourceTile, transformationMatrix, boundingVolume, tileContent, parentId, propertyTable) {
+        if (!this.isContentSupported(sourceTile) || !tileContent) {
             return null;
         }
         const draftObb = {
@@ -473,7 +498,7 @@ class I3SConverter {
             halfSize: [],
             quaternion: []
         };
-        const resourcesData = await (0, geometry_converter_1.default)(sourceTile.content, async () => (await this.nodePages.push({ index: 0, obb: draftObb }, parentId)).index, propertyTable, this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.workerSource);
+        const resourcesData = await (0, geometry_converter_1.default)(tileContent, transformationMatrix, boundingVolume, async () => (await this.nodePages.push({ index: 0, obb: draftObb }, parentId)).index, propertyTable, this.featuresHashArray, this.layers0?.attributeStorageInfo, this.options.draco, this.generateBoundingVolumes, this.options.mergeMaterials, this.geoidHeightModel, this.workerSource);
         return resourcesData;
     }
     /**
@@ -835,10 +860,9 @@ class I3SConverter {
         }
         this.refreshTokenTime = process_1.default.hrtime();
         const preloadOptions = await this._fetchPreloadOptions();
-        this.sourceTileset.options = { ...this.sourceTileset.options, ...preloadOptions };
         if (preloadOptions.headers) {
-            this.sourceTileset.loadOptions.fetch = {
-                ...this.sourceTileset.loadOptions.fetch,
+            this.loadOptions.fetch = {
+                ...this.loadOptions.fetch,
                 headers: preloadOptions.headers
             };
             console.log('Authorization Bearer token has been updated'); // eslint-disable-line no-undef, no-console
@@ -857,11 +881,11 @@ class I3SConverter {
     }
     /**
      * Check if the tile's content format is supported by the converter
-     * @param sourceRootTile
+     * @param sourceTile
      * @returns
      */
-    isContentSupported(sourceRootTile) {
-        return ['b3dm', 'glTF'].includes(sourceRootTile?.content?.type);
+    isContentSupported(sourceTile) {
+        return ['b3dm', 'glTF', 'scenegraph'].includes(sourceTile.type || '');
     }
     async loadWorkers() {
         console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console

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

@@ -142,4 +142,22 @@ export type MergedMaterial = {
     uvRegion?: Uint16Array;
 };
 export type TypedArrayConstructor = Uint8ArrayConstructor | Int8ArrayConstructor | Uint16ArrayConstructor | Int16ArrayConstructor | Int32ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor | Float64ArrayConstructor;
+/**
+ * glTF primitive modes (mesh topology types)
+ * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
+ */
+export declare enum GltfPrimitiveModeString {
+    POINTS = "POINTS",
+    LINES = "LINES",
+    LINE_LOOP = "LINE_LOOP",
+    LINE_STRIP = "LINE_STRIP",
+    TRIANGLES = "TRIANGLES",
+    TRIANGLE_STRIP = "TRIANGLE_STRIP",
+    TRIANGLE_FAN = "TRIANGLE_FAN"
+}
+/** Preprocessed data gathered from child tiles binary content */
+export type PreprocessData = {
+    /** Mesh topology types used in gltf primitives of the tileset */
+    meshTopologyTypes: Set<GltfPrimitiveModeString>;
+};
 //# sourceMappingURL=types.d.ts.map

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

package/dist/i3s-converter/types.js

@@ -1,2 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GltfPrimitiveModeString = void 0;
+/**
+ * glTF primitive modes (mesh topology types)
+ * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
+ */
+var GltfPrimitiveModeString;
+(function (GltfPrimitiveModeString) {
+    GltfPrimitiveModeString["POINTS"] = "POINTS";
+    GltfPrimitiveModeString["LINES"] = "LINES";
+    GltfPrimitiveModeString["LINE_LOOP"] = "LINE_LOOP";
+    GltfPrimitiveModeString["LINE_STRIP"] = "LINE_STRIP";
+    GltfPrimitiveModeString["TRIANGLES"] = "TRIANGLES";
+    GltfPrimitiveModeString["TRIANGLE_STRIP"] = "TRIANGLE_STRIP";
+    GltfPrimitiveModeString["TRIANGLE_FAN"] = "TRIANGLE_FAN";
+})(GltfPrimitiveModeString = exports.GltfPrimitiveModeString || (exports.GltfPrimitiveModeString = {}));

package/dist/i3s-server/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/i3s-server/app.js"],"names":[],"mappings":";AAOA,uBAAsB"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/i3s-server/app.js"],"names":[],"mappings":";AASA,uBAAsB"}

package/dist/i3s-server/app.js

@@ -4,11 +4,19 @@ const path = require('path');
 const logger = require('morgan');
 const cors = require('cors');
 const indexRouter = require('./routes/index');
+const { sceneServerRouter, router } = require('./routes/slpk-router');
+const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
 const app = express();
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(cors());
-app.use('/', indexRouter);
+if (/\.slpk$/.test(I3S_LAYER_PATH)) {
+    app.use('/SceneServer/layers/0', router);
+    app.use('/SceneServer', sceneServerRouter);
+}
+else {
+    app.use('/', indexRouter);
+}
 module.exports = app;

package/dist/i3s-server/controllers/slpk-controller.d.ts

@@ -0,0 +1,3 @@
+export function loadArchive(fullLayerPath: any): Promise<void>;
+export function getFileByUrl(url: any): Promise<Buffer | undefined>;
+//# sourceMappingURL=slpk-controller.d.ts.map

package/dist/i3s-server/controllers/slpk-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slpk-controller.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/controllers/slpk-controller.js"],"names":[],"mappings":"AAOA,+DAEC;AAOD,oEAgBC"}

package/dist/i3s-server/controllers/slpk-controller.js

@@ -0,0 +1,32 @@
+"use strict";
+require('@loaders.gl/polyfills');
+const { fetchFile, parse } = require('@loaders.gl/core');
+const { SLPKLoader } = require('@loaders.gl/i3s');
+const path = require('path');
+let slpkArchive;
+const loadArchive = async (fullLayerPath) => {
+    slpkArchive = await (await fetchFile(fullLayerPath)).arrayBuffer();
+};
+const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
+const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
+loadArchive(FULL_LAYER_PATH);
+async function getFileByUrl(url) {
+    const trimmedPath = /^\/?(.*)\/?$/.exec(url);
+    let uncompressedFile;
+    if (trimmedPath) {
+        try {
+            uncompressedFile = Buffer.from(await parse(slpkArchive, SLPKLoader, {
+                slpk: {
+                    path: trimmedPath[1],
+                    pathMode: 'http'
+                }
+            }));
+        }
+        catch (e) { }
+    }
+    return uncompressedFile;
+}
+module.exports = {
+    loadArchive,
+    getFileByUrl
+};

package/dist/i3s-server/routes/slpk-router.d.ts

@@ -0,0 +1,3 @@
+export const sceneServerRouter: any;
+export const router: any;
+//# sourceMappingURL=slpk-router.d.ts.map

package/dist/i3s-server/routes/slpk-router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slpk-router.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/routes/slpk-router.js"],"names":[],"mappings":"AAIA,oCAA2C;AAa3C,yBAAgC"}

package/dist/i3s-server/routes/slpk-router.js

@@ -0,0 +1,33 @@
+"use strict";
+const express = require('express');
+const { getFileByUrl } = require('../controllers/slpk-controller');
+const createSceneServer = require('../utils/create-scene-server');
+const sceneServerRouter = express.Router();
+sceneServerRouter.get('*', async function (req, res, next) {
+    const file = await getFileByUrl('/');
+    if (file) {
+        const layer = JSON.parse(file.toString());
+        const sceneServerResponse = createSceneServer(layer.name, layer);
+        res.send(sceneServerResponse);
+    }
+    else {
+        res.status(404);
+        res.send('File not found');
+    }
+});
+const router = express.Router();
+router.get('*', async function (req, res, next) {
+    console.log(req.path);
+    const file = await getFileByUrl(req.path);
+    if (file) {
+        res.send(file);
+    }
+    else {
+        res.status(404);
+        res.send('File not found');
+    }
+});
+module.exports = {
+    sceneServerRouter,
+    router
+};

package/dist/i3s-server/utils/create-scene-server.d.ts

@@ -0,0 +1,11 @@
+export = createSceneServer;
+declare function createSceneServer(name: any, layer: any): {
+    serviceItemId: any;
+    serviceName: any;
+    name: any;
+    currentVersion: string;
+    serviceVersion: string;
+    supportedBindings: string[];
+    layers: any[];
+};
+//# sourceMappingURL=create-scene-server.d.ts.map

package/dist/i3s-server/utils/create-scene-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-scene-server.d.ts","sourceRoot":"","sources":["../../../src/i3s-server/utils/create-scene-server.js"],"names":[],"mappings":";AAEA;;;;;;;;EAUC"}

package/dist/i3s-server/utils/create-scene-server.js

@@ -0,0 +1,14 @@
+"use strict";
+const { v4: uuidv4 } = require('uuid');
+const createSceneServer = (name, layer) => {
+    return {
+        serviceItemId: uuidv4().replace(/-/gi, ''),
+        serviceName: name,
+        name,
+        currentVersion: '10.7',
+        serviceVersion: '1.8',
+        supportedBindings: ['REST'],
+        layers: [layer]
+    };
+};
+module.exports = createSceneServer;

package/dist/lib/utils/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,EACxB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAErC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,EACxB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAGrC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD"}

package/dist/lib/utils/file-utils.js

@@ -116,7 +116,8 @@ exports.isFileExists = isFileExists;
  * @param path
  */
 function removeDir(path) {
-    return fs_1.promises.rmdir(path, { recursive: true });
+    // (node:35607) [DEP0147] DeprecationWarning: In future versions of Node.js, fs.rmdir(path, { recursive: true }) will be removed. Use fs.rm(path, { recursive: true }) instead
+    return fs_1.promises.rm(path, { recursive: true });
 }
 exports.removeDir = removeDir;
 /**