@gisatcz/deckgl-geolib 1.11.0-dev.5 → 1.11.0-dev.7

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

@@ -17,16 +17,12 @@ export type ClampToTerrainOptions = {
     terrainDrawMode?: string;
 };
 type MeshAndTexture = [MeshAttributes | null, TextureSource | null];
-/** All properties supported by CogBitmapLayer */
-export type CogBitmapLayerProps = _CogBitmapLayerProps & TileLayerProps<MeshAndTexture> & CompositeLayerProps;
 /** 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;
-    /** Whether the rendered texture should be blurred or not - effects minFilter and maxFilter * */
-    blurredTexture?: boolean;
     /** Weather visualise the entire image with specified opacity (0-1) * */
     opacity?: number;
     /** Whether the rendered texture should be clamped to terrain * */
@@ -35,25 +31,31 @@ type _CogBitmapLayerProps = {
      * 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;
-    rasterUrl: string;
     minZoom: number;
     maxZoom: number;
     state: {
+        initialized: boolean;
         isTiled?: boolean;
         terrain?: MeshAttributes;
         zRange?: ZRange | null;
+        bitmapCogTiles: any;
+        minZoom: number;
+        maxZoom: number;
     };
     initializeState(context: any): Promise<void>;
-    init(rasterUrl: string): Promise<void>;
+    init(): Promise<void>;
     updateState({ props, oldProps }: UpdateParameters<this>): void;
     getTiledBitmapData(tile: TileLoadProps): Promise<TextureSource>;
     renderSubLayers(props: TileLayerProps<TextureSource> & {
@@ -67,11 +69,12 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
         updateTriggers: {
             getTileData: {
                 rasterData: string;
+                cogBitmapOptions: GeoImageOptions;
                 clampToTerrain: boolean | ClampToTerrainOptions;
             };
         };
         extent: any;
-        tileSize: number;
+        tileSize: any;
         minZoom: number;
         maxZoom: number;
         maxRequests: number;

package/dist/esm/index.js

@@ -15214,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];
@@ -15222,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* () {
@@ -15535,7 +15538,6 @@ class CogBitmapLayer extends CompositeLayer {
     //
     // tileSize: number;
     //
-    // blurredTexture: boolean;
     initializeState(context) {
         const _super = Object.create(null, {
             initializeState: { get: () => super.initializeState }
@@ -15546,16 +15548,15 @@ class CogBitmapLayer extends CompositeLayer {
                 bitmapCogTiles: new CogTiles(this.props.cogBitmapOptions),
                 initialized: false,
             });
-            yield this.init(this.rasterUrl);
+            yield this.init();
         });
     }
-    init(rasterUrl) {
+    init() {
         return __awaiter(this, void 0, void 0, function* () {
             const cog = yield this.state.bitmapCogTiles.initializeCog(this.props.rasterData);
-            // this.tileSize = this.terrainCogTiles.getTileSize(cog);
             const zoomRange = this.state.bitmapCogTiles.getZoomRange(cog);
-            [this.minZoom, this.maxZoom] = zoomRange;
-            this.setState({ initialized: true });
+            const [minZoom, maxZoom] = zoomRange;
+            this.setState({ initialized: true, minZoom, maxZoom });
         });
     }
     updateState({ props, oldProps }) {
@@ -15563,8 +15564,8 @@ class CogBitmapLayer extends CompositeLayer {
         if (rasterDataChanged) {
             const { rasterData } = props;
             const isTiled = rasterData
-                && (Array.isArray(rasterData)
-                    || (rasterData.includes('{x}') && rasterData.includes('{y}'))) || this.props.isTiled;
+                && ((Array.isArray(rasterData)
+                    || (rasterData.includes('{x}') && rasterData.includes('{y}'))) || this.props.isTiled);
             this.setState({ isTiled });
         }
         // Reloading for single terrain mesh
@@ -15581,37 +15582,22 @@ class CogBitmapLayer extends CompositeLayer {
     }
     getTiledBitmapData(tile) {
         return __awaiter(this, void 0, void 0, function* () {
-            // const {
-            //   rasterData, fetch,
-            // } = this.props;
-            const { viewport } = this.context;
-            let bottomLeft = [0, 0];
-            let topRight = [0, 0];
-            if (viewport.isGeospatial) {
-                const bbox = tile.bbox;
-                bottomLeft = viewport.projectFlat([bbox.west, bbox.south]);
-                topRight = viewport.projectFlat([bbox.east, bbox.north]);
-            }
-            else {
-                const bbox = tile.bbox;
-                bottomLeft = [bbox.left, bbox.bottom];
-                topRight = [bbox.right, bbox.top];
-            }
-            [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
             // TODO - pass signal to getTile
             // abort request if signal is aborted
-            return yield this.state.bitmapCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z);
+            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, opacity, clampToTerrain } = this.props;
+        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: 256 }), Object.assign({ data: null, image: data, _instanced: false, bounds: [west, south, east, north], opacity, textureParameters: {
+        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',
             }, 
@@ -15621,8 +15607,11 @@ class CogBitmapLayer extends CompositeLayer {
             : {})));
     }
     renderLayers() {
-        const { rasterData, blurredTexture, opacity, clampToTerrain, tileSize, maxRequests, onTileLoad, onTileUnload, onTileError, maxCacheSize, maxCacheByteSize, refinementStrategy, } = this.props;
+        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',
             }), {
@@ -15633,13 +15622,15 @@ class CogBitmapLayer extends CompositeLayer {
                         rasterData: urlTemplateToUpdateTrigger$1(rasterData),
                         // blurredTexture,
                         // opacity,
+                        cogBitmapOptions,
                         clampToTerrain,
                     },
                 },
-                extent: this.state.bitmapCogTiles.cog ? this.state.bitmapCogTiles.getBoundsAsLatLon(this.state.bitmapCogTiles.cog) : null,
+                extent: this.state.bitmapCogTiles.cog
+                    ? this.state.bitmapCogTiles.getBoundsAsLatLon(this.state.bitmapCogTiles.cog) : null,
                 tileSize,
-                minZoom: this.minZoom,
-                maxZoom: this.maxZoom,
+                minZoom: this.state.minZoom,
+                maxZoom: this.state.maxZoom,
                 maxRequests,
                 onTileLoad,
                 onTileUnload,