@gisatcz/deckgl-geolib 2.2.2 → 2.3.0

package/dist/cjs/index.js

@@ -5255,7 +5255,7 @@ class TerrainGenerator {
             attributes = newAttributes;
             triangles = newTriangles;
         }
-        return {
+        const map = {
             // Data return by this loader implementation
             loaderData: {
                 header: {},
@@ -5268,6 +5268,14 @@ class TerrainGenerator {
             indices: { value: Uint32Array.from(triangles), size: 1 },
             attributes,
         };
+        const gridWidth = width === 257 ? 257 : width + 1;
+        const gridHeight = height === 257 ? 257 : height + 1;
+        return {
+            map,
+            raw: terrain,
+            width: gridWidth,
+            height: gridHeight
+        };
     }
     /**
      * Decodes raw raster data into a Float32Array of elevation values.
@@ -5487,7 +5495,16 @@ class BitmapGenerator {
         // Return raw GPU-ready ImageBitmap directly
         // Note: createImageBitmap(imageData) is cleaner, but using the canvas ensures broad compatibility
         c.putImageData(imageData, 0, 0);
-        return createImageBitmap(canvas);
+        const map = await createImageBitmap(canvas);
+        return {
+            map,
+            // rasters[0] is the interleaved buffer on the CogTiles path (primary use case).
+            // For planar multi-band GeoTIFFs via GeoImage.getBitmap(), only the first band is exposed here.
+            // Full multi-band raw picking support is tracked in https://github.com/Gisat/deck.gl-geotiff/issues/98
+            raw: rasters[0],
+            width,
+            height
+        };
     }
     static getMinMax(array, options, samplesPerPixel = 1) {
         let maxValue = -Infinity;
@@ -6223,6 +6240,9 @@ class CogBitmapLayer extends core.CompositeLayer {
         // TODO - pass signal to getTile
         // abort request if signal is aborted
         const tileData = await this.state.bitmapCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z);
+        if (tileData && !this.props.pickable) {
+            tileData.raw = null;
+        }
         return tileData;
     }
     renderSubLayers(props) {
@@ -6236,9 +6256,10 @@ class CogBitmapLayer extends core.CompositeLayer {
         }
         const { bbox: { west, south, east, north, }, } = props.tile;
         return new SubLayerClass({ ...props, tileSize: this.state.bitmapCogTiles.tileSize }, {
-            data: null,
-            image: data,
+            data: [1],
+            image: data.map,
             _instanced: false,
+            pickable: props.pickable,
             bounds: [west, south, east, north],
             textureParameters: {
                 minFilter: blurredTexture ? 'linear' : 'nearest',
@@ -6260,6 +6281,8 @@ class CogBitmapLayer extends core.CompositeLayer {
             }), {
                 getTileData: this.getTiledBitmapData.bind(this),
                 renderSubLayers: this.renderSubLayers.bind(this),
+                pickable: this.props.pickable,
+                onClick: this.props.onClick,
                 updateTriggers: {
                     getTileData: [
                         // rasterData: urlTemplateToUpdateTrigger(rasterData),
@@ -6423,13 +6446,7 @@ class CogTerrainLayer extends core.CompositeLayer {
         });
     }
     async getTiledTerrainData(tile) {
-        // const {
-        //   elevationData, fetch, texture, elevationDecoder, meshMaxError,
-        // } = this.props;
         const { viewport } = this.context;
-        // const dataUrl = getURLFromTemplate(elevationData, tile);
-        // const textureUrl = texture && getURLFromTemplate(texture, tile);
-        // const { signal } = tile;
         let bottomLeft = [0, 0];
         let topRight = [0, 0];
         if (viewport.isGeospatial) {
@@ -6446,6 +6463,9 @@ class CogTerrainLayer extends core.CompositeLayer {
         // TODO - pass signal to getTile
         // abort request if signal is aborted
         const terrain = await this.state.terrainCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z, bounds, this.props.meshMaxError);
+        if (terrain && !this.props.pickable) {
+            terrain.raw = null;
+        }
         return Promise.all([terrain, null]);
     }
     renderSubLayers(props) {
@@ -6456,12 +6476,13 @@ class CogTerrainLayer extends core.CompositeLayer {
             return null;
         }
         // const [mesh, texture] = data;
-        const [mesh] = data;
+        const [meshResult] = data;
         return new SubLayerClass({ ...props, tileSize: 256 }, {
             data: DUMMY_DATA,
-            mesh,
+            mesh: meshResult?.map,
             // texture,
             _instanced: false,
+            pickable: props.pickable,
             coordinateSystem: core.COORDINATE_SYSTEM.CARTESIAN,
             // getPosition: (d) => [0, 0, 0],
             getColor: color,
@@ -6479,8 +6500,7 @@ class CogTerrainLayer extends core.CompositeLayer {
             .map((tile) => tile.content)
             .filter((x) => x && x[0])
             .map((arr) => {
-            // @ts-expect-error: Tile content structure is not fully typed in the source layer
-            const bounds = arr[0]?.header?.boundingBox;
+            const bounds = arr[0]?.map?.header?.boundingBox;
             return bounds?.map((bound) => bound[2]);
         });
         if (ranges.length === 0) {
@@ -6506,6 +6526,8 @@ class CogTerrainLayer extends core.CompositeLayer {
             }), {
                 getTileData: this.getTiledTerrainData.bind(this),
                 renderSubLayers: this.renderSubLayers.bind(this),
+                pickable: this.props.pickable,
+                onClick: this.props.onClick,
                 updateTriggers: {
                     getTileData: {
                         elevationData: urlTemplateToUpdateTrigger(elevationData),