@gisatcz/deckgl-geolib 2.5.0 → 2.5.1-dev.1

package/dist/cjs/index.js

@@ -6738,6 +6738,323 @@ const EARTH_CIRCUMFERENCE = 2 * Math.PI * 6378137;
 const EARTH_HALF_CIRCUMFERENCE = EARTH_CIRCUMFERENCE / 2;
 const webMercatorOrigin = [-20037508.342789244, 20037508.342789244];
 const webMercatorRes0 = 156543.03125;
+function getLatLon(input) {
+    const x = input[0];
+    const y = input[1];
+    const lon = (x / EARTH_HALF_CIRCUMFERENCE) * 180;
+    let lat = (y / EARTH_HALF_CIRCUMFERENCE) * 180;
+    lat = (180 / Math.PI) * (2 * Math.atan(Math.exp((lat * Math.PI) / 180)) - Math.PI / 2);
+    return [lon, lat];
+}
+function getZoomLevelFromResolution(tileSize, resolution) {
+    return Math.round(Math.log2(EARTH_CIRCUMFERENCE / (resolution * tileSize)));
+}
+function calculateZoomRange(tileSize, resolution, imgCount) {
+    const maxZoom = getZoomLevelFromResolution(tileSize, resolution);
+    const minZoom = maxZoom - (imgCount - 1);
+    return [minZoom, maxZoom];
+}
+function calculateBoundsAsLatLon(bbox) {
+    const minX = Math.min(bbox[0], bbox[2]);
+    const maxX = Math.max(bbox[0], bbox[2]);
+    const minY = Math.min(bbox[1], bbox[3]);
+    const maxY = Math.max(bbox[1], bbox[3]);
+    const minXYDeg = getLatLon([minX, minY]);
+    const maxXYDeg = getLatLon([maxX, maxY]);
+    return [minXYDeg[0], minXYDeg[1], maxXYDeg[0], maxXYDeg[1]];
+}
+
+/* eslint-disable no-console */
+/**
+ * Reads TIFF tags to determine the numeric data type (e.g. "UInt8", "Int16", "Float32").
+ * The implementation mirrors the logic previously present in CogTiles.
+ */
+async function getDataTypeFromTags(fileDirectory) {
+    const hasSampleFormat = fileDirectory.hasTag('SampleFormat');
+    const hasBitsPerSample = fileDirectory.hasTag('BitsPerSample');
+    if (!hasSampleFormat || !hasBitsPerSample) {
+        console.warn("Missing SampleFormat or BitsPerSample tags, defaulting to UInt8");
+        return 'UInt8';
+    }
+    // In GeoTIFF, BitsPerSample (tag 258) and SampleFormat (tag 339) provide the type info.
+    // They can be either a single number or an array if there are multiple samples.
+    const sampleFormat = fileDirectory.getValue('SampleFormat'); // Tag 339
+    const bitsPerSample = fileDirectory.getValue('BitsPerSample'); // Tag 258
+    // If multiple bands exist, assume all bands share the same type.
+    const format = (sampleFormat && typeof sampleFormat.length === 'number' && sampleFormat.length > 0)
+        ? sampleFormat[0]
+        : sampleFormat;
+    const bits = (bitsPerSample && typeof bitsPerSample.length === 'number' && bitsPerSample.length > 0)
+        ? bitsPerSample[0]
+        : bitsPerSample;
+    let typePrefix;
+    // 1 = Unsigned Integer, 2 = Signed Integer, 3 = Floating Point
+    if (format === 1) {
+        typePrefix = 'UInt';
+    }
+    else if (format === 2) {
+        typePrefix = 'Int';
+    }
+    else if (format === 3) {
+        typePrefix = 'Float';
+    }
+    else {
+        typePrefix = 'Unknown';
+    }
+    return `${typePrefix}${bits}`;
+}
+/**
+ * Extracts the noData value from a GeoTIFF.js image.
+ * Returns the numeric value, NaN, or undefined if not present/parsable.
+ */
+function getNoDataValue(image) {
+    const noDataRaw = image.getGDALNoData();
+    if (noDataRaw === undefined || noDataRaw === null) {
+        console.warn('No noData value defined — raster might be rendered incorrectly.');
+        return undefined;
+    }
+    const cleaned = String(noDataRaw).replace(/\0/g, '').trim();
+    if (cleaned === '') {
+        console.warn('noData value is an empty string after cleanup.');
+        return undefined;
+    }
+    const parsed = Number(cleaned);
+    // Allow NaN if explicitly declared
+    if (cleaned.toLowerCase() === 'nan') {
+        return NaN;
+    }
+    // If not declared as "nan" and still parsed to NaN, it's an error
+    if (Number.isNaN(parsed)) {
+        console.warn(`Failed to parse numeric noData value: '${cleaned}'`);
+        return undefined;
+    }
+    return parsed;
+}
+/* eslint-enable no-console */
+
+/**
+ * LOD (level-of-detail) helpers extracted from CogTiles.
+ */
+function getErrorMultiplierForZoom(z, minZ, maxZ) {
+    if (z >= maxZ)
+        return 0.5;
+    if (z <= minZ)
+        return 3.0;
+    // Linear interpolation: 3.0 - ((z - minZ) / (maxZ - minZ)) * 2.5
+    return 3.0 - ((z - minZ) / (maxZ - minZ)) * 2.5;
+}
+function calculateDynamicMeshMaxError(z, resolution, minZ, maxZ) {
+    const multiplier = getErrorMultiplierForZoom(z, minZ, maxZ);
+    const errorValue = resolution * multiplier;
+    return Math.round(Math.max(0.5, Math.min(100, errorValue)));
+}
+async function buildCogZoomResolutionLookup(cog) {
+    const imageCount = await cog.getImageCount();
+    const baseImage = await cog.getImage(0);
+    const baseResolution = baseImage.getResolution()[0];
+    const baseWidth = baseImage.getWidth();
+    const zoomLookup = [];
+    const resolutionLookup = [];
+    for (let idx = 0; idx < imageCount; idx++) {
+        const image = await cog.getImage(idx);
+        const width = image.getWidth();
+        const scaleFactor = baseWidth / width;
+        const estimatedResolution = baseResolution * scaleFactor;
+        const zoomLevel = Math.round(Math.log2(webMercatorRes0 / estimatedResolution));
+        zoomLookup[idx] = zoomLevel;
+        resolutionLookup[idx] = estimatedResolution;
+    }
+    return [zoomLookup, resolutionLookup];
+}
+function getImageIndexForZoomLevel(zoom, cogZoomLookup) {
+    const minZoom = cogZoomLookup[cogZoomLookup.length - 1];
+    const maxZoom = cogZoomLookup[0];
+    if (zoom > maxZoom)
+        return 0;
+    if (zoom < minZoom)
+        return cogZoomLookup.length - 1;
+    const exactMatchIndex = cogZoomLookup.indexOf(zoom);
+    if (exactMatchIndex !== -1)
+        return exactMatchIndex;
+    let closestIndex = 0;
+    let minDistance = Math.abs(cogZoomLookup[0] - zoom);
+    for (let i = 1; i < cogZoomLookup.length; i += 1) {
+        const distance = Math.abs(cogZoomLookup[i] - zoom);
+        if (distance < minDistance) {
+            minDistance = distance;
+            closestIndex = i;
+        }
+    }
+    return closestIndex;
+}
+
+class TileCacheManager {
+    tileResultCache = new Map();
+    tileResultCacheMaxSize;
+    rasterCache = new Map();
+    rasterCacheMaxSize;
+    reliefMaskCache = new Map();
+    reliefMaskCacheMaxSize;
+    imageCache = new Map();
+    constructor(opts) {
+        this.tileResultCacheMaxSize = opts?.tileResultCacheMaxSize ?? 32;
+        this.rasterCacheMaxSize = opts?.rasterCacheMaxSize ?? 64;
+        this.reliefMaskCacheMaxSize = opts?.reliefMaskCacheMaxSize ?? 64;
+    }
+    getTileResultCacheKey(x, y, z, meshMaxError, skipTexture) {
+        return `${z}/${x}/${y}/${meshMaxError}/${skipTexture ? '1' : '0'}`;
+    }
+    getTileCacheKey(x, y, z) {
+        return `${z}/${x}/${y}`;
+    }
+    // TileResult cache methods
+    getTileResult(key) {
+        const entry = this.tileResultCache.get(key);
+        if (!entry)
+            return undefined;
+        // LRU touch
+        this.tileResultCache.delete(key);
+        this.tileResultCache.set(key, entry);
+        return entry;
+    }
+    setTileResult(key, entry) {
+        this.tileResultCache.set(key, entry);
+        if (this.tileResultCache.size > this.tileResultCacheMaxSize) {
+            const oldestKey = this.tileResultCache.keys().next().value;
+            if (oldestKey) {
+                const evicted = this.tileResultCache.get(oldestKey);
+                if (evicted && !evicted.settled)
+                    evicted.controller.abort();
+                this.tileResultCache.delete(oldestKey);
+            }
+        }
+    }
+    deleteTileResult(key) {
+        return this.tileResultCache.delete(key);
+    }
+    clearTileResultCache() {
+        for (const entry of this.tileResultCache.values()) {
+            if (!entry.settled)
+                entry.controller.abort();
+        }
+        this.tileResultCache.clear();
+    }
+    // Raster cache methods
+    getRaster(key) {
+        const p = this.rasterCache.get(key);
+        if (!p)
+            return undefined;
+        // LRU touch
+        this.rasterCache.delete(key);
+        this.rasterCache.set(key, p);
+        return p;
+    }
+    setRaster(key, p) {
+        this.rasterCache.set(key, p);
+        p.catch(() => this.rasterCache.delete(key));
+        if (this.rasterCache.size > this.rasterCacheMaxSize) {
+            const oldestKey = this.rasterCache.keys().next().value;
+            if (oldestKey)
+                this.rasterCache.delete(oldestKey);
+        }
+    }
+    deleteRaster(key) {
+        return this.rasterCache.delete(key);
+    }
+    clearRasterCache() {
+        this.rasterCache.clear();
+    }
+    // Relief mask cache methods
+    getReliefMask(key) {
+        const p = this.reliefMaskCache.get(key);
+        if (!p)
+            return undefined;
+        // LRU touch
+        this.reliefMaskCache.delete(key);
+        this.reliefMaskCache.set(key, p);
+        return p;
+    }
+    setReliefMask(key, p) {
+        this.reliefMaskCache.set(key, p);
+        p.catch(() => this.reliefMaskCache.delete(key));
+        if (this.reliefMaskCache.size > this.reliefMaskCacheMaxSize) {
+            const oldestKey = this.reliefMaskCache.keys().next().value;
+            if (oldestKey)
+                this.reliefMaskCache.delete(oldestKey);
+        }
+    }
+    deleteReliefMask(key) {
+        return this.reliefMaskCache.delete(key);
+    }
+    clearReliefMaskCache() {
+        this.reliefMaskCache.clear();
+    }
+    // Image cache methods
+    getImage(index) {
+        return this.imageCache.get(index);
+    }
+    setImage(index, p) {
+        this.imageCache.set(index, p);
+    }
+    deleteImage(index) {
+        return this.imageCache.delete(index);
+    }
+    clearImageCache() {
+        this.imageCache.clear();
+    }
+    // Clear everything
+    clearAll() {
+        this.clearTileResultCache();
+        this.clearRasterCache();
+        this.clearReliefMaskCache();
+        this.clearImageCache();
+    }
+}
+
+class TileReader {
+    options;
+    tileSize;
+    constructor(params) {
+        this.options = params.options;
+        this.tileSize = params.tileSize;
+    }
+    createEmptyTile(size) {
+        const s = size || this.tileSize;
+        const channels = this.options.numOfChannels || 1;
+        const totalSize = s * s * channels;
+        const tileData = new Float32Array(totalSize);
+        if (this.options.noDataValue !== undefined) {
+            tileData.fill(this.options.noDataValue);
+        }
+        return tileData;
+    }
+    createTileBuffer(dataType, tileSize, multiplier = 1) {
+        const length = tileSize * tileSize * multiplier;
+        switch (dataType) {
+            case 'UInt8':
+                return new Uint8Array(length);
+            case 'Int8':
+                return new Int8Array(length);
+            case 'UInt16':
+                return new Uint16Array(length);
+            case 'Int16':
+                return new Int16Array(length);
+            case 'UInt32':
+                return new Uint32Array(length);
+            case 'Int32':
+                return new Int32Array(length);
+            case 'Float32':
+                return new Float32Array(length);
+            case 'Float64':
+                return new Float64Array(length);
+            default:
+                // eslint-disable-next-line no-console
+                console.warn(`Unsupported data type: ${dataType}, defaulting to Float32`);
+                return new Float32Array(length);
+        }
+    }
+}
+
 const CogTilesGeoImageOptionsDefaults = {
     blurredTexture: true,
 };
@@ -6759,34 +7076,8 @@ class CogTiles {
     // and individual tile cancellations (e.g. from panning) do not poison other callers.
     // Once the promise settles (resolved or rejected), controller/callerCount are irrelevant;
     // future cache hits just await the already-resolved promise directly.
-    tileResultCache = new Map();
-    tileResultCacheMaxSize = 32;
-    getTileResultCacheKey(x, y, z, meshMaxError, skipTexture) {
-        return `${z}/${x}/${y}/${meshMaxError}/${skipTexture ? '1' : '0'}`;
-    }
-    /** Clears the TileResult cache. Call when the COG URL or meshMaxError changes. */
-    clearTileResultCache() {
-        // Abort any in-flight pipelines so their network requests are cancelled
-        for (const entry of this.tileResultCache.values()) {
-            if (!entry.settled)
-                entry.controller.abort();
-        }
-        this.tileResultCache.clear();
-    }
-    // Raw raster cache for ordinary bitmap layers — saves network fetch + decompression on revisit.
-    // BitmapGenerator is cheap to re-run from cached raster; no need to hold ImageBitmaps in memory.
-    rasterCache = new Map();
-    rasterCacheMaxSize = 64;
-    // Relief mask cache for bitmap + glaze layers — saves network fetch + kernel convolution on revisit.
-    // Stores the Float32Array output of composeSwissRelief; BitmapGenerator re-runs from it cheaply.
-    reliefMaskCache = new Map();
-    reliefMaskCacheMaxSize = 64;
-    getTileCacheKey(x, y, z) {
-        return `${z}/${x}/${y}`;
-    }
-    // Cache GeoTIFFImage Promises by index to prevent redundant HTTP requests from geotiff 3.0.4+ eager loading
-    // Stores Promises (not resolved values) so concurrent requests share the same getImage() call
-    imageCache = new Map();
+    cache = new TileCacheManager();
+    tileReader;
     // Store initialization promise to prevent concurrent duplicate initializations
     initializePromise;
     // Track the last successfully initialized URL to detect URL changes
@@ -6803,10 +7094,7 @@ class CogTiles {
         // Fully reset COG-derived state when the URL changes so the instance can be
         // safely reinitialized against a different source.
         if (this.lastInitializedUrl !== undefined && this.lastInitializedUrl !== url) {
-            this.clearTileResultCache();
-            this.rasterCache.clear();
-            this.reliefMaskCache.clear();
-            this.imageCache.clear();
+            this.cache.clearAll();
             this.cog = undefined;
             this.cogOrigin = [0, 0];
             this.cogZoomLookup = [];
@@ -6832,15 +7120,15 @@ class CogTiles {
                 const blockSize = this.options.blockSize ?? 65536;
                 this.cog = await fromUrl(url, { blockSize });
                 const imagePromise = this.cog.getImage();
-                this.imageCache.set(0, imagePromise); // Cache base image (index 0) to avoid re-fetching during getTileFromImage
+                this.cache.setImage(0, imagePromise); // Cache base image (index 0) to avoid re-fetching during getTileFromImage
                 const image = await imagePromise;
                 const fileDirectory = image.fileDirectory;
                 this.cogOrigin = image.getOrigin();
-                this.options.noDataValue ??= await this.getNoDataValue(image);
-                this.options.format ??= await this.getDataTypeFromTags(fileDirectory);
+                this.options.noDataValue ??= getNoDataValue(image);
+                this.options.format ??= await getDataTypeFromTags(fileDirectory);
                 this.options.numOfChannels = fileDirectory.getValue('SamplesPerPixel');
                 this.options.planarConfig = fileDirectory.getValue('PlanarConfiguration');
-                [this.cogZoomLookup, this.cogResolutionLookup] = await this.buildCogZoomResolutionLookup(this.cog);
+                [this.cogZoomLookup, this.cogResolutionLookup] = await buildCogZoomResolutionLookup(this.cog);
                 // Only compute quantized meshMaxError lookup for terrain COGs
                 if (this.options.type === 'terrain') {
                     this.computeMeshMaxErrorLookup();
@@ -6851,8 +7139,13 @@ class CogTiles {
                     throw new Error('GeoTIFF Error: The provided image is not tiled. '
                         + 'Please use "rio cogeo create --web-optimized" to fix this.');
                 }
-                this.zoomRange = this.calculateZoomRange(this.tileSize, image.getResolution()[0], await this.cog.getImageCount());
-                this.bounds = this.calculateBoundsAsLatLon(image.getBoundingBox());
+                this.zoomRange = calculateZoomRange(this.tileSize, image.getResolution()[0], await this.cog.getImageCount());
+                this.bounds = calculateBoundsAsLatLon(image.getBoundingBox());
+                // Initialize TileReader with buffer utilities
+                this.tileReader = new TileReader({
+                    options: this.options,
+                    tileSize: this.tileSize,
+                });
                 // Mark initialization complete for this URL (used to detect URL changes)
                 this.lastInitializedUrl = url;
             }
@@ -6869,60 +7162,9 @@ class CogTiles {
     getZoomRange() {
         return this.zoomRange;
     }
-    calculateZoomRange(tileSize, resolution, imgCount) {
-        const maxZoom = this.getZoomLevelFromResolution(tileSize, resolution);
-        const minZoom = maxZoom - (imgCount - 1);
-        return [minZoom, maxZoom];
-    }
-    calculateBoundsAsLatLon(bbox) {
-        const minX = Math.min(bbox[0], bbox[2]);
-        const maxX = Math.max(bbox[0], bbox[2]);
-        const minY = Math.min(bbox[1], bbox[3]);
-        const maxY = Math.max(bbox[1], bbox[3]);
-        const minXYDeg = this.getLatLon([minX, minY]);
-        const maxXYDeg = this.getLatLon([maxX, maxY]);
-        return [minXYDeg[0], minXYDeg[1], maxXYDeg[0], maxXYDeg[1]];
-    }
-    getZoomLevelFromResolution(tileSize, resolution) {
-        return Math.round(Math.log2(EARTH_CIRCUMFERENCE / (resolution * tileSize)));
-    }
     getBoundsAsLatLon() {
         return this.bounds;
     }
-    getLatLon(input) {
-        const x = input[0];
-        const y = input[1];
-        const lon = (x / EARTH_HALF_CIRCUMFERENCE) * 180;
-        let lat = (y / EARTH_HALF_CIRCUMFERENCE) * 180;
-        lat = (180 / Math.PI) * (2 * Math.atan(Math.exp((lat * Math.PI) / 180)) - Math.PI / 2);
-        return [lon, lat];
-    }
-    /**
-     * Calculates the error multiplier based on zoom level and COG zoom range.
-     * - z >= maxZ: multiplier = 0.5 (fine meshes at high zoom, maximum precision)
-     * - z <= minZ: multiplier = 3.0 (coarse meshes at low zoom, maximum performance)
-     * - Otherwise: linear interpolation between 3.0 and 0.5
-     */
-    getErrorMultiplierForZoom(z, minZ, maxZ) {
-        if (z >= maxZ)
-            return 0.5;
-        if (z <= minZ)
-            return 3.0;
-        // Linear interpolation: 3.0 - ((z - minZ) / (maxZ - minZ)) * 2.5
-        return 3.0 - ((z - minZ) / (maxZ - minZ)) * 2.5;
-    }
-    /**
-     * Calculates dynamic meshMaxError for a given zoom level and resolution.
-     * Formula: resolution * errorMultiplier, where multiplier scales from 3.0 (low zoom) to 0.5 (high zoom).
-     * Results are clamped to 0.5–100 meters to prevent pathological tessellation:
-     * - Min 0.5m ensures simplification always happens (no rounding to 0 with sub-meter pixels)
-     * - Max 100m prevents excessive simplification at low zoom with low-resolution COGs
-     */
-    calculateDynamicMeshMaxError(z, resolution, minZ, maxZ) {
-        const multiplier = this.getErrorMultiplierForZoom(z, minZ, maxZ);
-        const errorValue = resolution * multiplier;
-        return Math.max(0.5, Math.min(100, errorValue));
-    }
     /**
      * Gets the auto meshMaxError for a given overview index.
      * Returns undefined if auto lookup has not been computed.
@@ -6930,46 +7172,6 @@ class CogTiles {
     getMeshMaxErrorForImageIndex(imageIndex) {
         return this.cogMeshMaxErrorLookup[imageIndex];
     }
-    /**
-     * Builds lookup tables for zoom levels and estimated resolutions from a Cloud Optimized GeoTIFF (COG) object.
-     *
-     * It is assumed that inn web mapping, COG data is visualized in the Web Mercator coordinate system.
-     * At zoom level 0, the Web Mercator resolution is defined by the constant `webMercatorRes0`
-     * (e.g., 156543.03125 m/pixel). At each subsequent zoom level, this resolution is halved.
-     *
-     * This function calculates, for each image (overview) in the COG, its estimated resolution and
-     * corresponding zoom level based on the base image's resolution and width.
-     *
-     * @param {object} cog - A Cloud Optimized GeoTIFF object loaded via geotiff.js.
-     * @returns {Promise<[number[], number[]]>} A promise resolving to a tuple of two arrays:
-     *   - The first array (`zoomLookup`) maps each image index to its computed zoom level.
-     *   - The second array (`resolutionLookup`) maps each image index to its estimated resolution (m/pixel).
-     */
-    async buildCogZoomResolutionLookup(cog) {
-        // Retrieve the total number of images (overviews) in the COG.
-        const imageCount = await cog.getImageCount();
-        // Use the first image as the base reference.
-        const baseImage = await cog.getImage(0);
-        const baseResolution = baseImage.getResolution()[0]; // Resolution (m/pixel) of the base image.
-        const baseWidth = baseImage.getWidth();
-        // Initialize arrays to store the zoom level and resolution for each image.
-        const zoomLookup = [];
-        const resolutionLookup = [];
-        // Iterate over each image (overview) in the COG.
-        for (let idx = 0; idx < imageCount; idx++) {
-            const image = await cog.getImage(idx);
-            const width = image.getWidth();
-            // Calculate the scale factor relative to the base image.
-            const scaleFactor = baseWidth / width;
-            const estimatedResolution = baseResolution * scaleFactor;
-            // Calculate the zoom level using the Web Mercator resolution standard:
-            // webMercatorRes0 is the resolution at zoom level 0; each zoom level halves the resolution.
-            const zoomLevel = Math.round(Math.log2(webMercatorRes0 / estimatedResolution));
-            zoomLookup[idx] = zoomLevel;
-            resolutionLookup[idx] = estimatedResolution;
-        }
-        return [zoomLookup, resolutionLookup];
-    }
     /**
      * Computes dynamic meshMaxError values for each overview based on COG resolution and zoom level.
      * Called only for terrain COGs after buildCogZoomResolutionLookup() completes.
@@ -6981,7 +7183,7 @@ class CogTiles {
         const maxZ = this.cogZoomLookup[0];
         this.cogMeshMaxErrorLookup = this.cogResolutionLookup.map((resolution, idx) => {
             const zoom = this.cogZoomLookup[idx];
-            return this.calculateDynamicMeshMaxError(zoom, resolution, minZ, maxZ);
+            return calculateDynamicMeshMaxError(zoom, resolution, minZ, maxZ);
         });
     }
     /**
@@ -6996,29 +7198,7 @@ class CogTiles {
      * @returns {number} The index of the image in the COG that best matches the specified zoom level.
      */
     getImageIndexForZoomLevel(zoom) {
-        // Retrieve the minimum and maximum zoom levels from the lookup table.
-        const minZoom = this.cogZoomLookup[this.cogZoomLookup.length - 1];
-        const maxZoom = this.cogZoomLookup[0];
-        if (zoom > maxZoom)
-            return 0;
-        if (zoom < minZoom)
-            return this.cogZoomLookup.length - 1;
-        // For zoom levels within the available range, find the exact or closest matching index.
-        const exactMatchIndex = this.cogZoomLookup.indexOf(zoom);
-        if (exactMatchIndex !== -1) {
-            return exactMatchIndex;
-        }
-        // No exact match: find the closest zoom level
-        let closestIndex = 0;
-        let minDistance = Math.abs(this.cogZoomLookup[0] - zoom);
-        for (let i = 1; i < this.cogZoomLookup.length; i += 1) {
-            const distance = Math.abs(this.cogZoomLookup[i] - zoom);
-            if (distance < minDistance) {
-                minDistance = distance;
-                closestIndex = i;
-            }
-        }
-        return closestIndex;
+        return getImageIndexForZoomLevel(zoom, this.cogZoomLookup);
     }
     async getTileFromImage(tileX, tileY, zoom, fetchSize, signal) {
         // Create a fresh local AbortController for this specific fetch.
@@ -7035,10 +7215,10 @@ class CogTiles {
         try {
             const imageIndex = this.getImageIndexForZoomLevel(zoom);
             // Cache Promises to share in-flight requests across concurrent tiles at the same overview
-            let imagePromise = this.imageCache.get(imageIndex);
+            let imagePromise = this.cache.getImage(imageIndex);
             if (!imagePromise) {
                 imagePromise = this.cog.getImage(imageIndex);
-                this.imageCache.set(imageIndex, imagePromise);
+                this.cache.setImage(imageIndex, imagePromise);
             }
             const targetImage = await imagePromise;
             // --- STEP 1: CALCULATE BOUNDS IN METERS ---
@@ -7081,7 +7261,7 @@ class CogTiles {
             const readHeight = validReadMaxY - validReadY;
             // CHECK: If no overlap, return empty
             if (readWidth <= 0 || readHeight <= 0) {
-                return [this.createEmptyTile(FETCH_SIZE)];
+                return [this.tileReader.createEmptyTile(FETCH_SIZE)];
             }
             // 8. Calculate Offsets (Padding)
             // "missingLeft" is how many blank pixels we need to insert before the image data starts.
@@ -7097,7 +7277,7 @@ class CogTiles {
             if (missingLeft > 0 || missingTop > 0 || readWidth < FETCH_SIZE || readHeight < FETCH_SIZE) {
                 const numChannels = this.options.numOfChannels || 1;
                 // Initialize with a TypedArray of the full target size and correct data type
-                const validImageData = this.createTileBuffer(this.options.format || 'Float32', FETCH_SIZE, numChannels);
+                const validImageData = this.tileReader.createTileBuffer(this.options.format || 'Float32', FETCH_SIZE, numChannels);
                 if (this.options.noDataValue !== undefined) {
                     validImageData.fill(this.options.noDataValue);
                 }
@@ -7106,7 +7286,7 @@ class CogTiles {
                 // Place the valid pixel data into the tile buffer.
                 for (let band = 0; band < validRasterData.length; band += 1) {
                     // We must reset the buffer for each band, otherwise data from previous band persists in padding areas
-                    const tileBuffer = this.createTileBuffer(this.options.format || 'Float32', FETCH_SIZE);
+                    const tileBuffer = this.tileReader.createTileBuffer(this.options.format || 'Float32', FETCH_SIZE);
                     if (this.options.noDataValue !== undefined) {
                         tileBuffer.fill(this.options.noDataValue);
                     }
@@ -7169,20 +7349,6 @@ class CogTiles {
             throw error;
         }
     }
-    /**
-     * Creates a blank tile buffer filled with the "No Data" value.
-     * @param size The width/height of the square tile (e.g., 256 or 257)
-     */
-    createEmptyTile(size) {
-        const s = size || this.tileSize; // Defaults to 256
-        const channels = this.options.numOfChannels || 1;
-        const totalSize = s * s * channels;
-        const tileData = new Float32Array(totalSize);
-        if (this.options.noDataValue !== undefined) {
-            tileData.fill(this.options.noDataValue);
-        }
-        return tileData;
-    }
     async getTile(x, y, z, bounds, meshMaxError, signal, skipTexture) {
         // cellSizeMeters is derived purely from tile coordinates — compute once for all paths
         const latRad = Math.atan(Math.sinh(Math.PI * (1 - 2 * (y + 0.5) / Math.pow(2, z))));
@@ -7200,258 +7366,223 @@ class CogTiles {
         else {
             resolvedMeshMaxError = meshMaxError ?? 4.0;
         }
-        // ── PATH A: Terrain ──────────────────────────────────────────────────────────
-        // Full TileResult (mesh + raw + texture) cached with ref-counted abort so that
-        // panning cancels in-flight fetches only when ALL callers have cancelled.
         if (isTerrain) {
-            const skipTextureFlag = skipTexture ?? this.options.skipTexture ?? false;
-            const cacheKey = this.getTileResultCacheKey(x, y, z, resolvedMeshMaxError, skipTextureFlag);
-            const existing = this.tileResultCache.get(cacheKey);
-            if (existing) {
-                // LRU touch — move the key to the end of the Map to mark as recently used
-                this.tileResultCache.delete(cacheKey);
-                this.tileResultCache.set(cacheKey, existing);
-            }
-            if (existing) {
-                if (existing.settled) {
-                    if (signal?.aborted)
-                        return null;
-                    return existing.promise;
-                }
-                existing.callerCount += 1;
-                if (signal && !signal.aborted) {
-                    signal.addEventListener('abort', () => {
-                        existing.callerCount -= 1;
-                        if (existing.callerCount <= 0 && !existing.settled) {
-                            existing.controller.abort();
-                        }
-                    }, { once: true });
-                }
-                const result = await existing.promise;
+            return this.getTerrainTile(x, y, z, bounds, resolvedMeshMaxError, cellSizeMeters, signal, skipTexture);
+        }
+        if (isGlaze) {
+            return this.getGlazeTile(x, y, z, bounds, cellSizeMeters, meshMaxError, signal);
+        }
+        return this.getBitmapTile(x, y, z, bounds, cellSizeMeters, meshMaxError, signal);
+    }
+    async getTerrainTile(x, y, z, bounds, resolvedMeshMaxError, cellSizeMeters, signal, skipTexture) {
+        const skipTextureFlag = skipTexture ?? this.options.skipTexture ?? false;
+        const cacheKey = this.cache.getTileResultCacheKey(x, y, z, resolvedMeshMaxError, skipTextureFlag);
+        const existing = this.cache.getTileResult(cacheKey);
+        if (existing) {
+            if (existing.settled) {
                 if (signal?.aborted)
                     return null;
-                return result;
+                return existing.promise;
             }
-            const controller = new AbortController();
-            const pipeline = (async () => {
-                const isKernel = this.options.useSlope || this.options.useHillshade || this.options.useSwissRelief;
-                const requiredSize = this.tileSize + (isKernel ? 2 : 1);
-                const tileData = await this.getTileFromImage(x, y, z, requiredSize, controller.signal);
-                // === Step F: detect all-noData tiles before tessellation ===
-                const raster = tileData[0];
-                const noData = this.options.noDataValue;
-                if (noData !== undefined && raster) {
-                    const numChannels = this.options.numOfChannels || 1;
-                    let useChannelIndex = this.options.useChannelIndex ?? (this.options.useChannel ? (this.options.useChannel - 1) : 0);
-                    if (useChannelIndex == null)
-                        useChannelIndex = 0;
-                    const checkStrategy = this.options.noDataCheck ?? 'full';
-                    const width = requiredSize;
-                    const height = requiredSize;
-                    const isNoValue = (v) => (Number.isNaN(noData) ? Number.isNaN(v) : v === noData);
-                    let allNoData = true;
-                    if (checkStrategy === 'full') {
-                        // Full linear scan (safe)
-                        if (numChannels > 1) {
-                            for (let i = useChannelIndex; i < raster.length; i += numChannels) {
-                                const v = raster[i];
-                                if (!isNoValue(v)) {
-                                    allNoData = false;
-                                    break;
-                                }
+            existing.callerCount += 1;
+            if (signal && !signal.aborted) {
+                signal.addEventListener('abort', () => {
+                    existing.callerCount -= 1;
+                    if (existing.callerCount <= 0 && !existing.settled) {
+                        existing.controller.abort();
+                    }
+                }, { once: true });
+            }
+            const result = await existing.promise;
+            if (signal?.aborted)
+                return null;
+            return result;
+        }
+        const controller = new AbortController();
+        const pipeline = (async () => {
+            const isKernel = this.options.useSlope || this.options.useHillshade || this.options.useSwissRelief;
+            const requiredSize = this.tileSize + (isKernel ? 2 : 1);
+            const tileData = await this.getTileFromImage(x, y, z, requiredSize, controller.signal);
+            // === Step F: detect all-noData tiles before tessellation ===
+            const raster = tileData[0];
+            const noData = this.options.noDataValue;
+            if (noData !== undefined && raster) {
+                const numChannels = this.options.numOfChannels || 1;
+                let useChannelIndex = this.options.useChannelIndex ?? (this.options.useChannel ? (this.options.useChannel - 1) : 0);
+                if (useChannelIndex == null)
+                    useChannelIndex = 0;
+                const checkStrategy = this.options.noDataCheck ?? 'full';
+                const width = requiredSize;
+                const height = requiredSize;
+                const isNoValue = (v) => isF32NoData(v, noData);
+                let allNoData = true;
+                if (checkStrategy === 'full') {
+                    // Full linear scan (safe)
+                    if (numChannels > 1) {
+                        for (let i = useChannelIndex; i < raster.length; i += numChannels) {
+                            const v = raster[i];
+                            if (!isNoValue(v)) {
+                                allNoData = false;
+                                break;
                             }
                         }
-                        else {
-                            for (let i = 0; i < raster.length; i++) {
-                                const v = raster[i];
-                                if (!isNoValue(v)) {
-                                    allNoData = false;
-                                    break;
-                                }
+                    }
+                    else {
+                        for (let i = 0; i < raster.length; i++) {
+                            const v = raster[i];
+                            if (!isNoValue(v)) {
+                                allNoData = false;
+                                break;
                             }
                         }
                     }
-                    else if (checkStrategy === 'border+center') {
-                        // Border scan: iterate over top/bottom rows and left/right cols
-                        const stepX = numChannels;
-                        // Top row
+                }
+                else if (checkStrategy === 'border+center') {
+                    // Border scan: iterate over top/bottom rows and left/right cols
+                    const stepX = numChannels;
+                    // Top row
+                    for (let x = 0; x < width; x++) {
+                        const idx = x * stepX + useChannelIndex;
+                        const v = raster[idx];
+                        if (!isNoValue(v)) {
+                            allNoData = false;
+                            break;
+                        }
+                    }
+                    // Bottom row
+                    if (allNoData) {
                         for (let x = 0; x < width; x++) {
-                            const idx = x * stepX + useChannelIndex;
+                            const idx = ((height - 1) * width + x) * stepX + useChannelIndex;
                             const v = raster[idx];
                             if (!isNoValue(v)) {
                                 allNoData = false;
                                 break;
                             }
                         }
-                        // Bottom row
-                        if (allNoData) {
-                            for (let x = 0; x < width; x++) {
-                                const idx = ((height - 1) * width + x) * stepX + useChannelIndex;
-                                const v = raster[idx];
-                                if (!isNoValue(v)) {
-                                    allNoData = false;
-                                    break;
-                                }
-                            }
-                        }
-                        // Left/Right cols
-                        if (allNoData) {
-                            for (let y = 1; y < height - 1; y++) {
-                                const leftIdx = (y * width) * stepX + useChannelIndex;
-                                const rightIdx = (y * width + (width - 1)) * stepX + useChannelIndex;
-                                const vl = raster[leftIdx];
-                                const vr = raster[rightIdx];
-                                if (!isNoValue(vl) || !isNoValue(vr)) {
-                                    allNoData = false;
-                                    break;
-                                }
-                            }
-                        }
-                        // Center probe + 4 quadrant probes
-                        if (allNoData) {
-                            const probes = [
-                                [Math.floor(width / 2), Math.floor(height / 2)],
-                                [Math.floor(width / 4), Math.floor(height / 4)],
-                                [Math.floor((3 * width) / 4), Math.floor(height / 4)],
-                                [Math.floor(width / 4), Math.floor((3 * height) / 4)],
-                                [Math.floor((3 * width) / 4), Math.floor((3 * height) / 4)],
-                            ];
-                            for (const [px, py] of probes) {
-                                const idx = (py * width + px) * stepX + useChannelIndex;
-                                const v = raster[idx];
-                                if (!isNoValue(v)) {
-                                    allNoData = false;
-                                    break;
-                                }
+                    }
+                    // Left/Right cols
+                    if (allNoData) {
+                        for (let y = 1; y < height - 1; y++) {
+                            const leftIdx = (y * width) * stepX + useChannelIndex;
+                            const rightIdx = (y * width + (width - 1)) * stepX + useChannelIndex;
+                            const vl = raster[leftIdx];
+                            const vr = raster[rightIdx];
+                            if (!isNoValue(vl) || !isNoValue(vr)) {
+                                allNoData = false;
+                                break;
                             }
                         }
                     }
-                    else {
-                        // Unknown strategy — fallback to full
-                        for (let i = 0; i < raster.length; i++) {
-                            const v = raster[i];
+                    // Center probe + 4 quadrant probes
+                    if (allNoData) {
+                        const probes = [
+                            [Math.floor(width / 2), Math.floor(height / 2)],
+                            [Math.floor(width / 4), Math.floor(height / 4)],
+                            [Math.floor((3 * width) / 4), Math.floor(height / 4)],
+                            [Math.floor(width / 4), Math.floor((3 * height) / 4)],
+                            [Math.floor((3 * width) / 4), Math.floor((3 * height) / 4)],
+                        ];
+                        for (const [px, py] of probes) {
+                            const idx = (py * width + px) * stepX + useChannelIndex;
+                            const v = raster[idx];
                             if (!isNoValue(v)) {
                                 allNoData = false;
                                 break;
                             }
                         }
                     }
-                    if (allNoData) {
-                        // Do not cache all-noData result; remove cache entry so future requests re-evaluate if COG/metadata changes.
-                        this.tileResultCache.delete(cacheKey);
-                        return null;
-                    }
                 }
-                // Create generator options with skipTextureFlag applied (don't mutate shared this.options)
-                const generatorOptions = {
-                    ...this.options,
-                    skipTexture: skipTextureFlag,
-                };
-                return this.geo.getMap({
-                    rasters: [tileData[0]],
-                    width: requiredSize,
-                    height: requiredSize,
-                    bounds: bounds ?? [0, 0, 0, 0],
-                    cellSizeMeters,
-                }, generatorOptions, resolvedMeshMaxError);
-            })();
-            const entry = {
-                promise: pipeline,
-                controller,
-                callerCount: 1,
-                settled: false,
-            };
-            if (signal && !signal.aborted) {
-                signal.addEventListener('abort', () => {
-                    entry.callerCount -= 1;
-                    if (entry.callerCount <= 0 && !entry.settled) {
-                        entry.controller.abort();
+                else {
+                    // Unknown strategy — fallback to full
+                    for (let i = 0; i < raster.length; i++) {
+                        const v = raster[i];
+                        if (!isNoValue(v)) {
+                            allNoData = false;
+                            break;
+                        }
                     }
-                }, { once: true });
-            }
-            entry.promise = pipeline;
-            this.tileResultCache.set(cacheKey, entry);
-            if (this.tileResultCache.size > this.tileResultCacheMaxSize) {
-                const oldestKey = this.tileResultCache.keys().next().value;
-                if (typeof oldestKey === 'string') {
-                    const evicted = this.tileResultCache.get(oldestKey);
-                    if (evicted && !evicted.settled)
-                        evicted.controller.abort();
-                    this.tileResultCache.delete(oldestKey);
                 }
-            }
-            try {
-                const result = await pipeline;
-                entry.settled = true;
-                if (signal?.aborted)
+                if (allNoData) {
+                    // Do not cache all-noData result; remove cache entry so future requests re-evaluate if COG/metadata changes.
+                    this.cache.deleteTileResult(cacheKey);
                     return null;
-                return result;
-            }
-            catch (error) {
-                entry.settled = true;
-                this.tileResultCache.delete(cacheKey);
-                throw error;
-            }
-        }
-        // ── PATH B: Bitmap + glaze ────────────────────────────────────────────────────
-        // Relief mask (output of composeSwissRelief) cached — saves fetch + kernel on revisit.
-        // BitmapGenerator re-runs cheaply from the cached Float32Array.
-        // Signal is passed so cancelled tiles abort cleanly; cache entry is deleted on abort/error
-        // so the next request retries fresh.
-        if (isGlaze) {
-            const maskKey = this.getTileCacheKey(x, y, z);
-            let maskPromise = this.reliefMaskCache.get(maskKey);
-            if (maskPromise) {
-                // LRU touch — move the key to the end of the Map to mark as recently used
-                this.reliefMaskCache.delete(maskKey);
-                this.reliefMaskCache.set(maskKey, maskPromise);
-            }
-            if (!maskPromise) {
-                maskPromise = (async () => {
-                    const tileData = await this.getTileFromImage(x, y, z, this.tileSize + 2, signal);
-                    return ReliefCompositor.composeSwissRelief(tileData[0], this.options, cellSizeMeters, this.tileSize, this.tileSize);
-                })();
-                this.reliefMaskCache.set(maskKey, maskPromise);
-                maskPromise.catch(() => this.reliefMaskCache.delete(maskKey));
-                if (this.reliefMaskCache.size > this.reliefMaskCacheMaxSize) {
-                    const oldestKey = this.reliefMaskCache.keys().next().value;
-                    if (typeof oldestKey === 'string')
-                        this.reliefMaskCache.delete(oldestKey);
                 }
             }
-            if (signal?.aborted)
-                return null;
-            const reliefMask = await maskPromise;
-            if (signal?.aborted)
-                return null;
+            // Create generator options with skipTextureFlag applied (don't mutate shared this.options)
+            const generatorOptions = {
+                ...this.options,
+                skipTexture: skipTextureFlag,
+            };
             return this.geo.getMap({
-                rasters: [reliefMask],
-                width: this.tileSize,
-                height: this.tileSize,
+                rasters: [tileData[0]],
+                width: requiredSize,
+                height: requiredSize,
                 bounds: bounds ?? [0, 0, 0, 0],
                 cellSizeMeters,
-            }, this.options, meshMaxError ?? 4.0);
-        }
-        // ── PATH C: Ordinary bitmap ───────────────────────────────────────────────────
-        // Raw raster cached — saves fetch + decompression on revisit.
-        // BitmapGenerator re-runs cheaply from the cached TypedArray.
-        // Signal is passed so cancelled tiles abort cleanly; cache entry deleted on abort/error.
-        const rasterKey = this.getTileCacheKey(x, y, z);
-        let rasterPromise = this.rasterCache.get(rasterKey);
-        if (rasterPromise) {
-            // LRU touch — move the key to the end of the Map to mark as recently used
-            this.rasterCache.delete(rasterKey);
-            this.rasterCache.set(rasterKey, rasterPromise);
+            }, generatorOptions, resolvedMeshMaxError);
+        })();
+        const entry = {
+            promise: pipeline,
+            controller,
+            callerCount: 1,
+            settled: false,
+        };
+        if (signal && !signal.aborted) {
+            signal.addEventListener('abort', () => {
+                entry.callerCount -= 1;
+                if (entry.callerCount <= 0 && !entry.settled) {
+                    entry.controller.abort();
+                }
+            }, { once: true });
+        }
+        entry.promise = pipeline;
+        this.cache.setTileResult(cacheKey, entry);
+        try {
+            const result = await pipeline;
+            entry.settled = true;
+            if (signal?.aborted)
+                return null;
+            return result;
         }
+        catch (error) {
+            entry.settled = true;
+            this.cache.deleteTileResult(cacheKey);
+            throw error;
+        }
+    }
+    async getGlazeTile(x, y, z, bounds, cellSizeMeters, meshMaxError, signal) {
+        const maskKey = this.cache.getTileCacheKey(x, y, z);
+        let maskPromise = this.cache.getReliefMask(maskKey);
+        if (!maskPromise) {
+            const controller = new AbortController();
+            maskPromise = (async () => {
+                const tileData = await this.getTileFromImage(x, y, z, this.tileSize + 2, controller.signal);
+                return ReliefCompositor.composeSwissRelief(tileData[0], this.options, cellSizeMeters, this.tileSize, this.tileSize);
+            })();
+            this.cache.setReliefMask(maskKey, maskPromise);
+            maskPromise.catch(() => this.cache.deleteReliefMask(maskKey));
+        }
+        if (signal?.aborted)
+            return null;
+        const reliefMask = await maskPromise;
+        if (signal?.aborted)
+            return null;
+        return this.geo.getMap({
+            rasters: [reliefMask],
+            width: this.tileSize,
+            height: this.tileSize,
+            bounds: bounds ?? [0, 0, 0, 0],
+            cellSizeMeters,
+        }, this.options, meshMaxError ?? 4.0);
+    }
+    async getBitmapTile(x, y, z, bounds, cellSizeMeters, meshMaxError, signal) {
+        const rasterKey = this.cache.getTileCacheKey(x, y, z);
+        let rasterPromise = this.cache.getRaster(rasterKey);
         if (!rasterPromise) {
-            rasterPromise = this.getTileFromImage(x, y, z, this.tileSize, signal);
-            this.rasterCache.set(rasterKey, rasterPromise);
-            rasterPromise.catch(() => this.rasterCache.delete(rasterKey));
-            if (this.rasterCache.size > this.rasterCacheMaxSize) {
-                const oldestKey = this.rasterCache.keys().next().value;
-                if (typeof oldestKey === 'string')
-                    this.rasterCache.delete(oldestKey);
-            }
+            const controller = new AbortController();
+            rasterPromise = this.getTileFromImage(x, y, z, this.tileSize, controller.signal);
+            this.cache.setRaster(rasterKey, rasterPromise);
+            rasterPromise.catch(() => this.cache.deleteRaster(rasterKey));
         }
         if (signal?.aborted)
             return null;
@@ -7466,111 +7597,9 @@ class CogTiles {
             cellSizeMeters,
         }, this.options, meshMaxError ?? 4.0);
     }
-    /**
-     * Determines the data type (e.g., "Int32", "Float64") of a GeoTIFF image
-     * by reading its TIFF tags.
-     *
-     * @param {GeoTIFFImage} image - A GeoTIFF.js image.
-     * @returns {Promise<string>} - A string representing the data type.
-     */
-    async getDataTypeFromTags(fileDirectory) {
-        const hasSampleFormat = fileDirectory.hasTag('SampleFormat');
-        const hasBitsPerSample = fileDirectory.hasTag('BitsPerSample');
-        if (!hasSampleFormat || !hasBitsPerSample) {
-            console.warn("Missing SampleFormat or BitsPerSample tags, defaulting to UInt8");
-            return 'UInt8';
-        }
-        // In GeoTIFF, BitsPerSample (tag 258) and SampleFormat (tag 339) provide the type info.
-        // They can be either a single number or an array if there are multiple samples.
-        const sampleFormat = fileDirectory.getValue('SampleFormat'); // Tag 339
-        const bitsPerSample = fileDirectory.getValue('BitsPerSample'); // Tag 258
-        // If multiple bands exist, we assume all bands share the same type.
-        const format = (sampleFormat && typeof sampleFormat.length === 'number' && sampleFormat.length > 0)
-            ? sampleFormat[0]
-            : sampleFormat;
-        const bits = (bitsPerSample && typeof bitsPerSample.length === 'number' && bitsPerSample.length > 0)
-            ? bitsPerSample[0]
-            : bitsPerSample;
-        let typePrefix;
-        // 1 = Unsigned Integer, 2 = Signed Integer, 3 = Floating Point
-        if (format === 1) {
-            typePrefix = 'UInt';
-        }
-        else if (format === 2) {
-            typePrefix = 'Int';
-        }
-        else if (format === 3) {
-            typePrefix = 'Float';
-        }
-        else {
-            typePrefix = 'Unknown';
-        }
-        return `${typePrefix}${bits}`;
-    }
-    /**
-     * Extracts the noData value from a GeoTIFF.js image.
-     * Returns the noData value as a number (including NaN) if available, otherwise undefined.
-     *
-     * @param {GeoTIFFImage} image - The GeoTIFF.js image.
-     * @returns {number|undefined} The noData value, possibly NaN, or undefined if not set or invalid.
-     */
-    getNoDataValue(image) {
-        const noDataRaw = image.getGDALNoData();
-        if (noDataRaw === undefined || noDataRaw === null) {
-            /* eslint-disable no-console */
-            console.warn('No noData value defined — raster might be rendered incorrectly.');
-            return undefined;
-        }
-        const cleaned = String(noDataRaw).replace(/\0/g, '').trim();
-        if (cleaned === '') {
-            /* eslint-disable no-console */
-            console.warn('noData value is an empty string after cleanup.');
-            return undefined;
-        }
-        const parsed = Number(cleaned);
-        // Allow NaN if explicitly declared
-        if (cleaned.toLowerCase() === 'nan') {
-            return NaN;
-        }
-        // If not declared as "nan" and still parsed to NaN, it's an error
-        if (Number.isNaN(parsed)) {
-            /* eslint-disable no-console */
-            console.warn(`Failed to parse numeric noData value: '${cleaned}'`);
-            return undefined;
-        }
-        return parsed;
-    }
-    /**
-     * Creates a tile buffer of the specified size using a typed array corresponding to the provided data type.
-     *
-     * @param {string} dataType - A string specifying the data type (e.g., "Int32", "Float64", "UInt16", etc.).
-     * @param {number} tileSize - The width/height of the square tile.
-     * @param {number} multiplier - Optional multiplier for interleaved buffers (e.g., numChannels).
-     * @returns {TypedArray} A typed array buffer of length (tileSize * tileSize * multiplier).
-     */
-    createTileBuffer(dataType, tileSize, multiplier = 1) {
-        const length = tileSize * tileSize * multiplier;
-        switch (dataType) {
-            case 'UInt8':
-                return new Uint8Array(length);
-            case 'Int8':
-                return new Int8Array(length);
-            case 'UInt16':
-                return new Uint16Array(length);
-            case 'Int16':
-                return new Int16Array(length);
-            case 'UInt32':
-                return new Uint32Array(length);
-            case 'Int32':
-                return new Int32Array(length);
-            case 'Float32':
-                return new Float32Array(length);
-            case 'Float64':
-                return new Float64Array(length);
-            default:
-                console.warn(`Unsupported data type: ${dataType}, defaulting to Float32`);
-                return new Float32Array(length);
-        }
+    // Expose legacy API for clearing tile result cache (used by external layers)
+    clearTileResultCache() {
+        this.cache.clearTileResultCache();
     }
 }
 
@@ -7881,10 +7910,10 @@ class CogTerrainLayer extends core.CompositeLayer {
         }
         if (!this.state.isTiled && shouldReload) ;
         // Update the useChannel option for terrainCogTiles when terrainOptions.useChannel changes.
-        if (props?.terrainOptions?.useChannel !== oldProps.terrainOptions?.useChannel) {
+        if (props?.terrainOptions?.useChannel !== oldProps.terrainOptions?.useChannel && this.state.terrainCogTiles) {
             this.state.terrainCogTiles.options.useChannel = props.terrainOptions.useChannel;
-            // Trigger a refresh of the tiles
-            this.state.terrainCogTiles.options.useChannelIndex = null; // Clear cached index
+            this.state.terrainCogTiles.options.useChannelIndex = null; // Clear derived channel index
+            this.state.terrainCogTiles.clearTileResultCache(); // Invalidate cached tiles from previous channel
         }
         // Update skipTexture when wireframe/operation/disableTexture changes so cache keys are correct
         const newSkipTexture = !!(props?.wireframe || props?.operation === 'terrain' || props?.disableTexture);
@@ -8042,6 +8071,7 @@ class CogTerrainLayer extends core.CompositeLayer {
                         elevationDecoder,
                         terrainCogTiles: this.state.terrainCogTiles,
                         skipTexture: !!(this.props.wireframe || this.props.operation === 'terrain' || this.props.disableTexture),
+                        useChannel: this.props.terrainOptions?.useChannel,
                     },
                     renderSubLayers: {
                         disableTexture: this.props.disableTexture,