@loaders.gl/3d-tiles 4.0.0 → 4.0.2

package/dist/dist.dev.js

@@ -4409,14 +4409,14 @@ var __exports__ = (() => {
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (!void 0 || url.startsWith("http")) {
+    if (isBrowser2 || !void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
     return await (void 0)(url);
   }
   async function loadAsText(url) {
-    if (!void 0 || url.startsWith("http")) {
+    if (isBrowser2 || !void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
@@ -18305,6 +18305,7 @@ var __exports__ = (() => {
   var CD_UNCOMPRESSED_SIZE_OFFSET = 24n;
   var CD_FILE_NAME_LENGTH_OFFSET = 28n;
   var CD_EXTRA_FIELD_LENGTH_OFFSET = 30n;
+  var CD_START_DISK_OFFSET = 32n;
   var CD_LOCAL_HEADER_OFFSET_OFFSET = 42n;
   var CD_FILE_NAME_OFFSET = 46n;
   var signature = new Uint8Array([80, 75, 1, 2]);
@@ -18313,36 +18314,31 @@ var __exports__ = (() => {
     if (!compareArrayBuffers(magicBytes, signature.buffer)) {
       return null;
     }
-    let compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
-    let uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
+    const compressedSize = BigInt(await file.getUint32(headerOffset + CD_COMPRESSED_SIZE_OFFSET));
+    const uncompressedSize = BigInt(await file.getUint32(headerOffset + CD_UNCOMPRESSED_SIZE_OFFSET));
     const extraFieldLength = await file.getUint16(headerOffset + CD_EXTRA_FIELD_LENGTH_OFFSET);
+    const startDisk = BigInt(await file.getUint16(headerOffset + CD_START_DISK_OFFSET));
     const fileNameLength = await file.getUint16(headerOffset + CD_FILE_NAME_LENGTH_OFFSET);
     const filenameBytes = await file.slice(headerOffset + CD_FILE_NAME_OFFSET, headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength));
     const fileName = new TextDecoder().decode(filenameBytes);
     const extraOffset = headerOffset + CD_FILE_NAME_OFFSET + BigInt(fileNameLength);
     const oldFormatOffset = await file.getUint32(headerOffset + CD_LOCAL_HEADER_OFFSET_OFFSET);
-    let fileDataOffset = BigInt(oldFormatOffset);
-    let offsetInZip64Data = 4n;
-    if (uncompressedSize === BigInt(4294967295)) {
-      uncompressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-      offsetInZip64Data += 8n;
-    }
-    if (compressedSize === BigInt(4294967295)) {
-      compressedSize = await file.getBigUint64(extraOffset + offsetInZip64Data);
-      offsetInZip64Data += 8n;
-    }
-    if (fileDataOffset === BigInt(4294967295)) {
-      fileDataOffset = await file.getBigUint64(extraOffset + offsetInZip64Data);
-    }
-    const localHeaderOffset = fileDataOffset;
-    return {
-      compressedSize,
+    const localHeaderOffset = BigInt(oldFormatOffset);
+    const extraField = new DataView(await file.slice(extraOffset, extraOffset + BigInt(extraFieldLength)));
+    const zip64data = {
       uncompressedSize,
+      compressedSize,
+      localHeaderOffset,
+      startDisk
+    };
+    const res = findZip64DataInExtra(zip64data, extraField);
+    return {
+      ...zip64data,
+      ...res,
       extraFieldLength,
       fileNameLength,
       fileName,
-      extraOffset,
-      localHeaderOffset
+      extraOffset
     };
   };
   async function* makeZipCDHeaderIterator(fileProvider) {
@@ -18355,6 +18351,52 @@ var __exports__ = (() => {
       cdHeader = await parseZipCDFileHeader(cdHeader.extraOffset + BigInt(cdHeader.extraFieldLength), fileProvider);
     }
   }
+  var getUint16 = (...bytes) => {
+    return bytes[0] + bytes[1] * 16;
+  };
+  var findZip64DataInExtra = (zip64data, extraField) => {
+    const zip64dataList = findExpectedData(zip64data);
+    const zip64DataRes = {};
+    if (zip64dataList.length > 0) {
+      const zip64chunkSize = zip64dataList.reduce((sum, curr) => sum + curr.length, 0);
+      const offsetInExtraData = new Uint8Array(extraField.buffer).findIndex((_val, i2, arr) => getUint16(arr[i2], arr[i2 + 1]) === 1 && getUint16(arr[i2 + 2], arr[i2 + 3]) === zip64chunkSize);
+      let bytesRead = 0;
+      for (const note of zip64dataList) {
+        const offset = bytesRead;
+        zip64DataRes[note.name] = extraField.getBigUint64(offsetInExtraData + 4 + offset, true);
+        bytesRead = offset + note.length;
+      }
+    }
+    return zip64DataRes;
+  };
+  var findExpectedData = (zip64data) => {
+    const zip64dataList = [];
+    if (zip64data.uncompressedSize === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "uncompressedSize",
+        length: 8
+      });
+    }
+    if (zip64data.compressedSize === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "compressedSize",
+        length: 8
+      });
+    }
+    if (zip64data.localHeaderOffset === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "localHeaderOffset",
+        length: 8
+      });
+    }
+    if (zip64data.startDisk === BigInt(4294967295)) {
+      zip64dataList.push({
+        name: "startDisk",
+        length: 4
+      });
+    }
+    return zip64dataList;
+  };
 
   // ../zip/src/parse-zip/local-file-header.ts
   var COMPRESSION_METHOD_OFFSET = 8n;
@@ -19518,11 +19560,12 @@ var __exports__ = (() => {
     version: VERSION2,
     extensions: ["cmpt", "pnts", "b3dm", "i3dm"],
     mimeTypes: ["application/octet-stream"],
-    encodeSync,
     binary: true,
     options: {
       ["3d-tiles"]: {}
-    }
+    },
+    encode: async (tile, options) => encodeSync(tile, options),
+    encodeSync
   };
   function encodeSync(tile, options) {
     return encode3DTile(tile, options);

package/dist/index.cjs

@@ -2826,11 +2826,12 @@ var Tile3DWriter = {
   version: VERSION,
   extensions: ["cmpt", "pnts", "b3dm", "i3dm"],
   mimeTypes: ["application/octet-stream"],
-  encodeSync,
   binary: true,
   options: {
     ["3d-tiles"]: {}
-  }
+  },
+  encode: async (tile, options) => encodeSync(tile, options),
+  encodeSync
 };
 function encodeSync(tile, options) {
   return encode3DTile(tile, options);

package/dist/tile-3d-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile-3d-writer.d.ts","sourceRoot":"","sources":["../src/tile-3d-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAY9D,CAAC"}
+{"version":3,"file":"tile-3d-writer.d.ts","sourceRoot":"","sources":["../src/tile-3d-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,CAa9D,CAAC"}

package/dist/tile-3d-writer.js

@@ -7,11 +7,12 @@ export const Tile3DWriter = {
   version: VERSION,
   extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],
   mimeTypes: ['application/octet-stream'],
-  encodeSync,
   binary: true,
   options: {
     ['3d-tiles']: {}
-  }
+  },
+  encode: async (tile, options) => encodeSync(tile, options),
+  encodeSync
 };
 function encodeSync(tile, options) {
   return encode3DTile(tile, options);

package/dist/tile-3d-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tile-3d-writer.js","names":["VERSION","encode3DTile","Tile3DWriter","name","id","module","version","extensions","mimeTypes","encodeSync","binary","options","tile"],"sources":["../src/tile-3d-writer.ts"],"sourcesContent":["import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport encode3DTile from './lib/encoders/encode-3d-tile';\n\n/**\n * Exporter for 3D Tiles\n */\nexport const Tile3DWriter: Writer<unknown, never, WriterOptions> = {\n  name: '3D Tile',\n  id: '3d-tiles',\n  module: '3d-tiles',\n  version: VERSION,\n  extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n  mimeTypes: ['application/octet-stream'],\n  encodeSync,\n  binary: true,\n  options: {\n    ['3d-tiles']: {}\n  }\n};\n\nfunction encodeSync(tile, options) {\n  return encode3DTile(tile, options);\n}\n"],"mappings":"SACQA,OAAO;AAAA,OACRC,YAAY;AAKnB,OAAO,MAAMC,YAAmD,GAAG;EACjEC,IAAI,EAAE,SAAS;EACfC,EAAE,EAAE,UAAU;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEN,OAAO;EAChBO,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EAC5CC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,UAAU;EACVC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACP,CAAC,UAAU,GAAG,CAAC;EACjB;AACF,CAAC;AAED,SAASF,UAAUA,CAACG,IAAI,EAAED,OAAO,EAAE;EACjC,OAAOV,YAAY,CAACW,IAAI,EAAED,OAAO,CAAC;AACpC"}
+{"version":3,"file":"tile-3d-writer.js","names":["VERSION","encode3DTile","Tile3DWriter","name","id","module","version","extensions","mimeTypes","binary","options","encode","tile","encodeSync"],"sources":["../src/tile-3d-writer.ts"],"sourcesContent":["import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport encode3DTile from './lib/encoders/encode-3d-tile';\n\n/**\n * Exporter for 3D Tiles\n */\nexport const Tile3DWriter: Writer<unknown, never, WriterOptions> = {\n  name: '3D Tile',\n  id: '3d-tiles',\n  module: '3d-tiles',\n  version: VERSION,\n  extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],\n  mimeTypes: ['application/octet-stream'],\n  binary: true,\n  options: {\n    ['3d-tiles']: {}\n  },\n  encode: async (tile, options) => encodeSync(tile, options),\n  encodeSync\n};\n\nfunction encodeSync(tile, options) {\n  return encode3DTile(tile, options);\n}\n"],"mappings":"SACQA,OAAO;AAAA,OACRC,YAAY;AAKnB,OAAO,MAAMC,YAAmD,GAAG;EACjEC,IAAI,EAAE,SAAS;EACfC,EAAE,EAAE,UAAU;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEN,OAAO;EAChBO,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;EAC5CC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACP,CAAC,UAAU,GAAG,CAAC;EACjB,CAAC;EACDC,MAAM,EAAE,MAAAA,CAAOC,IAAI,EAAEF,OAAO,KAAKG,UAAU,CAACD,IAAI,EAAEF,OAAO,CAAC;EAC1DG;AACF,CAAC;AAED,SAASA,UAAUA,CAACD,IAAI,EAAEF,OAAO,EAAE;EACjC,OAAOT,YAAY,CAACW,IAAI,EAAEF,OAAO,CAAC;AACpC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
   "license": "MIT",
   "type": "module",
@@ -42,19 +42,19 @@
     "build-bundle": "ocular-bundle ./src/index.ts"
   },
   "dependencies": {
-    "@loaders.gl/draco": "4.0.0",
-    "@loaders.gl/gltf": "4.0.0",
-    "@loaders.gl/loader-utils": "4.0.0",
-    "@loaders.gl/math": "4.0.0",
-    "@loaders.gl/tiles": "4.0.0",
-    "@loaders.gl/zip": "4.0.0",
+    "@loaders.gl/draco": "4.0.2",
+    "@loaders.gl/gltf": "4.0.2",
+    "@loaders.gl/loader-utils": "4.0.2",
+    "@loaders.gl/math": "4.0.2",
+    "@loaders.gl/tiles": "4.0.2",
+    "@loaders.gl/zip": "4.0.2",
     "@math.gl/core": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0",
     "@probe.gl/log": "^4.0.4",
     "long": "^5.2.1"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.6"
+    "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "9b4211dc0ecd4134a1638ac0a29c5ea9008fd971"
+  "gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806"
 }

package/src/tile-3d-writer.ts

@@ -12,11 +12,12 @@ export const Tile3DWriter: Writer<unknown, never, WriterOptions> = {
   version: VERSION,
   extensions: ['cmpt', 'pnts', 'b3dm', 'i3dm'],
   mimeTypes: ['application/octet-stream'],
-  encodeSync,
   binary: true,
   options: {
     ['3d-tiles']: {}
-  }
+  },
+  encode: async (tile, options) => encodeSync(tile, options),
+  encodeSync
 };
 
 function encodeSync(tile, options) {