@gisatcz/deckgl-geolib 1.11.0-dev.2 → 1.11.0-dev.3

package/dist/cjs/index.js

@@ -3,6 +3,7 @@
 var core = require('@deck.gl/core');
 var geoLayers = require('@deck.gl/geo-layers');
 var layers = require('@deck.gl/layers');
+var extensions = require('@deck.gl/extensions');
 var chroma = require('chroma-js');
 var schema = require('@loaders.gl/schema');
 var loaderUtils = require('@loaders.gl/loader-utils');
@@ -15493,7 +15494,6 @@ const urlType$1 = {
         return true;
     },
 };
-const DUMMY_DATA$1 = [1];
 const defaultProps$1 = Object.assign(Object.assign({}, geoLayers.TileLayer.defaultProps), { 
     // Image url that encodes height data
     // elevationData: urlType,
@@ -15507,7 +15507,7 @@ const defaultProps$1 = Object.assign(Object.assign({}, geoLayers.TileLayer.defau
     }, rasterData: urlType$1, 
     // Color to use if texture is unavailable
     // color: { type: 'color', value: [255, 255, 255] },
-    blurredTexture: true, clampToTerrain: true, 
+    blurredTexture: true, opacity: 1, clampToTerrain: false, 
     // Object to decode height data, from (r, g, b) to height in meters
     // elevationDecoder: {
     //   type: 'object',
@@ -15557,7 +15557,6 @@ class CogBitmapLayer extends core.CompositeLayer {
             // this.tileSize = this.terrainCogTiles.getTileSize(cog);
             const zoomRange = this.state.bitmapCogTiles.getZoomRange(cog);
             [this.minZoom, this.maxZoom] = zoomRange;
-            console.log(cog);
             this.setState({ initialized: true });
         });
     }
@@ -15584,8 +15583,9 @@ class CogBitmapLayer extends core.CompositeLayer {
     }
     getTiledBitmapData(tile) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('getTiledBitmapData');
-            this.props;
+            // const {
+            //   rasterData, fetch,
+            // } = this.props;
             const { viewport } = this.context;
             let bottomLeft = [0, 0];
             let topRight = [0, 0];
@@ -15599,157 +15599,49 @@ class CogBitmapLayer extends core.CompositeLayer {
                 bottomLeft = [bbox.left, bbox.bottom];
                 topRight = [bbox.right, bbox.top];
             }
-            const bounds = [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
+            [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
             // TODO - pass signal to getTile
             // abort request if signal is aborted
-            const cogBitmap = yield this.state.bitmapCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z, bounds);
-            return Promise.all([cogBitmap]);
+            return yield this.state.bitmapCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z);
         });
     }
     renderSubLayers(props) {
-        console.log('rendering sub layer and consoling props');
         const SubLayerClass = this.getSubLayerClass('image', layers.BitmapLayer);
-        // const { color } = this.props;
-        console.log(this.props);
-        const { bounds, blurredTexture, clampToTerrain } = this.props;
-        const { data } = props;
+        const { blurredTexture, opacity, clampToTerrain } = this.props;
+        const data = props.data;
         if (!data) {
             return null;
         }
-        // const [raster, texture] = data;
-        const [image] = data;
         const { bbox: { west, south, east, north, }, } = props.tile;
-        return new SubLayerClass(Object.assign(Object.assign({}, props), { tileSize: 256 }), {
-            data: DUMMY_DATA$1,
-            // data: null,
-            image,
-            // texture,
-            _instanced: false,
-            // coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
-            // getPosition: (d) => [0, 0, 0],
-            bounds: [west, south, east, north],
-            // bounds,
-            opacity: 1,
-            textureParameters: {
+        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: {
                 minFilter: blurredTexture ? 'linear' : 'nearest',
                 magFilter: blurredTexture ? 'linear' : 'nearest',
-            },
-            // extensions: this.cogTiles?.options?.clampToTerrain ? [new TerrainExtension()] : [],
-            // ...(this.cogTiles?.options?.clampToTerrain?.terrainDrawMode
-            //   ? { terrainDrawMode: this.cogTiles?.options?.clampToTerrain.terrainDrawMode }
-            //   : {}),
-        });
-    }
-    // Update zRange of viewport
-    onViewportLoad(tiles) {
-        if (!tiles) {
-            return;
-        }
-        const { zRange } = this.state;
-        const ranges = tiles
-            .map((tile) => tile.content)
-            .filter((x) => x && x[0])
-            .map((arr) => {
-            var _a, _b;
-            // @ts-ignore
-            const bounds = (_b = (_a = arr[0]) === null || _a === void 0 ? void 0 : _a.header) === null || _b === void 0 ? void 0 : _b.boundingBox;
-            return bounds === null || bounds === void 0 ? void 0 : bounds.map((bound) => bound[2]);
-        });
-        if (ranges.length === 0) {
-            return;
-        }
-        const minZ = Math.min(...ranges.map((x) => x[0]));
-        const maxZ = Math.max(...ranges.map((x) => x[1]));
-        if (!zRange || minZ < zRange[0] || maxZ > zRange[1]) {
-            this.setState({ zRange: [Number.isFinite(minZ) ? minZ : 0, Number.isFinite(maxZ) ? maxZ : 0] });
-        }
+            }, 
+            //  TODO check if works!!!
+            extensions: clampToTerrain ? [new extensions._TerrainExtension()] : [] }, ((clampToTerrain === null || clampToTerrain === void 0 ? void 0 : clampToTerrain.terrainDrawMode)
+            ? { terrainDrawMode: clampToTerrain.terrainDrawMode }
+            : {})));
     }
-    // constructor(id:string, url:string, options:GeoImageOptions) {
-    //   super({});
-    //   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);
-    // }
-    //
-    // async init(url:string) {
-    //   const cog = await 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;
-    // }
-    //
     renderLayers() {
-        const { rasterData, blurredTexture, clampToTerrain, tileSize, maxZoom, minZoom, extent, maxRequests, onTileLoad, onTileUnload, onTileError, maxCacheSize, maxCacheByteSize, refinementStrategy, } = this.props;
-        console.log('render bitmap layers');
-        // console.log(this.state);
+        const { rasterData, blurredTexture, opacity, clampToTerrain, tileSize, maxRequests, onTileLoad, onTileUnload, onTileError, maxCacheSize, maxCacheByteSize, refinementStrategy, } = this.props;
         if (this.state.isTiled && this.state.initialized) {
-            console.log('start rendering tile layer');
             return new geoLayers.TileLayer(this.getSubLayerProps({
                 id: 'tiles',
             }), {
                 getTileData: this.getTiledBitmapData.bind(this),
-                // getTileData: (tileData: any) => this.state.bitmapCogTiles.getTile(
-                //   tileData.index.x,
-                //   tileData.index.y,
-                //   tileData.index.z,
-                // ),
                 renderSubLayers: this.renderSubLayers.bind(this),
-                // renderSubLayers: (props: any) => {
-                //   const {
-                //     bbox: {
-                //       west, south, east, north,
-                //     },
-                //   } = props.tile;
-                //   // MK proc to tady funguje jen s 0?
-                //   console.log(props.data[0]);
-                //   return new BitmapLayer(props, {
-                //     data: DUMMY_DATA,
-                //     image: props.data[0],
-                //     bounds: [west, south, east, north],
-                //     opacity: 1, // 0.6
-                //     textureParameters: {
-                //       minFilter: blurredTexture ? 'linear' : 'nearest',
-                //       magFilter: blurredTexture ? 'linear' : 'nearest',
-                //     },
-                //     // extensions: this.cogTiles?.options?.clampToTerrain ? [new TerrainExtension()] : [],
-                //     // ...(this.cogTiles?.options?.clampToTerrain?.terrainDrawMode
-                //     //   ? { terrainDrawMode: this.cogTiles?.options?.clampToTerrain.terrainDrawMode }
-                //     //   : {}),
-                //   });
-                // },
                 updateTriggers: {
                     getTileData: {
                         rasterData: urlTemplateToUpdateTrigger$1(rasterData),
                         blurredTexture,
+                        opacity,
                         clampToTerrain,
-                        // texture: urlTemplateToUpdateTrigger(texture),
-                        // meshMaxError,
-                        // elevationDecoder,
                     },
                 },
-                onViewportLoad: this.onViewportLoad.bind(this),
-                zRange: this.state.zRange || null,
+                extent: this.state.bitmapCogTiles.cog ? this.state.bitmapCogTiles.getBoundsAsLatLon(this.state.bitmapCogTiles.cog) : null,
                 tileSize,
-                maxZoom,
-                minZoom,
-                extent,
+                minZoom: this.minZoom,
+                maxZoom: this.maxZoom,
                 maxRequests,
                 onTileLoad,
                 onTileUnload,
@@ -15759,6 +15651,7 @@ class CogBitmapLayer extends core.CompositeLayer {
                 refinementStrategy,
             });
         }
+        return null;
     }
 }
 CogBitmapLayer.defaultProps = defaultProps$1;