@developmentseed/deck.gl-geotiff 0.2.0 → 0.3.0

package/dist/geotiff/geotiff.d.ts

@@ -1,59 +1,21 @@
-import type { GeoTIFF, GeoTIFFImage, TypedArrayWithDimensions } from "geotiff";
-import { BaseClient, Pool } from "geotiff";
+import type { RasterArray } from "@developmentseed/geotiff";
+import { GeoTIFF } from "@developmentseed/geotiff";
 import type { Converter } from "proj4";
-/**
- * Options that may be passed when reading image data from geotiff.js
- */
-type ReadRasterOptions = {
-    /** the subset to read data from in pixels. */
-    window?: [number, number, number, number];
-    /** The optional decoder pool to use. */
-    pool?: Pool;
-    /** An AbortSignal that may be signalled if the request is to be aborted */
-    signal?: AbortSignal;
-};
-/**
- * Retrieve the default geotiff.js decoder Pool.
- *
- * If a Pool has not yet been created, it will be created on first call.
- *
- * The Pool will be shared between all COGLayer and GeoTIFFLayer instances.
- */
-export declare function defaultPool(): Pool;
-/**
- * Load an RGBA image from a GeoTIFFImage.
- */
-export declare function loadRgbImage(image: GeoTIFFImage, options?: ReadRasterOptions): Promise<{
-    texture: ImageData;
-    height: number;
-    width: number;
-}>;
 /**
  * Add an alpha channel to an RGB image array.
  *
  * Only supports input arrays with 3 (RGB) or 4 (RGBA) channels. If the input is
  * already RGBA, it is returned unchanged.
  */
-export declare function addAlphaChannel(rgbImage: TypedArrayWithDimensions): ImageData;
-/**
- * Parse the GeoTIFF `ColorMap` tag into an ImageData.
- *
- * @param   {Uint16Array}  cmap  The colormap array from the GeoTIFF `ColorMap` tag.
- *
- * @return  {ImageData}          The parsed colormap as an ImageData object.
- */
-export declare function parseColormap(cmap: Uint16Array): ImageData;
-export declare function fetchGeoTIFF(input: GeoTIFF | string | ArrayBuffer | Blob | BaseClient): Promise<GeoTIFF>;
+export declare function addAlphaChannel(rgbImage: RasterArray): RasterArray;
+export declare function fetchGeoTIFF(input: GeoTIFF | string | URL | ArrayBuffer): Promise<GeoTIFF>;
 /**
  * Calculate the WGS84 bounding box of a GeoTIFF image
  */
-export declare function getGeographicBounds(image: GeoTIFFImage, converter: Converter): {
+export declare function getGeographicBounds(geotiff: GeoTIFF, converter: Converter): {
     west: number;
     south: number;
     east: number;
     north: number;
 };
-/** Parse the GDAL_NODATA TIFF tag into a number. */
-export declare function parseGDALNoData(GDAL_NODATA: string | undefined): number | null;
-export {};
 //# sourceMappingURL=geotiff.d.ts.map

package/dist/geotiff/geotiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geotiff.d.ts","sourceRoot":"","sources":["../../src/geotiff/geotiff.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EACL,UAAU,EAKV,IAAI,EACL,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1C,wCAAwC;IACxC,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ,2EAA2E;IAC3E,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AASF;;;;;;GAMG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBhE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,wBAAwB,GAAG,SAAS,CAwB7E;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,CAqB1D;AAED,wBAAsB,YAAY,CAChC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,GAAG,UAAU,GACxD,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,SAAS,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA4B9D;AAED,oDAAoD;AACpD,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,MAAM,GAAG,IAAI,CAYf"}
+{"version":3,"file":"geotiff.d.ts","sourceRoot":"","sources":["../../src/geotiff/geotiff.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAwClE;AAED,wBAAsB,YAAY,CAChC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,GAAG,GAAG,WAAW,GAC1C,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAsB9D"}

package/dist/geotiff/geotiff.js

@@ -1,44 +1,5 @@
-// Utilities for interacting with geotiff.js.
-import { BaseClient, fromArrayBuffer, fromBlob, fromCustomClient, fromUrl, Pool, } from "geotiff";
-/**
- * A default geotiff.js decoder pool instance.
- *
- * It will be created on first call of `defaultPool`.
- */
-let DEFAULT_POOL = null;
-/**
- * Retrieve the default geotiff.js decoder Pool.
- *
- * If a Pool has not yet been created, it will be created on first call.
- *
- * The Pool will be shared between all COGLayer and GeoTIFFLayer instances.
- */
-export function defaultPool() {
-    if (DEFAULT_POOL === null) {
-        DEFAULT_POOL = new Pool();
-    }
-    return DEFAULT_POOL;
-}
-/**
- * Load an RGBA image from a GeoTIFFImage.
- */
-export async function loadRgbImage(image, options) {
-    const mergedOptions = {
-        ...options,
-        interleave: true,
-        enableAlpha: true,
-    };
-    // Since we set interleave: true, the result is a single array with all
-    // samples, so we cast to TypedArrayWithDimensions
-    // https://github.com/geotiffjs/geotiff.js/issues/486
-    const rgbImage = (await image.readRGB(mergedOptions));
-    const imageData = addAlphaChannel(rgbImage);
-    return {
-        texture: imageData,
-        height: rgbImage.height,
-        width: rgbImage.width,
-    };
-}
+// Utilities for interacting with a GeoTIFF
+import { GeoTIFF } from "@developmentseed/geotiff";
 /**
  * Add an alpha channel to an RGB image array.
  *
@@ -47,75 +8,56 @@ export async function loadRgbImage(image, options) {
  */
 export function addAlphaChannel(rgbImage) {
     const { height, width } = rgbImage;
-    if (rgbImage.length === height * width * 4) {
+    if (rgbImage.layout === "band-separate") {
+        // This should be pretty easy to do by just returning an additional array of
+        // 255s
+        // But not sure if we'll want to do that, because it's fine to upload 3
+        // separate textures.
+        throw new Error("Band-separate images not yet implemented.");
+    }
+    if (rgbImage.data.length === height * width * 4) {
         // Already has alpha channel
-        return new ImageData(new Uint8ClampedArray(rgbImage), width, height);
+        return rgbImage;
     }
-    else if (rgbImage.length === height * width * 3) {
+    else if (rgbImage.data.length === height * width * 3) {
         // Need to add alpha channel
-        const rgbaLength = (rgbImage.length / 3) * 4;
-        const rgbaArray = new Uint8ClampedArray(rgbaLength);
-        for (let i = 0; i < rgbImage.length / 3; ++i) {
-            rgbaArray[i * 4] = rgbImage[i * 3];
-            rgbaArray[i * 4 + 1] = rgbImage[i * 3 + 1];
-            rgbaArray[i * 4 + 2] = rgbImage[i * 3 + 2];
-            rgbaArray[i * 4 + 3] = 255;
+        const rgbaLength = (rgbImage.data.length / 3) * 4;
+        const isUint16 = rgbImage.data instanceof Uint16Array;
+        const rgbaArray = isUint16
+            ? new Uint16Array(rgbaLength)
+            : new Uint8ClampedArray(rgbaLength);
+        const maxAlpha = isUint16 ? 65535 : 255;
+        for (let i = 0; i < rgbImage.data.length / 3; ++i) {
+            rgbaArray[i * 4] = rgbImage.data[i * 3];
+            rgbaArray[i * 4 + 1] = rgbImage.data[i * 3 + 1];
+            rgbaArray[i * 4 + 2] = rgbImage.data[i * 3 + 2];
+            rgbaArray[i * 4 + 3] = maxAlpha;
         }
-        return new ImageData(rgbaArray, width, height);
+        return {
+            ...rgbImage,
+            count: 4,
+            data: rgbaArray,
+        };
     }
     else {
-        throw new Error(`Unexpected number of channels in raster data: ${rgbImage.length / (height * width)}`);
+        throw new Error(`Unexpected number of channels in raster data: ${rgbImage.data.length / (height * width)}`);
     }
 }
-/**
- * Parse the GeoTIFF `ColorMap` tag into an ImageData.
- *
- * @param   {Uint16Array}  cmap  The colormap array from the GeoTIFF `ColorMap` tag.
- *
- * @return  {ImageData}          The parsed colormap as an ImageData object.
- */
-export function parseColormap(cmap) {
-    // TODO: test colormap handling on a 16-bit image with 2^16 entries?
-    const size = cmap.length / 3;
-    const rgba = new Uint8ClampedArray(size * 4);
-    const rOffset = 0;
-    const gOffset = size;
-    const bOffset = size * 2;
-    // Note: >> 8 is needed to convert from 16-bit to 8-bit color values
-    // It just divides by 256 and floors to nearest integer
-    for (let i = 0; i < size; i++) {
-        rgba[4 * i + 0] = cmap[rOffset + i] >> 8;
-        rgba[4 * i + 1] = cmap[gOffset + i] >> 8;
-        rgba[4 * i + 2] = cmap[bOffset + i] >> 8;
-        // Full opacity
-        rgba[4 * i + 3] = 255;
-    }
-    return new ImageData(rgba, size, 1);
-}
 export async function fetchGeoTIFF(input) {
-    if (typeof input === "string") {
-        return fromUrl(input);
+    if (typeof input === "string" || input instanceof URL) {
+        return await GeoTIFF.fromUrl(input);
     }
     if (input instanceof ArrayBuffer) {
-        return fromArrayBuffer(input);
-    }
-    if (input instanceof Blob) {
-        return fromBlob(input);
-    }
-    // TODO: instanceof may fail here if multiple versions of geotiff.js are
-    // present
-    if (input instanceof BaseClient) {
-        return fromCustomClient(input);
+        return await GeoTIFF.fromArrayBuffer(input);
     }
     return input;
 }
 /**
  * Calculate the WGS84 bounding box of a GeoTIFF image
  */
-export function getGeographicBounds(image, converter) {
-    const projectedBbox = image.getBoundingBox();
+export function getGeographicBounds(geotiff, converter) {
+    const [minX, minY, maxX, maxY] = geotiff.bbox;
     // Reproject all four corners to handle rotation/skew
-    const [minX, minY, maxX, maxY] = projectedBbox;
     const corners = [
         converter.forward([minX, minY]), // bottom-left
         converter.forward([maxX, minY]), // bottom-right
@@ -132,15 +74,4 @@ export function getGeographicBounds(image, converter) {
     // Return bounds in MapLibre format: [[west, south], [east, north]]
     return { west, south, east, north };
 }
-/** Parse the GDAL_NODATA TIFF tag into a number. */
-export function parseGDALNoData(GDAL_NODATA) {
-    if (!GDAL_NODATA) {
-        return null;
-    }
-    // Remove trailing null character if present
-    const noDataString = GDAL_NODATA?.[GDAL_NODATA?.length - 1] === "\x00"
-        ? GDAL_NODATA.slice(0, -1)
-        : GDAL_NODATA;
-    return noDataString?.length > 0 ? parseFloat(noDataString) : null;
-}
 //# sourceMappingURL=geotiff.js.map

package/dist/geotiff/geotiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"geotiff.js","sourceRoot":"","sources":["../../src/geotiff/geotiff.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geotiff.js","sourceRoot":"","sources":["../../src/geotiff/geotiff.ts"],"names":[],"mappings":"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"}

package/dist/geotiff/render-pipeline.d.ts

@@ -1,13 +1,15 @@
+import type { RasterModule } from "@developmentseed/deck.gl-raster/gpu-modules";
+import type { GeoTIFF, Overview } from "@developmentseed/geotiff";
 import type { Device, Texture } from "@luma.gl/core";
-import type { COGLayerProps } from "../cog-layer";
-import type { ImageFileDirectory } from "./types";
+import type { GetTileDataOptions } from "../cog-layer";
 export type TextureDataT = {
     height: number;
     width: number;
     texture: Texture;
+    mask?: Texture;
 };
-export declare function inferRenderPipeline(ifd: ImageFileDirectory, device: Device): {
-    getTileData: COGLayerProps<TextureDataT>["getTileData"];
-    renderTile: COGLayerProps<TextureDataT>["renderTile"];
+export declare function inferRenderPipeline(geotiff: GeoTIFF, device: Device): {
+    getTileData: (image: GeoTIFF | Overview, options: GetTileDataOptions) => Promise<TextureDataT>;
+    renderTile: (data: TextureDataT) => ImageData | RasterModule[];
 };
 //# sourceMappingURL=render-pipeline.d.ts.map

package/dist/geotiff/render-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-pipeline.d.ts","sourceRoot":"","sources":["../../src/geotiff/render-pipeline.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAgB,OAAO,EAAE,MAAM,eAAe,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAGtE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAGlD,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAqBF,wBAAgB,mBAAmB,CAEjC,GAAG,EAAE,kBAAkB,EACvB,MAAM,EAAE,MAAM,GACb;IACD,WAAW,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC;IACxD,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC;CACvD,CAYA"}
+{"version":3,"file":"render-pipeline.d.ts","sourceRoot":"","sources":["../../src/geotiff/render-pipeline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAWhF,OAAO,KAAK,EACV,OAAO,EACP,QAAQ,EAET,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,MAAM,EAAgB,OAAO,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvD,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAqBF,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb;IACD,WAAW,EAAE,CACX,KAAK,EAAE,OAAO,GAAG,QAAQ,EACzB,OAAO,EAAE,kBAAkB,KACxB,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B,UAAU,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,SAAS,GAAG,YAAY,EAAE,CAAC;CAChE,CAeA"}

package/dist/geotiff/render-pipeline.js

@@ -1,23 +1,25 @@
-import { CMYKToRGB, Colormap, CreateTexture, cieLabToRGB, FilterNoDataVal, YCbCrToRGB, } from "@developmentseed/deck.gl-raster/gpu-modules";
-import { addAlphaChannel, parseColormap, parseGDALNoData } from "./geotiff";
+import { Photometric, SampleFormat } from "@cogeotiff/core";
+import { BlackIsZero, CMYKToRGB, Colormap, CreateTexture, cieLabToRGB, FilterNoDataVal, MaskTexture, WhiteIsZero, } from "@developmentseed/deck.gl-raster/gpu-modules";
+import { parseColormap } from "@developmentseed/geotiff";
+import { addAlphaChannel } from "./geotiff";
 import { inferTextureFormat } from "./texture";
-import { PhotometricInterpretationT } from "./types";
-export function inferRenderPipeline(
-// TODO: narrow type to only used fields
-ifd, device) {
-    const { SampleFormat } = ifd;
-    switch (SampleFormat[0]) {
+export function inferRenderPipeline(geotiff, device) {
+    const { sampleFormat } = geotiff.cachedTags;
+    if (sampleFormat === null) {
+        throw new Error("SampleFormat tag is required to infer render pipeline");
+    }
+    switch (sampleFormat[0]) {
         // Unsigned integers
-        case 1:
-            return createUnormPipeline(ifd, device);
+        case SampleFormat.Uint:
+            return createUnormPipeline(geotiff, device);
     }
-    throw new Error(`Inferring render pipeline for non-unsigned integers not yet supported. Found SampleFormat: ${SampleFormat}`);
+    throw new Error(`Inferring render pipeline for non-unsigned integers not yet supported. Found SampleFormat: ${sampleFormat}`);
 }
 /**
  * Create pipeline for visualizing unsigned-integer data.
  */
-function createUnormPipeline(ifd, device) {
-    const { BitsPerSample, ColorMap, GDAL_NODATA, PhotometricInterpretation, SampleFormat, SamplesPerPixel, } = ifd;
+function createUnormPipeline(geotiff, device) {
+    const { bitsPerSample, colorMap, photometric, sampleFormat, samplesPerPixel, nodata, } = geotiff.cachedTags;
     const renderPipeline = [
         {
             module: CreateTexture,
@@ -26,22 +28,35 @@ function createUnormPipeline(ifd, device) {
             },
         },
     ];
-    // Add NoData filtering if GDAL_NODATA is defined
-    const noDataVal = parseGDALNoData(GDAL_NODATA);
-    if (noDataVal !== null) {
-        // Since values are 0-1 for unorm textures,
-        const noDataScaled = noDataVal / 255.0;
+    if (nodata !== null) {
+        // Since values are 0-1 for unorm textures, scale nodata to [0, 1]
+        const maxVal = 2 ** bitsPerSample[0] - 1;
+        const noDataScaled = nodata / maxVal;
         renderPipeline.push({
             module: FilterNoDataVal,
             props: { value: noDataScaled },
         });
     }
-    const toRGBModule = photometricInterpretationToRGB(PhotometricInterpretation, device, ColorMap);
+    if (geotiff.maskImage !== null) {
+        renderPipeline.push({
+            module: MaskTexture,
+            props: {
+                // TODO: how to handle if mask failed to load and is undefined here
+                maskTexture: (data) => data.mask,
+            },
+        });
+    }
+    const toRGBModule = photometricInterpretationToRGB({
+        count: samplesPerPixel,
+        photometric,
+        device,
+        colorMap,
+    });
     if (toRGBModule) {
         renderPipeline.push(toRGBModule);
     }
     // For palette images, use nearest-neighbor sampling
-    const samplerOptions = PhotometricInterpretation === PhotometricInterpretationT.Palette
+    const samplerOptions = photometric === Photometric.Palette
         ? {
             magFilter: "nearest",
             minFilter: "nearest",
@@ -51,32 +66,60 @@ function createUnormPipeline(ifd, device) {
             minFilter: "linear",
         };
     const getTileData = async (image, options) => {
-        const { device } = options;
-        const mergedOptions = {
-            ...options,
-            interleave: true,
-        };
-        let data = (await image.readRasters(mergedOptions));
-        let numSamples = SamplesPerPixel;
-        if (SamplesPerPixel === 3) {
+        const { device, x, y, signal, pool } = options;
+        const tile = await image.fetchTile(x, y, {
+            boundless: false,
+            pool,
+            signal,
+        });
+        let { array } = tile;
+        const { width, height, mask } = array;
+        let numSamples = samplesPerPixel;
+        if (samplesPerPixel === 3) {
             // WebGL2 doesn't have an RGB-only texture format; it requires RGBA.
-            data = addAlphaChannel(data);
+            array = addAlphaChannel(array);
             numSamples = 4;
         }
+        if (array.layout === "band-separate") {
+            throw new Error("Band-separate images not yet implemented.");
+        }
         const textureFormat = inferTextureFormat(
         // Add one sample for added alpha channel
-        numSamples, BitsPerSample, SampleFormat);
+        numSamples, bitsPerSample, sampleFormat);
+        const bytesPerPixel = (bitsPerSample[0] / 8) * numSamples;
+        const textureData = enforceAlignment(array.data, {
+            width,
+            height,
+            bytesPerPixel,
+        });
         const texture = device.createTexture({
-            data,
+            data: textureData,
             format: textureFormat,
-            width: data.width,
-            height: data.height,
-            sampler: samplerOptions,
+            width,
+            height,
+            // Use nearest filtering for the mask to avoid interpolated edges/halos
+            sampler: {
+                minFilter: "nearest",
+                magFilter: "nearest",
+            },
         });
+        let maskTexture;
+        if (mask !== null) {
+            maskTexture = device.createTexture({
+                // Mask is single-channel 8-bit, so bytesPerPixel must be 1
+                data: padToAlignment(mask, width, height, 1),
+                // Single-channel 8-bit texture for the mask
+                format: "r8unorm",
+                width,
+                height,
+                sampler: samplerOptions,
+            });
+        }
         return {
             texture,
-            height: data.height,
-            width: data.width,
+            mask: maskTexture,
+            height: array.height,
+            width: array.width,
         };
     };
     const renderTile = (tileData) => {
@@ -84,15 +127,29 @@ function createUnormPipeline(ifd, device) {
     };
     return { getTileData, renderTile };
 }
-function photometricInterpretationToRGB(PhotometricInterpretation, device, ColorMap) {
-    switch (PhotometricInterpretation) {
-        case PhotometricInterpretationT.RGB:
+function photometricInterpretationToRGB({ count, colorMap, device, photometric, }) {
+    if (count === 3 || count === 4) {
+        // Always interpret 3-band or 4-band images as RGB/RGBA
+        return null;
+    }
+    switch (photometric) {
+        case Photometric.MinIsWhite: {
+            return {
+                module: WhiteIsZero,
+            };
+        }
+        case Photometric.MinIsBlack: {
+            return {
+                module: BlackIsZero,
+            };
+        }
+        case Photometric.Rgb:
             return null;
-        case PhotometricInterpretationT.Palette: {
-            if (!ColorMap) {
+        case Photometric.Palette: {
+            if (!colorMap) {
                 throw new Error("ColorMap is required for PhotometricInterpretation Palette");
             }
-            const { data, width, height } = parseColormap(ColorMap);
+            const { data, width, height } = parseColormap(colorMap);
             const cmapTexture = device.createTexture({
                 data,
                 format: "rgba8unorm",
@@ -112,20 +169,22 @@ function photometricInterpretationToRGB(PhotometricInterpretation, device, Color
                 },
             };
         }
-        case PhotometricInterpretationT.CMYK:
+        // Not sure why cogeotiff calls this "Separated", but it means CMYK
+        case Photometric.Separated:
             return {
                 module: CMYKToRGB,
             };
-        case PhotometricInterpretationT.YCbCr:
-            return {
-                module: YCbCrToRGB,
-            };
-        case PhotometricInterpretationT.CIELab:
+        case Photometric.Ycbcr:
+            // @developmentseed/geotiff currently uses canvas to parse JPEG-compressed
+            // YCbCr images, which means the YCbCr->RGB conversion is already done by
+            // the browser's image decoder
+            return null;
+        case Photometric.Cielab:
             return {
                 module: cieLabToRGB,
             };
         default:
-            throw new Error(`Unsupported PhotometricInterpretation ${PhotometricInterpretation}`);
+            throw new Error(`Unsupported PhotometricInterpretation ${photometric}`);
     }
 }
 /**
@@ -146,4 +205,48 @@ function resolveModule(m, data) {
     }
     return { module, props: resolvedProps };
 }
+/**
+ * WebGL's default `UNPACK_ALIGNMENT` is 4, meaning each row of pixel data must
+ * start on a 4-byte boundary.
+ *
+ * For all array types, we must match our typed array type to what WebGL
+ * expects, so this must return the same array type as what was passed in.
+ */
+function enforceAlignment(data, { width, height, bytesPerPixel, }) {
+    return data instanceof Uint8Array ||
+        data instanceof Int8Array ||
+        data instanceof Uint16Array ||
+        data instanceof Int16Array
+        ? padToAlignment(data, width, height, bytesPerPixel)
+        : data;
+}
+/**
+ * WebGL's default `UNPACK_ALIGNMENT` is 4, meaning each row of pixel data must
+ * start on a 4-byte boundary.
+ *
+ * For 8-bit and 16-bit data, rows may not be 4-byte aligned. For 32-bit+ data,
+ * each element is already 4 bytes so rows are always aligned.
+ *
+ * Returns the original array unchanged when no padding is needed.
+ */
+function padToAlignment(data, width, height, bytesPerPixel) {
+    const rowBytes = width * bytesPerPixel;
+    const alignedRowBytes = Math.ceil(rowBytes / 4) * 4;
+    if (alignedRowBytes === rowBytes) {
+        return data;
+    }
+    const src = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+    const dstBytes = new Uint8Array(alignedRowBytes * height);
+    for (let r = 0; r < height; r++) {
+        dstBytes.set(src.subarray(r * rowBytes, (r + 1) * rowBytes), r * alignedRowBytes);
+    }
+    // Return the same typed array type as the input
+    if (data instanceof Int8Array)
+        return new Int8Array(dstBytes.buffer);
+    if (data instanceof Uint16Array)
+        return new Uint16Array(dstBytes.buffer);
+    if (data instanceof Int16Array)
+        return new Int16Array(dstBytes.buffer);
+    return dstBytes;
+}
 //# sourceMappingURL=render-pipeline.js.map

package/dist/geotiff/render-pipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-pipeline.js","sourceRoot":"","sources":["../../src/geotiff/render-pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-pipeline.js","sourceRoot":"","sources":["../../src/geotiff/render-pipeline.ts"],"names":[],"mappings":"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"}

package/dist/geotiff/texture.d.ts

@@ -1,14 +1,15 @@
-import type { TextureFormat, TextureProps } from "@luma.gl/core";
-import type { GeoTIFFImage, TypedArray } from "geotiff";
+import { SampleFormat } from "@cogeotiff/core";
+import type { GeoTIFF } from "@developmentseed/geotiff";
+import type { TextureFormat, TextureProps, TypedArray } from "@luma.gl/core";
 /**
  * Infers texture properties from a GeoTIFF image and its associated data.
  */
-export declare function createTextureProps(image: GeoTIFFImage, data: TypedArray, options: {
+export declare function createTextureProps(geotiff: GeoTIFF, data: TypedArray, options: {
     width: number;
     height: number;
 }): TextureProps;
 /**
  * Infer the TextureFormat given values from GeoTIFF tags.
  */
-export declare function inferTextureFormat(samplesPerPixel: number, bitsPerSample: Uint16Array, sampleFormat: Uint16Array): TextureFormat;
+export declare function inferTextureFormat(samplesPerPixel: number, bitsPerSample: Uint16Array, sampleFormat: SampleFormat[]): TextureFormat;
 //# sourceMappingURL=texture.d.ts.map

package/dist/geotiff/texture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"texture.d.ts","sourceRoot":"","sources":["../../src/geotiff/texture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGxD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,YAAY,CAgBd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,WAAW,EAC1B,YAAY,EAAE,WAAW,GACxB,aAAa,CAef"}
+{"version":3,"file":"texture.d.ts","sourceRoot":"","sources":["../../src/geotiff/texture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE7E;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,YAAY,CAed;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,WAAW,EAC1B,YAAY,EAAE,YAAY,EAAE,GAC3B,aAAa,CAef"}