@loaders.gl/geotiff 4.1.0-alpha.1 → 4.1.0-alpha.11

package/{src/lib/utils/Pool.ts → dist/lib/utils/Pool.ts.disabled}

@@ -1,8 +1,9 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 /** eslint-disable */
-import type {FileDirectory} from 'geotiff';
+import {FileDirectory} from 'geotiff';
 
 // import Worker from 'web-worker:./decoder.worker.ts';
 

package/{src/lib/utils/proxies.ts → dist/lib/utils/proxies.ts.disabled}

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {GeoTIFF} from 'geotiff';

package/dist/lib/utils/tiff-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tiff-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/tiff-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAExC;AASD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,oCAapC;AAOD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,WAG5C;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;;;EAItE;AAED,eAAO,MAAM,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"tiff-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/tiff-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAExC;AASD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,oCAapC;AAOD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,WAG5C;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;;;EAItE;AAED,eAAO,MAAM,cAAc,uBAAuB,CAAC"}

package/dist/lib/utils/tiff-utils.js.map

@@ -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","height","width","slice","SIGNAL_ABORTED"],"sources":["../../../src/lib/utils/tiff-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport 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":"AAKA,OAAO,SAASA,WAAWA,CAAIC,CAAU,EAAE;EACzC,OAAOC,KAAK,CAACC,OAAO,CAACF,CAAC,CAAC,GAAGA,CAAC,GAAG,CAACA,CAAC,CAAC;AACnC;AASA,OAAO,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;AAOA,OAAO,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;AAEA,OAAO,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;AAEA,OAAO,MAAME,cAAc,GAAG,oBAAoB"}
+{"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"],"sources":["../../../src/lib/utils/tiff-utils.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport 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":"AAMA,OAAO,SAASA,WAAWA,CAAIC,CAAU,EAAE;EACzC,OAAOC,KAAK,CAACC,OAAO,CAACF,CAAC,CAAC,GAAGA,CAAC,GAAG,CAACA,CAAC,CAAC;AACnC;AASA,OAAO,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;AAOA,OAAO,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;AAEA,OAAO,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;AAEA,OAAO,MAAME,cAAc,GAAG,oBAAoB"}

package/dist/loaders.d.ts

@@ -0,0 +1,13 @@
+import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+type GeoTiffData = {
+    bounds: number[];
+    width: number;
+    height: number;
+    imageData: ImageData;
+};
+interface GeoTiffLoaderOptions extends LoaderOptions {
+    enableAlpha: boolean;
+}
+export declare const GeoTiffLoader: LoaderWithParser<GeoTiffData, never, GeoTiffLoaderOptions>;
+export {};
+//# sourceMappingURL=loaders.d.ts.map

package/dist/loaders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../src/loaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAO9E,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,UAAU,oBAAqB,SAAQ,aAAa;IAClD,WAAW,EAAE,OAAO,CAAC;CACtB;AAuCD,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAAC,WAAW,EAAE,KAAK,EAAE,oBAAoB,CAWpF,CAAC"}

package/dist/loaders.js

@@ -0,0 +1,32 @@
+import { fromArrayBuffer } from 'geotiff';
+const VERSION = typeof "4.1.0-alpha.11" !== 'undefined' ? "4.1.0-alpha.11" : 'latest';
+const loadGeoTiff = async (data, options) => {
+  const tiff = await fromArrayBuffer(data);
+  const image = await tiff.getImage();
+  const rgbData = await image.readRGB({
+    enableAlpha: options === null || options === void 0 ? void 0 : options.enableAlpha
+  });
+  const width = image.getWidth();
+  const height = image.getHeight();
+  const imageData = new ImageData(width, height);
+  imageData.data.set(new Uint8ClampedArray(rgbData));
+  return {
+    bounds: [],
+    imageData,
+    width,
+    height
+  };
+};
+export const GeoTiffLoader = {
+  id: 'geotiff',
+  name: 'GeoTIFF',
+  module: 'geotiff',
+  version: VERSION,
+  options: {
+    enableAlpha: true
+  },
+  mimeTypes: ['image/tiff', 'image/geotiff'],
+  extensions: ['geotiff', 'tiff', 'geotif', 'tif'],
+  parse: loadGeoTiff
+};
+//# sourceMappingURL=loaders.js.map

package/dist/loaders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loaders.js","names":["fromArrayBuffer","VERSION","loadGeoTiff","data","options","tiff","image","getImage","rgbData","readRGB","enableAlpha","width","getWidth","height","getHeight","imageData","ImageData","set","Uint8ClampedArray","bounds","GeoTiffLoader","id","name","module","version","mimeTypes","extensions","parse"],"sources":["../src/loaders.ts"],"sourcesContent":["import {fromArrayBuffer} from 'geotiff';\nimport type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n// Type definitions\ntype GeoTiffData = {\n  bounds: number[];\n  width: number;\n  height: number;\n  imageData: ImageData;\n};\n\ninterface GeoTiffLoaderOptions extends LoaderOptions {\n  enableAlpha: boolean;\n}\n\n/**\n * Loads a GeoTIFF file containing a RGB image.\n */\nconst loadGeoTiff = async (\n  data: ArrayBuffer,\n  options?: GeoTiffLoaderOptions\n): Promise<GeoTiffData> => {\n  // Load using Geotiff.js\n  const tiff = await fromArrayBuffer(data);\n\n  // Assumes we only have one image inside TIFF\n  const image = await tiff.getImage();\n\n  // Read image and size\n  // TODO: Add support for worker pools here.\n  // TODO: Add support for more image formats.\n  const rgbData = await image.readRGB({\n    enableAlpha: options?.enableAlpha\n  });\n  const width = image.getWidth();\n  const height = image.getHeight();\n\n  // Create a new ImageData object\n  const imageData = new ImageData(width, height);\n  imageData.data.set(new Uint8ClampedArray(rgbData as unknown as Uint8Array));\n\n  // Return GeoJSON data\n  return {\n    // TODO: Add bounds here\n    bounds: [],\n    imageData,\n    width,\n    height\n  };\n};\n\n// Export loader\nexport const GeoTiffLoader: LoaderWithParser<GeoTiffData, never, GeoTiffLoaderOptions> = {\n  id: 'geotiff',\n  name: 'GeoTIFF',\n  module: 'geotiff',\n  version: VERSION,\n  options: {\n    enableAlpha: true\n  },\n  mimeTypes: ['image/tiff', 'image/geotiff'],\n  extensions: ['geotiff', 'tiff', 'geotif', 'tif'],\n  parse: loadGeoTiff\n};\n"],"mappings":"AAAA,SAAQA,eAAe,QAAO,SAAS;AAKvC,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAiB3E,MAAMC,WAAW,GAAG,MAAAA,CAClBC,IAAiB,EACjBC,OAA8B,KACL;EAEzB,MAAMC,IAAI,GAAG,MAAML,eAAe,CAACG,IAAI,CAAC;EAGxC,MAAMG,KAAK,GAAG,MAAMD,IAAI,CAACE,QAAQ,CAAC,CAAC;EAKnC,MAAMC,OAAO,GAAG,MAAMF,KAAK,CAACG,OAAO,CAAC;IAClCC,WAAW,EAAEN,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM;EACxB,CAAC,CAAC;EACF,MAAMC,KAAK,GAAGL,KAAK,CAACM,QAAQ,CAAC,CAAC;EAC9B,MAAMC,MAAM,GAAGP,KAAK,CAACQ,SAAS,CAAC,CAAC;EAGhC,MAAMC,SAAS,GAAG,IAAIC,SAAS,CAACL,KAAK,EAAEE,MAAM,CAAC;EAC9CE,SAAS,CAACZ,IAAI,CAACc,GAAG,CAAC,IAAIC,iBAAiB,CAACV,OAAgC,CAAC,CAAC;EAG3E,OAAO;IAELW,MAAM,EAAE,EAAE;IACVJ,SAAS;IACTJ,KAAK;IACLE;EACF,CAAC;AACH,CAAC;AAGD,OAAO,MAAMO,aAAyE,GAAG;EACvFC,EAAE,EAAE,SAAS;EACbC,IAAI,EAAE,SAAS;EACfC,MAAM,EAAE,SAAS;EACjBC,OAAO,EAAEvB,OAAO;EAChBG,OAAO,EAAE;IACPM,WAAW,EAAE;EACf,CAAC;EACDe,SAAS,EAAE,CAAC,YAAY,EAAE,eAAe,CAAC;EAC1CC,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC;EAChDC,KAAK,EAAEzB;AACT,CAAC"}

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AACrE,MAAM,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC;AAE5E,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI;KACpD,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM;CACzB,CAAC;AAEF,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE;IACjD,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE;IAC/C,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE;IAC7C,uBAAuB;IACvB,SAAS,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,mBAAmB;IACnB,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnD,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAEjD,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AACrE,MAAM,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC;AAE5E,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI;KACpD,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM;CACzB,CAAC;AAEF,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE;IACjD,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE;IAC/C,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC7C,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE;IAC7C,uBAAuB;IACvB,SAAS,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,mBAAmB;IACnB,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnD,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB"}

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../src/types.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {DTYPE_LOOKUP} from './lib/ome/ome-utils';\n\nexport type Dtype = (typeof DTYPE_LOOKUP)[keyof typeof DTYPE_LOOKUP];\nexport type TypedArray = InstanceType<(typeof globalThis)[`${Dtype}Array`]>;\n\nexport interface PixelData {\n  data: TypedArray;\n  width: number;\n  height: number;\n}\n\nexport type PixelSourceSelection<S extends string[]> = {\n  [K in S[number]]: number;\n};\n\nexport interface RasterSelection<S extends string[]> {\n  selection: PixelSourceSelection<S>;\n  signal?: AbortSignal;\n}\n\nexport interface TileSelection<S extends string[]> {\n  x: number;\n  y: number;\n  selection: PixelSourceSelection<S>;\n  signal?: AbortSignal;\n}\n\ninterface PhysicalSize {\n  size: number;\n  unit: string;\n}\n\nexport interface PixelSourceMeta {\n  physicalSizes?: Record<string, PhysicalSize>;\n  photometricInterpretation?: number;\n}\n\nexport type Labels<S extends string[]> = [...S, 'y', 'x'] | [...S, 'y', 'x', '_c'];\n\n/**\n * Interface to load tiles from a data source\n */\nexport interface PixelSource<S extends string[]> {\n  /** Loads a 2D plane */\n  getRaster(sel: RasterSelection<S>): Promise<PixelData>;\n  /** Loads a tile */\n  getTile(sel: TileSelection<S>): Promise<PixelData>;\n  onTileError(err: Error): void;\n  shape: number[];\n  dtype: Dtype;\n  labels: Labels<S>;\n  tileSize: number;\n  meta?: PixelSourceMeta;\n}\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../src/types.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {DTYPE_LOOKUP} from './lib/ome/ome-utils';\n\nexport type Dtype = (typeof DTYPE_LOOKUP)[keyof typeof DTYPE_LOOKUP];\nexport type TypedArray = InstanceType<(typeof globalThis)[`${Dtype}Array`]>;\n\nexport interface PixelData {\n  data: TypedArray;\n  width: number;\n  height: number;\n}\n\nexport type PixelSourceSelection<S extends string[]> = {\n  [K in S[number]]: number;\n};\n\nexport interface RasterSelection<S extends string[]> {\n  selection: PixelSourceSelection<S>;\n  signal?: AbortSignal;\n}\n\nexport interface TileSelection<S extends string[]> {\n  x: number;\n  y: number;\n  selection: PixelSourceSelection<S>;\n  signal?: AbortSignal;\n}\n\ninterface PhysicalSize {\n  size: number;\n  unit: string;\n}\n\nexport interface PixelSourceMeta {\n  physicalSizes?: Record<string, PhysicalSize>;\n  photometricInterpretation?: number;\n}\n\nexport type Labels<S extends string[]> = [...S, 'y', 'x'] | [...S, 'y', 'x', '_c'];\n\n/**\n * Interface to load tiles from a data source\n */\nexport interface PixelSource<S extends string[]> {\n  /** Loads a 2D plane */\n  getRaster(sel: RasterSelection<S>): Promise<PixelData>;\n  /** Loads a tile */\n  getTile(sel: TileSelection<S>): Promise<PixelData>;\n  onTileError(err: Error): void;\n  shape: number[];\n  dtype: Dtype;\n  labels: Labels<S>;\n  tileSize: number;\n  meta?: PixelSourceMeta;\n}\n"],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/geotiff",
-  "version": "4.1.0-alpha.1",
+  "version": "4.1.0-alpha.11",
   "description": "Framework-independent loaders for tiff and geotiff",
   "license": "MIT",
   "type": "module",
@@ -25,9 +25,9 @@
   "module": "dist/index.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "sideEffects": false,
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "fast-xml-parser": "^4.2.5",
-    "geotiff": "^1.0.4"
+    "geotiff": "^2.1.0"
   },
-  "gitHead": "6a4d3da93d45115ad99861474a43c3f4a0b280a7"
+  "gitHead": "5d3e23bf93762b48c8c1d6d926ede7a97fe43ab0"
 }

package/src/geotiff-loader.ts

@@ -0,0 +1,115 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {TypedArray} from '@loaders.gl/loader-utils';
+import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
+import {fromArrayBuffer} from 'geotiff';
+
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
+// Return type definition for GeoTIFF loader
+type GeoTIFFData = {
+  crs?: string;
+  bounds: number[];
+  metadata: Record<string, unknown>;
+
+  width: number;
+  height: number;
+  data: TypedArray;
+};
+
+/** GeoTIFF load options */
+export type GeoTIFFLoaderOptions = LoaderOptions & {
+  geotiff?: {
+    enableAlpha: boolean;
+  };
+};
+
+/** GeoTIFF loader */
+export const GeoTIFFLoader: LoaderWithParser<GeoTIFFData, never, GeoTIFFLoaderOptions> = {
+  id: 'geotiff',
+  name: 'GeoTIFF',
+  module: 'geotiff',
+  version: VERSION,
+  options: {
+    enableAlpha: true
+  },
+  mimeTypes: ['image/tiff', 'image/geotiff'],
+  extensions: ['geotiff', 'tiff', 'geotif', 'tif'],
+  parse: parseGeoTIFF
+};
+
+export function isTiff(arrayBuffer: ArrayBuffer): boolean {
+  const dataView = new DataView(arrayBuffer);
+  // Byte offset
+  const endianness = dataView.getUint16(0);
+  let littleEndian: boolean;
+  switch (endianness) {
+    case 0x4949:
+      littleEndian = true;
+      break;
+    case 0x4d4d:
+      littleEndian = false;
+      break;
+    default:
+      return false;
+    // throw new Error(`invalid byte order: 0x${endianness.toString(16)}`);
+  }
+
+  // Magic number
+  if (dataView.getUint16(2, littleEndian) !== 42) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Loads a GeoTIFF file containing a RGB image.
+ */
+async function parseGeoTIFF(
+  data: ArrayBuffer,
+  options?: GeoTIFFLoaderOptions
+): Promise<GeoTIFFData> {
+  // Load using Geotiff.js
+  const tiff = await fromArrayBuffer(data);
+
+  // Assumes we only have one image inside TIFF
+  const image = await tiff.getImage();
+
+  // Read image and size
+  // TODO: Add support for worker pools here.
+  // TODO: Add support for more image formats.
+  const rgbData = await image.readRGB({
+    enableAlpha: options?.geotiff?.enableAlpha
+  });
+
+  const width = image.getWidth();
+  const height = image.getHeight();
+
+  // Create a new ImageData object
+  const imageData = new Uint8ClampedArray(rgbData as unknown as Uint8Array);
+
+  // Get geo data
+  const bounds = image.getBoundingBox();
+  const metadata = image.getGeoKeys();
+
+  // ProjectedCSTypeGeoKey is the only key we support for now, we assume it is an EPSG code
+  let crs: string | undefined;
+  if (metadata?.ProjectedCSTypeGeoKey) {
+    crs = `EPSG:${metadata.ProjectedCSTypeGeoKey}`;
+  }
+
+  // Return GeoReferenced image data
+  return {
+    crs,
+    bounds,
+    width,
+    height,
+    data: imageData,
+    metadata
+  };
+}

package/src/index.ts

@@ -1,5 +1,8 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+export {GeoTIFFLoader} from './geotiff-loader';
+
 export {loadGeoTiff} from './lib/load-geotiff';
-export {default as TiffPixelSource} from './lib/tiff-pixel-source';
+export {TiffPixelSource} from './lib/tiff-pixel-source';

package/src/lib/load-geotiff.ts

@@ -1,17 +1,18 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {fromUrl, fromBlob, GeoTIFF} from 'geotiff';
 
-import {
-  // createPoolProxy,
-  createOffsetsProxy,
-  checkProxies
-} from './utils/proxies';
+// import {
+//   // createPoolProxy,
+//   createOffsetsProxy,
+//   checkProxies
+// } from './utils/proxies.ts.disabled';
 // import Pool from './lib/Pool';
 
 import {loadOmeTiff, isOmeTiff} from './ome/load-ome-tiff';
-import type TiffPixelSource from './tiff-pixel-source';
+import type {TiffPixelSource} from './tiff-pixel-source';
 
 /** Options for initializing a tiff pixel source. */
 interface GeoTIFFOptions {
@@ -68,14 +69,14 @@ export async function loadGeoTiff(
      * create a proxy that intercepts calls to `tiff.getImage`
      * and injects the pre-computed offsets.
      */
-    tiff = createOffsetsProxy(tiff, offsets);
+    // tiff = createOffsetsProxy(tiff, offsets);
   }
 
   /*
    * Inspect tiff source for our performance enhancing proxies.
    * Prints warnings to console if `offsets` or `pool` are missing.
    */
-  checkProxies(tiff);
+  // checkProxies(tiff);
 
   const firstImage = await tiff.getImage(0);
 

package/src/lib/ome/load-ome-tiff.ts

@@ -1,9 +1,10 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {GeoTIFF, GeoTIFFImage} from 'geotiff';
 
-import TiffPixelSource from '../tiff-pixel-source';
+import {TiffPixelSource} from '../tiff-pixel-source';
 import {getOmeLegacyIndexer, getOmeSubIFDIndexer, OmeTiffIndexer} from './ome-indexers';
 import {getOmePixelSourceMeta} from './ome-utils';
 import {fromString} from './omexml';

package/src/lib/ome/ome-indexers.ts

@@ -1,9 +1,12 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {GeoTIFFImage, GeoTIFF, ImageFileDirectory} from 'geotiff';
+import type {GeoTIFFImage, GeoTIFF} from 'geotiff';
 import type {OMEXML} from '../ome/omexml';
 
+export type ImageFileDirectory = any;
+
 export type OmeTiffSelection = {t: number; c: number; z: number};
 export type OmeTiffIndexer = (sel: OmeTiffSelection, z: number) => Promise<GeoTIFFImage>;
 
@@ -81,13 +84,14 @@ export function getOmeSubIFDIndexer(tiff: GeoTIFF, rootMeta: OMEXML): OmeTiffInd
       const subIfdOffset = SubIFDs[pyramidLevel - 1];
       ifdCache.set(key, tiff.parseFileDirectoryAt(subIfdOffset));
     }
-    const ifd = (await ifdCache.get(key)) as ImageFileDirectory;
+    const ifd = await ifdCache.get(key);
 
     // Create a new image object manually from IFD
     // https://github.com/geotiffjs/geotiff.js/blob/8ef472f41b51d18074aece2300b6a8ad91a21ae1/src/geotiff.js#L447-L453
     return new (baseImage.constructor as any)(
       ifd.fileDirectory,
       ifd.geoKeyDirectory,
+      // @ts-expect-error
       tiff.dataView,
       tiff.littleEndian,
       tiff.cache,

package/src/lib/ome/ome-utils.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {getDims, getLabels} from './utils';

package/src/lib/ome/omexml.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {XMLParser} from 'fast-xml-parser';

package/src/lib/ome/utils.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {OMEXML} from '../ome/omexml';

package/src/lib/tiff-pixel-source.ts

@@ -1,7 +1,8 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {GeoTIFFImage, RasterOptions} from 'geotiff';
+import type {GeoTIFFImage} from 'geotiff';
 import {getImageSize, isInterleaved, SIGNAL_ABORTED} from './utils/tiff-utils';
 
 import type {
@@ -16,7 +17,9 @@ import type {
   TypedArray
 } from '../types';
 
-class TiffPixelSource<S extends string[]> implements PixelSource<S> {
+type ReadRasterOptions = Record<string, any>;
+
+export class TiffPixelSource<S extends string[]> implements PixelSource<S> {
   public dtype: Dtype;
   public tileSize: number;
   public shape: number[];
@@ -56,7 +59,7 @@ class TiffPixelSource<S extends string[]> implements PixelSource<S> {
     return this._readRasters(image, {window, width, height, signal});
   }
 
-  private async _readRasters(image: GeoTIFFImage, props?: RasterOptions) {
+  private async _readRasters(image: GeoTIFFImage, props?: ReadRasterOptions) {
     const interleave = isInterleaved(this.shape);
     const raster = await image.readRasters({interleave, ...props});
 
@@ -98,5 +101,3 @@ class TiffPixelSource<S extends string[]> implements PixelSource<S> {
     console.error(err); // eslint-disable-line no-console
   }
 }
-
-export default TiffPixelSource;

package/src/lib/utils/Pool.ts.disabled

@@ -0,0 +1,99 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+/** eslint-disable */
+import {FileDirectory} from 'geotiff';
+
+// import Worker from 'web-worker:./decoder.worker.ts';
+
+// https://developer.mozilla.org/en-US/docs/Web/API/NavigatorConcurrentHardware/hardwareConcurrency
+// We need to give a different way of getting this for safari, so 4 is probably a safe bet
+// for parallel processing in the meantime.  More can't really hurt since they'll just block
+// each other and not the UI thread, which is the real benefit.
+const defaultPoolSize = globalThis?.navigator?.hardwareConcurrency ?? 4;
+
+/**
+ * Pool for workers to decode chunks of the images.
+ * This is a line-for-line copy of GeoTIFFs old implementation: https://github.com/geotiffjs/geotiff.js/blob/v1.0.0-beta.8/src/pool.js
+ */
+export default class Pool {
+  workers: Worker[];
+  idleWorkers: Worker[];
+  waitQueue: any[];
+  decoder: null;
+
+  /**
+   * @constructor
+   * @param {Number} size The size of the pool. Defaults to the number of CPUs
+   *                      available. When this parameter is `null` or 0, then the
+   *                      decoding will be done in the main thread.
+   */
+  constructor(size = defaultPoolSize) {
+    this.workers = [];
+    this.idleWorkers = [];
+    this.waitQueue = [];
+    this.decoder = null;
+
+    // eslint-disable-next-line no-plusplus
+    for (let i = 0; i < size; ++i) {
+      const w = new Worker('./decoder.worker');
+      this.workers.push(w);
+      this.idleWorkers.push(w);
+    }
+  }
+
+  /**
+   * Decode the given block of bytes with the set compression method.
+   * @param {ArrayBuffer} buffer the array buffer of bytes to decode.
+   * @returns {Promise.<ArrayBuffer>} the decoded result as a `Promise`
+   */
+  async decode(fileDirectory: FileDirectory, buffer: ArrayBuffer) {
+    const currentWorker = await this.waitForWorker();
+    return new Promise((resolve, reject) => {
+      currentWorker.onmessage = (event) => {
+        // this.workers.push(currentWorker);
+        // eslint-disable-next-line
+        this.finishTask(currentWorker);
+        resolve(event.data[0]);
+      };
+      currentWorker.onerror = (error) => {
+        // this.workers.push(currentWorker);
+        // eslint-disable-next-line
+        this.finishTask(currentWorker);
+        reject(error);
+      };
+      currentWorker.postMessage(['decode', fileDirectory, buffer], [buffer]);
+    });
+  }
+
+  async waitForWorker() {
+    const idleWorker = this.idleWorkers.pop();
+    if (idleWorker) {
+      return idleWorker;
+    }
+    const waiter: any = {};
+    const promise = new Promise((resolve) => {
+      waiter.resolve = resolve;
+    });
+
+    this.waitQueue.push(waiter);
+    return promise as Promise<Worker>;
+  }
+
+  async finishTask(currentWorker: Worker) {
+    const waiter = this.waitQueue.pop();
+    if (waiter) {
+      waiter.resolve(currentWorker);
+    } else {
+      this.idleWorkers.push(currentWorker);
+    }
+  }
+
+  destroy() {
+    // eslint-disable-next-line no-plusplus
+    for (let i = 0; i < this.workers.length; ++i) {
+      this.workers[i].terminate();
+    }
+  }
+}

package/src/lib/utils/proxies.ts.disabled

@@ -0,0 +1,96 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {GeoTIFF} from 'geotiff';
+import type Pool from './Pool';
+
+const VIV_PROXY_KEY = '__viv';
+const OFFSETS_PROXY_KEY = `${VIV_PROXY_KEY}-offsets` as const;
+const POOL_PROXY_KEY = `${VIV_PROXY_KEY}-decoder-pool` as const;
+
+/*
+ * Inspect if the GeoTIFF source is wrapped in our proxies,
+ * and warn if missing.
+ */
+export function checkProxies(tiff: GeoTIFF) {
+  if (!isProxy(tiff, OFFSETS_PROXY_KEY)) {
+    console.warn('GeoTIFF source is missing offsets proxy.'); // eslint-disable-line no-console
+  }
+
+  if (!isProxy(tiff, POOL_PROXY_KEY)) {
+    console.warn('GeoTIFF source is missing decoder-pool proxy.'); // eslint-disable-line no-console
+  }
+}
+
+/*
+ * > isProxy(tiff, POOL_PROXY_KEY) === true; // false
+ * > tiff = createPoolProxy(tiff, new Pool());
+ * > isProxy(tiff, POOL_PROXY_KEY) === true; // true
+ */
+function isProxy(tiff: GeoTIFF, proxyFlag: string) {
+  return (tiff as any)[proxyFlag] as boolean;
+}
+
+/*
+ * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy
+ * handler intercepts calls to `tiff.getImage` and uses our custom
+ * pre-computed offsets to pre-fetch the correct file directory.
+ *
+ * This is a bit of a hack. Internally GeoTIFF inspects `this.ifdRequests`
+ * to see which fileDirectories need to be traversed. By adding the
+ * ifdRequest for an 'index' manually, GeoTIFF will await that request
+ * rather than traversing the file system remotely.
+ */
+export function createOffsetsProxy(tiff: GeoTIFF, offsets: number[]) {
+  const get = (target: GeoTIFF, key: any) => {
+    // Intercept `tiff.getImage`
+    if (key === 'getImage') {
+      return (index: number) => {
+        // Manually add ifdRequest to tiff if missing and we have an offset.
+        if (!(index in target.ifdRequests) && index in offsets) {
+          const offset = offsets[index];
+          target.ifdRequests[index] = target.parseFileDirectoryAt(offset);
+        }
+        return target.getImage(index);
+      };
+    }
+
+    // tiff['__viv-offsets'] === true
+    if (key === OFFSETS_PROXY_KEY) {
+      return true;
+    }
+
+    return Reflect.get(target, key);
+  };
+  return new Proxy(tiff, {get});
+}
+
+/*
+ * Creates an ES6 Proxy that wraps a GeoTIFF object. The proxy
+ * handler intercepts calls to `tiff.readRasters` and injects
+ * a pool argument to every call. This means our TiffPixelSource
+ * doesn't need to be aware of whether a decoder pool is in use.
+ *
+ * > tiff.readRasters({ window }) -> tiff.readRasters({ window, pool });
+ */
+export function createPoolProxy(tiff: GeoTIFF, pool: Pool) {
+  const get = (target: GeoTIFF, key: any) => {
+    // Intercept calls to `image.readRasters`
+    if (key === 'readRasters') {
+      return (options: Parameters<typeof target.readRasters>) => {
+        // Inject `pool` argument with other raster options.
+        // @ts-ignore
+        return target.readRasters({...options, pool});
+      };
+    }
+
+    // tiff['__viv-decoder-pool'] === true
+    if (key === POOL_PROXY_KEY) {
+      return true;
+    }
+
+    return Reflect.get(target, key);
+  };
+  return new Proxy(tiff, {get});
+}

package/src/lib/utils/tiff-utils.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {PixelSource} from '../../types';