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

package/dist/cjs/index.js

@@ -14790,21 +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);
             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;
@@ -14853,7 +14853,7 @@ class GeoImage {
             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);
@@ -14862,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
@@ -15297,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);
@@ -15395,7 +15395,7 @@ class CogTiles {
                     width: this.tileSize,
                     height: this.tileSize,
                     bounds,
-                }, this.options);
+                }, this.options, meshMaxError);
                 // console.log(decompressed.length)
                 return decompressed;
             }
@@ -15654,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) {
@@ -15675,7 +15671,7 @@ class TerrainLayer extends core.CompositeLayer {
                 elevationDecoder }) });
         const { fetch } = this.props;
         return fetch(elevationData, {
-            propName: 'elevationData', layer: this, loadOptions, signal,
+            propName: 'elevationData', layer: this, loadOptions, signal, loaders: [],
         });
     }
     getTiledTerrainData(tile) {
@@ -15697,7 +15693,7 @@ class TerrainLayer extends core.CompositeLayer {
             const bounds = [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
             // 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);
+            const terrain = yield this.state.terrainCogTiles.getTile(tile.index.x, tile.index.y, tile.index.z, bounds, this.props.meshMaxError);
             return Promise.all([terrain]);
         });
     }