@loaders.gl/i3s 4.0.3 → 4.1.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +78 -9
- package/dist/i3s-content-worker-node.js +46 -46
- package/dist/i3s-content-worker-node.js.map +3 -3
- package/dist/i3s-content-worker.js +20 -33
- package/dist/index.cjs +1 -1
- package/dist/lib/parsers/parse-slpk/parse-slpk.js +2 -2
- package/dist/lib/parsers/parse-slpk/parse-slpk.js.map +1 -1
- package/package.json +10 -10
- package/src/lib/parsers/parse-slpk/parse-slpk.ts +2 -2
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
);
|
|
103
103
|
globalThis._loadersgl_.version = NPM_TAG;
|
|
104
104
|
} else {
|
|
105
|
-
globalThis._loadersgl_.version = "4.0.
|
|
105
|
+
globalThis._loadersgl_.version = "4.1.0-alpha.1";
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
return globalThis._loadersgl_.version;
|
|
@@ -186,10 +186,11 @@
|
|
|
186
186
|
};
|
|
187
187
|
|
|
188
188
|
// ../worker-utils/src/lib/node/worker_threads-browser.ts
|
|
189
|
-
var
|
|
189
|
+
var NodeWorker = class {
|
|
190
190
|
terminate() {
|
|
191
191
|
}
|
|
192
192
|
};
|
|
193
|
+
var parentPort = null;
|
|
193
194
|
|
|
194
195
|
// ../worker-utils/src/lib/worker-utils/get-loadable-worker-url.ts
|
|
195
196
|
var workerURLCache = /* @__PURE__ */ new Map();
|
|
@@ -278,7 +279,7 @@
|
|
|
278
279
|
_loadableURL = "";
|
|
279
280
|
/** Checks if workers are supported on this platform */
|
|
280
281
|
static isSupported() {
|
|
281
|
-
return typeof Worker !== "undefined" && isBrowser2 || typeof
|
|
282
|
+
return typeof Worker !== "undefined" && isBrowser2 || typeof NodeWorker !== "undefined" && !isBrowser2;
|
|
282
283
|
}
|
|
283
284
|
constructor(props) {
|
|
284
285
|
const { name, source, url } = props;
|
|
@@ -357,9 +358,9 @@
|
|
|
357
358
|
if (this.url) {
|
|
358
359
|
const absolute = this.url.includes(":/") || this.url.startsWith("/");
|
|
359
360
|
const url = absolute ? this.url : `./${this.url}`;
|
|
360
|
-
worker = new
|
|
361
|
+
worker = new NodeWorker(url, { eval: false });
|
|
361
362
|
} else if (this.source) {
|
|
362
|
-
worker = new
|
|
363
|
+
worker = new NodeWorker(this.source, { eval: true });
|
|
363
364
|
} else {
|
|
364
365
|
throw new Error("no worker");
|
|
365
366
|
}
|
|
@@ -603,19 +604,6 @@
|
|
|
603
604
|
|
|
604
605
|
// ../worker-utils/src/lib/worker-farm/worker-body.ts
|
|
605
606
|
async function getParentPort() {
|
|
606
|
-
let parentPort;
|
|
607
|
-
try {
|
|
608
|
-
eval("globalThis.parentPort = require('worker_threads').parentPort");
|
|
609
|
-
parentPort = globalThis.parentPort;
|
|
610
|
-
} catch {
|
|
611
|
-
try {
|
|
612
|
-
eval("globalThis.workerThreadsPromise = import('worker_threads')");
|
|
613
|
-
const workerThreads = await globalThis.workerThreadsPromise;
|
|
614
|
-
parentPort = workerThreads.parentPort;
|
|
615
|
-
} catch (error) {
|
|
616
|
-
console.error(error.message);
|
|
617
|
-
}
|
|
618
|
-
}
|
|
619
607
|
return parentPort;
|
|
620
608
|
}
|
|
621
609
|
var onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
@@ -1447,7 +1435,7 @@
|
|
|
1447
1435
|
var navigator_ = globalThis.navigator || {};
|
|
1448
1436
|
|
|
1449
1437
|
// ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
|
|
1450
|
-
var VERSION2 = true ? "4.0.
|
|
1438
|
+
var VERSION2 = true ? "4.1.0-alpha.1" : "untranspiled source";
|
|
1451
1439
|
var isBrowser4 = isBrowser3();
|
|
1452
1440
|
|
|
1453
1441
|
// ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
|
|
@@ -5315,7 +5303,7 @@
|
|
|
5315
5303
|
_defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
|
|
5316
5304
|
|
|
5317
5305
|
// ../images/src/lib/utils/version.ts
|
|
5318
|
-
var VERSION3 = true ? "4.0.
|
|
5306
|
+
var VERSION3 = true ? "4.1.0-alpha.1" : "latest";
|
|
5319
5307
|
|
|
5320
5308
|
// ../images/src/lib/category-api/image-type.ts
|
|
5321
5309
|
var parseImageNode = globalThis.loaders?.parseImageNode;
|
|
@@ -5721,18 +5709,9 @@
|
|
|
5721
5709
|
};
|
|
5722
5710
|
|
|
5723
5711
|
// ../draco/src/lib/utils/version.ts
|
|
5724
|
-
var VERSION4 = true ? "4.0.
|
|
5712
|
+
var VERSION4 = true ? "4.1.0-alpha.1" : "latest";
|
|
5725
5713
|
|
|
5726
5714
|
// ../draco/src/draco-loader.ts
|
|
5727
|
-
var DEFAULT_DRACO_OPTIONS = {
|
|
5728
|
-
draco: {
|
|
5729
|
-
decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
|
|
5730
|
-
// 'js' for IE11
|
|
5731
|
-
libraryPath: "libs/",
|
|
5732
|
-
extraAttributes: {},
|
|
5733
|
-
attributeNameEntry: void 0
|
|
5734
|
-
}
|
|
5735
|
-
};
|
|
5736
5715
|
var DracoLoader = {
|
|
5737
5716
|
name: "Draco",
|
|
5738
5717
|
id: "draco",
|
|
@@ -5744,7 +5723,15 @@
|
|
|
5744
5723
|
mimeTypes: ["application/octet-stream"],
|
|
5745
5724
|
binary: true,
|
|
5746
5725
|
tests: ["DRACO"],
|
|
5747
|
-
options:
|
|
5726
|
+
options: {
|
|
5727
|
+
draco: {
|
|
5728
|
+
decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
|
|
5729
|
+
// 'js' for IE11
|
|
5730
|
+
libraryPath: "libs/",
|
|
5731
|
+
extraAttributes: {},
|
|
5732
|
+
attributeNameEntry: void 0
|
|
5733
|
+
}
|
|
5734
|
+
}
|
|
5748
5735
|
};
|
|
5749
5736
|
|
|
5750
5737
|
// ../draco/src/lib/utils/get-draco-schema.ts
|
|
@@ -6325,7 +6312,7 @@
|
|
|
6325
6312
|
}
|
|
6326
6313
|
|
|
6327
6314
|
// ../textures/src/lib/utils/version.ts
|
|
6328
|
-
var VERSION5 = true ? "4.0.
|
|
6315
|
+
var VERSION5 = true ? "4.1.0-alpha.1" : "latest";
|
|
6329
6316
|
|
|
6330
6317
|
// ../textures/src/lib/parsers/basis-module-loader.ts
|
|
6331
6318
|
var BASIS_EXTERNAL_LIBRARIES = {
|
|
@@ -7853,7 +7840,7 @@
|
|
|
7853
7840
|
}
|
|
7854
7841
|
|
|
7855
7842
|
// src/i3s-content-loader.ts
|
|
7856
|
-
var VERSION6 = true ? "4.0.
|
|
7843
|
+
var VERSION6 = true ? "4.1.0-alpha.1" : "latest";
|
|
7857
7844
|
var I3SContentLoader = {
|
|
7858
7845
|
name: "I3S Content (Indexed Scene Layers)",
|
|
7859
7846
|
id: "i3s-content",
|
package/dist/index.cjs
CHANGED
|
@@ -1141,7 +1141,7 @@ var SLPKArchive = class {
|
|
|
1141
1141
|
|
|
1142
1142
|
// src/lib/parsers/parse-slpk/parse-slpk.ts
|
|
1143
1143
|
async function parseSLPKArchive(fileProvider, cb) {
|
|
1144
|
-
const hashCDOffset = await (0, import_zip2.searchFromTheEnd)(fileProvider, import_zip2.
|
|
1144
|
+
const hashCDOffset = await (0, import_zip2.searchFromTheEnd)(fileProvider, import_zip2.CD_HEADER_SIGNATURE);
|
|
1145
1145
|
const cdFileHeader = await (0, import_zip2.parseZipCDFileHeader)(hashCDOffset, fileProvider);
|
|
1146
1146
|
let hashTable;
|
|
1147
1147
|
if ((cdFileHeader == null ? void 0 : cdFileHeader.fileName) !== "@specialIndexFileHASH128@") {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { parseZipCDFileHeader,
|
|
1
|
+
import { parseZipCDFileHeader, CD_HEADER_SIGNATURE, parseZipLocalFileHeader, searchFromTheEnd, parseHashTable, makeHashTableFromZipHeaders } from '@loaders.gl/zip';
|
|
2
2
|
import { SLPKArchive } from "./slpk-archieve.js";
|
|
3
3
|
export async function parseSLPKArchive(fileProvider, cb) {
|
|
4
|
-
const hashCDOffset = await searchFromTheEnd(fileProvider,
|
|
4
|
+
const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
|
|
5
5
|
const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
|
|
6
6
|
let hashTable;
|
|
7
7
|
if ((cdFileHeader === null || cdFileHeader === void 0 ? void 0 : cdFileHeader.fileName) !== '@specialIndexFileHASH128@') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-slpk.js","names":["parseZipCDFileHeader","
|
|
1
|
+
{"version":3,"file":"parse-slpk.js","names":["parseZipCDFileHeader","CD_HEADER_SIGNATURE","parseZipLocalFileHeader","searchFromTheEnd","parseHashTable","makeHashTableFromZipHeaders","SLPKArchive","parseSLPKArchive","fileProvider","cb","hashCDOffset","cdFileHeader","hashTable","fileName","localFileHeader","localHeaderOffset","Error","fileDataOffset","hashFile","slice","compressedSize"],"sources":["../../../../src/lib/parsers/parse-slpk/parse-slpk.ts"],"sourcesContent":["import {FileProvider} from '@loaders.gl/loader-utils';\nimport {\n parseZipCDFileHeader,\n CD_HEADER_SIGNATURE,\n parseZipLocalFileHeader,\n searchFromTheEnd,\n parseHashTable,\n makeHashTableFromZipHeaders\n} from '@loaders.gl/zip';\nimport {SLPKArchive} from './slpk-archieve';\n\n/**\n * Creates slpk file handler from raw file\n * @param fileProvider raw file data\n * @param cb is called with information message during parsing\n * @returns slpk file handler\n */\nexport async function parseSLPKArchive(\n fileProvider: FileProvider,\n cb?: (msg: string) => void\n): Promise<SLPKArchive> {\n const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);\n\n const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);\n\n let hashTable: Record<string, bigint>;\n if (cdFileHeader?.fileName !== '@specialIndexFileHASH128@') {\n hashTable = await makeHashTableFromZipHeaders(fileProvider);\n cb?.(\n 'SLPK doesnt contain hash file, hash info has been composed according to zip archive headers'\n );\n } else {\n // cb?.('SLPK contains hash file');\n const localFileHeader = await parseZipLocalFileHeader(\n cdFileHeader.localHeaderOffset,\n fileProvider\n );\n if (!localFileHeader) {\n throw new Error('corrupted SLPK');\n }\n\n const fileDataOffset = localFileHeader.fileDataOffset;\n const hashFile = await fileProvider.slice(\n fileDataOffset,\n fileDataOffset + localFileHeader.compressedSize\n );\n\n hashTable = parseHashTable(hashFile);\n }\n\n return new SLPKArchive(fileProvider, hashTable);\n}\n"],"mappings":"AACA,SACEA,oBAAoB,EACpBC,mBAAmB,EACnBC,uBAAuB,EACvBC,gBAAgB,EAChBC,cAAc,EACdC,2BAA2B,QACtB,iBAAiB;AAAC,SACjBC,WAAW;AAQnB,OAAO,eAAeC,gBAAgBA,CACpCC,YAA0B,EAC1BC,EAA0B,EACJ;EACtB,MAAMC,YAAY,GAAG,MAAMP,gBAAgB,CAACK,YAAY,EAAEP,mBAAmB,CAAC;EAE9E,MAAMU,YAAY,GAAG,MAAMX,oBAAoB,CAACU,YAAY,EAAEF,YAAY,CAAC;EAE3E,IAAII,SAAiC;EACrC,IAAI,CAAAD,YAAY,aAAZA,YAAY,uBAAZA,YAAY,CAAEE,QAAQ,MAAK,2BAA2B,EAAE;IAC1DD,SAAS,GAAG,MAAMP,2BAA2B,CAACG,YAAY,CAAC;IAC3DC,EAAE,aAAFA,EAAE,uBAAFA,EAAE,CACA,6FACF,CAAC;EACH,CAAC,MAAM;IAEL,MAAMK,eAAe,GAAG,MAAMZ,uBAAuB,CACnDS,YAAY,CAACI,iBAAiB,EAC9BP,YACF,CAAC;IACD,IAAI,CAACM,eAAe,EAAE;MACpB,MAAM,IAAIE,KAAK,CAAC,gBAAgB,CAAC;IACnC;IAEA,MAAMC,cAAc,GAAGH,eAAe,CAACG,cAAc;IACrD,MAAMC,QAAQ,GAAG,MAAMV,YAAY,CAACW,KAAK,CACvCF,cAAc,EACdA,cAAc,GAAGH,eAAe,CAACM,cACnC,CAAC;IAEDR,SAAS,GAAGR,cAAc,CAACc,QAAQ,CAAC;EACtC;EAEA,OAAO,IAAIZ,WAAW,CAACE,YAAY,EAAEI,SAAS,CAAC;AACjD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/i3s",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.1.0-alpha.1",
|
|
4
4
|
"description": "i3s .",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -41,14 +41,14 @@
|
|
|
41
41
|
"build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@loaders.gl/compression": "4.0.
|
|
45
|
-
"@loaders.gl/crypto": "4.0.
|
|
46
|
-
"@loaders.gl/draco": "4.0.
|
|
47
|
-
"@loaders.gl/images": "4.0.
|
|
48
|
-
"@loaders.gl/loader-utils": "4.0.
|
|
49
|
-
"@loaders.gl/schema": "4.0.
|
|
50
|
-
"@loaders.gl/textures": "4.0.
|
|
51
|
-
"@loaders.gl/tiles": "4.0.
|
|
44
|
+
"@loaders.gl/compression": "4.1.0-alpha.1",
|
|
45
|
+
"@loaders.gl/crypto": "4.1.0-alpha.1",
|
|
46
|
+
"@loaders.gl/draco": "4.1.0-alpha.1",
|
|
47
|
+
"@loaders.gl/images": "4.1.0-alpha.1",
|
|
48
|
+
"@loaders.gl/loader-utils": "4.1.0-alpha.1",
|
|
49
|
+
"@loaders.gl/schema": "4.1.0-alpha.1",
|
|
50
|
+
"@loaders.gl/textures": "4.1.0-alpha.1",
|
|
51
|
+
"@loaders.gl/tiles": "4.1.0-alpha.1",
|
|
52
52
|
"@math.gl/core": "^4.0.0",
|
|
53
53
|
"@math.gl/culling": "^4.0.0",
|
|
54
54
|
"@math.gl/geospatial": "^4.0.0"
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"peerDependencies": {
|
|
57
57
|
"@loaders.gl/core": "^4.0.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "6a4d3da93d45115ad99861474a43c3f4a0b280a7"
|
|
60
60
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {FileProvider} from '@loaders.gl/loader-utils';
|
|
2
2
|
import {
|
|
3
3
|
parseZipCDFileHeader,
|
|
4
|
-
|
|
4
|
+
CD_HEADER_SIGNATURE,
|
|
5
5
|
parseZipLocalFileHeader,
|
|
6
6
|
searchFromTheEnd,
|
|
7
7
|
parseHashTable,
|
|
@@ -19,7 +19,7 @@ export async function parseSLPKArchive(
|
|
|
19
19
|
fileProvider: FileProvider,
|
|
20
20
|
cb?: (msg: string) => void
|
|
21
21
|
): Promise<SLPKArchive> {
|
|
22
|
-
const hashCDOffset = await searchFromTheEnd(fileProvider,
|
|
22
|
+
const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
|
|
23
23
|
|
|
24
24
|
const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
|
|
25
25
|
|