@gisatcz/deckgl-geolib 2.4.0-dev.5 → 2.4.1-dev.1

package/dist/esm/index.js

@@ -4866,6 +4866,7 @@ async function fromArrayBuffer(arrayBuffer, signal) {
 const DefaultGeoImageOptions = {
     // --- Shared / Data ---
     type: 'image',
+    blockSize: 65536,
     format: undefined,
     useChannel: null,
     useChannelIndex: null,
@@ -6255,36 +6256,57 @@ class CogTiles {
     bounds = [0, 0, 0, 0];
     geo = new GeoImage();
     options;
+    // 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();
+    // Store initialization promise to prevent concurrent duplicate initializations
+    initializePromise;
     constructor(options) {
         this.options = { ...CogTilesGeoImageOptionsDefaults, ...options };
     }
     async initializeCog(url) {
+        // Return existing initialization promise if already in progress (prevents concurrent duplicates)
+        if (this.initializePromise)
+            return this.initializePromise;
         if (this.cog)
-            return; // Prevent re-initialization on the same instance
-        try {
-            this.cog = await fromUrl(url);
-            const image = await this.cog.getImage();
-            const fileDirectory = image.fileDirectory;
-            this.cogOrigin = image.getOrigin();
-            this.options.noDataValue ??= await this.getNoDataValue(image);
-            this.options.format ??= await this.getDataTypeFromTags(fileDirectory);
-            this.options.numOfChannels = fileDirectory.getValue('SamplesPerPixel');
-            this.options.planarConfig = fileDirectory.getValue('PlanarConfiguration');
-            [this.cogZoomLookup, this.cogResolutionLookup] = await this.buildCogZoomResolutionLookup(this.cog);
-            this.tileSize = image.getTileWidth();
-            // 1. Validation: Ensure the image is tiled
-            if (!this.tileSize || !image.getTileHeight()) {
-                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());
-        }
-        catch (error) {
-            /* eslint-disable no-console */
-            console.error(`[CogTiles] Failed to initialize COG from ${url}:`, error);
-            throw error;
-        }
+            return;
+        this.initializePromise = (async () => {
+            try {
+                // fromUrl's type declaration only exposes RemoteSourceOptions, but the implementation
+                // also accepts BlockedSourceOptions (forwarded to makeFetchSource internally).
+                // Explicitly enabling BlockedSource restores the block-level LRU cache that was
+                // accidentally active in geotiff 3.0.3 (due to a null vs undefined bug there).
+                // blockSize defaults to 65536 (64KB) and can be tuned via GeoImageOptions.
+                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
+                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.numOfChannels = fileDirectory.getValue('SamplesPerPixel');
+                this.options.planarConfig = fileDirectory.getValue('PlanarConfiguration');
+                [this.cogZoomLookup, this.cogResolutionLookup] = await this.buildCogZoomResolutionLookup(this.cog);
+                this.tileSize = image.getTileWidth();
+                // 1. Validation: Ensure the image is tiled
+                if (!this.tileSize || !image.getTileHeight()) {
+                    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());
+            }
+            catch (error) {
+                // Reset initialization promise on error so retry can be attempted
+                this.initializePromise = undefined;
+                /* eslint-disable no-console */
+                console.error(`[CogTiles] Failed to initialize COG from ${url}:`, error);
+                throw error;
+            }
+        })();
+        return this.initializePromise;
     }
     getZoomRange() {
         return this.zoomRange;
@@ -6389,7 +6411,13 @@ class CogTiles {
     }
     async getTileFromImage(tileX, tileY, zoom, fetchSize) {
         const imageIndex = this.getImageIndexForZoomLevel(zoom);
-        const targetImage = await this.cog.getImage(imageIndex);
+        // Cache Promises to share in-flight requests across concurrent tiles at the same overview
+        let imagePromise = this.imageCache.get(imageIndex);
+        if (!imagePromise) {
+            imagePromise = this.cog.getImage(imageIndex);
+            this.imageCache.set(imageIndex, imagePromise);
+        }
+        const targetImage = await imagePromise;
         // --- STEP 1: CALCULATE BOUNDS IN METERS ---
         // 2. Get COG Metadata (image = COG)
         const imageResolution = this.cogResolutionLookup[imageIndex];
@@ -6880,11 +6908,21 @@ class CogTerrainLayer extends CompositeLayer {
     terrainUrl = '';
     async initializeState(context) {
         super.initializeState(context);
+        const terrainCogTiles = this.props.cogTiles || new CogTiles(this.props.terrainOptions);
         this.setState({
-            terrainCogTiles: this.props.cogTiles || new CogTiles(this.props.terrainOptions),
+            terrainCogTiles,
             initialized: false,
         });
-        await this.init(this.terrainUrl);
+        // Only initialize if not already done (e.g., provided cogTiles instance may be pre-initialized)
+        if (!terrainCogTiles.cog) {
+            await this.init();
+        }
+        else {
+            // CogTiles already initialized; just extract zoom range and mark ready
+            const zoomRange = terrainCogTiles.getZoomRange();
+            const [minZoom, maxZoom] = zoomRange;
+            this.setState({ initialized: true, minZoom, maxZoom });
+        }
     }
     async init() {
         await this.state.terrainCogTiles.initializeCog(this.props.elevationData);