@loaders.gl/3d-tiles 4.2.0-alpha.4 → 4.2.0-alpha.5

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

@@ -1,51 +1,76 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { MD5Hash } from '@loaders.gl/crypto';
 import { DeflateCompression, NoCompression } from '@loaders.gl/compression';
 import { IndexedArchive, parseZipLocalFileHeader } from '@loaders.gl/zip';
+/**
+ * Handling different compression types in zip
+ */
 const COMPRESSION_METHODS = {
-  0: data => new NoCompression().decompress(data),
-  8: data => new DeflateCompression({
-    raw: true
-  }).decompress(data)
+    /** No compression */
+    0: (data) => new NoCompression().decompress(data),
+    /** Deflation */
+    8: (data) => new DeflateCompression({ raw: true }).decompress(data)
 };
+/**
+ * Class for handling information about 3tz file
+ */
 export class Tiles3DArchive extends IndexedArchive {
-  constructor(fileProvider, hashTable, fileName) {
-    super(fileProvider, hashTable, fileName);
-    this.hashTable = void 0;
-    this.hashTable = hashTable;
-  }
-  async getFile(path) {
-    let data = await this.getFileBytes(path.toLocaleLowerCase());
-    if (!data) {
-      data = await this.getFileBytes(path);
+    /**
+     * creates Tiles3DArchive handler
+     * @param fileProvider - FileProvider with the whole file
+     * @param hashTable - hash info
+     */
+    constructor(fileProvider, hashTable, fileName) {
+        super(fileProvider, hashTable, fileName);
+        this.hashTable = hashTable;
     }
-    if (!data) {
-      throw new Error(`No such file in the archive: ${path}`);
+    /**
+     * Returns file with the given path from 3tz archive
+     * @param path - path inside the 3tz
+     * @returns buffer with ready to use file
+     */
+    async getFile(path) {
+        // sometimes paths are not in lower case when hash file is created,
+        // so first we're looking for lower case file name and then for original one
+        let data = await this.getFileBytes(path.toLocaleLowerCase());
+        if (!data) {
+            data = await this.getFileBytes(path);
+        }
+        if (!data) {
+            throw new Error(`No such file in the archive: ${path}`);
+        }
+        return data;
     }
-    return data;
-  }
-  async getFileBytes(path) {
-    let uncompressedFile;
-    if (this.hashTable) {
-      const arrayBuffer = new TextEncoder().encode(path).buffer;
-      const nameHash = await new MD5Hash().hash(arrayBuffer, 'hex');
-      const byteOffset = this.hashTable[nameHash];
-      if (byteOffset === undefined) {
-        return null;
-      }
-      const localFileHeader = await parseZipLocalFileHeader(byteOffset, this.fileProvider);
-      if (!localFileHeader) {
-        return null;
-      }
-      const compressedFile = await this.fileProvider.slice(localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
-      const compressionMethod = COMPRESSION_METHODS[localFileHeader.compressionMethod];
-      if (!compressionMethod) {
-        throw Error('Only Deflation compression is supported');
-      }
-      uncompressedFile = await compressionMethod(compressedFile);
-    } else {
-      uncompressedFile = await this.getFileWithoutHash(path);
+    /**
+     * Trying to get raw file data by adress
+     * @param path - path inside the archive
+     * @returns buffer with the raw file data
+     */
+    async getFileBytes(path) {
+        let uncompressedFile;
+        if (this.hashTable) {
+            const arrayBuffer = new TextEncoder().encode(path).buffer;
+            const nameHash = await new MD5Hash().hash(arrayBuffer, 'hex');
+            const byteOffset = this.hashTable[nameHash];
+            if (byteOffset === undefined) {
+                return null;
+            }
+            const localFileHeader = await parseZipLocalFileHeader(byteOffset, this.fileProvider);
+            if (!localFileHeader) {
+                return null;
+            }
+            const compressedFile = await this.fileProvider.slice(localFileHeader.fileDataOffset, localFileHeader.fileDataOffset + localFileHeader.compressedSize);
+            const compressionMethod = COMPRESSION_METHODS[localFileHeader.compressionMethod];
+            if (!compressionMethod) {
+                throw Error('Only Deflation compression is supported');
+            }
+            uncompressedFile = await compressionMethod(compressedFile);
+        }
+        else {
+            uncompressedFile = await this.getFileWithoutHash(path);
+        }
+        return uncompressedFile;
     }
-    return uncompressedFile;
-  }
 }
-//# sourceMappingURL=3d-tiles-archive-archive.js.map

package/dist/3d-tiles-archive/3d-tiles-archive-parser.d.ts

@@ -1,5 +1,5 @@
 import { FileProvider } from '@loaders.gl/loader-utils';
-import { Tiles3DArchive } from './3d-tiles-archive-archive';
+import { Tiles3DArchive } from "./3d-tiles-archive-archive.js";
 /**
  * Creates 3tz file handler from raw file
  * @param fileProvider raw file data

package/dist/3d-tiles-archive/3d-tiles-archive-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3d-tiles-archive-parser.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-archive/3d-tiles-archive-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAStD,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,iBAChB,YAAY,cACf,MAAM,KAAK,IAAI,kBACzB,QAAQ,cAAc,CA+BxB,CAAC"}
+{"version":3,"file":"3d-tiles-archive-parser.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-archive/3d-tiles-archive-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAStD,OAAO,EAAC,cAAc,EAAC,sCAAmC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,iBAChB,YAAY,cACf,MAAM,KAAK,IAAI,kBACzB,QAAQ,cAAc,CA+BxB,CAAC"}

package/dist/3d-tiles-archive/3d-tiles-archive-parser.js

@@ -1,21 +1,31 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { CD_HEADER_SIGNATURE, makeHashTableFromZipHeaders, parseHashTable, parseZipCDFileHeader, parseZipLocalFileHeader, searchFromTheEnd } from '@loaders.gl/zip';
 import { Tiles3DArchive } from "./3d-tiles-archive-archive.js";
+/**
+ * Creates 3tz file handler from raw file
+ * @param fileProvider raw file data
+ * @param cb is called with information message during parsing
+ * @returns 3tz file handler
+ */
 export const parse3DTilesArchive = async (fileProvider, cb) => {
-  const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
-  const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
-  let hashTable;
-  if ((cdFileHeader === null || cdFileHeader === void 0 ? void 0 : cdFileHeader.fileName) !== '@3dtilesIndex1@') {
-    hashTable = await makeHashTableFromZipHeaders(fileProvider);
-    cb === null || cb === void 0 ? void 0 : cb('3tz doesnt contain hash file, hash info has been composed according to zip archive headers');
-  } else {
-    const localFileHeader = await parseZipLocalFileHeader(cdFileHeader.localHeaderOffset, fileProvider);
-    if (!localFileHeader) {
-      throw new Error('corrupted 3tz zip archive');
+    const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
+    const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
+    let hashTable;
+    if (cdFileHeader?.fileName !== '@3dtilesIndex1@') {
+        hashTable = await makeHashTableFromZipHeaders(fileProvider);
+        cb?.('3tz doesnt contain hash file, hash info has been composed according to zip archive headers');
     }
-    const fileDataOffset = localFileHeader.fileDataOffset;
-    const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
-    hashTable = parseHashTable(hashFile);
-  }
-  return new Tiles3DArchive(fileProvider, hashTable);
+    else {
+        // cb?.('3tz contains hash file');
+        const localFileHeader = await parseZipLocalFileHeader(cdFileHeader.localHeaderOffset, fileProvider);
+        if (!localFileHeader) {
+            throw new Error('corrupted 3tz zip archive');
+        }
+        const fileDataOffset = localFileHeader.fileDataOffset;
+        const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
+        hashTable = parseHashTable(hashFile);
+    }
+    return new Tiles3DArchive(fileProvider, hashTable);
 };
-//# sourceMappingURL=3d-tiles-archive-parser.js.map

package/dist/3d-tiles-archive-loader.js

@@ -1,20 +1,31 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { DataViewFile } from '@loaders.gl/loader-utils';
 import { parse3DTilesArchive as parse3DTilesArchiveFromProvider } from "./3d-tiles-archive/3d-tiles-archive-parser.js";
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+/**
+ * Loader for 3tz packages
+ */
 export const Tiles3DArchiveFileLoader = {
-  name: '3tz',
-  id: '3tz',
-  module: '3d-tiles',
-  version: VERSION,
-  mimeTypes: ['application/octet-stream', 'application/vnd.maxar.archive.3tz+zip'],
-  parse: parse3DTilesArchive,
-  extensions: ['3tz'],
-  options: {}
+    name: '3tz',
+    id: '3tz',
+    module: '3d-tiles',
+    version: VERSION,
+    mimeTypes: ['application/octet-stream', 'application/vnd.maxar.archive.3tz+zip'],
+    parse: parse3DTilesArchive,
+    extensions: ['3tz'],
+    options: {}
 };
-async function parse3DTilesArchive(data) {
-  var _options$3dTilesArc, _options$3dTilesArc2;
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  const archive = await parse3DTilesArchiveFromProvider(new DataViewFile(new DataView(data)));
-  return archive.getFile((_options$3dTilesArc = (_options$3dTilesArc2 = options['3d-tiles-archive']) === null || _options$3dTilesArc2 === void 0 ? void 0 : _options$3dTilesArc2.path) !== null && _options$3dTilesArc !== void 0 ? _options$3dTilesArc : '');
+/**
+ * returns a single file from the 3tz archive
+ * @param data 3tz archive data
+ * @param options options
+ * @returns requested file
+ */
+async function parse3DTilesArchive(data, options = {}) {
+    const archive = await parse3DTilesArchiveFromProvider(new DataViewFile(new DataView(data)));
+    return archive.getFile(options['3d-tiles-archive']?.path ?? '');
 }
-//# sourceMappingURL=3d-tiles-archive-loader.js.map

package/dist/cesium-ion-loader.js

@@ -1,36 +1,40 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { Tiles3DLoader } from "./tiles-3d-loader.js";
 import { getIonTilesetMetadata } from "./lib/ion/ion.js";
-async function preload(url) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  options = options['cesium-ion'] || {};
-  const {
-    accessToken
-  } = options;
-  let assetId = options.assetId;
-  if (!Number.isFinite(assetId)) {
-    const matched = url.match(/\/([0-9]+)\/tileset.json/);
-    assetId = matched && matched[1];
-  }
-  return getIonTilesetMetadata(accessToken, assetId);
+async function preload(url, options = {}) {
+    options = options['cesium-ion'] || {};
+    // @ts-ignore
+    const { accessToken } = options;
+    // @ts-ignore
+    let assetId = options.assetId;
+    if (!Number.isFinite(assetId)) {
+        const matched = url.match(/\/([0-9]+)\/tileset.json/);
+        assetId = matched && matched[1];
+    }
+    return getIonTilesetMetadata(accessToken, assetId);
 }
+/**
+ * Loader for 3D tiles from Cesium ION
+ */
 export const CesiumIonLoader = {
-  ...Tiles3DLoader,
-  id: 'cesium-ion',
-  name: 'Cesium Ion',
-  preload,
-  parse: async (data, options, context) => {
-    options = {
-      ...options
-    };
-    options['3d-tiles'] = options['cesium-ion'];
-    options.loader = CesiumIonLoader;
-    return Tiles3DLoader.parse(data, options, context);
-  },
-  options: {
-    'cesium-ion': {
-      ...Tiles3DLoader.options['3d-tiles'],
-      accessToken: null
+    ...Tiles3DLoader,
+    id: 'cesium-ion',
+    name: 'Cesium Ion',
+    // @ts-ignore
+    preload,
+    parse: async (data, options, context) => {
+        options = { ...options };
+        options['3d-tiles'] = options['cesium-ion'];
+        // @ts-ignore
+        options.loader = CesiumIonLoader;
+        return Tiles3DLoader.parse(data, options, context); // , loader);
+    },
+    options: {
+        'cesium-ion': {
+            ...Tiles3DLoader.options['3d-tiles'],
+            accessToken: null
+        }
     }
-  }
 };
-//# sourceMappingURL=cesium-ion-loader.js.map