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

package/dist/esm/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisatcz/deckgl-geolib",
-  "version": "1.11.0-dev.5",
+  "version": "1.11.0-dev.7",
   "private": false,
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/cogbitmaplayer/CogBitmapLayer.ts

@@ -106,11 +106,6 @@ function urlTemplateToUpdateTrigger(template: URLTemplate): 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. * */
@@ -119,9 +114,6 @@ type _CogBitmapLayerProps = {
   /** 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;
 
@@ -133,12 +125,19 @@ type _CogBitmapLayerProps = {
    */
   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>>>
@@ -147,16 +146,18 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
 
   static layerName = 'CogBitmapLayer';
 
-  rasterUrl: string;
-
   minZoom: number;
 
   maxZoom: number;
 
   state!: {
+    initialized: boolean;
     isTiled?: boolean;
     terrain?: MeshAttributes;
     zRange?: ZRange | null;
+    bitmapCogTiles: any;
+    minZoom: number;
+    maxZoom: number;
   };
 
   // private _isLoaded: boolean;
@@ -171,7 +172,6 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
   //
   // tileSize: number;
   //
-  // blurredTexture: boolean;
 
   async initializeState(context: any) {
     super.initializeState(context);
@@ -181,17 +181,17 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
       initialized: false,
     });
 
-    await this.init(this.rasterUrl);
+    await this.init();
   }
 
-  async init(rasterUrl: string) {
+  async init() {
     const cog = await 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 }: UpdateParameters<this>): void {
@@ -199,8 +199,8 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
     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 });
     }
 
@@ -224,37 +224,16 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
   }
 
   async getTiledBitmapData(tile: TileLoadProps): Promise<TextureSource> {
-    // const {
-    //   rasterData, fetch,
-    // } = this.props;
-    const { viewport } = this.context;
-    // const dataUrl = getURLFromTemplate(rasterData, tile);
-    // const textureUrl = texture && getURLFromTemplate(texture, tile);
-
-    const { signal } = tile;
-    let bottomLeft = [0, 0] as [number, number];
-    let topRight = [0, 0] as [number, number];
-    if (viewport.isGeospatial) {
-      const bbox = tile.bbox as GeoBoundingBox;
-
-      bottomLeft = viewport.projectFlat([bbox.west, bbox.south]);
-      topRight = viewport.projectFlat([bbox.east, bbox.north]);
-    } else {
-      const bbox = tile.bbox as Exclude<TileBoundingBox, GeoBoundingBox>;
-      bottomLeft = [bbox.left, bbox.bottom];
-      topRight = [bbox.right, bbox.top];
-    }
-    const bounds: Bounds = [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
-
     // TODO - pass signal to getTile
     // abort request if signal is aborted
-    return await this.state.bitmapCogTiles.getTile(
+    const tileData = await this.state.bitmapCogTiles.getTile(
       tile.index.x,
       tile.index.y,
       tile.index.z,
       // bounds,
       // this.props.meshMaxError,
     );
+    return tileData;
   }
 
   renderSubLayers(
@@ -265,8 +244,9 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
       },
   ) {
     const SubLayerClass = this.getSubLayerClass('image', BitmapLayer);
+    const { blurredTexture } = this.state.bitmapCogTiles.options;
 
-    const { blurredTexture, opacity, clampToTerrain } = this.props;
+    const { opacity, clampToTerrain } = this.props;
 
     const { data } = props;
 
@@ -280,7 +260,7 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
       },
     } = props.tile;
 
-    return new SubLayerClass({ ...props, tileSize: 256 }, {
+    return new SubLayerClass({ ...props, tileSize: this.state.bitmapCogTiles.tileSize }, {
       data: null,
       image: data,
       _instanced: false,
@@ -304,7 +284,7 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
       blurredTexture,
       opacity,
       clampToTerrain,
-      tileSize,
+      // tileSize,
       maxRequests,
       onTileLoad,
       onTileUnload,
@@ -312,8 +292,11 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
       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',
       }), {
@@ -324,13 +307,15 @@ export default class CogBitmapLayer<ExtraPropsT extends {} = {}> extends Composi
             rasterData: urlTemplateToUpdateTrigger(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,

package/src/cogtiles/cogtiles.ts

@@ -17,6 +17,10 @@ export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
 const EARTH_CIRCUMFERENCE = 40075000.0;
 const EARTH_HALF_CIRCUMFERENCE = 20037500.0;
 
+const CogTilesGeoImageOptionsDefaults = {
+  blurredTexture: true,
+};
+
 class CogTiles {
   cog: Tiff;
 
@@ -37,7 +41,7 @@ class CogTiles {
   options: GeoImageOptions;
 
   constructor(options: GeoImageOptions) {
-    this.options = options;
+    this.options = { ...CogTilesGeoImageOptionsDefaults, ...options };
   }
 
   async initializeCog(url: string) {