@gisatcz/deckgl-geolib 1.9.0 → 1.9.2

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+# v1.9.2 (Wed Mar 06 2024)
+
+#### 🐾 Patch
+
+- Feature/fix terrain [#41](https://github.com/gisat-panther/deck.gl-geotiff/pull/41) ([@vdubr](https://github.com/vdubr))
+
+#### Authors: 1
+
+- Vojtěch Dubrovský ([@vdubr](https://github.com/vdubr))
+
+---
+
+# v1.9.1 (Wed Jan 31 2024)
+
+#### 🐾 Patch
+
+- Feature/terrain options update [#40](https://github.com/gisat-panther/deck.gl-geotiff/pull/40) (mariana.kecova@gisat.cz [@MariDani](https://github.com/MariDani))
+
+#### Authors: 2
+
+- Mariana Kecová ([@MariDani](https://github.com/MariDani))
+- Mariana Kecova (mariana.kecova@gisat.cz)
+
+---
+
 # v1.9.0 (Tue Dec 05 2023)
 
 #### 🚀 Enhancement

package/dist/cjs/index.js

@@ -1039,9 +1039,9 @@ class TerrainEffect {
     }
 
     const {
-      viewports,
-      isPicking = false
+      viewports
     } = opts;
+    const isPicking = opts.pass.startsWith('picking');
     this.isPicking = isPicking;
     this.isDrapingEnabled = true;
     const viewport = viewports[0];
@@ -1174,7 +1174,10 @@ class TerrainEffect {
             devicePixelRatio: 1
           }
         });
-        terrainCover.isDirty = false;
+
+        if (!this.isPicking) {
+          terrainCover.isDirty = false;
+        }
       }
     } catch (err) {
       terrainLayer.raiseError(err, "Error rendering terrain cover ".concat(terrainCover.id));
@@ -14691,6 +14694,9 @@ const DefaultGeoImageOptions = {
     nullColor: [0, 0, 0, 0],
     unidentifiedColor: [0, 0, 0, 0],
     clippedColor: [0, 0, 0, 0],
+    terrainColor: [133, 133, 133, 255],
+    terrainSkirtHeight: 100,
+    terrainMinValue: 0,
 };
 class GeoImage {
     constructor() {
@@ -14755,7 +14761,7 @@ class GeoImage {
             for (let i = 0; i < size; i += 4) {
                 //  height image calculation based on:
                 //  https://deck.gl/docs/api-reference/geo-layers/terrain-layer
-                const elevationValue = channel[pixel] * options.multiplier;
+                const elevationValue = (options.noDataValue && channel[pixel] === options.noDataValue) ? options.terrainMinValue : channel[pixel] * options.multiplier;
                 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);
@@ -14982,6 +14988,10 @@ class GeoImage {
                         pixelColor[3] = this.scale(dataArray[pixel], options.colorScaleValueRange[0], options.colorScaleValueRange.slice(-1)[0], 0, 255);
                     }
                 }
+                // If pixel has null value
+            }
+            else if (Number.isNaN(dataArray[pixel])) {
+                pixelColor = [0, 0, 0, 0];
             }
             // FIXME
             // eslint-disable-next-line
@@ -15378,7 +15388,7 @@ CogBitmapLayer.layerName = 'CogBitmapLayer';
 CogBitmapLayer.displayName = 'CogBitmapLayer';
 
 function isTileServiceUrl(url) {
-    if (url.includes('{x}') && url.includes('{y}') && url.includes('{z}')) {
+    if (url && url.includes('{x}') && url.includes('{y}') && url.includes('{z}')) {
         return true;
     }
     return false;
@@ -15400,15 +15410,21 @@ class CogTerrainLayer extends core.CompositeLayer {
         this.urlType = 'none';
         this.id = '';
         this.id = id;
+        const mergedTerrainOptions = Object.assign(Object.assign({}, DefaultGeoImageOptions), terrainOptions);
+        this.terrainOpacity = mergedTerrainOptions.alpha / 100;
+        this.terrainColor = chroma(mergedTerrainOptions.terrainColor.slice(0, 3)).rgb();
+        this.terrainSkirtHeight = mergedTerrainOptions.terrainSkirtHeight;
         if (bitmapUrl) {
             if (isTileServiceUrl(bitmapUrl)) {
                 this.bitmapUrl = bitmapUrl;
                 this.urlType = 'tile';
+                this.terrainColor = [0, 0, 0, 0];
             }
             else if (isCogUrl(bitmapUrl)) {
                 this.bitmapCogTiles = new CogTiles(bitmapOptions);
                 this.bitmapCogTiles.initializeCog(bitmapUrl);
                 this.urlType = 'cog';
+                this.terrainColor = [0, 0, 0, 0];
             }
             else {
                 console.warn('URL needs to point to a valid cog file, or needs to be in the {x}{y}{z} format.');
@@ -15419,10 +15435,23 @@ class CogTerrainLayer extends core.CompositeLayer {
         this.terrainUrl = terrainUrl;
     }
     initializeState() {
-        this.state = {
-            initialized: false,
-        };
-        this.init(this.terrainUrl);
+        const _super = Object.create(null, {
+            initializeState: { get: () => super.initializeState }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            _super.initializeState.call(this);
+            this.setState({
+                initialized: false,
+            });
+            yield this.init(this.terrainUrl);
+        });
+    }
+    shouldUpdateState() {
+        var _a;
+        if (((_a = this.internalState) === null || _a === void 0 ? void 0 : _a.subLayers.length) === 0) {
+            return true;
+        }
+        return false;
     }
     init(terrainUrl) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -15475,17 +15504,19 @@ class CogTerrainLayer extends core.CompositeLayer {
                             },
                             elevationData: props.data,
                             texture: bitmapTile,
+                            opacity: this.terrainOpacity,
                             bounds: [props.tile.bbox.west,
                                 props.tile.bbox.south,
                                 props.tile.bbox.east,
                                 props.tile.bbox.north,
                             ],
+                            color: this.terrainColor,
                             operation: 'terrain+draw',
                             minZoom: this.minZoom,
                             maxZoom: this.maxZoom,
                             loadOptions: {
                                 terrain: {
-                                    skirtHeight: 2000,
+                                    skirtHeight: this.terrainSkirtHeight,
                                     tesselator: 'martini',
                                 },
                             },