@loaders.gl/geotiff 3.3.0-alpha.4 → 3.3.0-alpha.6
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/bundle.js +5 -1
- package/dist/es5/bundle.js +0 -4
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/index.js +4 -7
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/load-geotiff.js +6 -26
- package/dist/es5/lib/load-geotiff.js.map +1 -1
- package/dist/es5/lib/ome/load-ome-tiff.js +1 -17
- package/dist/es5/lib/ome/load-ome-tiff.js.map +1 -1
- package/dist/es5/lib/ome/ome-indexers.js +19 -41
- package/dist/es5/lib/ome/ome-indexers.js.map +1 -1
- package/dist/es5/lib/ome/ome-utils.js +2 -12
- package/dist/es5/lib/ome/ome-utils.js.map +1 -1
- package/dist/es5/lib/ome/omexml.js +5 -19
- package/dist/es5/lib/ome/omexml.js.map +1 -1
- package/dist/es5/lib/ome/utils.js +1 -5
- package/dist/es5/lib/ome/utils.js.map +1 -1
- package/dist/es5/lib/tiff-pixel-source.js +6 -38
- package/dist/es5/lib/tiff-pixel-source.js.map +1 -1
- package/dist/es5/lib/utils/Pool.js +0 -27
- package/dist/es5/lib/utils/Pool.js.map +1 -1
- package/dist/es5/lib/utils/proxies.js +2 -12
- package/dist/es5/lib/utils/proxies.js.map +1 -1
- package/dist/es5/lib/utils/tiff-utils.js +6 -12
- package/dist/es5/lib/utils/tiff-utils.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/es5/typings/geotiff.js.map +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/load-geotiff.js +6 -5
- package/dist/esm/lib/load-geotiff.js.map +1 -1
- package/dist/esm/lib/ome/load-ome-tiff.js +1 -3
- package/dist/esm/lib/ome/load-ome-tiff.js.map +1 -1
- package/dist/esm/lib/ome/ome-indexers.js +52 -41
- package/dist/esm/lib/ome/ome-indexers.js.map +1 -1
- package/dist/esm/lib/ome/ome-utils.js +5 -9
- package/dist/esm/lib/ome/ome-utils.js.map +1 -1
- package/dist/esm/lib/ome/omexml.js +11 -12
- package/dist/esm/lib/ome/omexml.js.map +1 -1
- package/dist/esm/lib/ome/utils.js +3 -4
- package/dist/esm/lib/ome/utils.js.map +1 -1
- package/dist/esm/lib/tiff-pixel-source.js +12 -28
- package/dist/esm/lib/tiff-pixel-source.js.map +1 -1
- package/dist/esm/lib/utils/Pool.js +3 -15
- package/dist/esm/lib/utils/Pool.js.map +1 -1
- package/dist/esm/lib/utils/proxies.js +4 -6
- package/dist/esm/lib/utils/proxies.js.map +1 -1
- package/dist/esm/lib/utils/tiff-utils.js +3 -0
- package/dist/esm/lib/utils/tiff-utils.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/typings/geotiff.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,22 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.fromString = fromString;
|
|
9
|
-
|
|
10
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
-
|
|
12
9
|
var _fastXmlParser = _interopRequireDefault(require("fast-xml-parser"));
|
|
13
|
-
|
|
14
10
|
var _tiffUtils = require("../utils/tiff-utils");
|
|
15
|
-
|
|
16
|
-
function
|
|
17
|
-
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
19
|
-
|
|
11
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
12
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
20
13
|
var PARSER_OPTIONS = {
|
|
21
14
|
attributeNamePrefix: '',
|
|
22
15
|
attrNodeName: 'attr',
|
|
@@ -24,18 +17,14 @@ var PARSER_OPTIONS = {
|
|
|
24
17
|
parseAttributeValue: true,
|
|
25
18
|
ignoreAttributes: false
|
|
26
19
|
};
|
|
27
|
-
|
|
28
20
|
var parse = function parse(str) {
|
|
29
21
|
return _fastXmlParser.default.parse(str, PARSER_OPTIONS);
|
|
30
22
|
};
|
|
31
|
-
|
|
32
23
|
function fromString(str) {
|
|
33
24
|
var res = parse(str);
|
|
34
|
-
|
|
35
25
|
if (!res.OME) {
|
|
36
26
|
throw Error('Failed to parse OME-XML metadata.');
|
|
37
27
|
}
|
|
38
|
-
|
|
39
28
|
return (0, _tiffUtils.ensureArray)(res.OME.Image).map(function (img) {
|
|
40
29
|
var Channels = (0, _tiffUtils.ensureArray)(img.Pixels.Channel).map(function (c) {
|
|
41
30
|
if ('Color' in c.attr) {
|
|
@@ -43,14 +32,12 @@ function fromString(str) {
|
|
|
43
32
|
Color: (0, _tiffUtils.intToRgba)(c.attr.Color)
|
|
44
33
|
});
|
|
45
34
|
}
|
|
46
|
-
|
|
47
35
|
return _objectSpread({}, c.attr);
|
|
48
36
|
});
|
|
49
37
|
var _img$AquisitionDate = img.AquisitionDate,
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
38
|
+
AquisitionDate = _img$AquisitionDate === void 0 ? '' : _img$AquisitionDate,
|
|
39
|
+
_img$Description = img.Description,
|
|
40
|
+
Description = _img$Description === void 0 ? '' : _img$Description;
|
|
54
41
|
var image = _objectSpread(_objectSpread({}, img.attr), {}, {
|
|
55
42
|
AquisitionDate: AquisitionDate,
|
|
56
43
|
Description: Description,
|
|
@@ -58,7 +45,6 @@ function fromString(str) {
|
|
|
58
45
|
Channels: Channels
|
|
59
46
|
})
|
|
60
47
|
});
|
|
61
|
-
|
|
62
48
|
return _objectSpread(_objectSpread({}, image), {}, {
|
|
63
49
|
format: function format() {
|
|
64
50
|
var Pixels = image.Pixels;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"omexml.js","names":["PARSER_OPTIONS","attributeNamePrefix","attrNodeName","parseNodeValue","parseAttributeValue","ignoreAttributes","parse","str","parser","fromString","res","OME","Error","ensureArray","Image","map","img","Channels","Pixels","Channel","c","attr","Color","intToRgba","AquisitionDate","Description","image","format","sizes","name","size","unit","join","SizeX","SizeY","Type","SizeZ","SizeT","SizeC"],"sources":["../../../../src/lib/ome/omexml.ts"],"sourcesContent":["import parser from 'fast-xml-parser';\nimport {ensureArray, intToRgba} from '../utils/tiff-utils';\n\n// WARNING: Changes to the parser options _will_ effect the types in types/omexml.d.ts.\nconst PARSER_OPTIONS = {\n // Nests attributes withtout prefix under 'attr' key for each node\n attributeNamePrefix: '',\n attrNodeName: 'attr',\n\n // Parses numbers for both attributes and nodes\n parseNodeValue: true,\n parseAttributeValue: true,\n\n // Forces attributes to be parsed\n ignoreAttributes: false\n};\n\nconst parse = (str: string): Root => parser.parse(str, PARSER_OPTIONS);\n\nexport function fromString(str: string) {\n const res = parse(str);\n if (!res.OME) {\n throw Error('Failed to parse OME-XML metadata.');\n }\n return ensureArray(res.OME.Image).map((img) => {\n const Channels = ensureArray(img.Pixels.Channel).map((c) => {\n if ('Color' in c.attr) {\n return {...c.attr, Color: intToRgba(c.attr.Color)};\n }\n return {...c.attr};\n });\n const {AquisitionDate = '', Description = ''} = img;\n const image = {\n ...img.attr,\n AquisitionDate,\n Description,\n Pixels: {\n ...img.Pixels.attr,\n Channels\n }\n };\n return {\n ...image,\n format() {\n const {Pixels} = image;\n\n const sizes = (['X', 'Y', 'Z'] as const)\n .map((name) => {\n const size = Pixels[`PhysicalSize${name}` as const];\n const unit = Pixels[`PhysicalSize${name}Unit` as const];\n return size && unit ? `${size} ${unit}` : '-';\n })\n .join(' x ');\n\n return {\n 'Acquisition Date': image.AquisitionDate,\n 'Dimensions (XY)': `${Pixels.SizeX} x ${Pixels.SizeY}`,\n 'Pixels Type': Pixels.Type,\n 'Pixels Size (XYZ)': sizes,\n 'Z-sections/Timepoints': `${Pixels.SizeZ} x ${Pixels.SizeT}`,\n Channels: Pixels.SizeC\n };\n }\n };\n });\n}\n\nexport type OMEXML = ReturnType<typeof fromString>;\nexport type DimensionOrder = 'XYZCT' | 'XYZTC' | 'XYCTZ' | 'XYCZT' | 'XYTCZ' | 'XYTZC';\n\n// Structure of node is determined by the PARSER_OPTIONS.\ntype Node<T, A> = T & {attr: A};\ntype Attrs<Fields extends string, T = string> = {[K in Fields]: T};\n\ntype OMEAttrs = Attrs<'xmlns' | 'xmlns:xsi' | 'xsi:schemaLocation'>;\ntype OME = Node<{Insturment: Insturment; Image: Image | Image[]}, OMEAttrs>;\n\ntype Insturment = Node<\n {Objective: Node<{}, Attrs<'ID' | 'Model' | 'NominalMagnification'>>},\n Attrs<'ID'>\n>;\n\ninterface ImageNodes {\n AquisitionDate?: string;\n Description?: string;\n Pixels: Pixels;\n InstrumentRef: Node<{}, {ID: string}>;\n ObjectiveSettings: Node<{}, {ID: string}>;\n}\ntype Image = Node<ImageNodes, Attrs<'ID' | 'Name'>>;\n\ntype PixelType =\n | 'int8'\n | 'int16'\n | 'int32'\n | 'uint8'\n | 'uint16'\n | 'uint32'\n | 'float'\n | 'bit'\n | 'double'\n | 'complex'\n | 'double-complex';\n\nexport type UnitsLength =\n | 'Ym'\n | 'Zm'\n | 'Em'\n | 'Pm'\n | 'Tm'\n | 'Gm'\n | 'Mm'\n | 'km'\n | 'hm'\n | 'dam'\n | 'm'\n | 'dm'\n | 'cm'\n | 'mm'\n | 'µm'\n | 'nm'\n | 'pm'\n | 'fm'\n | 'am'\n | 'zm'\n | 'ym'\n | 'Å'\n | 'thou'\n | 'li'\n | 'in'\n | 'ft'\n | 'yd'\n | 'mi'\n | 'ua'\n | 'ly'\n | 'pc'\n | 'pt'\n | 'pixel'\n | 'reference frame';\n\ntype PhysicalSize<Name extends string> = `PhysicalSize${Name}`;\ntype PhysicalSizeUnit<Name extends string> = `PhysicalSize${Name}Unit`;\ntype Size<Names extends string> = `Size${Names}`;\n\ntype PixelAttrs = Attrs<\n PhysicalSize<'X' | 'Y' | 'Z'> | 'SignificantBits' | Size<'T' | 'C' | 'Z' | 'Y' | 'X'>,\n number\n> &\n Attrs<PhysicalSizeUnit<'X' | 'Y' | 'Z'>, UnitsLength> &\n Attrs<'BigEndian' | 'Interleaved', boolean> & {\n ID: string;\n DimensionOrder: DimensionOrder;\n Type: PixelType;\n };\n\ntype Pixels = Node<\n {\n Channel: Channel | Channel[];\n TiffData: Node<{}, Attrs<'IFD' | 'PlaneCount'>>;\n },\n PixelAttrs\n>;\n\ntype ChannelAttrs =\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n }\n | {\n ID: string;\n SamplesPerPixel: number;\n Name?: string;\n Color: number;\n };\n\ntype Channel = Node<{}, ChannelAttrs>;\n\ntype Root = {OME: OME};\n"],"mappings":";;;;;;;;AAAA;AACA;AAA2D;AAAA;AAG3D,IAAMA,cAAc,GAAG;EAErBC,mBAAmB,EAAE,EAAE;EACvBC,YAAY,EAAE,MAAM;EAGpBC,cAAc,EAAE,IAAI;EACpBC,mBAAmB,EAAE,IAAI;EAGzBC,gBAAgB,EAAE;AACpB,CAAC;AAED,IAAMC,KAAK,GAAG,SAARA,KAAK,CAAIC,GAAW;EAAA,OAAWC,sBAAM,CAACF,KAAK,CAACC,GAAG,EAAEP,cAAc,CAAC;AAAA;AAE/D,SAASS,UAAU,CAACF,GAAW,EAAE;EACtC,IAAMG,GAAG,GAAGJ,KAAK,CAACC,GAAG,CAAC;EACtB,IAAI,CAACG,GAAG,CAACC,GAAG,EAAE;IACZ,MAAMC,KAAK,CAAC,mCAAmC,CAAC;EAClD;EACA,OAAO,IAAAC,sBAAW,EAACH,GAAG,CAACC,GAAG,CAACG,KAAK,CAAC,CAACC,GAAG,CAAC,UAACC,GAAG,EAAK;IAC7C,IAAMC,QAAQ,GAAG,IAAAJ,sBAAW,EAACG,GAAG,CAACE,MAAM,CAACC,OAAO,CAAC,CAACJ,GAAG,CAAC,UAACK,CAAC,EAAK;MAC1D,IAAI,OAAO,IAAIA,CAAC,CAACC,IAAI,EAAE;QACrB,uCAAWD,CAAC,CAACC,IAAI;UAAEC,KAAK,EAAE,IAAAC,oBAAS,EAACH,CAAC,CAACC,IAAI,CAACC,KAAK;QAAC;MACnD;MACA,yBAAWF,CAAC,CAACC,IAAI;IACnB,CAAC,CAAC;IACF,0BAAgDL,GAAG,CAA5CQ,cAAc;MAAdA,cAAc,oCAAG,EAAE;MAAA,mBAAsBR,GAAG,CAAvBS,WAAW;MAAXA,WAAW,iCAAG,EAAE;IAC5C,IAAMC,KAAK,mCACNV,GAAG,CAACK,IAAI;MACXG,cAAc,EAAdA,cAAc;MACdC,WAAW,EAAXA,WAAW;MACXP,MAAM,kCACDF,GAAG,CAACE,MAAM,CAACG,IAAI;QAClBJ,QAAQ,EAARA;MAAQ;IACT,EACF;IACD,uCACKS,KAAK;MACRC,MAAM,oBAAG;QACP,IAAOT,MAAM,GAAIQ,KAAK,CAAfR,MAAM;QAEb,IAAMU,KAAK,GAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAC3Bb,GAAG,CAAC,UAACc,IAAI,EAAK;UACb,IAAMC,IAAI,GAAGZ,MAAM,uBAAgBW,IAAI,EAAY;UACnD,IAAME,IAAI,GAAGb,MAAM,uBAAgBW,IAAI,UAAgB;UACvD,OAAOC,IAAI,IAAIC,IAAI,aAAMD,IAAI,cAAIC,IAAI,IAAK,GAAG;QAC/C,CAAC,CAAC,CACDC,IAAI,CAAC,KAAK,CAAC;QAEd,OAAO;UACL,kBAAkB,EAAEN,KAAK,CAACF,cAAc;UACxC,iBAAiB,YAAKN,MAAM,CAACe,KAAK,gBAAMf,MAAM,CAACgB,KAAK,CAAE;UACtD,aAAa,EAAEhB,MAAM,CAACiB,IAAI;UAC1B,mBAAmB,EAAEP,KAAK;UAC1B,uBAAuB,YAAKV,MAAM,CAACkB,KAAK,gBAAMlB,MAAM,CAACmB,KAAK,CAAE;UAC5DpB,QAAQ,EAAEC,MAAM,CAACoB;QACnB,CAAC;MACH;IAAC;EAEL,CAAC,CAAC;AACJ"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getLabels = getLabels;
|
|
7
6
|
exports.getDims = getDims;
|
|
7
|
+
exports.getLabels = getLabels;
|
|
8
8
|
|
|
9
9
|
function getLabels(dimOrder) {
|
|
10
10
|
return dimOrder.toLowerCase().split('').reverse();
|
|
@@ -14,18 +14,14 @@ function getDims(labels) {
|
|
|
14
14
|
var lookup = new Map(labels.map(function (name, i) {
|
|
15
15
|
return [name, i];
|
|
16
16
|
}));
|
|
17
|
-
|
|
18
17
|
if (lookup.size !== labels.length) {
|
|
19
18
|
throw Error('Labels must be unique, found duplicated label.');
|
|
20
19
|
}
|
|
21
|
-
|
|
22
20
|
return function (name) {
|
|
23
21
|
var index = lookup.get(name);
|
|
24
|
-
|
|
25
22
|
if (index === undefined) {
|
|
26
23
|
throw Error('Invalid dimension.');
|
|
27
24
|
}
|
|
28
|
-
|
|
29
25
|
return index;
|
|
30
26
|
};
|
|
31
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"utils.js","names":["getLabels","dimOrder","toLowerCase","split","reverse","getDims","labels","lookup","Map","map","name","i","size","length","Error","index","get","undefined"],"sources":["../../../../src/lib/ome/utils.ts"],"sourcesContent":["import type {OMEXML} from '../ome/omexml';\nimport type {Labels} from '../../types';\n\n/*\n * Creates typed labels from DimensionOrder.\n * > imgMeta.Pixels.DimensionOrder === 'XYCZT'\n * > getLabels(imgMeta.Pixels) === ['t', 'z', 'c', 'y', 'x']\n */\n\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype Sel<Dim extends string> = Dim extends `${infer Z}${infer X}${infer A}${infer B}${infer C}`\n ? [C, B, A]\n : 'error';\nexport function getLabels(dimOrder: OMEXML[0]['Pixels']['DimensionOrder']) {\n return dimOrder.toLowerCase().split('').reverse() as Labels<Sel<Lowercase<typeof dimOrder>>>;\n}\n\n/*\n * Creates an ES6 map of 'label' -> index\n * > const labels = ['a', 'b', 'c', 'd'];\n * > const dims = getDims(labels);\n * > dims('a') === 0;\n * > dims('b') === 1;\n * > dims('c') === 2;\n * > dims('hi!'); // throws\n */\nexport function getDims<S extends string>(labels: S[]) {\n const lookup = new Map(labels.map((name, i) => [name, i]));\n if (lookup.size !== labels.length) {\n throw Error('Labels must be unique, found duplicated label.');\n }\n return (name: S) => {\n const index = lookup.get(name);\n if (index === undefined) {\n throw Error('Invalid dimension.');\n }\n return index;\n };\n}\n"],"mappings":";;;;;;;;AAaO,SAASA,SAAS,CAACC,QAA+C,EAAE;EACzE,OAAOA,QAAQ,CAACC,WAAW,EAAE,CAACC,KAAK,CAAC,EAAE,CAAC,CAACC,OAAO,EAAE;AACnD;;AAWO,SAASC,OAAO,CAAmBC,MAAW,EAAE;EACrD,IAAMC,MAAM,GAAG,IAAIC,GAAG,CAACF,MAAM,CAACG,GAAG,CAAC,UAACC,IAAI,EAAEC,CAAC;IAAA,OAAK,CAACD,IAAI,EAAEC,CAAC,CAAC;EAAA,EAAC,CAAC;EAC1D,IAAIJ,MAAM,CAACK,IAAI,KAAKN,MAAM,CAACO,MAAM,EAAE;IACjC,MAAMC,KAAK,CAAC,gDAAgD,CAAC;EAC/D;EACA,OAAO,UAACJ,IAAO,EAAK;IAClB,IAAMK,KAAK,GAAGR,MAAM,CAACS,GAAG,CAACN,IAAI,CAAC;IAC9B,IAAIK,KAAK,KAAKE,SAAS,EAAE;MACvB,MAAMH,KAAK,CAAC,oBAAoB,CAAC;IACnC;IACA,OAAOC,KAAK;EACd,CAAC;AACH"}
|
|
@@ -1,28 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
15
|
-
|
|
16
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
|
-
|
|
18
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
|
-
|
|
20
13
|
var _tiffUtils = require("./utils/tiff-utils");
|
|
21
|
-
|
|
22
|
-
function
|
|
23
|
-
|
|
24
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
25
|
-
|
|
14
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
15
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
26
16
|
var TiffPixelSource = function () {
|
|
27
17
|
function TiffPixelSource(indexer, dtype, tileSize, shape, labels, meta) {
|
|
28
18
|
(0, _classCallCheck2.default)(this, TiffPixelSource);
|
|
@@ -39,7 +29,6 @@ var TiffPixelSource = function () {
|
|
|
39
29
|
this.labels = labels;
|
|
40
30
|
this.meta = meta;
|
|
41
31
|
}
|
|
42
|
-
|
|
43
32
|
(0, _createClass2.default)(TiffPixelSource, [{
|
|
44
33
|
key: "getRaster",
|
|
45
34
|
value: function () {
|
|
@@ -52,13 +41,11 @@ var TiffPixelSource = function () {
|
|
|
52
41
|
selection = _ref.selection, signal = _ref.signal;
|
|
53
42
|
_context.next = 3;
|
|
54
43
|
return this._indexer(selection);
|
|
55
|
-
|
|
56
44
|
case 3:
|
|
57
45
|
image = _context.sent;
|
|
58
46
|
return _context.abrupt("return", this._readRasters(image, {
|
|
59
47
|
signal: signal
|
|
60
48
|
}));
|
|
61
|
-
|
|
62
49
|
case 5:
|
|
63
50
|
case "end":
|
|
64
51
|
return _context.stop();
|
|
@@ -66,11 +53,9 @@ var TiffPixelSource = function () {
|
|
|
66
53
|
}
|
|
67
54
|
}, _callee, this);
|
|
68
55
|
}));
|
|
69
|
-
|
|
70
56
|
function getRaster(_x) {
|
|
71
57
|
return _getRaster.apply(this, arguments);
|
|
72
58
|
}
|
|
73
|
-
|
|
74
59
|
return getRaster;
|
|
75
60
|
}()
|
|
76
61
|
}, {
|
|
@@ -78,7 +63,6 @@ var TiffPixelSource = function () {
|
|
|
78
63
|
value: function () {
|
|
79
64
|
var _getTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref2) {
|
|
80
65
|
var x, y, selection, signal, _this$_getTileExtent, height, width, x0, y0, window, image;
|
|
81
|
-
|
|
82
66
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
83
67
|
while (1) {
|
|
84
68
|
switch (_context2.prev = _context2.next) {
|
|
@@ -90,7 +74,6 @@ var TiffPixelSource = function () {
|
|
|
90
74
|
window = [x0, y0, x0 + width, y0 + height];
|
|
91
75
|
_context2.next = 7;
|
|
92
76
|
return this._indexer(selection);
|
|
93
|
-
|
|
94
77
|
case 7:
|
|
95
78
|
image = _context2.sent;
|
|
96
79
|
return _context2.abrupt("return", this._readRasters(image, {
|
|
@@ -99,7 +82,6 @@ var TiffPixelSource = function () {
|
|
|
99
82
|
height: height,
|
|
100
83
|
signal: signal
|
|
101
84
|
}));
|
|
102
|
-
|
|
103
85
|
case 9:
|
|
104
86
|
case "end":
|
|
105
87
|
return _context2.stop();
|
|
@@ -107,11 +89,9 @@ var TiffPixelSource = function () {
|
|
|
107
89
|
}
|
|
108
90
|
}, _callee2, this);
|
|
109
91
|
}));
|
|
110
|
-
|
|
111
92
|
function getTile(_x2) {
|
|
112
93
|
return _getTile.apply(this, arguments);
|
|
113
94
|
}
|
|
114
|
-
|
|
115
95
|
return getTile;
|
|
116
96
|
}()
|
|
117
97
|
}, {
|
|
@@ -119,7 +99,6 @@ var TiffPixelSource = function () {
|
|
|
119
99
|
value: function () {
|
|
120
100
|
var _readRasters2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(image, props) {
|
|
121
101
|
var _props$signal;
|
|
122
|
-
|
|
123
102
|
var interleave, raster, data;
|
|
124
103
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
125
104
|
while (1) {
|
|
@@ -130,17 +109,13 @@ var TiffPixelSource = function () {
|
|
|
130
109
|
return image.readRasters(_objectSpread({
|
|
131
110
|
interleave: interleave
|
|
132
111
|
}, props));
|
|
133
|
-
|
|
134
112
|
case 3:
|
|
135
113
|
raster = _context3.sent;
|
|
136
|
-
|
|
137
114
|
if (!(props !== null && props !== void 0 && (_props$signal = props.signal) !== null && _props$signal !== void 0 && _props$signal.aborted)) {
|
|
138
115
|
_context3.next = 6;
|
|
139
116
|
break;
|
|
140
117
|
}
|
|
141
|
-
|
|
142
118
|
throw _tiffUtils.SIGNAL_ABORTED;
|
|
143
|
-
|
|
144
119
|
case 6:
|
|
145
120
|
data = interleave ? raster : raster[0];
|
|
146
121
|
return _context3.abrupt("return", {
|
|
@@ -148,7 +123,6 @@ var TiffPixelSource = function () {
|
|
|
148
123
|
width: raster.width,
|
|
149
124
|
height: raster.height
|
|
150
125
|
});
|
|
151
|
-
|
|
152
126
|
case 8:
|
|
153
127
|
case "end":
|
|
154
128
|
return _context3.stop();
|
|
@@ -156,33 +130,28 @@ var TiffPixelSource = function () {
|
|
|
156
130
|
}
|
|
157
131
|
}, _callee3, this);
|
|
158
132
|
}));
|
|
159
|
-
|
|
160
133
|
function _readRasters(_x3, _x4) {
|
|
161
134
|
return _readRasters2.apply(this, arguments);
|
|
162
135
|
}
|
|
163
|
-
|
|
164
136
|
return _readRasters;
|
|
165
137
|
}()
|
|
166
138
|
}, {
|
|
167
139
|
key: "_getTileExtent",
|
|
168
|
-
value:
|
|
140
|
+
value:
|
|
141
|
+
function _getTileExtent(x, y) {
|
|
169
142
|
var _getImageSize = (0, _tiffUtils.getImageSize)(this),
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
143
|
+
zoomLevelHeight = _getImageSize.height,
|
|
144
|
+
zoomLevelWidth = _getImageSize.width;
|
|
173
145
|
var height = this.tileSize;
|
|
174
146
|
var width = this.tileSize;
|
|
175
147
|
var maxXTileCoord = Math.floor(zoomLevelWidth / this.tileSize);
|
|
176
148
|
var maxYTileCoord = Math.floor(zoomLevelHeight / this.tileSize);
|
|
177
|
-
|
|
178
149
|
if (x === maxXTileCoord) {
|
|
179
150
|
width = zoomLevelWidth % this.tileSize;
|
|
180
151
|
}
|
|
181
|
-
|
|
182
152
|
if (y === maxYTileCoord) {
|
|
183
153
|
height = zoomLevelHeight % this.tileSize;
|
|
184
154
|
}
|
|
185
|
-
|
|
186
155
|
return {
|
|
187
156
|
height: height,
|
|
188
157
|
width: width
|
|
@@ -196,7 +165,6 @@ var TiffPixelSource = function () {
|
|
|
196
165
|
}]);
|
|
197
166
|
return TiffPixelSource;
|
|
198
167
|
}();
|
|
199
|
-
|
|
200
168
|
var _default = TiffPixelSource;
|
|
201
169
|
exports.default = _default;
|
|
202
170
|
//# sourceMappingURL=tiff-pixel-source.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"tiff-pixel-source.js","names":["TiffPixelSource","indexer","dtype","tileSize","shape","labels","meta","_indexer","selection","signal","image","_readRasters","x","y","_getTileExtent","height","width","x0","y0","window","props","interleave","isInterleaved","readRasters","raster","aborted","SIGNAL_ABORTED","data","getImageSize","zoomLevelHeight","zoomLevelWidth","maxXTileCoord","Math","floor","maxYTileCoord","err","console","error"],"sources":["../../../src/lib/tiff-pixel-source.ts"],"sourcesContent":["import type {GeoTIFFImage, RasterOptions} from 'geotiff';\nimport {getImageSize, isInterleaved, SIGNAL_ABORTED} from './utils/tiff-utils';\n\nimport type {\n PixelSource,\n PixelSourceSelection,\n PixelSourceMeta,\n Dtype,\n Labels,\n RasterSelection,\n TileSelection,\n PixelData,\n TypedArray\n} from '../types';\n\nclass TiffPixelSource<S extends string[]> implements PixelSource<S> {\n public dtype: Dtype;\n public tileSize: number;\n public shape: number[];\n public labels: Labels<S>;\n public meta: PixelSourceMeta | undefined;\n private _indexer: (sel: PixelSourceSelection<S>) => Promise<GeoTIFFImage>;\n\n // eslint-disable-next-line max-params\n constructor(\n indexer: (sel: PixelSourceSelection<S>) => Promise<GeoTIFFImage>,\n dtype: Dtype,\n tileSize: number,\n shape: number[],\n labels: Labels<S>,\n meta?: PixelSourceMeta\n ) {\n this._indexer = indexer;\n this.dtype = dtype;\n this.tileSize = tileSize;\n this.shape = shape;\n this.labels = labels;\n this.meta = meta;\n }\n\n async getRaster({selection, signal}: RasterSelection<S>) {\n const image = await this._indexer(selection);\n return this._readRasters(image, {signal});\n }\n\n async getTile({x, y, selection, signal}: TileSelection<S>) {\n const {height, width} = this._getTileExtent(x, y);\n const x0 = x * this.tileSize;\n const y0 = y * this.tileSize;\n const window = [x0, y0, x0 + width, y0 + height];\n\n const image = await this._indexer(selection);\n return this._readRasters(image, {window, width, height, signal});\n }\n\n private async _readRasters(image: GeoTIFFImage, props?: RasterOptions) {\n const interleave = isInterleaved(this.shape);\n const raster = await image.readRasters({interleave, ...props});\n\n if (props?.signal?.aborted) {\n throw SIGNAL_ABORTED;\n }\n\n /*\n * geotiff.js returns objects with different structure\n * depending on `interleave`. It's weird, but this seems to work.\n */\n const data = (interleave ? raster : raster[0]) as TypedArray;\n return {\n data,\n width: raster.width,\n height: raster.height\n } as PixelData;\n }\n\n /*\n * Computes tile size given x, y coord.\n */\n private _getTileExtent(x: number, y: number) {\n const {height: zoomLevelHeight, width: zoomLevelWidth} = getImageSize(this);\n let height = this.tileSize;\n let width = this.tileSize;\n const maxXTileCoord = Math.floor(zoomLevelWidth / this.tileSize);\n const maxYTileCoord = Math.floor(zoomLevelHeight / this.tileSize);\n if (x === maxXTileCoord) {\n width = zoomLevelWidth % this.tileSize;\n }\n if (y === maxYTileCoord) {\n height = zoomLevelHeight % this.tileSize;\n }\n return {height, width};\n }\n\n onTileError(err: Error) {\n console.error(err); // eslint-disable-line no-console\n }\n}\n\nexport default TiffPixelSource;\n"],"mappings":"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"}
|
|
@@ -1,22 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
15
|
-
|
|
16
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
17
|
-
|
|
18
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
|
-
|
|
20
13
|
var _globalThis$navigator, _globalThis$navigator2;
|
|
21
14
|
|
|
22
15
|
var 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;
|
|
@@ -46,7 +39,6 @@ var Pool = function () {
|
|
|
46
39
|
value: function () {
|
|
47
40
|
var _decode = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(fileDirectory, buffer) {
|
|
48
41
|
var _this = this;
|
|
49
|
-
|
|
50
42
|
var currentWorker;
|
|
51
43
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
52
44
|
while (1) {
|
|
@@ -54,25 +46,19 @@ var Pool = function () {
|
|
|
54
46
|
case 0:
|
|
55
47
|
_context.next = 2;
|
|
56
48
|
return this.waitForWorker();
|
|
57
|
-
|
|
58
49
|
case 2:
|
|
59
50
|
currentWorker = _context.sent;
|
|
60
51
|
return _context.abrupt("return", new Promise(function (resolve, reject) {
|
|
61
52
|
currentWorker.onmessage = function (event) {
|
|
62
53
|
_this.finishTask(currentWorker);
|
|
63
|
-
|
|
64
54
|
resolve(event.data[0]);
|
|
65
55
|
};
|
|
66
|
-
|
|
67
56
|
currentWorker.onerror = function (error) {
|
|
68
57
|
_this.finishTask(currentWorker);
|
|
69
|
-
|
|
70
58
|
reject(error);
|
|
71
59
|
};
|
|
72
|
-
|
|
73
60
|
currentWorker.postMessage(['decode', fileDirectory, buffer], [buffer]);
|
|
74
61
|
}));
|
|
75
|
-
|
|
76
62
|
case 4:
|
|
77
63
|
case "end":
|
|
78
64
|
return _context.stop();
|
|
@@ -80,11 +66,9 @@ var Pool = function () {
|
|
|
80
66
|
}
|
|
81
67
|
}, _callee, this);
|
|
82
68
|
}));
|
|
83
|
-
|
|
84
69
|
function decode(_x, _x2) {
|
|
85
70
|
return _decode.apply(this, arguments);
|
|
86
71
|
}
|
|
87
|
-
|
|
88
72
|
return decode;
|
|
89
73
|
}()
|
|
90
74
|
}, {
|
|
@@ -97,14 +81,11 @@ var Pool = function () {
|
|
|
97
81
|
switch (_context2.prev = _context2.next) {
|
|
98
82
|
case 0:
|
|
99
83
|
idleWorker = this.idleWorkers.pop();
|
|
100
|
-
|
|
101
84
|
if (!idleWorker) {
|
|
102
85
|
_context2.next = 3;
|
|
103
86
|
break;
|
|
104
87
|
}
|
|
105
|
-
|
|
106
88
|
return _context2.abrupt("return", idleWorker);
|
|
107
|
-
|
|
108
89
|
case 3:
|
|
109
90
|
waiter = {};
|
|
110
91
|
promise = new Promise(function (resolve) {
|
|
@@ -112,7 +93,6 @@ var Pool = function () {
|
|
|
112
93
|
});
|
|
113
94
|
this.waitQueue.push(waiter);
|
|
114
95
|
return _context2.abrupt("return", promise);
|
|
115
|
-
|
|
116
96
|
case 7:
|
|
117
97
|
case "end":
|
|
118
98
|
return _context2.stop();
|
|
@@ -120,11 +100,9 @@ var Pool = function () {
|
|
|
120
100
|
}
|
|
121
101
|
}, _callee2, this);
|
|
122
102
|
}));
|
|
123
|
-
|
|
124
103
|
function waitForWorker() {
|
|
125
104
|
return _waitForWorker.apply(this, arguments);
|
|
126
105
|
}
|
|
127
|
-
|
|
128
106
|
return waitForWorker;
|
|
129
107
|
}()
|
|
130
108
|
}, {
|
|
@@ -137,13 +115,11 @@ var Pool = function () {
|
|
|
137
115
|
switch (_context3.prev = _context3.next) {
|
|
138
116
|
case 0:
|
|
139
117
|
waiter = this.waitQueue.pop();
|
|
140
|
-
|
|
141
118
|
if (waiter) {
|
|
142
119
|
waiter.resolve(currentWorker);
|
|
143
120
|
} else {
|
|
144
121
|
this.idleWorkers.push(currentWorker);
|
|
145
122
|
}
|
|
146
|
-
|
|
147
123
|
case 2:
|
|
148
124
|
case "end":
|
|
149
125
|
return _context3.stop();
|
|
@@ -151,11 +127,9 @@ var Pool = function () {
|
|
|
151
127
|
}
|
|
152
128
|
}, _callee3, this);
|
|
153
129
|
}));
|
|
154
|
-
|
|
155
130
|
function finishTask(_x3) {
|
|
156
131
|
return _finishTask.apply(this, arguments);
|
|
157
132
|
}
|
|
158
|
-
|
|
159
133
|
return finishTask;
|
|
160
134
|
}()
|
|
161
135
|
}, {
|
|
@@ -168,6 +142,5 @@ var Pool = function () {
|
|
|
168
142
|
}]);
|
|
169
143
|
return Pool;
|
|
170
144
|
}();
|
|
171
|
-
|
|
172
145
|
exports.default = Pool;
|
|
173
146
|
//# sourceMappingURL=Pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"Pool.js","names":["defaultPoolSize","globalThis","navigator","hardwareConcurrency","Pool","size","workers","idleWorkers","waitQueue","decoder","i","w","Worker","push","fileDirectory","buffer","waitForWorker","currentWorker","Promise","resolve","reject","onmessage","event","finishTask","data","onerror","error","postMessage","idleWorker","pop","waiter","promise","length","terminate"],"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":"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"}
|
|
@@ -1,20 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.checkProxies = checkProxies;
|
|
9
8
|
exports.createOffsetsProxy = createOffsetsProxy;
|
|
10
9
|
exports.createPoolProxy = createPoolProxy;
|
|
11
|
-
|
|
12
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
-
|
|
14
|
-
function
|
|
15
|
-
|
|
16
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
17
|
-
|
|
11
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
12
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
13
|
var VIV_PROXY_KEY = '__viv';
|
|
19
14
|
var OFFSETS_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-offsets");
|
|
20
15
|
var POOL_PROXY_KEY = "".concat(VIV_PROXY_KEY, "-decoder-pool");
|
|
@@ -41,7 +36,6 @@ function createOffsetsProxy(tiff, offsets) {
|
|
|
41
36
|
var offset = offsets[index];
|
|
42
37
|
target.ifdRequests[index] = target.parseFileDirectoryAt(offset);
|
|
43
38
|
}
|
|
44
|
-
|
|
45
39
|
return target.getImage(index);
|
|
46
40
|
};
|
|
47
41
|
}
|
|
@@ -49,10 +43,8 @@ function createOffsetsProxy(tiff, offsets) {
|
|
|
49
43
|
if (key === OFFSETS_PROXY_KEY) {
|
|
50
44
|
return true;
|
|
51
45
|
}
|
|
52
|
-
|
|
53
46
|
return Reflect.get(target, key);
|
|
54
47
|
};
|
|
55
|
-
|
|
56
48
|
return new Proxy(tiff, {
|
|
57
49
|
get: get
|
|
58
50
|
});
|
|
@@ -71,10 +63,8 @@ function createPoolProxy(tiff, pool) {
|
|
|
71
63
|
if (key === POOL_PROXY_KEY) {
|
|
72
64
|
return true;
|
|
73
65
|
}
|
|
74
|
-
|
|
75
66
|
return Reflect.get(target, key);
|
|
76
67
|
};
|
|
77
|
-
|
|
78
68
|
return new Proxy(tiff, {
|
|
79
69
|
get: get
|
|
80
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"proxies.js","names":["VIV_PROXY_KEY","OFFSETS_PROXY_KEY","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,IAAMA,aAAa,GAAG,OAAO;AAC7B,IAAMC,iBAAiB,aAAMD,aAAa,aAAmB;AAC7D,IAAME,cAAc,aAAMF,aAAa,kBAAwB;;AAMxD,SAASG,YAAY,CAACC,IAAa,EAAE;EAC1C,IAAI,CAACC,OAAO,CAACD,IAAI,EAAEH,iBAAiB,CAAC,EAAE;IACrCK,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,OAAO,CAACD,IAAa,EAAEI,SAAiB,EAAE;EACjD,OAAQJ,IAAI,CAASI,SAAS,CAAC;AACjC;;AAYO,SAASC,kBAAkB,CAACL,IAAa,EAAEM,OAAiB,EAAE;EACnE,IAAMC,GAAG,GAAG,SAANA,GAAG,CAAIC,MAAe,EAAEC,GAAQ,EAAK;IAEzC,IAAIA,GAAG,KAAK,UAAU,EAAE;MACtB,OAAO,UAACC,KAAa,EAAK;QAExB,IAAI,EAAEA,KAAK,IAAIF,MAAM,CAACG,WAAW,CAAC,IAAID,KAAK,IAAIJ,OAAO,EAAE;UACtD,IAAMM,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,KAAKZ,iBAAiB,EAAE;MAC7B,OAAO,IAAI;IACb;IAEA,OAAOkB,OAAO,CAACR,GAAG,CAACC,MAAM,EAAEC,GAAG,CAAC;EACjC,CAAC;EACD,OAAO,IAAIO,KAAK,CAAChB,IAAI,EAAE;IAACO,GAAG,EAAHA;EAAG,CAAC,CAAC;AAC/B;;AAUO,SAASU,eAAe,CAACjB,IAAa,EAAEkB,IAAU,EAAE;EACzD,IAAMX,GAAG,GAAG,SAANA,GAAG,CAAIC,MAAe,EAAEC,GAAQ,EAAK;IAEzC,IAAIA,GAAG,KAAK,aAAa,EAAE;MACzB,OAAO,UAACU,OAA8C,EAAK;QAGzD,OAAOX,MAAM,CAACY,WAAW,iCAAKD,OAAO;UAAED,IAAI,EAAJA;QAAI,GAAE;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,GAAG,EAAHA;EAAG,CAAC,CAAC;AAC/B"}
|