@loaders.gl/raster 5.0.0-beta.1 → 5.0.0-beta.2
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/README.md +6 -2
- package/dist/geotiff/advanced.cjs +16 -11
- package/dist/geotiff/advanced.cjs.map +2 -2
- package/dist/geotiff/geotiff-loader-types.d.ts +1 -1
- package/dist/geotiff/geotiff-loader-types.js +2 -2
- package/dist/geotiff/geotiff-loader-types.js.map +1 -1
- package/dist/geotiff/geotiff-raster-loader-types.d.ts.map +1 -1
- package/dist/geotiff/geotiff-raster-loader-types.js +2 -2
- package/dist/geotiff/geotiff-raster-loader-types.js.map +1 -1
- package/dist/geotiff/geotiff-source-loader-types.js +1 -1
- package/dist/geotiff/geotiff-source-loader-types.js.map +1 -1
- package/dist/geotiff/geotiff-source-loader.js +1 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.d.ts +1 -0
- package/dist/geotiff/lib/ome/load-ome-tiff.d.ts.map +1 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.js +7 -1
- package/dist/geotiff/lib/ome/load-ome-tiff.js.map +1 -1
- package/dist/geotiff/lib/ome/omexml.d.ts.map +1 -1
- package/dist/geotiff/lib/ome/omexml.js +5 -4
- package/dist/geotiff/lib/ome/omexml.js.map +1 -1
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.d.ts.map +1 -1
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js +6 -5
- package/dist/geotiff/lib/tiff/tiff-gdal-metadata.js.map +1 -1
- package/dist/geotiff/loaders.js +1 -1
- package/dist/geotiff/ometiff-source-loader-types.js +1 -1
- package/dist/geotiff/ometiff-source-loader-types.js.map +1 -1
- package/dist/geotiff/ometiff-source-loader.js +1 -1
- package/dist/geotiff-loader-types.d.ts +2 -0
- package/dist/geotiff-loader-types.d.ts.map +1 -0
- package/dist/geotiff-loader-types.js +2 -0
- package/dist/geotiff-loader-types.js.map +1 -0
- package/dist/geotiff-loader.d.ts +2 -0
- package/dist/geotiff-loader.d.ts.map +1 -0
- package/dist/geotiff-loader.js +2 -0
- package/dist/geotiff-loader.js.map +1 -0
- package/dist/geotiff-raster-loader-types.d.ts +2 -0
- package/dist/geotiff-raster-loader-types.d.ts.map +1 -0
- package/dist/geotiff-raster-loader-types.js +2 -0
- package/dist/geotiff-raster-loader-types.js.map +1 -0
- package/dist/geotiff-raster-loader.d.ts +2 -0
- package/dist/geotiff-raster-loader.d.ts.map +1 -0
- package/dist/geotiff-raster-loader.js +2 -0
- package/dist/geotiff-raster-loader.js.map +1 -0
- package/dist/geotiff-source-loader-types.d.ts +2 -0
- package/dist/geotiff-source-loader-types.d.ts.map +1 -0
- package/dist/geotiff-source-loader-types.js +2 -0
- package/dist/geotiff-source-loader-types.js.map +1 -0
- package/dist/geotiff-source-loader.d.ts +2 -0
- package/dist/geotiff-source-loader.d.ts.map +1 -0
- package/dist/geotiff-source-loader.js +2 -0
- package/dist/geotiff-source-loader.js.map +1 -0
- package/dist/index.cjs +11 -11
- package/dist/index.cjs.map +2 -2
- package/dist/lerc/lerc-loader-types.d.ts +1 -1
- package/dist/lerc/lerc-loader-types.js +2 -2
- package/dist/lerc/lerc-loader-types.js.map +1 -1
- package/dist/lerc-loader-types.d.ts +2 -0
- package/dist/lerc-loader-types.d.ts.map +1 -0
- package/dist/lerc-loader-types.js +2 -0
- package/dist/lerc-loader-types.js.map +1 -0
- package/dist/lerc-loader.d.ts +2 -0
- package/dist/lerc-loader.d.ts.map +1 -0
- package/dist/lerc-loader.js +2 -0
- package/dist/lerc-loader.js.map +1 -0
- package/dist/ometiff-source-loader-types.d.ts +2 -0
- package/dist/ometiff-source-loader-types.d.ts.map +1 -0
- package/dist/ometiff-source-loader-types.js +2 -0
- package/dist/ometiff-source-loader-types.js.map +1 -0
- package/dist/ometiff-source-loader.d.ts +2 -0
- package/dist/ometiff-source-loader.d.ts.map +1 -0
- package/dist/ometiff-source-loader.js +2 -0
- package/dist/ometiff-source-loader.js.map +1 -0
- package/dist/quantized-mesh-loader-types.d.ts +2 -0
- package/dist/quantized-mesh-loader-types.d.ts.map +1 -0
- package/dist/quantized-mesh-loader-types.js +2 -0
- package/dist/quantized-mesh-loader-types.js.map +1 -0
- package/dist/quantized-mesh-loader.d.ts +2 -0
- package/dist/quantized-mesh-loader.d.ts.map +1 -0
- package/dist/quantized-mesh-loader.js +2 -0
- package/dist/quantized-mesh-loader.js.map +1 -0
- package/dist/quantized-mesh-worker.js +218 -77
- package/dist/quantized-mesh-writer.d.ts +2 -0
- package/dist/quantized-mesh-writer.d.ts.map +1 -0
- package/dist/quantized-mesh-writer.js +2 -0
- package/dist/quantized-mesh-writer.js.map +1 -0
- package/dist/terrain/index.cjs +5 -5
- package/dist/terrain/index.cjs.map +2 -2
- package/dist/terrain/lib/utils/version.js +1 -1
- package/dist/terrain/quantized-mesh-loader-types.d.ts.map +1 -1
- package/dist/terrain/quantized-mesh-loader-types.js +1 -2
- package/dist/terrain/quantized-mesh-loader-types.js.map +1 -1
- package/dist/terrain/terrain-loader-types.d.ts +2 -2
- package/dist/terrain/terrain-loader-types.d.ts.map +1 -1
- package/dist/terrain/terrain-loader-types.js +1 -1
- package/dist/terrain/terrain-loader-types.js.map +1 -1
- package/dist/terrain/terrain-loader.js +3 -3
- package/dist/terrain/terrain-loader.js.map +1 -1
- package/dist/terrain-loader-types.d.ts +2 -0
- package/dist/terrain-loader-types.d.ts.map +1 -0
- package/dist/terrain-loader-types.js +2 -0
- package/dist/terrain-loader-types.js.map +1 -0
- package/dist/terrain-loader.d.ts +2 -0
- package/dist/terrain-loader.d.ts.map +1 -0
- package/dist/terrain-loader.js +2 -0
- package/dist/terrain-loader.js.map +1 -0
- package/dist/terrain-worker.js +244 -103
- package/package.json +79 -52
- package/src/geotiff/geotiff-loader-types.ts +1 -1
- package/src/geotiff/geotiff-raster-loader-types.ts +1 -3
- package/src/geotiff/geotiff-source-loader-types.ts +1 -1
- package/src/geotiff/lib/ome/load-ome-tiff.ts +7 -1
- package/src/geotiff/lib/ome/omexml.ts +5 -4
- package/src/geotiff/lib/tiff/tiff-gdal-metadata.ts +6 -5
- package/src/geotiff/ometiff-source-loader-types.ts +1 -1
- package/src/geotiff-loader-types.ts +1 -0
- package/src/geotiff-loader.ts +1 -0
- package/src/geotiff-raster-loader-types.ts +1 -0
- package/src/geotiff-raster-loader.ts +1 -0
- package/src/geotiff-source-loader-types.ts +1 -0
- package/src/geotiff-source-loader.ts +1 -0
- package/src/lerc/lerc-loader-types.ts +1 -1
- package/src/lerc-loader-types.ts +1 -0
- package/src/lerc-loader.ts +1 -0
- package/src/ometiff-source-loader-types.ts +1 -0
- package/src/ometiff-source-loader.ts +1 -0
- package/src/quantized-mesh-loader-types.ts +1 -0
- package/src/quantized-mesh-loader.ts +1 -0
- package/src/quantized-mesh-writer.ts +1 -0
- package/src/terrain/quantized-mesh-loader-types.ts +1 -2
- package/src/terrain/terrain-loader-types.ts +3 -4
- package/src/terrain/terrain-loader.ts +3 -3
- package/src/terrain-loader-types.ts +1 -0
- package/src/terrain-loader.ts +1 -0
|
@@ -15,29 +15,41 @@
|
|
|
15
15
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
16
16
|
};
|
|
17
17
|
|
|
18
|
-
//
|
|
18
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/node/worker_threads-browser.js
|
|
19
19
|
var parentPort;
|
|
20
20
|
var init_worker_threads_browser = __esm({
|
|
21
|
-
"
|
|
22
|
-
"use strict";
|
|
21
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/node/worker_threads-browser.js"() {
|
|
23
22
|
parentPort = null;
|
|
24
23
|
}
|
|
25
24
|
});
|
|
26
25
|
|
|
27
|
-
//
|
|
26
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-utils/get-transfer-list.js
|
|
28
27
|
function getTransferList(object, recursive = true, transfers) {
|
|
29
28
|
const transfersSet = transfers || /* @__PURE__ */ new Set();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
29
|
+
const seen = /* @__PURE__ */ new Set();
|
|
30
|
+
function visit(value) {
|
|
31
|
+
if (!value || typeof value !== "object" || seen.has(value))
|
|
32
|
+
return;
|
|
33
|
+
seen.add(value);
|
|
34
|
+
if (isTransferable(value))
|
|
35
|
+
transfersSet.add(value);
|
|
36
|
+
else if (ArrayBuffer.isView(value)) {
|
|
37
|
+
if (isTransferable(value.buffer))
|
|
38
|
+
transfersSet.add(value.buffer);
|
|
39
|
+
} else if (recursive && value instanceof Map) {
|
|
40
|
+
for (const [key, item] of value) {
|
|
41
|
+
visit(key);
|
|
42
|
+
visit(item);
|
|
43
|
+
}
|
|
44
|
+
} else if (recursive && value instanceof Set) {
|
|
45
|
+
for (const item of value)
|
|
46
|
+
visit(item);
|
|
47
|
+
} else if (recursive) {
|
|
48
|
+
for (const key of Object.keys(value))
|
|
49
|
+
visit(value[key]);
|
|
39
50
|
}
|
|
40
51
|
}
|
|
52
|
+
visit(object);
|
|
41
53
|
return transfers === void 0 ? Array.from(transfersSet) : [];
|
|
42
54
|
}
|
|
43
55
|
function isTransferable(object) {
|
|
@@ -59,12 +71,11 @@
|
|
|
59
71
|
return false;
|
|
60
72
|
}
|
|
61
73
|
var init_get_transfer_list = __esm({
|
|
62
|
-
"
|
|
63
|
-
"use strict";
|
|
74
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-utils/get-transfer-list.js"() {
|
|
64
75
|
}
|
|
65
76
|
});
|
|
66
77
|
|
|
67
|
-
//
|
|
78
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-farm/worker-body.js
|
|
68
79
|
async function getParentPort() {
|
|
69
80
|
return parentPort;
|
|
70
81
|
}
|
|
@@ -77,15 +88,15 @@
|
|
|
77
88
|
}
|
|
78
89
|
var onMessageWrapperMap, WorkerBody;
|
|
79
90
|
var init_worker_body = __esm({
|
|
80
|
-
"
|
|
81
|
-
"use strict";
|
|
91
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-farm/worker-body.js"() {
|
|
82
92
|
init_get_transfer_list();
|
|
83
93
|
init_worker_threads_browser();
|
|
84
94
|
onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
85
95
|
WorkerBody = class {
|
|
86
96
|
/** Check that we are actually in a worker thread */
|
|
87
97
|
static async inWorkerThread() {
|
|
88
|
-
|
|
98
|
+
const workerGlobalScope = globalThis.WorkerGlobalScope;
|
|
99
|
+
return typeof workerGlobalScope === "function" && globalThis instanceof workerGlobalScope || Boolean(await getParentPort());
|
|
89
100
|
}
|
|
90
101
|
/*
|
|
91
102
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
@@ -158,15 +169,11 @@
|
|
|
158
169
|
}
|
|
159
170
|
});
|
|
160
171
|
|
|
161
|
-
//
|
|
172
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/async-queue/async-queue.js
|
|
162
173
|
var AsyncQueue;
|
|
163
174
|
var init_async_queue = __esm({
|
|
164
|
-
"
|
|
165
|
-
"use strict";
|
|
175
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/async-queue/async-queue.js"() {
|
|
166
176
|
AsyncQueue = class {
|
|
167
|
-
_values;
|
|
168
|
-
_settlers;
|
|
169
|
-
_closed;
|
|
170
177
|
constructor() {
|
|
171
178
|
this._values = [];
|
|
172
179
|
this._settlers = [];
|
|
@@ -234,7 +241,51 @@
|
|
|
234
241
|
}
|
|
235
242
|
});
|
|
236
243
|
|
|
237
|
-
//
|
|
244
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/shared-state.js
|
|
245
|
+
var SharedWorkerState;
|
|
246
|
+
var init_shared_state = __esm({
|
|
247
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/shared-state.js"() {
|
|
248
|
+
SharedWorkerState = class {
|
|
249
|
+
constructor(buffer) {
|
|
250
|
+
if (typeof SharedArrayBuffer === "undefined" || !(buffer instanceof SharedArrayBuffer) || buffer.byteLength !== 16)
|
|
251
|
+
throw new Error("Expected a 16-byte shared worker control buffer");
|
|
252
|
+
this.buffer = buffer;
|
|
253
|
+
this.values = new Int32Array(buffer);
|
|
254
|
+
}
|
|
255
|
+
get snapshot() {
|
|
256
|
+
return {
|
|
257
|
+
cancelled: Atomics.load(this.values, 0) !== 0,
|
|
258
|
+
completed: Atomics.load(this.values, 1),
|
|
259
|
+
total: Atomics.load(this.values, 2),
|
|
260
|
+
revision: Atomics.load(this.values, 3)
|
|
261
|
+
};
|
|
262
|
+
}
|
|
263
|
+
cancel() {
|
|
264
|
+
Atomics.store(this.values, 0, 1);
|
|
265
|
+
Atomics.add(this.values, 3, 1);
|
|
266
|
+
Atomics.notify(this.values, 0);
|
|
267
|
+
}
|
|
268
|
+
throwIfCancelled() {
|
|
269
|
+
if (Atomics.load(this.values, 0) !== 0) {
|
|
270
|
+
const error = new Error("Shared worker task was cancelled");
|
|
271
|
+
error.name = "AbortError";
|
|
272
|
+
throw error;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
/** Integer counters for application-defined work; messages still carry phase names and units. */
|
|
276
|
+
setProgress(completed, total = -1) {
|
|
277
|
+
if (!Number.isInteger(completed) || completed < 0 || completed > 2147483647 || !Number.isInteger(total) || total < -1 || total > 2147483647) {
|
|
278
|
+
throw new RangeError("Shared progress requires nonnegative int32 counts (or total -1)");
|
|
279
|
+
}
|
|
280
|
+
Atomics.store(this.values, 1, completed);
|
|
281
|
+
Atomics.store(this.values, 2, total);
|
|
282
|
+
Atomics.add(this.values, 3, 1);
|
|
283
|
+
}
|
|
284
|
+
};
|
|
285
|
+
}
|
|
286
|
+
});
|
|
287
|
+
|
|
288
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/create-worker.js
|
|
238
289
|
async function createWorker(process, processInBatches) {
|
|
239
290
|
if (!await WorkerBody.inWorkerThread()) {
|
|
240
291
|
return;
|
|
@@ -243,27 +294,56 @@
|
|
|
243
294
|
process: processOnMainThread
|
|
244
295
|
};
|
|
245
296
|
WorkerBody.onmessage = async (type, payload) => {
|
|
297
|
+
if (type === "cancel") {
|
|
298
|
+
activeController?.abort();
|
|
299
|
+
activeInputBatches?.close();
|
|
300
|
+
activeOutputAcknowledgements?.close();
|
|
301
|
+
return;
|
|
302
|
+
}
|
|
303
|
+
const controller = type === "process" || type === "process-in-batches" ? new AbortController() : void 0;
|
|
304
|
+
if (controller)
|
|
305
|
+
activeController = controller;
|
|
306
|
+
const startedAt = performance.now();
|
|
246
307
|
const reporter = type === "process" || type === "process-in-batches" ? createProgressReporter() : void 0;
|
|
247
|
-
|
|
308
|
+
let sharedState;
|
|
309
|
+
const throwIfAborted = () => {
|
|
310
|
+
controller?.signal.throwIfAborted();
|
|
311
|
+
sharedState?.throwIfCancelled();
|
|
312
|
+
};
|
|
313
|
+
const jobContext = {
|
|
314
|
+
...context,
|
|
315
|
+
signal: controller?.signal,
|
|
316
|
+
sharedState,
|
|
317
|
+
throwIfAborted,
|
|
318
|
+
reportProgress: (progress) => {
|
|
319
|
+
if (!controller?.signal.aborted && !sharedState?.snapshot.cancelled)
|
|
320
|
+
reporter?.report(progress);
|
|
321
|
+
}
|
|
322
|
+
};
|
|
248
323
|
try {
|
|
324
|
+
if (controller && payload.options?.["sharedState"]) {
|
|
325
|
+
sharedState = new SharedWorkerState(payload.options["sharedState"]);
|
|
326
|
+
jobContext.sharedState = sharedState;
|
|
327
|
+
}
|
|
249
328
|
switch (type) {
|
|
250
329
|
case "preload":
|
|
251
330
|
WorkerBody.postMessage("done", {});
|
|
252
331
|
break;
|
|
253
332
|
case "process":
|
|
333
|
+
throwIfAborted();
|
|
254
334
|
if (!process) {
|
|
255
335
|
throw new Error("Worker does not support atomic processing");
|
|
256
336
|
}
|
|
257
|
-
const result = await process(
|
|
258
|
-
|
|
259
|
-
payload.options || {},
|
|
260
|
-
jobContext,
|
|
261
|
-
payload.context || {}
|
|
262
|
-
);
|
|
337
|
+
const result = await process(payload.input, payload.options || {}, jobContext, payload.context || {});
|
|
338
|
+
throwIfAborted();
|
|
263
339
|
reporter?.finish();
|
|
264
|
-
WorkerBody.postMessage("done", {
|
|
340
|
+
await WorkerBody.postMessage("done", {
|
|
341
|
+
result,
|
|
342
|
+
executionMs: performance.now() - startedAt
|
|
343
|
+
});
|
|
265
344
|
break;
|
|
266
345
|
case "process-in-batches":
|
|
346
|
+
throwIfAborted();
|
|
267
347
|
if (!processInBatches) {
|
|
268
348
|
throw new Error("Worker does not support batched processing");
|
|
269
349
|
}
|
|
@@ -272,18 +352,15 @@
|
|
|
272
352
|
activeInputBatches = inputBatches;
|
|
273
353
|
activeOutputAcknowledgements = outputAcknowledgements;
|
|
274
354
|
try {
|
|
275
|
-
const resultIterator = processInBatches(
|
|
276
|
-
createDemandDrivenIterator(inputBatches),
|
|
277
|
-
payload.options || {},
|
|
278
|
-
jobContext,
|
|
279
|
-
payload.context || {}
|
|
280
|
-
);
|
|
355
|
+
const resultIterator = processInBatches(createDemandDrivenIterator(inputBatches), payload.options || {}, jobContext, payload.context || {});
|
|
281
356
|
for await (const batch of resultIterator) {
|
|
357
|
+
throwIfAborted();
|
|
282
358
|
await WorkerBody.postMessage("output-batch", { result: batch });
|
|
283
359
|
await outputAcknowledgements.next();
|
|
284
360
|
}
|
|
361
|
+
throwIfAborted();
|
|
285
362
|
reporter?.finish();
|
|
286
|
-
await WorkerBody.postMessage("done", {});
|
|
363
|
+
await WorkerBody.postMessage("done", { executionMs: performance.now() - startedAt });
|
|
287
364
|
} finally {
|
|
288
365
|
activeInputBatches = null;
|
|
289
366
|
activeOutputAcknowledgements = null;
|
|
@@ -310,11 +387,18 @@
|
|
|
310
387
|
default:
|
|
311
388
|
}
|
|
312
389
|
} catch (error) {
|
|
313
|
-
reporter?.finish();
|
|
390
|
+
reporter?.finish(controller?.signal.aborted || sharedState?.snapshot.cancelled);
|
|
314
391
|
const message = error instanceof Error ? error.message : "";
|
|
315
|
-
WorkerBody.postMessage("error", {
|
|
392
|
+
await WorkerBody.postMessage("error", {
|
|
393
|
+
error: message,
|
|
394
|
+
errorName: error instanceof Error ? error.name : "Error"
|
|
395
|
+
});
|
|
396
|
+
} finally {
|
|
397
|
+
if (controller && activeController === controller)
|
|
398
|
+
activeController = null;
|
|
316
399
|
}
|
|
317
400
|
};
|
|
401
|
+
await WorkerBody.postMessage("ready", {});
|
|
318
402
|
}
|
|
319
403
|
async function* createDemandDrivenIterator(inputBatches) {
|
|
320
404
|
while (true) {
|
|
@@ -327,27 +411,45 @@
|
|
|
327
411
|
}
|
|
328
412
|
}
|
|
329
413
|
function processOnMainThread(arrayBuffer, options = {}, jobContext = {}) {
|
|
414
|
+
const signal = activeController?.signal;
|
|
415
|
+
signal?.throwIfAborted();
|
|
330
416
|
return new Promise((resolve, reject) => {
|
|
331
417
|
const id = requestId++;
|
|
332
|
-
const
|
|
333
|
-
|
|
418
|
+
const cleanup = () => {
|
|
419
|
+
signal?.removeEventListener("abort", abort);
|
|
420
|
+
void WorkerBody.removeEventListener(onMessage);
|
|
421
|
+
};
|
|
422
|
+
const abort = () => {
|
|
423
|
+
cleanup();
|
|
424
|
+
reject(signal?.reason);
|
|
425
|
+
};
|
|
426
|
+
const onMessage = (type, payload) => {
|
|
427
|
+
if (payload.id !== id)
|
|
334
428
|
return;
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
case "error":
|
|
342
|
-
WorkerBody.removeEventListener(onMessage);
|
|
343
|
-
reject(payload2.error);
|
|
344
|
-
break;
|
|
345
|
-
default:
|
|
429
|
+
if (type === "done") {
|
|
430
|
+
cleanup();
|
|
431
|
+
resolve(payload.result);
|
|
432
|
+
} else if (type === "error") {
|
|
433
|
+
cleanup();
|
|
434
|
+
reject(payload.error);
|
|
346
435
|
}
|
|
347
436
|
};
|
|
348
|
-
WorkerBody.addEventListener(onMessage)
|
|
349
|
-
|
|
350
|
-
|
|
437
|
+
void WorkerBody.addEventListener(onMessage).then(async () => {
|
|
438
|
+
if (signal?.aborted) {
|
|
439
|
+
abort();
|
|
440
|
+
return;
|
|
441
|
+
}
|
|
442
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
443
|
+
await WorkerBody.postMessage("process", {
|
|
444
|
+
id,
|
|
445
|
+
input: arrayBuffer,
|
|
446
|
+
options,
|
|
447
|
+
context: jobContext
|
|
448
|
+
});
|
|
449
|
+
}).catch((error) => {
|
|
450
|
+
cleanup();
|
|
451
|
+
reject(error);
|
|
452
|
+
});
|
|
351
453
|
});
|
|
352
454
|
}
|
|
353
455
|
function createProgressReporter() {
|
|
@@ -364,8 +466,10 @@
|
|
|
364
466
|
return {
|
|
365
467
|
/** Records progress while retaining phase transitions. */
|
|
366
468
|
report(progress) {
|
|
367
|
-
if (finished)
|
|
368
|
-
|
|
469
|
+
if (finished)
|
|
470
|
+
return;
|
|
471
|
+
if (pending && pending.phase !== progress.phase)
|
|
472
|
+
flush();
|
|
369
473
|
pending = { ...progress };
|
|
370
474
|
if (!scheduled) {
|
|
371
475
|
scheduled = true;
|
|
@@ -373,29 +477,58 @@
|
|
|
373
477
|
}
|
|
374
478
|
},
|
|
375
479
|
/** Flushes final progress and suppresses reports from stale callbacks. */
|
|
376
|
-
finish() {
|
|
480
|
+
finish(discard = false) {
|
|
481
|
+
if (discard)
|
|
482
|
+
pending = void 0;
|
|
377
483
|
flush();
|
|
378
484
|
finished = true;
|
|
379
485
|
}
|
|
380
486
|
};
|
|
381
487
|
}
|
|
382
|
-
var requestId, activeInputBatches, activeOutputAcknowledgements;
|
|
488
|
+
var requestId, activeController, activeInputBatches, activeOutputAcknowledgements;
|
|
383
489
|
var init_create_worker = __esm({
|
|
384
|
-
"
|
|
385
|
-
|
|
490
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/create-worker.js"() {
|
|
491
|
+
init_shared_state();
|
|
386
492
|
init_async_queue();
|
|
387
493
|
init_worker_body();
|
|
388
494
|
requestId = 0;
|
|
495
|
+
activeController = null;
|
|
389
496
|
activeInputBatches = null;
|
|
390
497
|
activeOutputAcknowledgements = null;
|
|
391
498
|
}
|
|
392
499
|
});
|
|
393
500
|
|
|
394
|
-
//
|
|
501
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/index.js
|
|
502
|
+
var import_meta, path, moduleUrl;
|
|
395
503
|
var init_worker_utils = __esm({
|
|
504
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/index.js"() {
|
|
505
|
+
init_create_worker();
|
|
506
|
+
import_meta = {};
|
|
507
|
+
path = typeof __filename === "string" ? __filename.replace(/\\/g, "/") : "";
|
|
508
|
+
moduleUrl = path ? `file://${path.startsWith("/") ? "" : "/"}${encodeURI(path).replace(/#/g, "%23").replace(/\?/g, "%3F")}` : import_meta.url;
|
|
509
|
+
}
|
|
510
|
+
});
|
|
511
|
+
|
|
512
|
+
// ../../node_modules/@math.gl/core/dist/tasks/index.js
|
|
513
|
+
var init_tasks = __esm({
|
|
514
|
+
"../../node_modules/@math.gl/core/dist/tasks/index.js"() {
|
|
515
|
+
init_worker_utils();
|
|
516
|
+
}
|
|
517
|
+
});
|
|
518
|
+
|
|
519
|
+
// ../core/src/worker-utils/lib/worker-api/create-worker.ts
|
|
520
|
+
var init_create_worker2 = __esm({
|
|
521
|
+
"../core/src/worker-utils/lib/worker-api/create-worker.ts"() {
|
|
522
|
+
"use strict";
|
|
523
|
+
init_tasks();
|
|
524
|
+
}
|
|
525
|
+
});
|
|
526
|
+
|
|
527
|
+
// ../core/src/worker-utils/index.ts
|
|
528
|
+
var init_worker_utils2 = __esm({
|
|
396
529
|
"../core/src/worker-utils/index.ts"() {
|
|
397
530
|
"use strict";
|
|
398
|
-
|
|
531
|
+
init_create_worker2();
|
|
399
532
|
}
|
|
400
533
|
});
|
|
401
534
|
|
|
@@ -539,7 +672,7 @@
|
|
|
539
672
|
var init_create_loader_worker = __esm({
|
|
540
673
|
"../core/src/loader-utils/lib/worker-loader-utils/create-loader-worker.ts"() {
|
|
541
674
|
"use strict";
|
|
542
|
-
|
|
675
|
+
init_worker_utils2();
|
|
543
676
|
}
|
|
544
677
|
});
|
|
545
678
|
|
|
@@ -13372,8 +13505,8 @@ return true;`);
|
|
|
13372
13505
|
});
|
|
13373
13506
|
|
|
13374
13507
|
// ../../node_modules/apache-arrow/ipc/reader.mjs
|
|
13375
|
-
function shouldAutoDestroy(
|
|
13376
|
-
return options && typeof options["autoDestroy"] === "boolean" ? options["autoDestroy"] :
|
|
13508
|
+
function shouldAutoDestroy(self, options) {
|
|
13509
|
+
return options && typeof options["autoDestroy"] === "boolean" ? options["autoDestroy"] : self["autoDestroy"];
|
|
13377
13510
|
}
|
|
13378
13511
|
function* readAllSync(source) {
|
|
13379
13512
|
const reader = RecordBatchReader.from(source);
|
|
@@ -17333,7 +17466,7 @@ return true;`);
|
|
|
17333
17466
|
var init_version = __esm({
|
|
17334
17467
|
"src/terrain/lib/utils/version.ts"() {
|
|
17335
17468
|
"use strict";
|
|
17336
|
-
VERSION = true ? "5.0.0-beta.
|
|
17469
|
+
VERSION = true ? "5.0.0-beta.2" : "latest";
|
|
17337
17470
|
}
|
|
17338
17471
|
});
|
|
17339
17472
|
|
|
@@ -17355,6 +17488,18 @@ return true;`);
|
|
|
17355
17488
|
}
|
|
17356
17489
|
});
|
|
17357
17490
|
|
|
17491
|
+
// src/quantized-mesh-loader.ts
|
|
17492
|
+
var quantized_mesh_loader_exports = {};
|
|
17493
|
+
__export(quantized_mesh_loader_exports, {
|
|
17494
|
+
QuantizedMeshLoaderWithParser: () => QuantizedMeshLoaderWithParser
|
|
17495
|
+
});
|
|
17496
|
+
var init_quantized_mesh_loader = __esm({
|
|
17497
|
+
"src/quantized-mesh-loader.ts"() {
|
|
17498
|
+
"use strict";
|
|
17499
|
+
init_quantized_mesh_loader2();
|
|
17500
|
+
}
|
|
17501
|
+
});
|
|
17502
|
+
|
|
17358
17503
|
// src/terrain/quantized-mesh-loader-types.ts
|
|
17359
17504
|
var QuantizedMeshLoader;
|
|
17360
17505
|
var init_quantized_mesh_loader_types = __esm({
|
|
@@ -17382,10 +17527,6 @@ return true;`);
|
|
|
17382
17527
|
});
|
|
17383
17528
|
|
|
17384
17529
|
// src/terrain/quantized-mesh-loader.ts
|
|
17385
|
-
var quantized_mesh_loader_exports = {};
|
|
17386
|
-
__export(quantized_mesh_loader_exports, {
|
|
17387
|
-
QuantizedMeshLoaderWithParser: () => QuantizedMeshLoaderWithParser
|
|
17388
|
-
});
|
|
17389
17530
|
function parseQuantizedMeshInRequestedShape(arrayBuffer, options) {
|
|
17390
17531
|
const mesh = parseQuantizedMesh(arrayBuffer, options?.["quantized-mesh"]);
|
|
17391
17532
|
const table = convertMeshToTable(mesh, "arrow-table");
|
|
@@ -17399,7 +17540,7 @@ return true;`);
|
|
|
17399
17540
|
};
|
|
17400
17541
|
}
|
|
17401
17542
|
var _QuantizedMeshLoaderPreload, QuantizedMeshLoaderMetadataWithoutPreload, QuantizedMeshLoaderWithParser;
|
|
17402
|
-
var
|
|
17543
|
+
var init_quantized_mesh_loader2 = __esm({
|
|
17403
17544
|
"src/terrain/quantized-mesh-loader.ts"() {
|
|
17404
17545
|
"use strict";
|
|
17405
17546
|
init_arrow_transport();
|
|
@@ -17419,6 +17560,6 @@ return true;`);
|
|
|
17419
17560
|
|
|
17420
17561
|
// src/terrain/workers/quantized-mesh-worker.ts
|
|
17421
17562
|
init_loader_utils();
|
|
17422
|
-
|
|
17563
|
+
init_quantized_mesh_loader2();
|
|
17423
17564
|
createLoaderWorker(QuantizedMeshLoaderWithParser);
|
|
17424
17565
|
})();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantized-mesh-writer.d.ts","sourceRoot":"","sources":["../src/quantized-mesh-writer.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quantized-mesh-writer.js","sourceRoot":"","sources":["../src/quantized-mesh-writer.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC"}
|
package/dist/terrain/index.cjs
CHANGED
|
@@ -64,7 +64,7 @@ var QuantizedMeshFormat = {
|
|
|
64
64
|
};
|
|
65
65
|
|
|
66
66
|
// dist/terrain/lib/utils/version.js
|
|
67
|
-
var VERSION = true ? "5.0.0-beta.
|
|
67
|
+
var VERSION = true ? "5.0.0-beta.2" : "latest";
|
|
68
68
|
|
|
69
69
|
// dist/terrain/terrain-loader-types.js
|
|
70
70
|
var TerrainLoader = {
|
|
@@ -74,7 +74,7 @@ var TerrainLoader = {
|
|
|
74
74
|
version: VERSION,
|
|
75
75
|
worker: true,
|
|
76
76
|
/** Loads the parser-bearing terrain loader implementation. */
|
|
77
|
-
preload: async () => (await import("@loaders.gl/raster/terrain
|
|
77
|
+
preload: async () => (await import("@loaders.gl/raster/terrain-loader")).TerrainLoaderWithParser,
|
|
78
78
|
options: {
|
|
79
79
|
terrain: {
|
|
80
80
|
tesselator: "auto",
|
|
@@ -816,7 +816,7 @@ var TerrainLoaderWithParser = {
|
|
|
816
816
|
serializeWorkerResult: import_arrow_transport.serializeArrowWorkerResult,
|
|
817
817
|
deserializeWorkerResult: import_arrow_transport.deserializeArrowWorkerResult,
|
|
818
818
|
/** Image decoder requested by terrain workers through the nested parse bridge. */
|
|
819
|
-
subloaders: {
|
|
819
|
+
subloaders: { ImageLoader: import_images.ImageLoader },
|
|
820
820
|
parse: parseTerrain
|
|
821
821
|
};
|
|
822
822
|
async function parseTerrain(arrayBuffer, options, context) {
|
|
@@ -824,7 +824,7 @@ async function parseTerrain(arrayBuffer, options, context) {
|
|
|
824
824
|
...options,
|
|
825
825
|
core: { ...options?.core, mimeType: "application/x.image" }
|
|
826
826
|
};
|
|
827
|
-
const image = await (0, import_loader_utils2.parseFromContext)(arrayBuffer, import_images.
|
|
827
|
+
const image = await (0, import_loader_utils2.parseFromContext)(arrayBuffer, import_images.ImageLoader, loadImageOptions, context);
|
|
828
828
|
const imageData = (0, import_images.getImageData)(image);
|
|
829
829
|
const terrainImage = {
|
|
830
830
|
width: imageData.width,
|
|
@@ -855,7 +855,7 @@ var QuantizedMeshLoader = {
|
|
|
855
855
|
version: VERSION,
|
|
856
856
|
worker: true,
|
|
857
857
|
/** Loads the parser-bearing quantized mesh loader implementation. */
|
|
858
|
-
preload: async () => (await import("@loaders.gl/raster/
|
|
858
|
+
preload: async () => (await import("@loaders.gl/raster/quantized-mesh-loader")).QuantizedMeshLoaderWithParser,
|
|
859
859
|
options: {
|
|
860
860
|
"quantized-mesh": {
|
|
861
861
|
shape: "arrow-table",
|