Merge pull request #9326 from camptocamp/backport/9325-to-master

[Backport master] Fix WMTS opacity from permalink
camptocamp · Apr 11, 2024 · cd6f2c9 · cd6f2c9
2 parents 0bcb8c3 + 144ecc5
commit cd6f2c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/datasource/ExternalDataSourcesManager.js b/src/datasource/ExternalDataSourcesManager.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017-2023 Camptocamp SA
+// Copyright (c) 2017-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -441,7 +441,7 @@ export class ExternalDatSourcesManager {
    * @param {any} capabilities  WMTS Capabilities definition
    * @param {string} wmtsUrl The WMTS capabilities url
    */
-  createAndAddDataSourceFromWMTSCapability(layer, capabilities, wmtsUrl) {
+  createAndAddDataSourceFromWMTSCapability(layer, capabilities, wmtsUrl, opacity) {
     const id = getId(layer);
 
     // (1) No need to do anything if there's already a WMTS data source (and its
@@ -489,6 +489,7 @@ 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
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017-2023 Camptocamp SA
+// Copyright (c) 2017-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -127,7 +127,7 @@ export class Controller {
       throw new Error('Missing url');
     }
     const manager = this.gmfExternalDataSourcesManager_;
-    manager.createAndAddDataSourceFromWMTSCapability(layer, this.capabilities, this.url);
+    manager.createAndAddDataSourceFromWMTSCapability(layer, this.capabilities, this.url, 1);
   }
 
   /**

diff --git a/src/permalink/Permalink.js b/src/permalink/Permalink.js
@@ -1731,6 +1731,7 @@ PermalinkService.prototype.initExternalDataSources_ = function () {
                 layerCap,
                 response.capabilities,
                 response.url,
+                this.ngeoStateManager_.getInitialNumberValue(`${ParamPrefix.TREE_OPACITY}${layerName}`),
               );
             } else {
               // TODO - handle 'not found' layer in capabilities