@gisatcz/deckgl-geolib 1.10.2-dev.4 → 1.10.2-dev.6

package/dist/cjs/index.js

@@ -14745,6 +14745,7 @@ function inCircle(ax, ay, bx, by, cx, cy, px, py) {
 }
 
 /* eslint 'max-len': [1, { code: 105, comments: 999, ignoreStrings: true, ignoreUrls: true }] */
+// FIXME - tesselator as a parameter
 const tesselator = 'martini';
 const DefaultGeoImageOptions = {
     type: 'image',
@@ -14789,22 +14790,21 @@ class GeoImage {
             this.data = data;
         });
     }
-    getMap(input, options) {
+    getMap(input, options, meshMaxError) {
         return __awaiter(this, void 0, void 0, function* () {
             const mergedOptions = Object.assign(Object.assign({}, DefaultGeoImageOptions), options);
-            console.log('xxx_mergedOptions', mergedOptions);
             switch (mergedOptions.type) {
                 case 'image':
                     return this.getBitmap(input, mergedOptions);
                 case 'terrain':
-                    return this.getHeightmap(input, mergedOptions);
+                    return this.getHeightmap(input, mergedOptions, meshMaxError);
                 default:
                     return null;
             }
         });
     }
     // GetHeightmap uses only "useChannel" and "multiplier" options
-    getHeightmap(input, options) {
+    getHeightmap(input, options, meshMaxError) {
         return __awaiter(this, void 0, void 0, function* () {
             let rasters = [];
             let width;
@@ -14828,18 +14828,8 @@ class GeoImage {
                     channel = rasters[options.useChannel]; // length = 65536
                 }
             }
-            // const canvas = document.createElement('canvas');
-            // canvas.width = width;
-            // canvas.height = height;
-            // // const c = canvas.getContext('2d');
-            // // const imageData = c!.createImageData(width, height);
-            // const terrain = new Float32Array((width + 1) * (height + 1));
-            const terrain = new Float32Array((width + 1) * (height + 1)); // length = 66049
+            const terrain = new Float32Array((width + 1) * (height + 1));
             const numOfChannels = channel.length / (width * height);
-            // return mesh data
-            // const size: number = width * height * 4;
-            const size = width * height;
-            console.log('xxx_size', size);
             let pixel = options.useChannel === null ? 0 : options.useChannel;
             for (let i = 0, y = 0; y < height; y++) {
                 for (let x = 0; x < width; x++, i++) {
@@ -14848,25 +14838,6 @@ class GeoImage {
                     pixel += numOfChannels;
                 }
             }
-            // for (let i = 0; i < size; i++) {
-            //   //  height image calculation based on:
-            //   //  https://deck.gl/docs/api-reference/geo-layers/terrain-layer
-            //   const elevationValue = (options.noDataValue && channel[pixel] === options.noDataValue) ? options.terrainMinValue : channel[pixel] * options.multiplier!;
-            //   terrain[i] = elevationValue;
-            //   // const colorValue = Math.floor((elevationValue + 10000) / 0.1);
-            //   // imageData.data[i] = Math.floor(colorValue / (256 * 256));
-            //   // imageData.data[i + 1] = Math.floor((colorValue / 256) % 256);
-            //   // imageData.data[i + 2] = colorValue % 256;
-            //   // imageData.data[i + 3] = 255;
-            //   pixel += numOfChannels;
-            // }
-            // c!.putImageData(imageData, 0, 0);
-            // const imageUrl = canvas.toDataURL('image/png');
-            // console.log('Heightmap generated.');
-            console.log('xxx_terrain', terrain);
-            if (terrain[0] > 0) {
-                debugger;
-            }
             {
                 // backfill bottom border
                 for (let i = (width + 1) * width, x = 0; x < width; x++, i++) {
@@ -14879,11 +14850,10 @@ class GeoImage {
             }
             // getMesh
             const { terrainSkirtHeight } = options;
-            console.log('xxx_bounds_0', input.bounds);
             let mesh;
             switch (tesselator) {
                 case 'martini':
-                    mesh = getMartiniTileMesh(terrainSkirtHeight, width, terrain);
+                    mesh = getMartiniTileMesh(meshMaxError, width, terrain);
                     break;
                 case 'delatin':
                     mesh = getDelatinTileMesh(meshMaxError, width, height, terrain);
@@ -14892,7 +14862,7 @@ class GeoImage {
                     if (width === height && !(height && (width - 1))) {
                         // fixme get terrain to separate method
                         // terrain = getTerrain(data, width, height, elevationDecoder, 'martini');
-                        mesh = getMartiniTileMesh(terrainSkirtHeight, width, terrain);
+                        mesh = getMartiniTileMesh(meshMaxError, width, terrain);
                     }
                     else {
                         // fixme get terrain to separate method
@@ -14910,8 +14880,6 @@ class GeoImage {
             let attributes = getMeshAttributes(vertices, terrain, width, height, input.bounds);
             // Compute bounding box before adding skirt so that z values are not skewed
             const boundingBox = schema.getMeshBoundingBox(attributes);
-            // FIXME uncomment and add skirt
-            console.log('xxx_skirtHeight', terrainSkirtHeight);
             if (terrainSkirtHeight) {
                 const { attributes: newAttributes, triangles: newTriangles } = addSkirt(attributes, triangles, terrainSkirtHeight);
                 attributes = newAttributes;
@@ -15212,7 +15180,6 @@ function getMeshAttributes(vertices, terrain, width, height, bounds) {
     const positions = new Float32Array(numOfVerticies * 3);
     // vec2. 1 to 1 relationship with position. represents the uv on the texture image. 0,0 to 1,1.
     const texCoords = new Float32Array(numOfVerticies * 2);
-    console.log('xxx_bounds', bounds);
     const [minX, minY, maxX, maxY] = bounds || [0, 0, width, height];
     const xScale = (maxX - minX) / width;
     const yScale = (maxY - minY) / height;
@@ -15261,7 +15228,6 @@ class CogTiles {
         this.geo = new GeoImage();
         this.lzw = new LZWDecoder$1();
         this.options = options;
-        // this.testCog()
     }
     initializeCog(url) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -15275,16 +15241,6 @@ class CogTiles {
             this.cog.images.forEach((image) => {
                 image.loadGeoTiffTags();
             });
-            /*
-                console.log("---- START OF COG INFO DUMP ----")
-                this.cog.images[0].tags.forEach((tag) => {
-                    //console.log(tag.value.name)
-                    console.log(tag.name + ":")
-                    console.log(tag.value)
-                })
-                console.log("---- END OF COG INFO DUMP ----")
-                */
-            // console.log(this.cog)
             this.tileSize = this.getTileSize(this.cog);
             this.lowestOriginTileOffset = this.getImageTileIndex(this.cog.images[this.cog.images.length - 1]);
             this.zoomRange = this.getZoomRange(this.cog);
@@ -15302,7 +15258,6 @@ class CogTiles {
     }
     getBoundsAsLatLon(cog) {
         const { bbox } = cog.images[cog.images.length - 1];
-        // console.log(bbox)
         const minX = Math.min(bbox[0], bbox[2]);
         const maxX = Math.max(bbox[0], bbox[2]);
         const minY = Math.min(bbox[1], bbox[3]);
@@ -15342,7 +15297,7 @@ class CogTiles {
         const cartographicPositionAdjusted = [cartographicPosition[0], -cartographicPosition[1]];
         return cartographicPositionAdjusted;
     }
-    getTile(x, y, z, bounds) {
+    getTile(x, y, z, bounds, meshMaxError) {
         return __awaiter(this, void 0, void 0, function* () {
             const wantedMpp = this.getResolutionFromZoomLevel(this.tileSize, z);
             const img = this.cog.getImageByResolution(wantedMpp);
@@ -15440,7 +15395,7 @@ class CogTiles {
                     width: this.tileSize,
                     height: this.tileSize,
                     bounds,
-                }, this.options);
+                }, this.options, meshMaxError);
                 // console.log(decompressed.length)
                 return decompressed;
             }
@@ -15515,32 +15470,6 @@ class CogTiles {
         }
         return undefined;
     }
-    testCog() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = 'https://gisat-gis.eu-central-1.linodeobjects.com/eman/versions/v2/Quadrants/Q3_Bolivia_ASTER_2002_RGB_COG_LZW.tif';
-            this.options = {
-                type: 'image', multiplier: 1.0, useChannel: 1, alpha: 180, clipLow: 1, clipHigh: Number.MAX_VALUE,
-            };
-            const c = yield this.initializeCog(url);
-            const middleImage = c.images[Math.floor(c.images.length / 2)];
-            console.log(middleImage);
-            const imageTileIndex = this.getImageTileIndex(middleImage);
-            console.log(imageTileIndex);
-            const x = Math.floor(middleImage.tileCount.x / 2);
-            const y = Math.floor(middleImage.tileCount.y / 2);
-            console.log(c.getTile(x, y, Math.floor(c.images.length / 2)));
-            const tileGlobalX = x + imageTileIndex[0];
-            const tileGlobalY = y + imageTileIndex[1];
-            const tileGlobalZ = imageTileIndex[2];
-            const tile = yield this.getTile(tileGlobalX, tileGlobalY, tileGlobalZ);
-            if (tile === false) {
-                console.log("couldn't retrieve tile");
-            }
-            else {
-                console.log(tile);
-            }
-        });
-    }
 }
 
 // let needsRerender: boolean = false;
@@ -15575,10 +15504,6 @@ class CogBitmapLayer extends core.CompositeLayer {
             this.tileSize = this.cogTiles.getTileSize(cog);
             const zoomRange = this.cogTiles.getZoomRange(cog);
             [this.minZoom, this.maxZoom] = zoomRange;
-            // console.log(zoomRange)
-            // extent = cogTiles.getBoundsAsLatLon(cog)
-            // console.log(extent)
-            // needsRerender = true;
         });
     }
     renderLayers() {
@@ -15688,36 +15613,29 @@ function urlTemplateToUpdateTrigger(template) {
     }
     return template || '';
 }
+// TODO remove elevationDecoder
+// TODO use meshMaxError
+// TODO - pass signal to getTile
 /** Render mesh surfaces from height map images. */
 class TerrainLayer extends core.CompositeLayer {
-    // constructor(props: TerrainLayerProps & ExtraPropsT, terrainOptions: GeoImageOptions) {
-    //   super(props);
-    //   console.log('xxx_terrainOptions', terrainOptions);
-    // }
     initializeState(context) {
         const _super = Object.create(null, {
             initializeState: { get: () => super.initializeState }
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.initializeState.call(this, context);
-            console.log('xxx_initializeState_terrain');
             this.setState({
                 terrainCogTiles: new CogTiles(this.props.terrainOptions),
                 initialized: false,
             });
-            // XXX
             yield this.init(this.terrainUrl);
         });
     }
     init(terrainUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('xxx_LAYER INITIALIZE STATE');
-            // XXX
             const cog = yield this.state.terrainCogTiles.initializeCog(this.props.elevationData);
-            console.log('xxx_LAYER INITIALIZE STATE', cog);
             // this.tileSize = this.terrainCogTiles.getTileSize(cog);
             const zoomRange = this.state.terrainCogTiles.getZoomRange(cog);
-            console.log('xxx_LAYER INITIALIZE STATE', zoomRange);
             [this.minZoom, this.maxZoom] = zoomRange;
             this.setState({ initialized: true });
         });
@@ -15736,11 +15654,7 @@ class TerrainLayer extends core.CompositeLayer {
             || props.meshMaxError !== oldProps.meshMaxError
             || props.elevationDecoder !== oldProps.elevationDecoder
             || props.bounds !== oldProps.bounds;
-        if (!this.state.isTiled && shouldReload) {
-            // When state.isTiled, elevationData cannot be an array
-            const terrain = this.loadTerrain(props);
-            this.setState({ terrain });
-        }
+        if (!this.state.isTiled && shouldReload) ;
         // TODO - remove in v9
         // @ts-ignore
         if (props.workerUrl) {
@@ -15756,47 +15670,10 @@ class TerrainLayer extends core.CompositeLayer {
                 meshMaxError,
                 elevationDecoder }) });
         const { fetch } = this.props;
-        console.log('xxx_loaddata');
         return fetch(elevationData, {
-            propName: 'elevationData', layer: this, loadOptions, signal,
+            propName: 'elevationData', layer: this, loadOptions, signal, loaders: [],
         });
     }
-    // OLD version
-    // getTiledTerrainData(tile: TileLoadProps): Promise<MeshAndTexture> {
-    //   const {
-    //     elevationData, fetch, texture, elevationDecoder, meshMaxError,
-    //   } = this.props;
-    //   const { viewport } = this.context;
-    //   const dataUrl = getURLFromTemplate(elevationData, 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]];
-    //   const terrain = this.loadTerrain({
-    //     elevationData: dataUrl,
-    //     bounds,
-    //     elevationDecoder,
-    //     meshMaxError,
-    //     signal,
-    //   });
-    //   const surface = textureUrl
-    //     ? // If surface image fails to load, the tile should still be displayed
-    // 	  fetch(textureUrl, {
-    //       propName: 'texture', layer: this, loaders: [], signal,
-    //     }).catch((_) => null)
-    //     : Promise.resolve(null);
-    //   return Promise.all([terrain, surface]);
-    // }
     getTiledTerrainData(tile) {
         return __awaiter(this, void 0, void 0, function* () {
             this.props;
@@ -15805,7 +15682,6 @@ class TerrainLayer extends core.CompositeLayer {
             let topRight = [0, 0];
             if (viewport.isGeospatial) {
                 const bbox = tile.bbox;
-                console.log('xxx_coords', bbox.west, bbox.south, bbox.east, bbox.north);
                 bottomLeft = viewport.projectFlat([bbox.west, bbox.south]);
                 topRight = viewport.projectFlat([bbox.east, bbox.north]);
             }
@@ -15815,18 +15691,9 @@ class TerrainLayer extends core.CompositeLayer {
                 topRight = [bbox.right, bbox.top];
             }
             const bounds = [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
-            // const bounds: Bounds = [0, 100, 100, 100];
-            // const bounds: Bounds = [tile.bbox.west, tile.bbox.south, tile.bbox.east, tile.bbox.north];
-            // XXX
-            const terrain = yield this.state.terrainCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z, bounds);
-            console.log('xxx_TILE', terrain, bounds);
-            // const terrain = this.loadTerrain({
-            //   elevationData: dataUrl,
-            //   bounds,
-            //   elevationDecoder,
-            //   meshMaxError,
-            //   signal,
-            // });
+            // TODO - pass signal to getTile
+            // abort request if signal is aborted
+            const terrain = yield this.state.terrainCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z, bounds, this.props.meshMaxError);
             return Promise.all([terrain]);
         });
     }
@@ -15871,19 +15738,16 @@ class TerrainLayer extends core.CompositeLayer {
         }
         const minZ = Math.min(...ranges.map((x) => x[0]));
         const maxZ = Math.max(...ranges.map((x) => x[1]));
-        console.log('xxx_ranges', ranges);
         if (!zRange || minZ < zRange[0] || maxZ > zRange[1]) {
             this.setState({ zRange: [Number.isFinite(minZ) ? minZ : 0, Number.isFinite(maxZ) ? maxZ : 0] });
         }
     }
     renderLayers() {
         const { color, material, elevationData, texture, wireframe, meshMaxError, elevationDecoder, tileSize, maxZoom, minZoom, extent, maxRequests, onTileLoad, onTileUnload, onTileError, maxCacheSize, maxCacheByteSize, refinementStrategy, } = this.props;
-        console.log('xxx_renderLayers', this.state.initialized);
         if (this.state.isTiled && this.state.initialized) {
             return new geoLayers.TileLayer(this.getSubLayerProps({
                 id: 'tiles',
             }), {
-                // XXX
                 getTileData: this.getTiledTerrainData.bind(this),
                 renderSubLayers: this.renderSubLayers.bind(this),
                 updateTriggers: {