@loaders.gl/tile-converter 4.3.0-alpha.1 → 4.3.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.3.0-alpha.1",
+  "version": "4.3.0-alpha.3",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -53,20 +53,20 @@
     "copy-certificates": "cp -R src/i3s-server/certs dist/i3s-server"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.3.0-alpha.1",
-    "@loaders.gl/compression": "4.3.0-alpha.1",
-    "@loaders.gl/crypto": "4.3.0-alpha.1",
-    "@loaders.gl/draco": "4.3.0-alpha.1",
-    "@loaders.gl/gltf": "4.3.0-alpha.1",
-    "@loaders.gl/i3s": "4.3.0-alpha.1",
-    "@loaders.gl/images": "4.3.0-alpha.1",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.1",
-    "@loaders.gl/math": "4.3.0-alpha.1",
-    "@loaders.gl/polyfills": "4.3.0-alpha.1",
-    "@loaders.gl/textures": "4.3.0-alpha.1",
-    "@loaders.gl/tiles": "4.3.0-alpha.1",
-    "@loaders.gl/worker-utils": "4.3.0-alpha.1",
-    "@loaders.gl/zip": "4.3.0-alpha.1",
+    "@loaders.gl/3d-tiles": "4.3.0-alpha.3",
+    "@loaders.gl/compression": "4.3.0-alpha.3",
+    "@loaders.gl/crypto": "4.3.0-alpha.3",
+    "@loaders.gl/draco": "4.3.0-alpha.3",
+    "@loaders.gl/gltf": "4.3.0-alpha.3",
+    "@loaders.gl/i3s": "4.3.0-alpha.3",
+    "@loaders.gl/images": "4.3.0-alpha.3",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.3",
+    "@loaders.gl/math": "4.3.0-alpha.3",
+    "@loaders.gl/polyfills": "4.3.0-alpha.3",
+    "@loaders.gl/textures": "4.3.0-alpha.3",
+    "@loaders.gl/tiles": "4.3.0-alpha.3",
+    "@loaders.gl/worker-utils": "4.3.0-alpha.3",
+    "@loaders.gl/zip": "4.3.0-alpha.3",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -94,5 +94,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "568446ea69eb590f0c42d965459b636216cda74e"
+  "gitHead": "3213679d79e6ff2814d48fd3337acfa446c74099"
 }

package/src/i3s-converter/helpers/load-3d-tiles.ts

@@ -6,7 +6,7 @@ import type {
 } from '@loaders.gl/3d-tiles';
 import {Tiles3DArchive} from '@loaders.gl/3d-tiles';
 import {LoaderWithParser, load} from '@loaders.gl/core';
-import {FileHandleFile, FileProvider} from '@loaders.gl/loader-utils';
+import {FileHandleFile, FileProviderInterface} from '@loaders.gl/loader-utils';
 import {
   CD_HEADER_SIGNATURE,
   ZipFileSystem,
@@ -142,7 +142,7 @@ export function isNestedTileset(tile: Tiles3DTileJSONPostprocessed) {
  * @returns hash table of the 3TZ file content or undefined if the hash file is not presented inside
  */
 async function loadHashTable(
-  fileProvider: FileProvider
+  fileProvider: FileProviderInterface
 ): Promise<undefined | Record<string, bigint>> {
   let hashTable: undefined | Record<string, bigint>;
 

package/src/i3s-server/app.ts

@@ -24,7 +24,13 @@ app.use(express.static(path.join(__dirname, 'public')));
 app.use(cors());
 
 if (/\.slpk$/.test(I3S_LAYER_PATH)) {
-  loadArchive(FULL_LAYER_PATH);
+  let filePath = FULL_LAYER_PATH;
+  // Checks if the first character is not a point to indicate absolute path
+  const absolutePath = /^[^.]/.exec(I3S_LAYER_PATH);
+  if (absolutePath) {
+    filePath = I3S_LAYER_PATH;
+  }
+  loadArchive(filePath);
   app.use('/SceneServer/layers/0', router);
   app.use('/SceneServer', sceneServerRouter);
 } else {

package/src/i3s-server/controllers/index-controller.ts

@@ -3,18 +3,24 @@ import fs from 'fs';
 
 const {promises} = fs;
 
-const I3S_LAYER_PATH = process.env.I3sLayerPath || '';
-
 /**
  * Get local file name by input HTTP URL
  * @param url - I3S HTTP service url
+ * @param i3sLayerPath - I3S layer path
  * @returns - local file name
  */
-export async function getFileNameByUrl(url: string): Promise<string | null> {
+export async function getFileNameByUrl(url: string, i3sLayerPath = ''): Promise<string | null> {
+  i3sLayerPath = i3sLayerPath || process.env.I3sLayerPath || '';
   const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];
-  const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH);
+  let filePath = process.cwd();
+  // Checks if the first character is not a point to indicate absolute path
+  const absolutePath = /^[^.]/.exec(i3sLayerPath);
+  if (absolutePath) {
+    filePath = '';
+  }
+  const FULL_LAYER_PATH = path.join(filePath, i3sLayerPath, url);
   for (const ext of extensions) {
-    const fileName = `${FULL_LAYER_PATH}${url}/index.${ext}`;
+    const fileName = `${FULL_LAYER_PATH}/index.${ext}`;
     try {
       await promises.access(fileName);
       return fileName;