@developmentseed/deck.gl-geotiff 0.1.0-beta.6 → 0.2.0

package/dist/cog-layer.d.ts

@@ -1,11 +1,59 @@
-import type { CompositeLayerProps, UpdateParameters } from "@deck.gl/core";
+import type { CompositeLayerProps, Layer, LayersList, UpdateParameters } from "@deck.gl/core";
 import { CompositeLayer } from "@deck.gl/core";
+import type { _Tile2DHeader as Tile2DHeader, TileLayerProps, _TileLoadProps as TileLoadProps } from "@deck.gl/geo-layers";
 import { TileLayer } from "@deck.gl/geo-layers";
-import type { TileMatrixSet } from "@developmentseed/deck.gl-raster";
+import type { RasterModule, TileMatrixSet } from "@developmentseed/deck.gl-raster";
 import type { ReprojectionFns } from "@developmentseed/raster-reproject";
-import type { GeoTIFF, GeoTIFFImage, Pool } from "geotiff";
-export interface COGLayerProps extends CompositeLayerProps {
-    geotiff: GeoTIFF;
+import type { Device } from "@luma.gl/core";
+import type { BaseClient, GeoTIFF, GeoTIFFImage, Pool } from "geotiff";
+import type { TextureDataT } from "./geotiff/render-pipeline.js";
+import type { GeoKeysParser, ProjectionInfo } from "./proj.js";
+/**
+ * Minimum interface that **must** be returned from getTileData.
+ */
+export type MinimalDataT = {
+    height: number;
+    width: number;
+};
+export type DefaultDataT = MinimalDataT & {
+    texture: ImageData;
+};
+/** Options passed to `getTileData`. */
+export type GetTileDataOptions = {
+    /** The luma.gl Device */
+    device: Device;
+    /** the subset to read data from in pixels. */
+    window?: [number, number, number, number];
+    /** An AbortSignal that may be signalled if the request is to be aborted */
+    signal?: AbortSignal;
+    /** The decoder pool to use. */
+    pool: Pool;
+};
+type GetTileDataResult<DataT> = {
+    data: DataT;
+    forwardTransform: ReprojectionFns["forwardTransform"];
+    inverseTransform: ReprojectionFns["inverseTransform"];
+};
+export interface COGLayerProps<DataT extends MinimalDataT = DefaultDataT> extends CompositeLayerProps {
+    /**
+     * GeoTIFF input.
+     *
+     * - URL string pointing to a COG
+     * - ArrayBuffer containing the COG data
+     * - Blob containing the COG data
+     * - An instance of GeoTIFF.js's GeoTIFF class
+     * - An instance of GeoTIFF.js's BaseClient for custom fetching
+     */
+    geotiff: GeoTIFF | string | ArrayBuffer | Blob | BaseClient;
+    /**
+     * A function callback for parsing GeoTIFF geo keys to a Proj4 compatible
+     * definition.
+     *
+     * By default, uses epsg.io to resolve EPSG codes found in the GeoTIFF.
+     * Alternatively, you may want to use `geotiff-geokeys-to-proj4`, which is
+     * more extensive but adds 1.5MB to your bundle size.
+     */
+    geoKeysParser?: GeoKeysParser;
     /**
      * GeoTIFF.js Pool for decoding image chunks.
      *
@@ -19,6 +67,26 @@ export interface COGLayerProps extends CompositeLayerProps {
      * @default 0.125
      */
     maxError?: number;
+    /**
+     * User-defined method to load data for a tile.
+     *
+     * The default implementation loads an RGBA image using geotiff.js's readRGB
+     * method, returning an ImageData object.
+     *
+     * For more customizability, you can also return a Texture object from
+     * luma.gl, along with optional custom shaders for the RasterLayer.
+     */
+    getTileData?: (image: GeoTIFFImage, options: GetTileDataOptions) => Promise<DataT>;
+    /**
+     * User-defined method to render data for a tile.
+     *
+     * This receives the data returned by getTileData and must return a render
+     * pipeline.
+     *
+     * The default implementation returns an object with a `texture` property,
+     * assuming that this texture is already renderable.
+     */
+    renderTile: (data: DataT) => ImageData | RasterModule[];
     /**
      * Enable debug visualization showing the triangulation mesh
      * @default false
@@ -29,25 +97,62 @@ export interface COGLayerProps extends CompositeLayerProps {
      * @default 0.5
      */
     debugOpacity?: number;
+    /**
+     * Called when the GeoTIFF metadata has been loaded and parsed.
+     *
+     * @param   {GeoTIFF}  geotiff
+     * @param   {ProjectionInfo}  projection
+     */
+    onGeoTIFFLoad?: (geotiff: GeoTIFF, options: {
+        projection: ProjectionInfo;
+        /**
+         * Bounds of the image in geographic coordinates (WGS84) [minLon, minLat,
+         * maxLon, maxLat]
+         */
+        geographicBounds: {
+            west: number;
+            south: number;
+            east: number;
+            north: number;
+        };
+    }) => void;
+    /** A user-provided AbortSignal to cancel loading.
+     *
+     * This can be useful in combination with the MosaicLayer, so that when a
+     * mosaic source is out of the viewport, all of its tile requests are
+     * automatically aborted.
+     */
+    signal?: AbortSignal;
 }
 /**
  * COGLayer renders a COG using a tiled approach with reprojection.
  */
-export declare class COGLayer extends CompositeLayer<COGLayerProps> {
+export declare class COGLayer<DataT extends MinimalDataT = DefaultDataT> extends CompositeLayer<COGLayerProps<DataT>> {
     static layerName: string;
-    static defaultProps: {
-        maxError: number;
-    };
+    static defaultProps: Partial<COGLayerProps<DefaultDataT>>;
     state: {
         forwardReproject?: ReprojectionFns["forwardReproject"];
         inverseReproject?: ReprojectionFns["inverseReproject"];
         metadata?: TileMatrixSet;
         images?: GeoTIFFImage[];
+        defaultGetTileData?: COGLayerProps<TextureDataT>["getTileData"];
+        defaultRenderTile?: COGLayerProps<TextureDataT>["renderTile"];
     };
     initializeState(): void;
     updateState(params: UpdateParameters<this>): void;
     _parseGeoTIFF(): Promise<void>;
+    /**
+     * Inner callback passed in to the underlying TileLayer's `getTileData`.
+     */
+    _getTileData(tile: TileLoadProps, images: GeoTIFFImage[], metadata: TileMatrixSet): Promise<GetTileDataResult<DataT>>;
+    _renderSubLayers(props: TileLayerProps<GetTileDataResult<DataT>> & {
+        id: string;
+        data?: GetTileDataResult<DataT>;
+        _offset: number;
+        tile: Tile2DHeader<GetTileDataResult<DataT>>;
+    }, metadata: TileMatrixSet, forwardReproject: ReprojectionFns["forwardReproject"], inverseReproject: ReprojectionFns["inverseReproject"]): Layer | LayersList | null;
     renderTileLayer(metadata: TileMatrixSet, forwardReproject: ReprojectionFns["forwardReproject"], inverseReproject: ReprojectionFns["inverseReproject"], images: GeoTIFFImage[]): TileLayer;
     renderLayers(): TileLayer<any, {}> | null;
 }
+export {};
 //# sourceMappingURL=cog-layer.d.ts.map

package/dist/cog-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cog-layer.d.ts","sourceRoot":"","sources":["../src/cog-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EAEnB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAe3D,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACxD,OAAO,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD;;GAEG;AACH,qBAAa,QAAS,SAAQ,cAAc,CAAC,aAAa,CAAC;IACzD,OAAgB,SAAS,SAAc;IACvC,OAAgB,YAAY;;MAAgB;IAEpC,KAAK,EAAE;QACb,gBAAgB,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACvD,gBAAgB,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACvD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;KACzB,CAAC;IAEO,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAa7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCpC,eAAe,CACb,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,EACrD,MAAM,EAAE,YAAY,EAAE,GACrB,SAAS;IA8IZ,YAAY;CAiBb"}
+{"version":3,"file":"cog-layer.d.ts","sourceRoot":"","sources":["../src/cog-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EACV,aAAa,IAAI,YAAY,EAC7B,cAAc,EACd,cAAc,IAAI,aAAa,EAEhC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAQvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG/D;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG;IACxC,OAAO,EAAE,SAAS,CAAC;CACpB,CAAC;AAEF,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,8CAA8C;IAC9C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1C,2EAA2E;IAC3E,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB,+BAA+B;IAC/B,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,KAAK,iBAAiB,CAAC,KAAK,IAAI;IAC9B,IAAI,EAAE,KAAK,CAAC;IACZ,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;IACtD,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,WAAW,aAAa,CAAC,KAAK,SAAS,YAAY,GAAG,YAAY,CACtE,SAAQ,mBAAmB;IAC3B;;;;;;;;OAQG;IACH,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,GAAG,UAAU,CAAC;IAE5D;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IAEZ;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,kBAAkB,KACxB,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpB;;;;;;;;OAQG;IACH,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,SAAS,GAAG,YAAY,EAAE,CAAC;IAExD;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;QACP,UAAU,EAAE,cAAc,CAAC;QAC3B;;;WAGG;QACH,gBAAgB,EAAE;YAChB,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,EAAE,MAAM,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACf,CAAC;KACH,KACE,IAAI,CAAC;IAEV;;;;;OAKG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAQD;;GAEG;AACH,qBAAa,QAAQ,CACnB,KAAK,SAAS,YAAY,GAAG,YAAY,CACzC,SAAQ,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAgB,SAAS,SAAc;IACvC,OAAgB,YAAY,uCAAgB;IAEpC,KAAK,EAAE;QACb,gBAAgB,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACvD,gBAAgB,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACvD,QAAQ,CAAC,EAAE,aAAa,CAAC;QACzB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;QACxB,kBAAkB,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC;QAChE,iBAAiB,CAAC,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC;KAC/D,CAAC;IAEO,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAa7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA+CpC;;OAEG;IACG,YAAY,CAChB,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,YAAY,EAAE,EACtB,QAAQ,EAAE,aAAa,GACtB,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IA+CpC,gBAAgB,CAGd,KAAK,EAAE,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG;QAChD,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;KAC9C,EACD,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,GACpD,KAAK,GAAG,UAAU,GAAG,IAAI;IA8E5B,eAAe,CACb,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,eAAe,CAAC,kBAAkB,CAAC,EACrD,MAAM,EAAE,YAAY,EAAE,GACrB,SAAS;IAsBZ,YAAY;CAiBb"}

package/dist/cog-layer.js

@@ -4,11 +4,14 @@ import { PathLayer } from "@deck.gl/layers";
 import { RasterLayer, RasterTileset2D } from "@developmentseed/deck.gl-raster";
 import proj4 from "proj4";
 import { parseCOGTileMatrixSet } from "./cog-tile-matrix-set.js";
-import { fromGeoTransform, getGeoTIFFProjection, } from "./geotiff-reprojection.js";
-import { defaultPool, loadRgbImage } from "./geotiff.js";
-const DEFAULT_MAX_ERROR = 0.125;
+import { defaultPool, fetchGeoTIFF, getGeographicBounds, } from "./geotiff/geotiff.js";
+import { inferRenderPipeline } from "./geotiff/render-pipeline.js";
+import { fromGeoTransform } from "./geotiff-reprojection.js";
+import { epsgIoGeoKeyParser } from "./proj.js";
 const defaultProps = {
-    maxError: DEFAULT_MAX_ERROR,
+    geoKeysParser: epsgIoGeoKeyParser,
+    debug: false,
+    debugOpacity: 0.5,
 };
 /**
  * COGLayer renders a COG using a tiled approach with reprojection.
@@ -28,30 +31,142 @@ export class COGLayer extends CompositeLayer {
         }
     }
     async _parseGeoTIFF() {
-        const { geotiff } = this.props;
-        const metadata = await parseCOGTileMatrixSet(geotiff);
+        const geotiff = await fetchGeoTIFF(this.props.geotiff);
+        const geoKeysParser = this.props.geoKeysParser;
+        const metadata = await parseCOGTileMatrixSet(geotiff, geoKeysParser);
         const image = await geotiff.getImage();
         const imageCount = await geotiff.getImageCount();
         const images = [];
         for (let imageIdx = 0; imageIdx < imageCount; imageIdx++) {
             images.push(await geotiff.getImage(imageIdx));
         }
-        const sourceProjection = await getGeoTIFFProjection(image);
+        const sourceProjection = await geoKeysParser(image.getGeoKeys());
         if (!sourceProjection) {
             throw new Error("Could not determine source projection from GeoTIFF geo keys");
         }
-        const converter = proj4(sourceProjection, "EPSG:4326");
+        const converter = proj4(sourceProjection.def, "EPSG:4326");
         const forwardReproject = (x, y) => converter.forward([x, y], false);
         const inverseReproject = (x, y) => converter.inverse([x, y], false);
+        if (this.props.onGeoTIFFLoad) {
+            const geographicBounds = getGeographicBounds(image, converter);
+            this.props.onGeoTIFFLoad(geotiff, {
+                projection: sourceProjection,
+                geographicBounds,
+            });
+        }
+        const { getTileData: defaultGetTileData, renderTile: defaultRenderTile } = inferRenderPipeline(image.fileDirectory, this.context.device);
         this.setState({
             metadata,
             forwardReproject,
             inverseReproject,
             images,
+            defaultGetTileData,
+            defaultRenderTile,
+        });
+    }
+    /**
+     * Inner callback passed in to the underlying TileLayer's `getTileData`.
+     */
+    async _getTileData(tile, images, metadata) {
+        const { signal } = tile;
+        const { x, y, z } = tile.index;
+        // Select overview image
+        const geotiffImage = images[images.length - 1 - z];
+        const imageHeight = geotiffImage.getHeight();
+        const imageWidth = geotiffImage.getWidth();
+        const tileMatrix = metadata.tileMatrices[z];
+        const { tileWidth, tileHeight } = tileMatrix;
+        const tileGeotransform = computeTileGeotransform(x, y, tileMatrix);
+        const { forwardTransform, inverseTransform } = fromGeoTransform(tileGeotransform);
+        const window = [
+            x * tileWidth,
+            y * tileHeight,
+            Math.min((x + 1) * tileWidth, imageWidth),
+            Math.min((y + 1) * tileHeight, imageHeight),
+        ];
+        const getTileData = this.props.getTileData || this.state.defaultGetTileData;
+        // Combine abort signals if both are defined
+        const combinedSignal = signal && this.props.signal
+            ? AbortSignal.any([signal, this.props.signal])
+            : signal || this.props.signal;
+        const data = await getTileData(geotiffImage, {
+            device: this.context.device,
+            window,
+            signal: combinedSignal,
+            pool: this.props.pool || defaultPool(),
         });
+        return {
+            // @ts-expect-error type mismatch when using provided getTileData
+            data,
+            forwardTransform,
+            inverseTransform,
+        };
+    }
+    _renderSubLayers(
+    // TODO: it would be nice to have a cleaner type here
+    // this is copy-pasted from the upstream tile layer definition for props.
+    props, metadata, forwardReproject, inverseReproject) {
+        const { maxError, debug, debugOpacity } = this.props;
+        const { tile } = props;
+        if (!props.data) {
+            return null;
+        }
+        const { data, forwardTransform, inverseTransform } = props.data;
+        const layers = [];
+        if (data) {
+            const { height, width } = data;
+            const renderTile = this.props.renderTile || this.state.defaultRenderTile;
+            layers.push(new RasterLayer({
+                id: `${props.id}-raster`,
+                width,
+                height,
+                renderPipeline: renderTile(data),
+                maxError,
+                reprojectionFns: {
+                    forwardTransform,
+                    inverseTransform,
+                    forwardReproject,
+                    inverseReproject,
+                },
+                debug,
+                debugOpacity,
+            }));
+        }
+        if (debug) {
+            // Get projected bounds from tile data
+            // getTileMetadata returns data that includes projectedBounds
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const projectedBounds = tile?.projectedBounds;
+            if (!projectedBounds || !metadata) {
+                return [];
+            }
+            // Project bounds from image CRS to WGS84
+            const { topLeft, topRight, bottomLeft, bottomRight } = projectedBounds;
+            const topLeftWgs84 = metadata.projectToWgs84(topLeft);
+            const topRightWgs84 = metadata.projectToWgs84(topRight);
+            const bottomRightWgs84 = metadata.projectToWgs84(bottomRight);
+            const bottomLeftWgs84 = metadata.projectToWgs84(bottomLeft);
+            // Create a closed path around the tile bounds
+            const path = [
+                topLeftWgs84,
+                topRightWgs84,
+                bottomRightWgs84,
+                bottomLeftWgs84,
+                topLeftWgs84, // Close the path
+            ];
+            layers.push(new PathLayer({
+                id: `${this.id}-${tile.id}-bounds`,
+                data: [path],
+                getPath: (d) => d,
+                getColor: [255, 0, 0, 255], // Red
+                getWidth: 2,
+                widthUnits: "pixels",
+                pickable: false,
+            }));
+        }
+        return layers;
     }
     renderTileLayer(metadata, forwardReproject, inverseReproject, images) {
-        const { maxError, debug = false, debugOpacity = 0.5 } = this.props;
         // Create a factory class that wraps COGTileset2D with the metadata
         class RasterTileset2DFactory extends RasterTileset2D {
             constructor(opts) {
@@ -61,92 +176,8 @@ export class COGLayer extends CompositeLayer {
         return new TileLayer({
             id: `cog-tile-layer-${this.id}`,
             TilesetClass: RasterTileset2DFactory,
-            getTileData: async (tile) => {
-                const { signal } = tile;
-                const { x, y, z } = tile.index;
-                // Select overview image
-                const geotiffImage = images[images.length - 1 - z];
-                const imageHeight = geotiffImage.getHeight();
-                const imageWidth = geotiffImage.getWidth();
-                const tileMatrix = metadata.tileMatrices[z];
-                const { tileWidth, tileHeight } = tileMatrix;
-                const tileGeotransform = computeTileGeotransform(x, y, tileMatrix);
-                const { pixelToInputCRS, inputCRSToPixel } = fromGeoTransform(tileGeotransform);
-                const window = [
-                    x * tileWidth,
-                    y * tileHeight,
-                    Math.min((x + 1) * tileWidth, imageWidth),
-                    Math.min((y + 1) * tileHeight, imageHeight),
-                ];
-                const { imageData, height, width } = await loadRgbImage(geotiffImage, {
-                    window,
-                    signal,
-                    pool: this.props.pool || defaultPool(),
-                });
-                return {
-                    image: imageData,
-                    height,
-                    width,
-                    pixelToInputCRS,
-                    inputCRSToPixel,
-                };
-            },
-            renderSubLayers: (props) => {
-                const { tile, data } = props;
-                const layers = [];
-                if (data) {
-                    const { image, height, width, pixelToInputCRS, inputCRSToPixel, } = data;
-                    const rasterLayer = new RasterLayer({
-                        id: `${props.id}-raster`,
-                        width,
-                        height,
-                        texture: image,
-                        maxError,
-                        reprojectionFns: {
-                            pixelToInputCRS,
-                            inputCRSToPixel,
-                            forwardReproject,
-                            inverseReproject,
-                        },
-                        debug,
-                        debugOpacity,
-                    });
-                    layers.push(rasterLayer);
-                }
-                if (debug) {
-                    // Get projected bounds from tile data
-                    // getTileMetadata returns data that includes projectedBounds
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    const projectedBounds = tile?.projectedBounds;
-                    if (!projectedBounds || !metadata) {
-                        return [];
-                    }
-                    // Project bounds from image CRS to WGS84
-                    const { topLeft, topRight, bottomLeft, bottomRight } = projectedBounds;
-                    const topLeftWgs84 = metadata.projectToWgs84(topLeft);
-                    const topRightWgs84 = metadata.projectToWgs84(topRight);
-                    const bottomRightWgs84 = metadata.projectToWgs84(bottomRight);
-                    const bottomLeftWgs84 = metadata.projectToWgs84(bottomLeft);
-                    // Create a closed path around the tile bounds
-                    const path = [
-                        topLeftWgs84,
-                        topRightWgs84,
-                        bottomRightWgs84,
-                        bottomLeftWgs84,
-                        topLeftWgs84, // Close the path
-                    ];
-                    layers.push(new PathLayer({
-                        id: `${tile.id}-bounds`,
-                        data: [{ path }],
-                        getPath: (d) => d.path,
-                        getColor: [255, 0, 0, 255], // Red
-                        getWidth: 2,
-                        widthUnits: "pixels",
-                        pickable: false,
-                    }));
-                }
-                return layers;
-            },
+            getTileData: async (tile) => this._getTileData(tile, images, metadata),
+            renderSubLayers: (props) => this._renderSubLayers(props, metadata, forwardReproject, inverseReproject),
         });
     }
     renderLayers() {

package/dist/cog-layer.js.map

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

package/dist/cog-tile-matrix-set.d.ts

@@ -1,5 +1,7 @@
 import type { TileMatrixSet } from "@developmentseed/deck.gl-raster";
 import type { GeoTIFF } from "geotiff";
+import { type ProjectionDefinition } from "proj4";
+import type { GeoKeysParser, SupportedCrsUnit } from "./proj";
 /**
  *
  * Ported from Vincent's work here:
@@ -7,5 +9,24 @@ import type { GeoTIFF } from "geotiff";
  *
  * @return  {TileMatrixSet}[return description]
  */
-export declare function parseCOGTileMatrixSet(tiff: GeoTIFF): Promise<TileMatrixSet>;
+export declare function parseCOGTileMatrixSet(tiff: GeoTIFF, geoKeysParser: GeoKeysParser): Promise<TileMatrixSet>;
+/**
+ * Coefficient to convert the coordinate reference system (CRS)
+ * units into meters (metersPerUnit).
+ *
+ * From note g in http://docs.opengeospatial.org/is/17-083r2/17-083r2.html#table_2:
+ *
+ * > If the CRS uses meters as units of measure for the horizontal dimensions,
+ * > then metersPerUnit=1; if it has degrees, then metersPerUnit=2pa/360
+ * > (a is the Earth maximum radius of the ellipsoid).
+ *
+ * If `crsUnit` is provided, it takes precedence over the unit defined in the
+ * CRS. This exists because sometimes the parsed CRS from
+ * `geotiff-geokeys-to-proj4` doesn't have a unit defined.
+ */
+declare function metersPerUnit(parsedCrs: ProjectionDefinition, crsUnit?: SupportedCrsUnit): number;
+export declare const __TEST_EXPORTS: {
+    metersPerUnit: typeof metersPerUnit;
+};
+export {};
 //# sourceMappingURL=cog-tile-matrix-set.d.ts.map

package/dist/cog-tile-matrix-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cog-tile-matrix-set.d.ts","sourceRoot":"","sources":["../src/cog-tile-matrix-set.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,SAAS,CAAC;AAarD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,aAAa,CAAC,CA0FxB"}
+{"version":3,"file":"cog-tile-matrix-set.d.ts","sourceRoot":"","sources":["../src/cog-tile-matrix-set.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,SAAS,CAAC;AACrD,OAAc,EAAE,KAAK,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAkB,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAM9E;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,aAAa,CAAC,CAyFxB;AAED;;;;;;;;;;;;;GAaG;AAEH,iBAAS,aAAa,CACpB,SAAS,EAAE,oBAAoB,EAC/B,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAqBR;AA4GD,eAAO,MAAM,cAAc;;CAE1B,CAAC"}

package/dist/cog-tile-matrix-set.js

@@ -1,6 +1,6 @@
-import { extractGeotransform, getGeoTIFFProjection, } from "./geotiff-reprojection";
 import proj4 from "proj4";
 import Ellipsoid from "./ellipsoids.js";
+import { extractGeotransform } from "./geotiff-reprojection";
 // 0.28 mm per pixel
 // https://docs.ogc.org/is/17-083r4/17-083r4.html#toc15
 const SCREEN_PIXEL_SIZE = 0.00028;
@@ -11,7 +11,7 @@ const SCREEN_PIXEL_SIZE = 0.00028;
  *
  * @return  {TileMatrixSet}[return description]
  */
-export async function parseCOGTileMatrixSet(tiff) {
+export async function parseCOGTileMatrixSet(tiff, geoKeysParser) {
     const fullResImage = await tiff.getImage();
     if (!fullResImage.isTiled) {
         throw new Error("COG TileMatrixSet requires a tiled GeoTIFF");
@@ -20,13 +20,12 @@ export async function parseCOGTileMatrixSet(tiff) {
     const bbox = fullResImage.getBoundingBox();
     const fullImageWidth = fullResImage.getWidth();
     const fullImageHeight = fullResImage.getHeight();
-    const crs = await getGeoTIFFProjection(fullResImage);
+    const crs = await geoKeysParser(fullResImage.getGeoKeys());
     if (crs === null) {
         throw new Error("Could not determine coordinate reference system from GeoTIFF geo keys");
     }
-    const parsedCrs = parseCrs(crs);
-    const projectToWgs84 = proj4(crs, "EPSG:4326").forward;
-    const projectTo3857 = proj4(crs, "EPSG:3857").forward;
+    const projectToWgs84 = proj4(crs.def, "EPSG:4326").forward;
+    const projectTo3857 = proj4(crs.def, "EPSG:3857").forward;
     const boundingBox = {
         lowerLeft: [bbox[0], bbox[1]],
         upperRight: [bbox[2], bbox[3]],
@@ -43,7 +42,8 @@ export async function parseCOGTileMatrixSet(tiff) {
         {
             // Set as highest resolution / finest level
             id: String(imageCount - 1),
-            scaleDenominator: (cellSize * metersPerUnit(parsedCrs)) / SCREEN_PIXEL_SIZE,
+            scaleDenominator: (cellSize * metersPerUnit(crs.parsed, crs.coordinatesUnits)) /
+                SCREEN_PIXEL_SIZE,
             cellSize,
             pointOfOrigin: [transform[2], transform[5]],
             tileWidth: fullResImage.getTileWidth(),
@@ -65,7 +65,7 @@ export async function parseCOGTileMatrixSet(tiff) {
             fullWidth: fullImageWidth,
             fullHeight: fullImageHeight,
             baseTransform: transform,
-            parsedCrs,
+            crs,
         });
         tileMatrices.push(tileMatrix);
     }
@@ -89,30 +89,36 @@ export async function parseCOGTileMatrixSet(tiff) {
  * > If the CRS uses meters as units of measure for the horizontal dimensions,
  * > then metersPerUnit=1; if it has degrees, then metersPerUnit=2pa/360
  * > (a is the Earth maximum radius of the ellipsoid).
+ *
+ * If `crsUnit` is provided, it takes precedence over the unit defined in the
+ * CRS. This exists because sometimes the parsed CRS from
+ * `geotiff-geokeys-to-proj4` doesn't have a unit defined.
  */
 // https://github.com/developmentseed/morecantile/blob/7c95a11c491303700d6e33e9c1607f2719584dec/morecantile/utils.py#L67-L90
-function metersPerUnit(parsedCrs) {
-    switch (parsedCrs.units) {
+function metersPerUnit(parsedCrs, crsUnit) {
+    const unit = (crsUnit || parsedCrs.units)?.toLowerCase();
+    switch (unit) {
+        case "m":
         case "metre":
         case "meter":
         case "meters":
             return 1;
         case "foot":
             return 0.3048;
-        case "US survey foot":
+        case "us survey foot":
             return 1200 / 3937;
     }
-    if (parsedCrs.units === "degree") {
+    if (unit === "degree") {
         // 2 * π * ellipsoid semi-major-axis / 360
         const { a } = Ellipsoid[parsedCrs.ellps];
         return (2 * Math.PI * a) / 360;
     }
-    throw new Error(`Unsupported CRS units: ${parsedCrs.units}`);
+    throw new Error(`Unsupported CRS units: ${unit}`);
 }
 /**
  * Create tile matrix for COG overview
  */
-function createOverviewTileMatrix({ id, image, fullWidth, baseTransform, parsedCrs, }) {
+function createOverviewTileMatrix({ id, image, fullWidth, baseTransform, crs, }) {
     const width = image.getWidth();
     const height = image.getHeight();
     // For now, just use scaleX
@@ -136,7 +142,8 @@ function createOverviewTileMatrix({ id, image, fullWidth, baseTransform, parsedC
     const tileHeight = image.getTileHeight();
     return {
         id,
-        scaleDenominator: (cellSize * metersPerUnit(parsedCrs)) / SCREEN_PIXEL_SIZE,
+        scaleDenominator: (cellSize * metersPerUnit(crs.parsed, crs.coordinatesUnits)) /
+            SCREEN_PIXEL_SIZE,
         cellSize,
         pointOfOrigin: [geotransform[2], geotransform[5]],
         tileWidth,
@@ -146,15 +153,6 @@ function createOverviewTileMatrix({ id, image, fullWidth, baseTransform, parsedC
         geotransform,
     };
 }
-function parseCrs(crs) {
-    // If you pass proj4.defs a projjson, it doesn't parse it; it just returns the
-    // input.
-    //
-    // Instead, you need to assign it to an alias and then retrieve it.
-    const key = "__deck.gl-geotiff-internal__";
-    proj4.defs(key, crs);
-    return proj4.defs(key);
-}
 function computeWgs84BoundingBox(boundingBox, projectToWgs84) {
     const lowerLeftWgs84 = projectToWgs84(boundingBox.lowerLeft);
     const lowerRightWgs84 = projectToWgs84([
@@ -176,4 +174,7 @@ function computeWgs84BoundingBox(boundingBox, projectToWgs84) {
         upperRight: [maxLon, maxLat],
     };
 }
+export const __TEST_EXPORTS = {
+    metersPerUnit,
+};
 //# sourceMappingURL=cog-tile-matrix-set.js.map