@loaders.gl/geotiff 3.4.14 → 3.4.15
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/es5/bundle.js +2 -3
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/index.js +2 -2
- package/dist/es5/lib/load-geotiff.js +23 -65
- package/dist/es5/lib/load-geotiff.js.map +1 -1
- package/dist/es5/lib/ome/load-ome-tiff.js +41 -51
- package/dist/es5/lib/ome/load-ome-tiff.js.map +1 -1
- package/dist/es5/lib/ome/ome-indexers.js +75 -88
- package/dist/es5/lib/ome/ome-indexers.js.map +1 -1
- package/dist/es5/lib/ome/ome-utils.js +18 -18
- package/dist/es5/lib/ome/ome-utils.js.map +1 -1
- package/dist/es5/lib/ome/omexml.js +34 -32
- package/dist/es5/lib/ome/omexml.js.map +1 -1
- package/dist/es5/lib/ome/utils.js +3 -5
- package/dist/es5/lib/ome/utils.js.map +1 -1
- package/dist/es5/lib/tiff-pixel-source.js +73 -136
- package/dist/es5/lib/tiff-pixel-source.js.map +1 -1
- package/dist/es5/lib/utils/Pool.js +45 -112
- package/dist/es5/lib/utils/Pool.js.map +1 -1
- package/dist/es5/lib/utils/proxies.js +14 -17
- package/dist/es5/lib/utils/proxies.js.map +1 -1
- package/dist/es5/lib/utils/tiff-utils.js +9 -14
- package/dist/es5/lib/utils/tiff-utils.js.map +1 -1
- package/package.json +2 -2
|
@@ -5,17 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
9
|
var _globalThis$navigator, _globalThis$navigator2;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
(0, _classCallCheck2.default)(this, Pool);
|
|
10
|
+
const defaultPoolSize = (_globalThis$navigator = globalThis === null || globalThis === void 0 ? void 0 : (_globalThis$navigator2 = globalThis.navigator) === null || _globalThis$navigator2 === void 0 ? void 0 : _globalThis$navigator2.hardwareConcurrency) !== null && _globalThis$navigator !== void 0 ? _globalThis$navigator : 4;
|
|
11
|
+
class Pool {
|
|
12
|
+
constructor() {
|
|
13
|
+
let size = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPoolSize;
|
|
19
14
|
(0, _defineProperty2.default)(this, "workers", void 0);
|
|
20
15
|
(0, _defineProperty2.default)(this, "idleWorkers", void 0);
|
|
21
16
|
(0, _defineProperty2.default)(this, "waitQueue", void 0);
|
|
@@ -24,113 +19,51 @@ var Pool = function () {
|
|
|
24
19
|
this.idleWorkers = [];
|
|
25
20
|
this.waitQueue = [];
|
|
26
21
|
this.decoder = null;
|
|
27
|
-
for (
|
|
28
|
-
|
|
22
|
+
for (let i = 0; i < size; ++i) {
|
|
23
|
+
const w = new Worker('./decoder.worker');
|
|
29
24
|
this.workers.push(w);
|
|
30
25
|
this.idleWorkers.push(w);
|
|
31
26
|
}
|
|
32
27
|
}
|
|
33
|
-
(
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
return decode;
|
|
67
|
-
}()
|
|
68
|
-
}, {
|
|
69
|
-
key: "waitForWorker",
|
|
70
|
-
value: function () {
|
|
71
|
-
var _waitForWorker = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2() {
|
|
72
|
-
var idleWorker, waiter, promise;
|
|
73
|
-
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
74
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
75
|
-
case 0:
|
|
76
|
-
idleWorker = this.idleWorkers.pop();
|
|
77
|
-
if (!idleWorker) {
|
|
78
|
-
_context2.next = 3;
|
|
79
|
-
break;
|
|
80
|
-
}
|
|
81
|
-
return _context2.abrupt("return", idleWorker);
|
|
82
|
-
case 3:
|
|
83
|
-
waiter = {};
|
|
84
|
-
promise = new Promise(function (resolve) {
|
|
85
|
-
waiter.resolve = resolve;
|
|
86
|
-
});
|
|
87
|
-
this.waitQueue.push(waiter);
|
|
88
|
-
return _context2.abrupt("return", promise);
|
|
89
|
-
case 7:
|
|
90
|
-
case "end":
|
|
91
|
-
return _context2.stop();
|
|
92
|
-
}
|
|
93
|
-
}, _callee2, this);
|
|
94
|
-
}));
|
|
95
|
-
function waitForWorker() {
|
|
96
|
-
return _waitForWorker.apply(this, arguments);
|
|
97
|
-
}
|
|
98
|
-
return waitForWorker;
|
|
99
|
-
}()
|
|
100
|
-
}, {
|
|
101
|
-
key: "finishTask",
|
|
102
|
-
value: function () {
|
|
103
|
-
var _finishTask = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(currentWorker) {
|
|
104
|
-
var waiter;
|
|
105
|
-
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
106
|
-
while (1) switch (_context3.prev = _context3.next) {
|
|
107
|
-
case 0:
|
|
108
|
-
waiter = this.waitQueue.pop();
|
|
109
|
-
if (waiter) {
|
|
110
|
-
waiter.resolve(currentWorker);
|
|
111
|
-
} else {
|
|
112
|
-
this.idleWorkers.push(currentWorker);
|
|
113
|
-
}
|
|
114
|
-
case 2:
|
|
115
|
-
case "end":
|
|
116
|
-
return _context3.stop();
|
|
117
|
-
}
|
|
118
|
-
}, _callee3, this);
|
|
119
|
-
}));
|
|
120
|
-
function finishTask(_x3) {
|
|
121
|
-
return _finishTask.apply(this, arguments);
|
|
122
|
-
}
|
|
123
|
-
return finishTask;
|
|
124
|
-
}()
|
|
125
|
-
}, {
|
|
126
|
-
key: "destroy",
|
|
127
|
-
value: function destroy() {
|
|
128
|
-
for (var i = 0; i < this.workers.length; ++i) {
|
|
129
|
-
this.workers[i].terminate();
|
|
130
|
-
}
|
|
28
|
+
async decode(fileDirectory, buffer) {
|
|
29
|
+
const currentWorker = await this.waitForWorker();
|
|
30
|
+
return new Promise((resolve, reject) => {
|
|
31
|
+
currentWorker.onmessage = event => {
|
|
32
|
+
this.finishTask(currentWorker);
|
|
33
|
+
resolve(event.data[0]);
|
|
34
|
+
};
|
|
35
|
+
currentWorker.onerror = error => {
|
|
36
|
+
this.finishTask(currentWorker);
|
|
37
|
+
reject(error);
|
|
38
|
+
};
|
|
39
|
+
currentWorker.postMessage(['decode', fileDirectory, buffer], [buffer]);
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
async waitForWorker() {
|
|
43
|
+
const idleWorker = this.idleWorkers.pop();
|
|
44
|
+
if (idleWorker) {
|
|
45
|
+
return idleWorker;
|
|
46
|
+
}
|
|
47
|
+
const waiter = {};
|
|
48
|
+
const promise = new Promise(resolve => {
|
|
49
|
+
waiter.resolve = resolve;
|
|
50
|
+
});
|
|
51
|
+
this.waitQueue.push(waiter);
|
|
52
|
+
return promise;
|
|
53
|
+
}
|
|
54
|
+
async finishTask(currentWorker) {
|
|
55
|
+
const waiter = this.waitQueue.pop();
|
|
56
|
+
if (waiter) {
|
|
57
|
+
waiter.resolve(currentWorker);
|
|
58
|
+
} else {
|
|
59
|
+
this.idleWorkers.push(currentWorker);
|
|
131
60
|
}
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
|
|
61
|
+
}
|
|
62
|
+
destroy() {
|
|
63
|
+
for (let i = 0; i < this.workers.length; ++i) {
|
|
64
|
+
this.workers[i].terminate();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
135
68
|
exports.default = Pool;
|
|
136
69
|
//# sourceMappingURL=Pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pool.js","names":["defaultPoolSize","_globalThis$navigator","globalThis","_globalThis$navigator2","navigator","hardwareConcurrency","Pool","size","arguments","length","undefined","
|
|
1
|
+
{"version":3,"file":"Pool.js","names":["defaultPoolSize","_globalThis$navigator","globalThis","_globalThis$navigator2","navigator","hardwareConcurrency","Pool","constructor","size","arguments","length","undefined","_defineProperty2","default","workers","idleWorkers","waitQueue","decoder","i","w","Worker","push","decode","fileDirectory","buffer","currentWorker","waitForWorker","Promise","resolve","reject","onmessage","event","finishTask","data","onerror","error","postMessage","idleWorker","pop","waiter","promise","destroy","terminate","exports"],"sources":["../../../../src/lib/utils/Pool.ts"],"sourcesContent":["/** eslint-disable */\nimport type {FileDirectory} from 'geotiff';\n\n// import Worker from 'web-worker:./decoder.worker.ts';\n\n// https://developer.mozilla.org/en-US/docs/Web/API/NavigatorConcurrentHardware/hardwareConcurrency\n// We need to give a different way of getting this for safari, so 4 is probably a safe bet\n// for parallel processing in the meantime. More can't really hurt since they'll just block\n// each other and not the UI thread, which is the real benefit.\nconst defaultPoolSize = globalThis?.navigator?.hardwareConcurrency ?? 4;\n\n/**\n * Pool for workers to decode chunks of the images.\n * This is a line-for-line copy of GeoTIFFs old implementation: https://github.com/geotiffjs/geotiff.js/blob/v1.0.0-beta.6/src/pool.js\n */\nexport default class Pool {\n workers: Worker[];\n idleWorkers: Worker[];\n waitQueue: any[];\n decoder: null;\n\n /**\n * @constructor\n * @param {Number} size The size of the pool. Defaults to the number of CPUs\n * available. When this parameter is `null` or 0, then the\n * decoding will be done in the main thread.\n */\n constructor(size = defaultPoolSize) {\n this.workers = [];\n this.idleWorkers = [];\n this.waitQueue = [];\n this.decoder = null;\n\n // eslint-disable-next-line no-plusplus\n for (let i = 0; i < size; ++i) {\n const w = new Worker('./decoder.worker');\n this.workers.push(w);\n this.idleWorkers.push(w);\n }\n }\n\n /**\n * Decode the given block of bytes with the set compression method.\n * @param {ArrayBuffer} buffer the array buffer of bytes to decode.\n * @returns {Promise.<ArrayBuffer>} the decoded result as a `Promise`\n */\n async decode(fileDirectory: FileDirectory, buffer: ArrayBuffer) {\n const currentWorker = await this.waitForWorker();\n return new Promise((resolve, reject) => {\n currentWorker.onmessage = (event) => {\n // this.workers.push(currentWorker);\n // eslint-disable-next-line\n this.finishTask(currentWorker);\n resolve(event.data[0]);\n };\n currentWorker.onerror = (error) => {\n // this.workers.push(currentWorker);\n // eslint-disable-next-line\n this.finishTask(currentWorker);\n reject(error);\n };\n currentWorker.postMessage(['decode', fileDirectory, buffer], [buffer]);\n });\n }\n\n async waitForWorker() {\n const idleWorker = this.idleWorkers.pop();\n if (idleWorker) {\n return idleWorker;\n }\n const waiter: any = {};\n const promise = new Promise((resolve) => {\n waiter.resolve = resolve;\n });\n\n this.waitQueue.push(waiter);\n return promise as Promise<Worker>;\n }\n\n async finishTask(currentWorker: Worker) {\n const waiter = this.waitQueue.pop();\n if (waiter) {\n waiter.resolve(currentWorker);\n } else {\n this.idleWorkers.push(currentWorker);\n }\n }\n\n destroy() {\n // eslint-disable-next-line no-plusplus\n for (let i = 0; i < this.workers.length; ++i) {\n this.workers[i].terminate();\n }\n }\n}\n"],"mappings":";;;;;;;;;AASA,MAAMA,eAAe,IAAAC,qBAAA,GAAGC,UAAU,aAAVA,UAAU,wBAAAC,sBAAA,GAAVD,UAAU,CAAEE,SAAS,cAAAD,sBAAA,uBAArBA,sBAAA,CAAuBE,mBAAmB,cAAAJ,qBAAA,cAAAA,qBAAA,GAAI,CAAC;AAMxD,MAAMK,IAAI,CAAC;EAYxBC,WAAWA,CAAA,EAAyB;IAAA,IAAxBC,IAAI,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGT,eAAe;IAAA,IAAAY,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAChC,IAAI,CAACC,OAAO,GAAG,EAAE;IACjB,IAAI,CAACC,WAAW,GAAG,EAAE;IACrB,IAAI,CAACC,SAAS,GAAG,EAAE;IACnB,IAAI,CAACC,OAAO,GAAG,IAAI;IAGnB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGV,IAAI,EAAE,EAAEU,CAAC,EAAE;MAC7B,MAAMC,CAAC,GAAG,IAAIC,MAAM,CAAC,kBAAkB,CAAC;MACxC,IAAI,CAACN,OAAO,CAACO,IAAI,CAACF,CAAC,CAAC;MACpB,IAAI,CAACJ,WAAW,CAACM,IAAI,CAACF,CAAC,CAAC;IAC1B;EACF;EAOA,MAAMG,MAAMA,CAACC,aAA4B,EAAEC,MAAmB,EAAE;IAC9D,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC;IAChD,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtCJ,aAAa,CAACK,SAAS,GAAIC,KAAK,IAAK;QAGnC,IAAI,CAACC,UAAU,CAACP,aAAa,CAAC;QAC9BG,OAAO,CAACG,KAAK,CAACE,IAAI,CAAC,CAAC,CAAC,CAAC;MACxB,CAAC;MACDR,aAAa,CAACS,OAAO,GAAIC,KAAK,IAAK;QAGjC,IAAI,CAACH,UAAU,CAACP,aAAa,CAAC;QAC9BI,MAAM,CAACM,KAAK,CAAC;MACf,CAAC;MACDV,aAAa,CAACW,WAAW,CAAC,CAAC,QAAQ,EAAEb,aAAa,EAAEC,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC;EACJ;EAEA,MAAME,aAAaA,CAAA,EAAG;IACpB,MAAMW,UAAU,GAAG,IAAI,CAACtB,WAAW,CAACuB,GAAG,CAAC,CAAC;IACzC,IAAID,UAAU,EAAE;MACd,OAAOA,UAAU;IACnB;IACA,MAAME,MAAW,GAAG,CAAC,CAAC;IACtB,MAAMC,OAAO,GAAG,IAAIb,OAAO,CAAEC,OAAO,IAAK;MACvCW,MAAM,CAACX,OAAO,GAAGA,OAAO;IAC1B,CAAC,CAAC;IAEF,IAAI,CAACZ,SAAS,CAACK,IAAI,CAACkB,MAAM,CAAC;IAC3B,OAAOC,OAAO;EAChB;EAEA,MAAMR,UAAUA,CAACP,aAAqB,EAAE;IACtC,MAAMc,MAAM,GAAG,IAAI,CAACvB,SAAS,CAACsB,GAAG,CAAC,CAAC;IACnC,IAAIC,MAAM,EAAE;MACVA,MAAM,CAACX,OAAO,CAACH,aAAa,CAAC;IAC/B,CAAC,MAAM;MACL,IAAI,CAACV,WAAW,CAACM,IAAI,CAACI,aAAa,CAAC;IACtC;EACF;EAEAgB,OAAOA,CAAA,EAAG;IAER,KAAK,IAAIvB,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG,IAAI,CAACJ,OAAO,CAACJ,MAAM,EAAE,EAAEQ,CAAC,EAAE;MAC5C,IAAI,CAACJ,OAAO,CAACI,CAAC,CAAC,CAACwB,SAAS,CAAC,CAAC;IAC7B;EACF;AACF;AAACC,OAAA,CAAA9B,OAAA,GAAAP,IAAA"}
|
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.checkProxies = checkProxies;
|
|
8
7
|
exports.createOffsetsProxy = createOffsetsProxy;
|
|
9
8
|
exports.createPoolProxy = createPoolProxy;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
var VIV_PROXY_KEY = '__viv';
|
|
14
|
-
var OFFSETS_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-offsets");
|
|
15
|
-
var POOL_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-decoder-pool");
|
|
9
|
+
const VIV_PROXY_KEY = '__viv';
|
|
10
|
+
const OFFSETS_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-offsets");
|
|
11
|
+
const POOL_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-decoder-pool");
|
|
16
12
|
function checkProxies(tiff) {
|
|
17
13
|
if (!isProxy(tiff, OFFSETS_PROXY_KEY)) {
|
|
18
14
|
console.warn('GeoTIFF source is missing offsets proxy.');
|
|
@@ -25,11 +21,11 @@ function isProxy(tiff, proxyFlag) {
|
|
|
25
21
|
return tiff[proxyFlag];
|
|
26
22
|
}
|
|
27
23
|
function createOffsetsProxy(tiff, offsets) {
|
|
28
|
-
|
|
24
|
+
const get = (target, key) => {
|
|
29
25
|
if (key === 'getImage') {
|
|
30
|
-
return
|
|
26
|
+
return index => {
|
|
31
27
|
if (!(index in target.ifdRequests) && index in offsets) {
|
|
32
|
-
|
|
28
|
+
const offset = offsets[index];
|
|
33
29
|
target.ifdRequests[index] = target.parseFileDirectoryAt(offset);
|
|
34
30
|
}
|
|
35
31
|
return target.getImage(index);
|
|
@@ -41,16 +37,17 @@ function createOffsetsProxy(tiff, offsets) {
|
|
|
41
37
|
return Reflect.get(target, key);
|
|
42
38
|
};
|
|
43
39
|
return new Proxy(tiff, {
|
|
44
|
-
get
|
|
40
|
+
get
|
|
45
41
|
});
|
|
46
42
|
}
|
|
47
43
|
function createPoolProxy(tiff, pool) {
|
|
48
|
-
|
|
44
|
+
const get = (target, key) => {
|
|
49
45
|
if (key === 'readRasters') {
|
|
50
|
-
return
|
|
51
|
-
return target.readRasters(
|
|
52
|
-
|
|
53
|
-
|
|
46
|
+
return options => {
|
|
47
|
+
return target.readRasters({
|
|
48
|
+
...options,
|
|
49
|
+
pool
|
|
50
|
+
});
|
|
54
51
|
};
|
|
55
52
|
}
|
|
56
53
|
if (key === POOL_PROXY_KEY) {
|
|
@@ -59,7 +56,7 @@ function createPoolProxy(tiff, pool) {
|
|
|
59
56
|
return Reflect.get(target, key);
|
|
60
57
|
};
|
|
61
58
|
return new Proxy(tiff, {
|
|
62
|
-
get
|
|
59
|
+
get
|
|
63
60
|
});
|
|
64
61
|
}
|
|
65
62
|
//# sourceMappingURL=proxies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxies.js","names":["VIV_PROXY_KEY","OFFSETS_PROXY_KEY","concat","POOL_PROXY_KEY","checkProxies","tiff","isProxy","console","warn","proxyFlag","createOffsetsProxy","offsets","get","target","key","index","ifdRequests","offset","parseFileDirectoryAt","getImage","Reflect","Proxy","createPoolProxy","pool","options","readRasters"
|
|
1
|
+
{"version":3,"file":"proxies.js","names":["VIV_PROXY_KEY","OFFSETS_PROXY_KEY","concat","POOL_PROXY_KEY","checkProxies","tiff","isProxy","console","warn","proxyFlag","createOffsetsProxy","offsets","get","target","key","index","ifdRequests","offset","parseFileDirectoryAt","getImage","Reflect","Proxy","createPoolProxy","pool","options","readRasters"],"sources":["../../../../src/lib/utils/proxies.ts"],"sourcesContent":["import type {GeoTIFF} from 'geotiff';\nimport type Pool from './Pool';\n\nconst VIV_PROXY_KEY = '__viv';\nconst OFFSETS_PROXY_KEY = `${VIV_PROXY_KEY}-offsets` as const;\nconst POOL_PROXY_KEY = `${VIV_PROXY_KEY}-decoder-pool` as const;\n\n/*\n * Inspect if the GeoTIFF source is wrapped in our proxies,\n * and warn if missing.\n */\nexport function checkProxies(tiff: GeoTIFF) {\n if (!isProxy(tiff, OFFSETS_PROXY_KEY)) {\n console.warn('GeoTIFF source is missing offsets proxy.'); // eslint-disable-line no-console\n }\n\n if (!isProxy(tiff, POOL_PROXY_KEY)) {\n console.warn('GeoTIFF source is missing decoder-pool proxy.'); // eslint-disable-line no-console\n }\n}\n\n/*\n * > isProxy(tiff, POOL_PROXY_KEY) === true; // false\n * > tiff = createPoolProxy(tiff, new Pool());\n * > isProxy(tiff, POOL_PROXY_KEY) === true; // true\n */\nfunction isProxy(tiff: GeoTIFF, proxyFlag: string) {\n return (tiff as any)[proxyFlag] as boolean;\n}\n\n/*\n * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy\n * handler intercepts calls to `tiff.getImage` and uses our custom\n * pre-computed offsets to pre-fetch the correct file directory.\n *\n * This is a bit of a hack. Internally GeoTIFF inspects `this.ifdRequests`\n * to see which fileDirectories need to be traversed. By adding the\n * ifdRequest for an 'index' manually, GeoTIFF will await that request\n * rather than traversing the file system remotely.\n */\nexport function createOffsetsProxy(tiff: GeoTIFF, offsets: number[]) {\n const get = (target: GeoTIFF, key: any) => {\n // Intercept `tiff.getImage`\n if (key === 'getImage') {\n return (index: number) => {\n // Manually add ifdRequest to tiff if missing and we have an offset.\n if (!(index in target.ifdRequests) && index in offsets) {\n const offset = offsets[index];\n target.ifdRequests[index] = target.parseFileDirectoryAt(offset);\n }\n return target.getImage(index);\n };\n }\n\n // tiff['__viv-offsets'] === true\n if (key === OFFSETS_PROXY_KEY) {\n return true;\n }\n\n return Reflect.get(target, key);\n };\n return new Proxy(tiff, {get});\n}\n\n/*\n * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy\n * handler intercepts calls to `tiff.readRasters` and injects\n * a pool argument to every call. This means our TiffPixelSource\n * doesn't need to be aware of whether a decoder pool is in use.\n *\n * > tiff.readRasters({ window }) -> tiff.readRasters({ window, pool });\n */\nexport function createPoolProxy(tiff: GeoTIFF, pool: Pool) {\n const get = (target: GeoTIFF, key: any) => {\n // Intercept calls to `image.readRasters`\n if (key === 'readRasters') {\n return (options: Parameters<typeof target.readRasters>) => {\n // Inject `pool` argument with other raster options.\n // @ts-ignore\n return target.readRasters({...options, pool});\n };\n }\n\n // tiff['__viv-decoder-pool'] === true\n if (key === POOL_PROXY_KEY) {\n return true;\n }\n\n return Reflect.get(target, key);\n };\n return new Proxy(tiff, {get});\n}\n"],"mappings":";;;;;;;;AAGA,MAAMA,aAAa,GAAG,OAAO;AAC7B,MAAMC,iBAAiB,MAAAC,MAAA,CAAMF,aAAa,aAAmB;AAC7D,MAAMG,cAAc,MAAAD,MAAA,CAAMF,aAAa,kBAAwB;AAMxD,SAASI,YAAYA,CAACC,IAAa,EAAE;EAC1C,IAAI,CAACC,OAAO,CAACD,IAAI,EAAEJ,iBAAiB,CAAC,EAAE;IACrCM,OAAO,CAACC,IAAI,CAAC,0CAA0C,CAAC;EAC1D;EAEA,IAAI,CAACF,OAAO,CAACD,IAAI,EAAEF,cAAc,CAAC,EAAE;IAClCI,OAAO,CAACC,IAAI,CAAC,+CAA+C,CAAC;EAC/D;AACF;AAOA,SAASF,OAAOA,CAACD,IAAa,EAAEI,SAAiB,EAAE;EACjD,OAAQJ,IAAI,CAASI,SAAS,CAAC;AACjC;AAYO,SAASC,kBAAkBA,CAACL,IAAa,EAAEM,OAAiB,EAAE;EACnE,MAAMC,GAAG,GAAGA,CAACC,MAAe,EAAEC,GAAQ,KAAK;IAEzC,IAAIA,GAAG,KAAK,UAAU,EAAE;MACtB,OAAQC,KAAa,IAAK;QAExB,IAAI,EAAEA,KAAK,IAAIF,MAAM,CAACG,WAAW,CAAC,IAAID,KAAK,IAAIJ,OAAO,EAAE;UACtD,MAAMM,MAAM,GAAGN,OAAO,CAACI,KAAK,CAAC;UAC7BF,MAAM,CAACG,WAAW,CAACD,KAAK,CAAC,GAAGF,MAAM,CAACK,oBAAoB,CAACD,MAAM,CAAC;QACjE;QACA,OAAOJ,MAAM,CAACM,QAAQ,CAACJ,KAAK,CAAC;MAC/B,CAAC;IACH;IAGA,IAAID,GAAG,KAAKb,iBAAiB,EAAE;MAC7B,OAAO,IAAI;IACb;IAEA,OAAOmB,OAAO,CAACR,GAAG,CAACC,MAAM,EAAEC,GAAG,CAAC;EACjC,CAAC;EACD,OAAO,IAAIO,KAAK,CAAChB,IAAI,EAAE;IAACO;EAAG,CAAC,CAAC;AAC/B;AAUO,SAASU,eAAeA,CAACjB,IAAa,EAAEkB,IAAU,EAAE;EACzD,MAAMX,GAAG,GAAGA,CAACC,MAAe,EAAEC,GAAQ,KAAK;IAEzC,IAAIA,GAAG,KAAK,aAAa,EAAE;MACzB,OAAQU,OAA8C,IAAK;QAGzD,OAAOX,MAAM,CAACY,WAAW,CAAC;UAAC,GAAGD,OAAO;UAAED;QAAI,CAAC,CAAC;MAC/C,CAAC;IACH;IAGA,IAAIT,GAAG,KAAKX,cAAc,EAAE;MAC1B,OAAO,IAAI;IACb;IAEA,OAAOiB,OAAO,CAACR,GAAG,CAACC,MAAM,EAAEC,GAAG,CAAC;EACjC,CAAC;EACD,OAAO,IAAIO,KAAK,CAAChB,IAAI,EAAE;IAACO;EAAG,CAAC,CAAC;AAC/B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
@@ -9,7 +8,6 @@ exports.ensureArray = ensureArray;
|
|
|
9
8
|
exports.getImageSize = getImageSize;
|
|
10
9
|
exports.intToRgba = intToRgba;
|
|
11
10
|
exports.isInterleaved = isInterleaved;
|
|
12
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
11
|
function ensureArray(x) {
|
|
14
12
|
return Array.isArray(x) ? x : [x];
|
|
15
13
|
}
|
|
@@ -17,27 +15,24 @@ function intToRgba(int) {
|
|
|
17
15
|
if (!Number.isInteger(int)) {
|
|
18
16
|
throw Error('Not an integer.');
|
|
19
17
|
}
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
const buffer = new ArrayBuffer(4);
|
|
19
|
+
const view = new DataView(buffer);
|
|
22
20
|
view.setInt32(0, int, false);
|
|
23
|
-
|
|
21
|
+
const bytes = new Uint8Array(buffer);
|
|
24
22
|
return Array.from(bytes);
|
|
25
23
|
}
|
|
26
24
|
function isInterleaved(shape) {
|
|
27
|
-
|
|
25
|
+
const lastDimSize = shape[shape.length - 1];
|
|
28
26
|
return lastDimSize === 3 || lastDimSize === 4;
|
|
29
27
|
}
|
|
30
28
|
function getImageSize(source) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
_source$shape$slice2 = (0, _slicedToArray2.default)(_source$shape$slice, 2),
|
|
34
|
-
height = _source$shape$slice2[0],
|
|
35
|
-
width = _source$shape$slice2[1];
|
|
29
|
+
const interleaved = isInterleaved(source.shape);
|
|
30
|
+
const [height, width] = source.shape.slice(interleaved ? -3 : -2);
|
|
36
31
|
return {
|
|
37
|
-
height
|
|
38
|
-
width
|
|
32
|
+
height,
|
|
33
|
+
width
|
|
39
34
|
};
|
|
40
35
|
}
|
|
41
|
-
|
|
36
|
+
const SIGNAL_ABORTED = '__vivSignalAborted';
|
|
42
37
|
exports.SIGNAL_ABORTED = SIGNAL_ABORTED;
|
|
43
38
|
//# sourceMappingURL=tiff-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tiff-utils.js","names":["ensureArray","x","Array","isArray","intToRgba","int","Number","isInteger","Error","buffer","ArrayBuffer","view","DataView","setInt32","bytes","Uint8Array","from","isInterleaved","shape","lastDimSize","length","getImageSize","source","interleaved","
|
|
1
|
+
{"version":3,"file":"tiff-utils.js","names":["ensureArray","x","Array","isArray","intToRgba","int","Number","isInteger","Error","buffer","ArrayBuffer","view","DataView","setInt32","bytes","Uint8Array","from","isInterleaved","shape","lastDimSize","length","getImageSize","source","interleaved","height","width","slice","SIGNAL_ABORTED","exports"],"sources":["../../../../src/lib/utils/tiff-utils.ts"],"sourcesContent":["import type {PixelSource} from '../../types';\n\nexport function ensureArray<T>(x: T | T[]) {\n return Array.isArray(x) ? x : [x];\n}\n\n/*\n * Converts 32-bit integer color representation to RGBA tuple.\n * Used to serialize colors from OME-XML metadata.\n *\n * > console.log(intToRgba(100100));\n * > // [0, 1, 135, 4]\n */\nexport function intToRgba(int: number) {\n if (!Number.isInteger(int)) {\n throw Error('Not an integer.');\n }\n\n // Write number to int32 representation (4 bytes).\n const buffer = new ArrayBuffer(4);\n const view = new DataView(buffer);\n view.setInt32(0, int, false); // offset === 0, littleEndian === false\n\n // Take u8 view and extract number for each byte (1 byte for R/G/B/A).\n const bytes = new Uint8Array(buffer);\n return Array.from(bytes) as [number, number, number, number];\n}\n\n/*\n * Helper method to determine whether pixel data is interleaved or not.\n * > isInterleaved([1, 24, 24]) === false;\n * > isInterleaved([1, 24, 24, 3]) === true;\n */\nexport function isInterleaved(shape: number[]) {\n const lastDimSize = shape[shape.length - 1];\n return lastDimSize === 3 || lastDimSize === 4;\n}\n\nexport function getImageSize<T extends string[]>(source: PixelSource<T>) {\n const interleaved = isInterleaved(source.shape);\n const [height, width] = source.shape.slice(interleaved ? -3 : -2);\n return {height, width};\n}\n\nexport const SIGNAL_ABORTED = '__vivSignalAborted';\n"],"mappings":";;;;;;;;;;AAEO,SAASA,WAAWA,CAAIC,CAAU,EAAE;EACzC,OAAOC,KAAK,CAACC,OAAO,CAACF,CAAC,CAAC,GAAGA,CAAC,GAAG,CAACA,CAAC,CAAC;AACnC;AASO,SAASG,SAASA,CAACC,GAAW,EAAE;EACrC,IAAI,CAACC,MAAM,CAACC,SAAS,CAACF,GAAG,CAAC,EAAE;IAC1B,MAAMG,KAAK,CAAC,iBAAiB,CAAC;EAChC;EAGA,MAAMC,MAAM,GAAG,IAAIC,WAAW,CAAC,CAAC,CAAC;EACjC,MAAMC,IAAI,GAAG,IAAIC,QAAQ,CAACH,MAAM,CAAC;EACjCE,IAAI,CAACE,QAAQ,CAAC,CAAC,EAAER,GAAG,EAAE,KAAK,CAAC;EAG5B,MAAMS,KAAK,GAAG,IAAIC,UAAU,CAACN,MAAM,CAAC;EACpC,OAAOP,KAAK,CAACc,IAAI,CAACF,KAAK,CAAC;AAC1B;AAOO,SAASG,aAAaA,CAACC,KAAe,EAAE;EAC7C,MAAMC,WAAW,GAAGD,KAAK,CAACA,KAAK,CAACE,MAAM,GAAG,CAAC,CAAC;EAC3C,OAAOD,WAAW,KAAK,CAAC,IAAIA,WAAW,KAAK,CAAC;AAC/C;AAEO,SAASE,YAAYA,CAAqBC,MAAsB,EAAE;EACvE,MAAMC,WAAW,GAAGN,aAAa,CAACK,MAAM,CAACJ,KAAK,CAAC;EAC/C,MAAM,CAACM,MAAM,EAAEC,KAAK,CAAC,GAAGH,MAAM,CAACJ,KAAK,CAACQ,KAAK,CAACH,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;EACjE,OAAO;IAACC,MAAM;IAAEC;EAAK,CAAC;AACxB;AAEO,MAAME,cAAc,GAAG,oBAAoB;AAACC,OAAA,CAAAD,cAAA,GAAAA,cAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/geotiff",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.15",
|
|
4
4
|
"description": "Framework-independent loaders for tiff and geotiff",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -39,5 +39,5 @@
|
|
|
39
39
|
"fast-xml-parser": "^4.2.5",
|
|
40
40
|
"geotiff": "^1.0.4"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "19e941d5805568e449ef9092490d6568a4853298"
|
|
43
43
|
}
|