Merge pull request #9343 from camptocamp/wmts-opacity-geo-6913

Fix WMTS layer opacity from permalink
camptocamp · May 8, 2024 · 3bf6a7e · 3bf6a7e
2 parents acc1393 + c8f4cec
commit 3bf6a7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/datasource/ExternalDataSourcesManager.js b/src/datasource/ExternalDataSourcesManager.js
@@ -441,7 +441,7 @@ export class ExternalDatSourcesManager {
    * @param {any} capabilities  WMTS Capabilities definition
    * @param {string} wmtsUrl The WMTS capabilities url
    */
-  createAndAddDataSourceFromWMTSCapability(layer, capabilities, wmtsUrl, opacity) {
+  createAndAddDataSourceFromWMTSCapability(layer, capabilities, wmtsUrl) {
     const id = getId(layer);
 
     // (1) No need to do anything if there's already a WMTS data source (and its
@@ -489,7 +489,6 @@ export class ExternalDatSourcesManager {
 
     // (4) Create and add the OL layer
     const layerObj = this.ngeoLayerHelper_.createWMTSLayerFromCapabilititesObj(capabilities, layer);
-    layerObj.setOpacity(opacity);
     this.addLayer_(layerObj);
 
     // (5) Add data source to ngeo collection

diff --git a/src/import/wmtsCapabilityLayertreeComponent.js b/src/import/wmtsCapabilityLayertreeComponent.js
@@ -127,7 +127,7 @@ export class Controller {
       throw new Error('Missing url');
     }
     const manager = this.gmfExternalDataSourcesManager_;
-    manager.createAndAddDataSourceFromWMTSCapability(layer, this.capabilities, this.url, 1);
+    manager.createAndAddDataSourceFromWMTSCapability(layer, this.capabilities, this.url);
   }
 
   /**

diff --git a/src/permalink/Permalink.js b/src/permalink/Permalink.js
@@ -1337,7 +1337,9 @@ PermalinkService.prototype.initLayers_ = function () {
           );
           if (treeCtrl.layer) {
             if (opacity !== undefined) {
-              treeCtrl.layer.setOpacity(opacity);
+              this.$timeout_(() => {
+                treeCtrl.layer.setOpacity(opacity);
+              }, 100);
             }
             // === Set the gmfLayerBeingSwipe layer ===
             if (
@@ -1704,8 +1706,7 @@ PermalinkService.prototype.initExternalDataSources_ = function () {
               gmfExtDSManager.createAndAddDataSourceFromWMTSCapability(
                 layerCap,
                 response.capabilities,
-                response.url,
-                this.ngeoStateManager_.getInitialNumberValue(`${ParamPrefix.TREE_OPACITY}${layerName}`)
+                response.url
               );
             } else {
               // TODO - handle 'not found' layer in capabilities