@gisatcz/deckgl-geolib 1.11.0-dev.0 → 1.11.0-dev.10

package/dist/cjs/types/cogbitmaplayer/CogBitmapLayer.d.ts

@@ -1,42 +1,87 @@
-import { CompositeLayer } from '@deck.gl/core';
-import { TileLayer } from '@deck.gl/geo-layers';
+import { CompositeLayer, CompositeLayerProps, DefaultProps, TextureSource, 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 { _TerrainExtension as TerrainExtension } from '@deck.gl/extensions';
-import CogTiles from '../cogtiles/cogtiles.ts';
+import type { MeshAttributes } from '@loaders.gl/schema';
 import { GeoImageOptions } from '../geoimage/geoimage.ts';
-declare class CogBitmapLayer extends CompositeLayer<any> {
+export type TileBoundingBox = NonGeoBoundingBox | GeoBoundingBox;
+export type ZRange = [minZ: number, maxZ: number];
+export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
+export type URLTemplate = string | string[] | null;
+export declare const urlType: {
+    type: "object";
+    value: URLTemplate;
+    validate: (value: any, propType: any) => boolean;
+    equal: (value1: any, value2: any) => boolean;
+};
+export type ClampToTerrainOptions = {
+    terrainDrawMode?: string;
+};
+type MeshAndTexture = [MeshAttributes | null, TextureSource | null];
+/** Props added by the CogBitmapLayer */
+type _CogBitmapLayerProps = {
+    /** Image url that encodes raster data. * */
+    rasterData: URLTemplate;
+    /** Bounding box of the bitmap image, [minX, minY, maxX, maxY] in world coordinates. * */
+    bounds: Bounds | null;
+    /** Weather visualise the entire image with specified opacity (0-1) * */
+    opacity?: number;
+    /** Whether the rendered texture should be clamped to terrain * */
+    clampToTerrain?: ClampToTerrainOptions | boolean;
+    /**
+     * TODO
+     */
+    cogBitmapOptions: GeoImageOptions;
+    isTiled: boolean;
+    /**
+     * @deprecated Use `loadOptions.terrain.workerUrl` instead
+     */
+    workerUrl?: string;
+};
+/** All properties supported by CogBitmapLayer */
+export type CogBitmapLayerProps = _CogBitmapLayerProps & TileLayerProps<MeshAndTexture> & CompositeLayerProps;
+/** Render bitmap texture from cog raster images. */
+export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_CogBitmapLayerProps & Required<TileLayerProps<MeshAndTexture>>>> {
+    static defaultProps: DefaultProps<CogBitmapLayerProps>;
     static layerName: string;
-    id: string;
-    url: string;
-    static displayName: string;
-    cogTiles: CogTiles;
-    tileSize: number;
     minZoom: number;
     maxZoom: number;
-    blurredTexture: boolean;
-    constructor(id: string, url: string, options: GeoImageOptions);
-    initializeState(): void;
-    init(url: string): Promise<void>;
-    renderLayers(): TileLayer<any, {
-        id: `${string}-${string}`;
-        getTileData: (tileData: any) => Promise<string>;
+    state: {
+        initialized: boolean;
+        isTiled?: boolean;
+        terrain?: MeshAttributes;
+        zRange?: ZRange | null;
+        bitmapCogTiles: any;
         minZoom: number;
         maxZoom: number;
-        tileSize: number;
-        maxRequests: 6;
-        extent: [number, number, number, number];
-        renderSubLayers: (props: any) => BitmapLayer<{
-            terrainDrawMode: any;
-            data: null;
-            image: any;
-            bounds: [any, any, any, any];
-            opacity: number;
-            textureParameters: {
-                minFilter: "linear" | "nearest";
-                magFilter: "linear" | "nearest";
+    };
+    initializeState(context: any): Promise<void>;
+    init(): Promise<void>;
+    updateState({ props, oldProps }: UpdateParameters<this>): void;
+    getTiledBitmapData(tile: TileLoadProps): Promise<TextureSource>;
+    renderSubLayers(props: TileLayerProps<TextureSource> & {
+        id: string;
+        data: TextureSource;
+        tile: Tile2DHeader<TextureSource>;
+    }): BitmapLayer<{}>;
+    renderLayers(): TileLayer<any, {
+        getTileData: any;
+        renderSubLayers: any;
+        updateTriggers: {
+            getTileData: {
+                clampToTerrain: boolean | ClampToTerrainOptions;
             };
-            extensions: TerrainExtension[];
-        }>;
+        };
+        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("node_modules/@deck.gl/geo-layers/dist/tileset-2d/tileset-2d.js").RefinementStrategy;
     }>;
 }
-export default CogBitmapLayer;
+export {};

package/dist/esm/index.js

@@ -15075,7 +15075,9 @@ class GeoImage {
         }) : undefined;
         for (let i = 0; i < arrayLength; i += 4) {
             let pixelColor = options.nullColor;
-            if (options.noDataValue === undefined || dataArray[pixel] !== options.noDataValue) {
+            // FIXME
+            // eslint-disable-next-line max-len
+            if ((!Number.isNaN(dataArray[pixel])) && (options.noDataValue === undefined || dataArray[pixel] !== options.noDataValue)) {
                 if ((options.clipLow != null && dataArray[pixel] <= options.clipLow)
                     || (options.clipHigh != null && dataArray[pixel] >= options.clipHigh)) {
                     pixelColor = options.clippedColor;
@@ -15111,10 +15113,6 @@ class GeoImage {
                         pixelColor[3] = this.scale(dataArray[pixel], options.colorScaleValueRange[0], options.colorScaleValueRange.slice(-1)[0], 0, 255);
                     }
                 }
-                // If pixel has null value
-            }
-            else if (Number.isNaN(dataArray[pixel])) {
-                pixelColor = [0, 0, 0, 0];
             }
             // FIXME
             // eslint-disable-next-line
@@ -15216,6 +15214,9 @@ function getDelatinTileMesh(meshMaxError, width, height, terrain) {
 
 const EARTH_CIRCUMFERENCE = 40075000.0;
 const EARTH_HALF_CIRCUMFERENCE = 20037500.0;
+const CogTilesGeoImageOptionsDefaults = {
+    blurredTexture: true,
+};
 class CogTiles {
     constructor(options) {
         this.zoomRange = [0, 0];
@@ -15224,7 +15225,7 @@ class CogTiles {
         this.loaded = false;
         this.geo = new GeoImage();
         this.lzw = new LZWDecoder$1();
-        this.options = options;
+        this.options = Object.assign(Object.assign({}, CogTilesGeoImageOptionsDefaults), options);
     }
     initializeCog(url) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -15469,68 +15470,174 @@ class CogTiles {
     }
 }
 
-// let needsRerender: boolean = false;
-// let extent = [0, 0, 0, 0]
+const urlType$1 = {
+    type: 'object',
+    value: null,
+    validate: (value, propType) => (propType.optional && value === null)
+        || typeof value === 'string'
+        || (Array.isArray(value) && value.every((url) => typeof url === 'string')),
+    equal: (value1, value2) => {
+        if (value1 === value2) {
+            return true;
+        }
+        if (!Array.isArray(value1) || !Array.isArray(value2)) {
+            return false;
+        }
+        const len = value1.length;
+        if (len !== value2.length) {
+            return false;
+        }
+        for (let i = 0; i < len; i++) {
+            if (value1[i] !== value2[i]) {
+                return false;
+            }
+        }
+        return true;
+    },
+};
+const defaultProps$1 = Object.assign(Object.assign({}, TileLayer.defaultProps), { 
+    // Image url that encodes height data
+    // elevationData: urlType,
+    // Image url to use as texture
+    // texture: { ...urlType, optional: true },
+    // Martini error tolerance in meters, smaller number -> more detailed mesh
+    // meshMaxError: { type: 'number', value: 4.0 },
+    // Bounding box of the terrain image, [minX, minY, maxX, maxY] in world coordinates
+    bounds: {
+        type: 'array', value: null, optional: true, compare: true,
+    }, rasterData: urlType$1, 
+    // Color to use if texture is unavailable
+    // color: { type: 'color', value: [255, 255, 255] },
+    blurredTexture: true, opacity: 1, clampToTerrain: false, 
+    // Object to decode height data, from (r, g, b) to height in meters
+    // elevationDecoder: {
+    //   type: 'object',
+    //   value: {
+    //     rScaler: 1,
+    //     gScaler: 0,
+    //     bScaler: 0,
+    //     offset: 0,
+    //   },
+    // },
+    // Supply url to local terrain worker bundle. Only required if running offline and cannot access CDN.
+    workerUrl: '' });
+/** Render bitmap texture from cog raster images. */
 class CogBitmapLayer extends CompositeLayer {
-    constructor(id, url, options) {
-        super({});
-        // private _isLoaded: boolean;
-        this.id = '';
-        this.id = id;
-        // this.state = {
-        //   initialized: false,
-        // };
-        // this._isLoaded = false;
-        this.cogTiles = new CogTiles(options);
-        this.blurredTexture = options.blurredTexture;
-        this.url = url;
-        // setTimeout(() => {
-        //   this.init(url);
-        // }, 500);
-    }
-    initializeState() {
-        this.state = {
-            initialized: false,
-        };
-        this.init(this.url);
-    }
-    init(url) {
+    // private _isLoaded: boolean;
+    // id = '';
+    // url: string;
+    // static displayName: string;
+    // cogTiles: CogTiles;
+    //
+    // tileSize: number;
+    //
+    initializeState(context) {
+        const _super = Object.create(null, {
+            initializeState: { get: () => super.initializeState }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            const cog = yield this.cogTiles.initializeCog(url);
-            this.setState({ initialized: true });
-            this.tileSize = this.cogTiles.getTileSize(cog);
-            const zoomRange = this.cogTiles.getZoomRange(cog);
-            [this.minZoom, this.maxZoom] = zoomRange;
+            _super.initializeState.call(this, context);
+            this.setState({
+                bitmapCogTiles: new CogTiles(this.props.cogBitmapOptions),
+                initialized: false,
+            });
+            yield this.init();
+        });
+    }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cog = yield this.state.bitmapCogTiles.initializeCog(this.props.rasterData);
+            const zoomRange = this.state.bitmapCogTiles.getZoomRange(cog);
+            const [minZoom, maxZoom] = zoomRange;
+            this.setState({ initialized: true, minZoom, maxZoom });
+        });
+    }
+    updateState({ props, oldProps }) {
+        const rasterDataChanged = props.rasterData !== oldProps.rasterData;
+        if (rasterDataChanged) {
+            const { rasterData } = props;
+            const isTiled = rasterData
+                && ((Array.isArray(rasterData)
+                    || (rasterData.includes('{x}') && rasterData.includes('{y}'))) || this.props.isTiled);
+            this.setState({ isTiled });
+        }
+        // Reloading for single terrain mesh
+        const shouldReload = rasterDataChanged
+            // || props.meshMaxError !== oldProps.meshMaxError
+            // || props.elevationDecoder !== oldProps.elevationDecoder
+            || props.bounds !== oldProps.bounds;
+        if (!this.state.isTiled && shouldReload) ;
+        // TODO - remove in v9
+        // @ts-ignore
+        if (props.workerUrl) {
+            log.removed('workerUrl', 'loadOptions.terrain.workerUrl')();
+        }
+    }
+    getTiledBitmapData(tile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // TODO - pass signal to getTile
+            // abort request if signal is aborted
+            const tileData = yield this.state.bitmapCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z);
+            return tileData;
         });
     }
+    renderSubLayers(props) {
+        const SubLayerClass = this.getSubLayerClass('image', BitmapLayer);
+        const { blurredTexture } = this.state.bitmapCogTiles.options;
+        const { opacity, clampToTerrain } = this.props;
+        const { data } = props;
+        if (!data) {
+            return null;
+        }
+        const { bbox: { west, south, east, north, }, } = props.tile;
+        return new SubLayerClass(Object.assign(Object.assign({}, props), { tileSize: this.state.bitmapCogTiles.tileSize }), Object.assign({ data: null, image: data, _instanced: false, bounds: [west, south, east, north], opacity, textureParameters: {
+                minFilter: blurredTexture ? 'linear' : 'nearest',
+                magFilter: blurredTexture ? 'linear' : 'nearest',
+            }, 
+            //  TODO check if works!!!
+            extensions: clampToTerrain ? [new _TerrainExtension()] : [] }, ((clampToTerrain === null || clampToTerrain === void 0 ? void 0 : clampToTerrain.terrainDrawMode)
+            ? { terrainDrawMode: clampToTerrain.terrainDrawMode }
+            : {})));
+    }
     renderLayers() {
-        if (this.cogTiles.cog) {
-            const layer = new TileLayer({
-                id: `${this.id}-${String(performance.now())}`,
-                getTileData: (tileData) => this.cogTiles.getTile(tileData.index.x, tileData.index.y, tileData.index.z),
-                minZoom: this.minZoom,
-                maxZoom: this.maxZoom,
-                tileSize: this.tileSize,
-                maxRequests: 6,
-                extent: this.cogTiles.cog ? this.cogTiles.getBoundsAsLatLon(this.cogTiles.cog) : null,
-                renderSubLayers: (props) => {
-                    var _a, _b, _c, _d, _e, _f, _g;
-                    const { bbox: { west, south, east, north, }, } = props.tile;
-                    return new BitmapLayer(props, Object.assign({ data: null, image: props.data, bounds: [west, south, east, north], opacity: 1, textureParameters: {
-                            minFilter: this.blurredTexture ? 'linear' : 'nearest',
-                            magFilter: this.blurredTexture ? 'linear' : 'nearest',
-                        }, extensions: ((_b = (_a = this.cogTiles) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.clampToTerrain) ? [new _TerrainExtension()] : [] }, (((_e = (_d = (_c = this.cogTiles) === null || _c === void 0 ? void 0 : _c.options) === null || _d === void 0 ? void 0 : _d.clampToTerrain) === null || _e === void 0 ? void 0 : _e.terrainDrawMode)
-                        ? { terrainDrawMode: (_g = (_f = this.cogTiles) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.clampToTerrain.terrainDrawMode }
-                        : {})));
+        const { rasterData, blurredTexture, opacity, clampToTerrain, 
+        // tileSize,
+        maxRequests, onTileLoad, onTileUnload, onTileError, maxCacheSize, maxCacheByteSize, refinementStrategy, cogBitmapOptions, } = this.props;
+        if (this.state.isTiled && this.state.initialized) {
+            const { tileSize } = this.state.bitmapCogTiles;
+            return new TileLayer(this.getSubLayerProps({
+                id: 'tiles',
+            }), {
+                getTileData: this.getTiledBitmapData.bind(this),
+                renderSubLayers: this.renderSubLayers.bind(this),
+                updateTriggers: {
+                    getTileData: {
+                        // rasterData: urlTemplateToUpdateTrigger(rasterData),
+                        // blurredTexture,
+                        // opacity,
+                        // cogBitmapOptions,
+                        clampToTerrain,
+                    },
                 },
+                extent: this.state.bitmapCogTiles.cog
+                    ? this.state.bitmapCogTiles.getBoundsAsLatLon(this.state.bitmapCogTiles.cog) : null,
+                tileSize,
+                minZoom: this.state.minZoom,
+                maxZoom: this.state.maxZoom,
+                maxRequests,
+                onTileLoad,
+                onTileUnload,
+                onTileError,
+                maxCacheSize,
+                maxCacheByteSize,
+                refinementStrategy,
             });
-            return layer;
         }
         return null;
     }
 }
+CogBitmapLayer.defaultProps = defaultProps$1;
 CogBitmapLayer.layerName = 'CogBitmapLayer';
-CogBitmapLayer.displayName = 'CogBitmapLayer';
 
 // Copyright (c) 2015 - 2017 Uber Technologies, Inc.
 //