@gisatcz/deckgl-geolib 2.2.2 → 2.3.1-dev.1

package/dist/esm/types/core/CogTiles.d.ts

@@ -1,6 +1,6 @@
 import { GeoTIFF, GeoTIFFImage } from 'geotiff';
 import GeoImage from './GeoImage';
-import { GeoImageOptions } from './types';
+import { GeoImageOptions, TileResult } from './types';
 export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
 declare class CogTiles {
     cog: GeoTIFF;
@@ -54,30 +54,7 @@ declare class CogTiles {
      * @param size The width/height of the square tile (e.g., 256 or 257)
      */
     createEmptyTile(size?: number): Float32Array<ArrayBuffer>;
-    getTile(x: number, y: number, z: number, bounds: Bounds, meshMaxError: number): Promise<{
-        loaderData: {
-            header: {};
-        };
-        header: {
-            vertexCount: any;
-            boundingBox: [[number, number, number], [number, number, number]];
-        };
-        mode: number;
-        indices: {
-            value: Uint32Array<ArrayBuffer>;
-            size: number;
-        };
-        attributes: {
-            POSITION: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-            TEXCOORD_0: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-        };
-    } | ImageBitmap>;
+    getTile(x: number, y: number, z: number, bounds: Bounds, meshMaxError: number): Promise<TileResult | null>;
     /**
      * Determines the data type (e.g., "Int32", "Float64") of a GeoTIFF image
      * by reading its TIFF tags.

package/dist/esm/types/core/GeoImage.d.ts

@@ -1,5 +1,5 @@
 import { GeoTIFFImage } from 'geotiff';
-import { GeoImageOptions, Bounds } from './types';
+import { GeoImageOptions, Bounds, TileResult } from './types';
 export * from './types';
 export default class GeoImage {
     data: GeoTIFFImage | undefined;
@@ -9,62 +9,16 @@ export default class GeoImage {
         height: number;
         rasters: any[];
         bounds: Bounds;
-    }, options: GeoImageOptions, meshMaxError: any): Promise<{
-        loaderData: {
-            header: {};
-        };
-        header: {
-            vertexCount: any;
-            boundingBox: [[number, number, number], [number, number, number]];
-        };
-        mode: number;
-        indices: {
-            value: Uint32Array<ArrayBuffer>;
-            size: number;
-        };
-        attributes: {
-            POSITION: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-            TEXCOORD_0: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-        };
-    } | ImageBitmap>;
+    }, options: GeoImageOptions, meshMaxError: any): Promise<TileResult | null>;
     getHeightmap(input: string | {
         bounds: Bounds;
         width: number;
         height: number;
         rasters: any[];
-    }, options: GeoImageOptions, meshMaxError: any): Promise<{
-        loaderData: {
-            header: {};
-        };
-        header: {
-            vertexCount: any;
-            boundingBox: [[number, number, number], [number, number, number]];
-        };
-        mode: number;
-        indices: {
-            value: Uint32Array<ArrayBuffer>;
-            size: number;
-        };
-        attributes: {
-            POSITION: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-            TEXCOORD_0: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-        };
-    }>;
+    }, options: GeoImageOptions, meshMaxError: any): Promise<TileResult>;
     getBitmap(input: string | {
         width: number;
         height: number;
         rasters: any[];
-    }, options: GeoImageOptions): Promise<ImageBitmap>;
+    }, options: GeoImageOptions): Promise<TileResult>;
 }

package/dist/esm/types/core/lib/BitmapGenerator.d.ts

@@ -1,11 +1,11 @@
 import chroma from 'chroma-js';
-import { GeoImageOptions, TypedArray } from '../types';
+import { GeoImageOptions, TypedArray, TileResult } from '../types';
 export declare class BitmapGenerator {
     static generate(input: {
         width: number;
         height: number;
         rasters: TypedArray[];
-    }, options: GeoImageOptions): Promise<ImageBitmap>;
+    }, options: GeoImageOptions): Promise<TileResult>;
     static getMinMax(array: TypedArray, options: GeoImageOptions, samplesPerPixel?: number): number[];
     static getColorValue(dataArray: TypedArray | any[], options: GeoImageOptions, arrayLength: number, samplesPerPixel?: number): Uint8ClampedArray<ArrayBuffer>;
     static findClassIndex(number: number, intervals: [number, number][], bounds: [boolean, boolean][]): number;

package/dist/esm/types/core/lib/TerrainGenerator.d.ts

@@ -1,34 +1,11 @@
-import { GeoImageOptions, Bounds, TypedArray } from '../types';
+import { GeoImageOptions, Bounds, TypedArray, TileResult } from '../types';
 export declare class TerrainGenerator {
     static generate(input: {
         width: number;
         height: number;
         rasters: TypedArray[];
         bounds: Bounds;
-    }, options: GeoImageOptions, meshMaxError: number): {
-        loaderData: {
-            header: {};
-        };
-        header: {
-            vertexCount: any;
-            boundingBox: [[number, number, number], [number, number, number]];
-        };
-        mode: number;
-        indices: {
-            value: Uint32Array<ArrayBuffer>;
-            size: number;
-        };
-        attributes: {
-            POSITION: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-            TEXCOORD_0: {
-                value: Float32Array<ArrayBuffer>;
-                size: number;
-            };
-        };
-    };
+    }, options: GeoImageOptions, meshMaxError: number): TileResult;
     /**
      * Decodes raw raster data into a Float32Array of elevation values.
      * Handles channel selection, value scaling, data type validation, and border stitching.

package/dist/esm/types/core/types.d.ts

@@ -1,4 +1,5 @@
 import chroma from 'chroma-js';
+import type { MeshAttributes } from '@loaders.gl/schema';
 export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
 export type ClampToTerrainOptions = {
     terrainDrawMode?: string;
@@ -40,3 +41,22 @@ export type GeoImageOptions = {
 };
 export declare const DefaultGeoImageOptions: GeoImageOptions;
 export type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+export type TerrainMesh = {
+    loaderData?: Record<string, unknown>;
+    header?: {
+        vertexCount: number;
+        boundingBox?: [number[], number[]];
+    };
+    mode: number;
+    indices?: {
+        value: Uint32Array;
+        size: number;
+    };
+    attributes: MeshAttributes;
+};
+export interface TileResult {
+    map: ImageBitmap | TerrainMesh;
+    raw: TypedArray | null;
+    width: number;
+    height: number;
+}

package/dist/esm/types/layers/CogBitmapLayer.d.ts

@@ -1,9 +1,9 @@
-import { CompositeLayer, CompositeLayerProps, DefaultProps, TextureSource, UpdateParameters } from '@deck.gl/core';
+import { CompositeLayer, CompositeLayerProps, DefaultProps, UpdateParameters } from '@deck.gl/core';
 import { _Tile2DHeader as Tile2DHeader, _TileLoadProps as TileLoadProps, GeoBoundingBox, NonGeoBoundingBox, TileLayer, TileLayerProps } from '@deck.gl/geo-layers';
 import { BitmapLayer } from '@deck.gl/layers';
 import type { MeshAttributes } from '@loaders.gl/schema';
 import CogTiles from '../core/CogTiles';
-import { GeoImageOptions } from '../core/GeoImage';
+import { GeoImageOptions, TileResult } from '../core/GeoImage';
 export type TileBoundingBox = NonGeoBoundingBox | GeoBoundingBox;
 export type ZRange = [minZ: number, maxZ: number];
 export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
@@ -17,7 +17,7 @@ export declare const urlType: {
 export type ClampToTerrainOptions = {
     terrainDrawMode?: string;
 };
-type MeshAndTexture = [MeshAttributes | null, TextureSource | null];
+type MeshAndTexture = TileResult;
 /** Props added by the CogBitmapLayer */
 type _CogBitmapLayerProps = {
     /** Image url that encodes raster data. * */
@@ -56,29 +56,12 @@ export default class CogBitmapLayer<ExtraPropsT extends object = object> extends
     initializeState(context: any): Promise<void>;
     init(): Promise<void>;
     updateState({ props, oldProps }: UpdateParameters<this>): void;
-    getTiledBitmapData(tile: TileLoadProps): Promise<TextureSource>;
-    renderSubLayers(props: TileLayerProps<TextureSource> & {
+    getTiledBitmapData(tile: TileLoadProps): Promise<TileResult>;
+    renderSubLayers(props: TileLayerProps<TileResult> & {
         id: string;
-        data: TextureSource;
-        tile: Tile2DHeader<TextureSource>;
+        data: TileResult;
+        tile: Tile2DHeader<TileResult>;
     }): BitmapLayer<{}>;
-    renderLayers(): TileLayer<any, {
-        getTileData: any;
-        renderSubLayers: any;
-        updateTriggers: {
-            getTileData: (number | boolean | ClampToTerrainOptions)[];
-        };
-        extent: any;
-        tileSize: any;
-        minZoom: number;
-        maxZoom: number;
-        maxRequests: number;
-        onTileLoad: (tile: Tile2DHeader<MeshAndTexture>) => void;
-        onTileUnload: (tile: Tile2DHeader<MeshAndTexture>) => void;
-        onTileError: (err: any, tile?: any) => void;
-        maxCacheSize: number;
-        maxCacheByteSize: number;
-        refinementStrategy: import("@deck.gl/geo-layers/dist/tileset-2d").RefinementStrategy;
-    }>;
+    renderLayers(): TileLayer<TileResult, {}>;
 }
 export {};

package/dist/esm/types/layers/CogTerrainLayer.d.ts

@@ -3,7 +3,7 @@ import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
 import type { MeshAttributes } from '@loaders.gl/schema';
 import { TileLayerProps, GeoBoundingBox, _TileLoadProps as TileLoadProps, _Tile2DHeader as Tile2DHeader, NonGeoBoundingBox } from '@deck.gl/geo-layers';
 import CogTiles from '../core/CogTiles';
-import { GeoImageOptions } from '../core/GeoImage';
+import { GeoImageOptions, TileResult } from '../core/GeoImage';
 export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
 export type TileBoundingBox = NonGeoBoundingBox | GeoBoundingBox;
 export type ZRange = [minZ: number, maxZ: number];
@@ -27,7 +27,7 @@ type TerrainLoadProps = {
     meshMaxError: number;
     signal?: AbortSignal;
 };
-type MeshAndTexture = [MeshAttributes | null, TextureSource | null];
+type MeshAndTexture = [TileResult | null, TextureSource | null];
 /** All properties supported by CogTerrainLayer */
 export type CogTerrainLayerProps = _CogTerrainLayerProps & TileLayerProps<MeshAndTexture> & CompositeLayerProps;
 /** Props added by the CogTerrainLayer */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisatcz/deckgl-geolib",
-  "version": "2.2.2",
+  "version": "2.3.1-dev.1",
   "description": "Deck.gl extension for rendering Cloud-Optimized GeoTIFF (COG) data",
   "keywords": [
     "deck.gl",