@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
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { serializeArrowWorkerResult, deserializeArrowWorkerResult } from '@loaders.gl/core/schema-utils/arrow-transport';
|
|
5
5
|
import { parseFromContext } from '@loaders.gl/core/loader-utils';
|
|
6
6
|
import { convertMeshToTable, convertTableToMesh } from '@loaders.gl/core/schema-utils';
|
|
7
|
-
import {
|
|
7
|
+
import { ImageLoader, getImageData } from '@loaders.gl/images';
|
|
8
8
|
import { makeTerrainMeshFromImage } from "./lib/parse-terrain.js";
|
|
9
9
|
import { TerrainLoader as TerrainLoaderMetadata } from "./terrain-loader-types.js";
|
|
10
10
|
const { preload: _TerrainLoaderPreload, ...TerrainLoaderMetadataWithoutPreload } = TerrainLoaderMetadata;
|
|
@@ -16,7 +16,7 @@ export const TerrainLoaderWithParser = {
|
|
|
16
16
|
serializeWorkerResult: serializeArrowWorkerResult,
|
|
17
17
|
deserializeWorkerResult: deserializeArrowWorkerResult,
|
|
18
18
|
/** Image decoder requested by terrain workers through the nested parse bridge. */
|
|
19
|
-
subloaders: {
|
|
19
|
+
subloaders: { ImageLoader },
|
|
20
20
|
parse: parseTerrain
|
|
21
21
|
};
|
|
22
22
|
/**
|
|
@@ -31,7 +31,7 @@ export async function parseTerrain(arrayBuffer, options, context) {
|
|
|
31
31
|
...options,
|
|
32
32
|
core: { ...options?.core, mimeType: 'application/x.image' }
|
|
33
33
|
};
|
|
34
|
-
const image = await parseFromContext(arrayBuffer,
|
|
34
|
+
const image = await parseFromContext(arrayBuffer, ImageLoader, loadImageOptions, context);
|
|
35
35
|
const imageData = getImageData(image);
|
|
36
36
|
const terrainImage = {
|
|
37
37
|
width: imageData.width,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../../src/terrain/terrain-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAiB,wBAAwB,EAAC,+BAA4B;AAC7E,OAAO,EACL,aAAa,IAAI,qBAAqB,EAEvC,kCAA+B;AAEhC,MAAM,EAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,mCAAmC,EAAC,GAC5E,qBAAqB,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,GAAG,mCAAmC;IACtC,qBAAqB,EAAE,0BAA0B;IACjD,uBAAuB,EAAE,4BAA4B;IACrD,kFAAkF;IAClF,UAAU,EAAE,EAAC,WAAW,EAAC;IACzB,KAAK,EAAE,YAAY;CACoE,CAAC;AAE1F;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,WAAwB,EACxB,OAA8B,EAC9B,OAAuB;IAEvB,MAAM,gBAAgB,GAAG;QACvB,GAAG,OAAO;QACV,IAAI,EAAE,EAAC,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,qBAAqB,EAAC;KAC1D,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,OAAQ,CAAC,CAAC;IAC3F,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,SAAS,CAAC,KAAK;QACtB,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,IAAI,EACF,SAAS,CAAC,IAAI,YAAY,iBAAiB;YACzC,CAAC,CAAC,IAAI,UAAU,CACZ,SAAS,CAAC,IAAI,CAAC,MAAM,EACrB,SAAS,CAAC,IAAI,CAAC,UAAU,EACzB,SAAS,CAAC,IAAI,CAAC,UAAU,CAC1B;YACH,CAAC,CAAC,SAAS,CAAC,IAAI;KACrB,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,GAAG,uBAAuB,CAAC,OAAO,CAAC,OAAO;QAC1C,GAAG,OAAO,EAAE,OAAO;KACF,CAAC;IACpB,MAAM,IAAI,GAAG,wBAAwB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtD,IAAI,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,aAAa,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO;QACL,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-loader-types.d.ts","sourceRoot":"","sources":["../src/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-loader-types.js","sourceRoot":"","sources":["../src/terrain-loader-types.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-loader.d.ts","sourceRoot":"","sources":["../src/terrain-loader.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-loader.js","sourceRoot":"","sources":["../src/terrain-loader.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC"}
|
package/dist/terrain-worker.js
CHANGED
|
@@ -59,29 +59,41 @@
|
|
|
59
59
|
}
|
|
60
60
|
});
|
|
61
61
|
|
|
62
|
-
//
|
|
62
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/node/worker_threads-browser.js
|
|
63
63
|
var parentPort;
|
|
64
64
|
var init_worker_threads_browser = __esm({
|
|
65
|
-
"
|
|
66
|
-
"use strict";
|
|
65
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/node/worker_threads-browser.js"() {
|
|
67
66
|
parentPort = null;
|
|
68
67
|
}
|
|
69
68
|
});
|
|
70
69
|
|
|
71
|
-
//
|
|
70
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-utils/get-transfer-list.js
|
|
72
71
|
function getTransferList(object, recursive = true, transfers) {
|
|
73
72
|
const transfersSet = transfers || /* @__PURE__ */ new Set();
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
const seen = /* @__PURE__ */ new Set();
|
|
74
|
+
function visit(value) {
|
|
75
|
+
if (!value || typeof value !== "object" || seen.has(value))
|
|
76
|
+
return;
|
|
77
|
+
seen.add(value);
|
|
78
|
+
if (isTransferable(value))
|
|
79
|
+
transfersSet.add(value);
|
|
80
|
+
else if (ArrayBuffer.isView(value)) {
|
|
81
|
+
if (isTransferable(value.buffer))
|
|
82
|
+
transfersSet.add(value.buffer);
|
|
83
|
+
} else if (recursive && value instanceof Map) {
|
|
84
|
+
for (const [key, item] of value) {
|
|
85
|
+
visit(key);
|
|
86
|
+
visit(item);
|
|
87
|
+
}
|
|
88
|
+
} else if (recursive && value instanceof Set) {
|
|
89
|
+
for (const item of value)
|
|
90
|
+
visit(item);
|
|
91
|
+
} else if (recursive) {
|
|
92
|
+
for (const key of Object.keys(value))
|
|
93
|
+
visit(value[key]);
|
|
83
94
|
}
|
|
84
95
|
}
|
|
96
|
+
visit(object);
|
|
85
97
|
return transfers === void 0 ? Array.from(transfersSet) : [];
|
|
86
98
|
}
|
|
87
99
|
function isTransferable(object) {
|
|
@@ -103,12 +115,11 @@
|
|
|
103
115
|
return false;
|
|
104
116
|
}
|
|
105
117
|
var init_get_transfer_list = __esm({
|
|
106
|
-
"
|
|
107
|
-
"use strict";
|
|
118
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-utils/get-transfer-list.js"() {
|
|
108
119
|
}
|
|
109
120
|
});
|
|
110
121
|
|
|
111
|
-
//
|
|
122
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-farm/worker-body.js
|
|
112
123
|
async function getParentPort() {
|
|
113
124
|
return parentPort;
|
|
114
125
|
}
|
|
@@ -121,15 +132,15 @@
|
|
|
121
132
|
}
|
|
122
133
|
var onMessageWrapperMap, WorkerBody;
|
|
123
134
|
var init_worker_body = __esm({
|
|
124
|
-
"
|
|
125
|
-
"use strict";
|
|
135
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-farm/worker-body.js"() {
|
|
126
136
|
init_get_transfer_list();
|
|
127
137
|
init_worker_threads_browser();
|
|
128
138
|
onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
129
139
|
WorkerBody = class {
|
|
130
140
|
/** Check that we are actually in a worker thread */
|
|
131
141
|
static async inWorkerThread() {
|
|
132
|
-
|
|
142
|
+
const workerGlobalScope = globalThis.WorkerGlobalScope;
|
|
143
|
+
return typeof workerGlobalScope === "function" && globalThis instanceof workerGlobalScope || Boolean(await getParentPort());
|
|
133
144
|
}
|
|
134
145
|
/*
|
|
135
146
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
@@ -202,15 +213,11 @@
|
|
|
202
213
|
}
|
|
203
214
|
});
|
|
204
215
|
|
|
205
|
-
//
|
|
216
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/async-queue/async-queue.js
|
|
206
217
|
var AsyncQueue;
|
|
207
218
|
var init_async_queue = __esm({
|
|
208
|
-
"
|
|
209
|
-
"use strict";
|
|
219
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/async-queue/async-queue.js"() {
|
|
210
220
|
AsyncQueue = class {
|
|
211
|
-
_values;
|
|
212
|
-
_settlers;
|
|
213
|
-
_closed;
|
|
214
221
|
constructor() {
|
|
215
222
|
this._values = [];
|
|
216
223
|
this._settlers = [];
|
|
@@ -278,7 +285,51 @@
|
|
|
278
285
|
}
|
|
279
286
|
});
|
|
280
287
|
|
|
281
|
-
//
|
|
288
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/shared-state.js
|
|
289
|
+
var SharedWorkerState;
|
|
290
|
+
var init_shared_state = __esm({
|
|
291
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/shared-state.js"() {
|
|
292
|
+
SharedWorkerState = class {
|
|
293
|
+
constructor(buffer) {
|
|
294
|
+
if (typeof SharedArrayBuffer === "undefined" || !(buffer instanceof SharedArrayBuffer) || buffer.byteLength !== 16)
|
|
295
|
+
throw new Error("Expected a 16-byte shared worker control buffer");
|
|
296
|
+
this.buffer = buffer;
|
|
297
|
+
this.values = new Int32Array(buffer);
|
|
298
|
+
}
|
|
299
|
+
get snapshot() {
|
|
300
|
+
return {
|
|
301
|
+
cancelled: Atomics.load(this.values, 0) !== 0,
|
|
302
|
+
completed: Atomics.load(this.values, 1),
|
|
303
|
+
total: Atomics.load(this.values, 2),
|
|
304
|
+
revision: Atomics.load(this.values, 3)
|
|
305
|
+
};
|
|
306
|
+
}
|
|
307
|
+
cancel() {
|
|
308
|
+
Atomics.store(this.values, 0, 1);
|
|
309
|
+
Atomics.add(this.values, 3, 1);
|
|
310
|
+
Atomics.notify(this.values, 0);
|
|
311
|
+
}
|
|
312
|
+
throwIfCancelled() {
|
|
313
|
+
if (Atomics.load(this.values, 0) !== 0) {
|
|
314
|
+
const error = new Error("Shared worker task was cancelled");
|
|
315
|
+
error.name = "AbortError";
|
|
316
|
+
throw error;
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
/** Integer counters for application-defined work; messages still carry phase names and units. */
|
|
320
|
+
setProgress(completed, total = -1) {
|
|
321
|
+
if (!Number.isInteger(completed) || completed < 0 || completed > 2147483647 || !Number.isInteger(total) || total < -1 || total > 2147483647) {
|
|
322
|
+
throw new RangeError("Shared progress requires nonnegative int32 counts (or total -1)");
|
|
323
|
+
}
|
|
324
|
+
Atomics.store(this.values, 1, completed);
|
|
325
|
+
Atomics.store(this.values, 2, total);
|
|
326
|
+
Atomics.add(this.values, 3, 1);
|
|
327
|
+
}
|
|
328
|
+
};
|
|
329
|
+
}
|
|
330
|
+
});
|
|
331
|
+
|
|
332
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/create-worker.js
|
|
282
333
|
async function createWorker(process2, processInBatches) {
|
|
283
334
|
if (!await WorkerBody.inWorkerThread()) {
|
|
284
335
|
return;
|
|
@@ -287,27 +338,56 @@
|
|
|
287
338
|
process: processOnMainThread
|
|
288
339
|
};
|
|
289
340
|
WorkerBody.onmessage = async (type, payload) => {
|
|
341
|
+
if (type === "cancel") {
|
|
342
|
+
activeController?.abort();
|
|
343
|
+
activeInputBatches?.close();
|
|
344
|
+
activeOutputAcknowledgements?.close();
|
|
345
|
+
return;
|
|
346
|
+
}
|
|
347
|
+
const controller = type === "process" || type === "process-in-batches" ? new AbortController() : void 0;
|
|
348
|
+
if (controller)
|
|
349
|
+
activeController = controller;
|
|
350
|
+
const startedAt = performance.now();
|
|
290
351
|
const reporter = type === "process" || type === "process-in-batches" ? createProgressReporter() : void 0;
|
|
291
|
-
|
|
352
|
+
let sharedState;
|
|
353
|
+
const throwIfAborted = () => {
|
|
354
|
+
controller?.signal.throwIfAborted();
|
|
355
|
+
sharedState?.throwIfCancelled();
|
|
356
|
+
};
|
|
357
|
+
const jobContext = {
|
|
358
|
+
...context,
|
|
359
|
+
signal: controller?.signal,
|
|
360
|
+
sharedState,
|
|
361
|
+
throwIfAborted,
|
|
362
|
+
reportProgress: (progress) => {
|
|
363
|
+
if (!controller?.signal.aborted && !sharedState?.snapshot.cancelled)
|
|
364
|
+
reporter?.report(progress);
|
|
365
|
+
}
|
|
366
|
+
};
|
|
292
367
|
try {
|
|
368
|
+
if (controller && payload.options?.["sharedState"]) {
|
|
369
|
+
sharedState = new SharedWorkerState(payload.options["sharedState"]);
|
|
370
|
+
jobContext.sharedState = sharedState;
|
|
371
|
+
}
|
|
293
372
|
switch (type) {
|
|
294
373
|
case "preload":
|
|
295
374
|
WorkerBody.postMessage("done", {});
|
|
296
375
|
break;
|
|
297
376
|
case "process":
|
|
377
|
+
throwIfAborted();
|
|
298
378
|
if (!process2) {
|
|
299
379
|
throw new Error("Worker does not support atomic processing");
|
|
300
380
|
}
|
|
301
|
-
const result = await process2(
|
|
302
|
-
|
|
303
|
-
payload.options || {},
|
|
304
|
-
jobContext,
|
|
305
|
-
payload.context || {}
|
|
306
|
-
);
|
|
381
|
+
const result = await process2(payload.input, payload.options || {}, jobContext, payload.context || {});
|
|
382
|
+
throwIfAborted();
|
|
307
383
|
reporter?.finish();
|
|
308
|
-
WorkerBody.postMessage("done", {
|
|
384
|
+
await WorkerBody.postMessage("done", {
|
|
385
|
+
result,
|
|
386
|
+
executionMs: performance.now() - startedAt
|
|
387
|
+
});
|
|
309
388
|
break;
|
|
310
389
|
case "process-in-batches":
|
|
390
|
+
throwIfAborted();
|
|
311
391
|
if (!processInBatches) {
|
|
312
392
|
throw new Error("Worker does not support batched processing");
|
|
313
393
|
}
|
|
@@ -316,18 +396,15 @@
|
|
|
316
396
|
activeInputBatches = inputBatches;
|
|
317
397
|
activeOutputAcknowledgements = outputAcknowledgements;
|
|
318
398
|
try {
|
|
319
|
-
const resultIterator = processInBatches(
|
|
320
|
-
createDemandDrivenIterator(inputBatches),
|
|
321
|
-
payload.options || {},
|
|
322
|
-
jobContext,
|
|
323
|
-
payload.context || {}
|
|
324
|
-
);
|
|
399
|
+
const resultIterator = processInBatches(createDemandDrivenIterator(inputBatches), payload.options || {}, jobContext, payload.context || {});
|
|
325
400
|
for await (const batch of resultIterator) {
|
|
401
|
+
throwIfAborted();
|
|
326
402
|
await WorkerBody.postMessage("output-batch", { result: batch });
|
|
327
403
|
await outputAcknowledgements.next();
|
|
328
404
|
}
|
|
405
|
+
throwIfAborted();
|
|
329
406
|
reporter?.finish();
|
|
330
|
-
await WorkerBody.postMessage("done", {});
|
|
407
|
+
await WorkerBody.postMessage("done", { executionMs: performance.now() - startedAt });
|
|
331
408
|
} finally {
|
|
332
409
|
activeInputBatches = null;
|
|
333
410
|
activeOutputAcknowledgements = null;
|
|
@@ -354,11 +431,18 @@
|
|
|
354
431
|
default:
|
|
355
432
|
}
|
|
356
433
|
} catch (error) {
|
|
357
|
-
reporter?.finish();
|
|
434
|
+
reporter?.finish(controller?.signal.aborted || sharedState?.snapshot.cancelled);
|
|
358
435
|
const message = error instanceof Error ? error.message : "";
|
|
359
|
-
WorkerBody.postMessage("error", {
|
|
436
|
+
await WorkerBody.postMessage("error", {
|
|
437
|
+
error: message,
|
|
438
|
+
errorName: error instanceof Error ? error.name : "Error"
|
|
439
|
+
});
|
|
440
|
+
} finally {
|
|
441
|
+
if (controller && activeController === controller)
|
|
442
|
+
activeController = null;
|
|
360
443
|
}
|
|
361
444
|
};
|
|
445
|
+
await WorkerBody.postMessage("ready", {});
|
|
362
446
|
}
|
|
363
447
|
async function* createDemandDrivenIterator(inputBatches) {
|
|
364
448
|
while (true) {
|
|
@@ -371,27 +455,45 @@
|
|
|
371
455
|
}
|
|
372
456
|
}
|
|
373
457
|
function processOnMainThread(arrayBuffer, options = {}, jobContext = {}) {
|
|
458
|
+
const signal = activeController?.signal;
|
|
459
|
+
signal?.throwIfAborted();
|
|
374
460
|
return new Promise((resolve, reject) => {
|
|
375
461
|
const id = requestId++;
|
|
376
|
-
const
|
|
377
|
-
|
|
462
|
+
const cleanup = () => {
|
|
463
|
+
signal?.removeEventListener("abort", abort);
|
|
464
|
+
void WorkerBody.removeEventListener(onMessage);
|
|
465
|
+
};
|
|
466
|
+
const abort = () => {
|
|
467
|
+
cleanup();
|
|
468
|
+
reject(signal?.reason);
|
|
469
|
+
};
|
|
470
|
+
const onMessage = (type, payload) => {
|
|
471
|
+
if (payload.id !== id)
|
|
378
472
|
return;
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
case "error":
|
|
386
|
-
WorkerBody.removeEventListener(onMessage);
|
|
387
|
-
reject(payload2.error);
|
|
388
|
-
break;
|
|
389
|
-
default:
|
|
473
|
+
if (type === "done") {
|
|
474
|
+
cleanup();
|
|
475
|
+
resolve(payload.result);
|
|
476
|
+
} else if (type === "error") {
|
|
477
|
+
cleanup();
|
|
478
|
+
reject(payload.error);
|
|
390
479
|
}
|
|
391
480
|
};
|
|
392
|
-
WorkerBody.addEventListener(onMessage)
|
|
393
|
-
|
|
394
|
-
|
|
481
|
+
void WorkerBody.addEventListener(onMessage).then(async () => {
|
|
482
|
+
if (signal?.aborted) {
|
|
483
|
+
abort();
|
|
484
|
+
return;
|
|
485
|
+
}
|
|
486
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
487
|
+
await WorkerBody.postMessage("process", {
|
|
488
|
+
id,
|
|
489
|
+
input: arrayBuffer,
|
|
490
|
+
options,
|
|
491
|
+
context: jobContext
|
|
492
|
+
});
|
|
493
|
+
}).catch((error) => {
|
|
494
|
+
cleanup();
|
|
495
|
+
reject(error);
|
|
496
|
+
});
|
|
395
497
|
});
|
|
396
498
|
}
|
|
397
499
|
function createProgressReporter() {
|
|
@@ -408,8 +510,10 @@
|
|
|
408
510
|
return {
|
|
409
511
|
/** Records progress while retaining phase transitions. */
|
|
410
512
|
report(progress) {
|
|
411
|
-
if (finished)
|
|
412
|
-
|
|
513
|
+
if (finished)
|
|
514
|
+
return;
|
|
515
|
+
if (pending && pending.phase !== progress.phase)
|
|
516
|
+
flush();
|
|
413
517
|
pending = { ...progress };
|
|
414
518
|
if (!scheduled) {
|
|
415
519
|
scheduled = true;
|
|
@@ -417,29 +521,58 @@
|
|
|
417
521
|
}
|
|
418
522
|
},
|
|
419
523
|
/** Flushes final progress and suppresses reports from stale callbacks. */
|
|
420
|
-
finish() {
|
|
524
|
+
finish(discard = false) {
|
|
525
|
+
if (discard)
|
|
526
|
+
pending = void 0;
|
|
421
527
|
flush();
|
|
422
528
|
finished = true;
|
|
423
529
|
}
|
|
424
530
|
};
|
|
425
531
|
}
|
|
426
|
-
var requestId, activeInputBatches, activeOutputAcknowledgements;
|
|
532
|
+
var requestId, activeController, activeInputBatches, activeOutputAcknowledgements;
|
|
427
533
|
var init_create_worker = __esm({
|
|
428
|
-
"
|
|
429
|
-
|
|
534
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/lib/worker-api/create-worker.js"() {
|
|
535
|
+
init_shared_state();
|
|
430
536
|
init_async_queue();
|
|
431
537
|
init_worker_body();
|
|
432
538
|
requestId = 0;
|
|
539
|
+
activeController = null;
|
|
433
540
|
activeInputBatches = null;
|
|
434
541
|
activeOutputAcknowledgements = null;
|
|
435
542
|
}
|
|
436
543
|
});
|
|
437
544
|
|
|
438
|
-
//
|
|
545
|
+
// ../../node_modules/@math.gl/core/dist/worker-utils/index.js
|
|
546
|
+
var import_meta, path, moduleUrl;
|
|
439
547
|
var init_worker_utils = __esm({
|
|
548
|
+
"../../node_modules/@math.gl/core/dist/worker-utils/index.js"() {
|
|
549
|
+
init_create_worker();
|
|
550
|
+
import_meta = {};
|
|
551
|
+
path = typeof __filename === "string" ? __filename.replace(/\\/g, "/") : "";
|
|
552
|
+
moduleUrl = path ? `file://${path.startsWith("/") ? "" : "/"}${encodeURI(path).replace(/#/g, "%23").replace(/\?/g, "%3F")}` : import_meta.url;
|
|
553
|
+
}
|
|
554
|
+
});
|
|
555
|
+
|
|
556
|
+
// ../../node_modules/@math.gl/core/dist/tasks/index.js
|
|
557
|
+
var init_tasks = __esm({
|
|
558
|
+
"../../node_modules/@math.gl/core/dist/tasks/index.js"() {
|
|
559
|
+
init_worker_utils();
|
|
560
|
+
}
|
|
561
|
+
});
|
|
562
|
+
|
|
563
|
+
// ../core/src/worker-utils/lib/worker-api/create-worker.ts
|
|
564
|
+
var init_create_worker2 = __esm({
|
|
565
|
+
"../core/src/worker-utils/lib/worker-api/create-worker.ts"() {
|
|
566
|
+
"use strict";
|
|
567
|
+
init_tasks();
|
|
568
|
+
}
|
|
569
|
+
});
|
|
570
|
+
|
|
571
|
+
// ../core/src/worker-utils/index.ts
|
|
572
|
+
var init_worker_utils2 = __esm({
|
|
440
573
|
"../core/src/worker-utils/index.ts"() {
|
|
441
574
|
"use strict";
|
|
442
|
-
|
|
575
|
+
init_create_worker2();
|
|
443
576
|
}
|
|
444
577
|
});
|
|
445
578
|
|
|
@@ -583,7 +716,7 @@
|
|
|
583
716
|
var init_create_loader_worker = __esm({
|
|
584
717
|
"../core/src/loader-utils/lib/worker-loader-utils/create-loader-worker.ts"() {
|
|
585
718
|
"use strict";
|
|
586
|
-
|
|
719
|
+
init_worker_utils2();
|
|
587
720
|
}
|
|
588
721
|
});
|
|
589
722
|
|
|
@@ -17149,7 +17282,7 @@ return true;`);
|
|
|
17149
17282
|
var init_version = __esm({
|
|
17150
17283
|
"../images/src/lib/utils/version.ts"() {
|
|
17151
17284
|
"use strict";
|
|
17152
|
-
VERSION = true ? "5.0.0-beta.
|
|
17285
|
+
VERSION = true ? "5.0.0-beta.2" : "latest";
|
|
17153
17286
|
}
|
|
17154
17287
|
});
|
|
17155
17288
|
|
|
@@ -17198,13 +17331,13 @@ return true;`);
|
|
|
17198
17331
|
// ../images/src/lib/parsers/parse-to-image.ts
|
|
17199
17332
|
async function parseToImage(arrayBuffer, options, url) {
|
|
17200
17333
|
const blobOrDataUrl = getBlobOrSVGDataUrl(arrayBuffer, url);
|
|
17201
|
-
const
|
|
17202
|
-
const objectUrl = typeof blobOrDataUrl !== "string" &&
|
|
17334
|
+
const URL2 = self.URL || self.webkitURL;
|
|
17335
|
+
const objectUrl = typeof blobOrDataUrl !== "string" && URL2.createObjectURL(blobOrDataUrl);
|
|
17203
17336
|
try {
|
|
17204
17337
|
return await loadToImage(objectUrl || blobOrDataUrl, options);
|
|
17205
17338
|
} finally {
|
|
17206
17339
|
if (objectUrl) {
|
|
17207
|
-
|
|
17340
|
+
URL2.revokeObjectURL(objectUrl);
|
|
17208
17341
|
}
|
|
17209
17342
|
}
|
|
17210
17343
|
}
|
|
@@ -17343,39 +17476,39 @@ return true;`);
|
|
|
17343
17476
|
init_parse_to_image_bitmap();
|
|
17344
17477
|
init_svg_utils();
|
|
17345
17478
|
init_parse_to_node_image();
|
|
17346
|
-
INVALID_IMAGE_TYPE_ERROR = "@loaders.gl/images:
|
|
17347
|
-
UNSUPPORTED_IMAGE_BITMAP_ERROR = "@loaders.gl/images:
|
|
17479
|
+
INVALID_IMAGE_TYPE_ERROR = "@loaders.gl/images: ImageLoader only accepts options.image.type='imagebitmap'. Remove legacy image/data/auto values and call getImageData(image) if you need raw pixels.";
|
|
17480
|
+
UNSUPPORTED_IMAGE_BITMAP_ERROR = "@loaders.gl/images: ImageLoader requires browser ImageBitmap support. Use a browser with createImageBitmap support or load images under Node.js with @loaders.gl/core/polyfills.";
|
|
17348
17481
|
}
|
|
17349
17482
|
});
|
|
17350
17483
|
|
|
17351
|
-
// ../images/src/image-
|
|
17352
|
-
var
|
|
17353
|
-
__export(
|
|
17354
|
-
|
|
17484
|
+
// ../images/src/image-loader.ts
|
|
17485
|
+
var image_loader_exports = {};
|
|
17486
|
+
__export(image_loader_exports, {
|
|
17487
|
+
ImageLoaderWithParser: () => ImageLoaderWithParser
|
|
17355
17488
|
});
|
|
17356
|
-
var
|
|
17357
|
-
var
|
|
17358
|
-
"../images/src/image-
|
|
17489
|
+
var _ImageLoaderPreload, ImageLoaderMetadataWithoutPreload, ImageLoaderWithParser;
|
|
17490
|
+
var init_image_loader = __esm({
|
|
17491
|
+
"../images/src/image-loader.ts"() {
|
|
17359
17492
|
"use strict";
|
|
17360
17493
|
init_parse_image_bitmap();
|
|
17361
|
-
|
|
17362
|
-
({ preload:
|
|
17363
|
-
|
|
17364
|
-
...
|
|
17494
|
+
init_image_loader_types();
|
|
17495
|
+
({ preload: _ImageLoaderPreload, ...ImageLoaderMetadataWithoutPreload } = ImageLoader);
|
|
17496
|
+
ImageLoaderWithParser = {
|
|
17497
|
+
...ImageLoaderMetadataWithoutPreload,
|
|
17365
17498
|
parse: parseImageBitmap,
|
|
17366
17499
|
parseBlob: parseImageBitmapBlob
|
|
17367
17500
|
};
|
|
17368
17501
|
}
|
|
17369
17502
|
});
|
|
17370
17503
|
|
|
17371
|
-
// ../images/src/image-
|
|
17504
|
+
// ../images/src/image-loader-types.ts
|
|
17372
17505
|
async function preload() {
|
|
17373
|
-
const {
|
|
17374
|
-
return
|
|
17506
|
+
const { ImageLoaderWithParser: ImageLoaderWithParser2 } = await Promise.resolve().then(() => (init_image_loader(), image_loader_exports));
|
|
17507
|
+
return ImageLoaderWithParser2;
|
|
17375
17508
|
}
|
|
17376
|
-
var DEFAULT_IMAGE_BITMAP_LOADER_OPTIONS,
|
|
17377
|
-
var
|
|
17378
|
-
"../images/src/image-
|
|
17509
|
+
var DEFAULT_IMAGE_BITMAP_LOADER_OPTIONS, ImageLoader;
|
|
17510
|
+
var init_image_loader_types = __esm({
|
|
17511
|
+
"../images/src/image-loader-types.ts"() {
|
|
17379
17512
|
"use strict";
|
|
17380
17513
|
init_version();
|
|
17381
17514
|
init_image_format();
|
|
@@ -17383,7 +17516,7 @@ return true;`);
|
|
|
17383
17516
|
image: {}
|
|
17384
17517
|
// imagebitmap: {} - passes (platform dependent) parameters to ImageBitmap constructor
|
|
17385
17518
|
};
|
|
17386
|
-
|
|
17519
|
+
ImageLoader = {
|
|
17387
17520
|
dataType: null,
|
|
17388
17521
|
batchType: null,
|
|
17389
17522
|
...ImageBitmapFormat,
|
|
@@ -17473,7 +17606,7 @@ return true;`);
|
|
|
17473
17606
|
var init_src = __esm({
|
|
17474
17607
|
"../images/src/index.ts"() {
|
|
17475
17608
|
"use strict";
|
|
17476
|
-
|
|
17609
|
+
init_image_loader_types();
|
|
17477
17610
|
init_parsed_image_api();
|
|
17478
17611
|
}
|
|
17479
17612
|
});
|
|
@@ -18270,7 +18403,7 @@ return true;`);
|
|
|
18270
18403
|
var init_version2 = __esm({
|
|
18271
18404
|
"src/terrain/lib/utils/version.ts"() {
|
|
18272
18405
|
"use strict";
|
|
18273
|
-
VERSION2 = true ? "5.0.0-beta.
|
|
18406
|
+
VERSION2 = true ? "5.0.0-beta.2" : "latest";
|
|
18274
18407
|
}
|
|
18275
18408
|
});
|
|
18276
18409
|
|
|
@@ -18291,6 +18424,19 @@ return true;`);
|
|
|
18291
18424
|
}
|
|
18292
18425
|
});
|
|
18293
18426
|
|
|
18427
|
+
// src/terrain-loader.ts
|
|
18428
|
+
var terrain_loader_exports = {};
|
|
18429
|
+
__export(terrain_loader_exports, {
|
|
18430
|
+
TerrainLoaderWithParser: () => TerrainLoaderWithParser,
|
|
18431
|
+
parseTerrain: () => parseTerrain
|
|
18432
|
+
});
|
|
18433
|
+
var init_terrain_loader = __esm({
|
|
18434
|
+
"src/terrain-loader.ts"() {
|
|
18435
|
+
"use strict";
|
|
18436
|
+
init_terrain_loader2();
|
|
18437
|
+
}
|
|
18438
|
+
});
|
|
18439
|
+
|
|
18294
18440
|
// src/terrain/terrain-loader-types.ts
|
|
18295
18441
|
var TerrainLoader;
|
|
18296
18442
|
var init_terrain_loader_types = __esm({
|
|
@@ -18326,17 +18472,12 @@ return true;`);
|
|
|
18326
18472
|
});
|
|
18327
18473
|
|
|
18328
18474
|
// src/terrain/terrain-loader.ts
|
|
18329
|
-
var terrain_loader_exports = {};
|
|
18330
|
-
__export(terrain_loader_exports, {
|
|
18331
|
-
TerrainLoaderWithParser: () => TerrainLoaderWithParser,
|
|
18332
|
-
parseTerrain: () => parseTerrain
|
|
18333
|
-
});
|
|
18334
18475
|
async function parseTerrain(arrayBuffer, options, context) {
|
|
18335
18476
|
const loadImageOptions = {
|
|
18336
18477
|
...options,
|
|
18337
18478
|
core: { ...options?.core, mimeType: "application/x.image" }
|
|
18338
18479
|
};
|
|
18339
|
-
const image = await parseFromContext(arrayBuffer,
|
|
18480
|
+
const image = await parseFromContext(arrayBuffer, ImageLoader, loadImageOptions, context);
|
|
18340
18481
|
const imageData = getImageData(image);
|
|
18341
18482
|
const terrainImage = {
|
|
18342
18483
|
width: imageData.width,
|
|
@@ -18363,7 +18504,7 @@ return true;`);
|
|
|
18363
18504
|
};
|
|
18364
18505
|
}
|
|
18365
18506
|
var _TerrainLoaderPreload, TerrainLoaderMetadataWithoutPreload, TerrainLoaderWithParser;
|
|
18366
|
-
var
|
|
18507
|
+
var init_terrain_loader2 = __esm({
|
|
18367
18508
|
"src/terrain/terrain-loader.ts"() {
|
|
18368
18509
|
"use strict";
|
|
18369
18510
|
init_arrow_transport();
|
|
@@ -18378,7 +18519,7 @@ return true;`);
|
|
|
18378
18519
|
serializeWorkerResult: serializeArrowWorkerResult,
|
|
18379
18520
|
deserializeWorkerResult: deserializeArrowWorkerResult,
|
|
18380
18521
|
/** Image decoder requested by terrain workers through the nested parse bridge. */
|
|
18381
|
-
subloaders: {
|
|
18522
|
+
subloaders: { ImageLoader },
|
|
18382
18523
|
parse: parseTerrain
|
|
18383
18524
|
};
|
|
18384
18525
|
}
|
|
@@ -18386,6 +18527,6 @@ return true;`);
|
|
|
18386
18527
|
|
|
18387
18528
|
// src/terrain/workers/terrain-worker.ts
|
|
18388
18529
|
init_loader_utils();
|
|
18389
|
-
|
|
18530
|
+
init_terrain_loader2();
|
|
18390
18531
|
createLoaderWorker(TerrainLoaderWithParser);
|
|
18391
18532
|
})();
|