@eeacms/volto-arcgis-block 0.1.166 → 0.1.168

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.168](https://github.com/eea/volto-arcgis-block/compare/0.1.167...0.1.168) - 6 July 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-2300 (fix): Preserve selected region in dropdown menu if layers are changed and region exists in both layers [ujbolivar - [`443d3a5`](https://github.com/eea/volto-arcgis-block/commit/443d3a53eb4958a2d5fd3e9dd3a8b938f0416f4f)]
+### [0.1.167](https://github.com/eea/volto-arcgis-block/compare/0.1.166...0.1.167) - 5 July 2023
+
+#### :hammer_and_wrench: Others
+
+- LINT [manuelmartinezbilbomatica - [`0fd14f1`](https://github.com/eea/volto-arcgis-block/commit/0fd14f153088c272884939c73d7fc5b535ccf764)]
+- LINT [manuelmartinezbilbomatica - [`725d36c`](https://github.com/eea/volto-arcgis-block/commit/725d36cce3fd03e0eecc5302f94d24a331096af7)]
+- FIX: Full Extent to whole dataset working from Custom Mapviewer and General Mapviewer [manuelmartinezbilbomatica - [`0d90358`](https://github.com/eea/volto-arcgis-block/commit/0d903585e0b37311da39f5b80516ce5145801393)]
 ### [0.1.166](https://github.com/eea/volto-arcgis-block/compare/0.1.165...0.1.166) - 4 July 2023
 
 ### [0.1.165](https://github.com/eea/volto-arcgis-block/compare/0.1.164...0.1.165) - 4 July 2023

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.166",
+  "version": "0.1.168",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/HotspotWidget.jsx

@@ -16,7 +16,6 @@ class HotspotWidget extends React.Component {
     //not be showing the basemap panel
     this.state = {
       showMapMenu: false,
-      activeLayers: sessionStorage.checkedLayers,
     };
     this.menuClass =
       'esri-icon-filter esri-widget--button esri-widget esri-interactive';
@@ -30,7 +29,6 @@ class HotspotWidget extends React.Component {
     this.esriLayer_pa = null;
     this.esriLayer_pa2 = null;
     this.subscribedLayers = sessionStorage;
-    this.checkedLayers = {};
     this.dataBBox = [];
     this.dataJSONNames = [];
     this.klcHighlightsArray = [];
@@ -186,8 +184,6 @@ class HotspotWidget extends React.Component {
   }
 
   handleApplyFilter(typeFilter) {
-    let checkedLayers =
-      JSON.parse(sessionStorage.getItem('checkedLayers')) || {};
     let typeLegend;
 
     if (this.props.selectedLayers) {
@@ -250,7 +246,7 @@ class HotspotWidget extends React.Component {
           .getElementById('select-klc-lccTime')
           .value.match(/\d+/g)
           .map(Number)[0];
-        checkedLayers.forEach((layer) => {
+        this.state.activeLayers.forEach((layer) => {
           layer.includes('all_lcc_a_pol')
             ? (typeLegend = 'all_lcc_a_pol')
             : (typeLegend = 'all_lcc_b_pol');
@@ -281,7 +277,7 @@ class HotspotWidget extends React.Component {
         }
       }
       if (type === 'lc') {
-        checkedLayers.forEach((layer) => {
+        this.state.activeLayers.forEach((layer) => {
           layer.includes('all_present_lc_a_pol')
             ? (typeLegend = 'all_present_lc_a_pol')
             : (typeLegend = 'all_present_lc_b_pol');
@@ -437,9 +433,7 @@ class HotspotWidget extends React.Component {
     ) {
       typeFilter.push('lcc');
     }
-    let checkedLayers =
-      JSON.parse(sessionStorage.getItem('checkedLayers')) || {};
-    checkedLayers.forEach((layer) => {
+    this.state.activeLayers.forEach((layer) => {
       if (layer.match('cop_klc')) {
         typeFilter.push('klc');
       }
@@ -510,8 +504,6 @@ class HotspotWidget extends React.Component {
     var selectBoxLccTime;
     let modularKLCAreas = [];
     let dichotomousKLCAreas = [];
-    let checkedLayers =
-      JSON.parse(sessionStorage.getItem('checkedLayers')) || {};
 
     selectBox = document.getElementById('select-klc-area');
     selectBoxLccTime = document.getElementById('select-klc-lccTime');
@@ -597,17 +589,16 @@ class HotspotWidget extends React.Component {
       );
       selectBox.options[0].disabled = true;
     }
-    if (checkedLayers.length) {
-      for (let a = 0; a < checkedLayers.length; a++) {
+    if (this.state.activeLayers.length) {
+      for (let a = 0; a < this.state.activeLayers.length; a++) {
         if (
-          checkedLayers[a].includes('all_lcc_b_pol') ||
-          checkedLayers[a].includes('all_present_lc_b_pol')
+          this.state.activeLayers[a].includes('all_lcc_b_pol') ||
+          this.state.activeLayers[a].includes('all_present_lc_b_pol')
         ) {
           for (let i = 0; i < modularKLCAreas.length; i++) {
             let option = modularKLCAreas[i];
             selectBox.options.add(new Option(option, option, option));
           }
-          this.checkedLayers = checkedLayers;
           for (let u = 0; u < selectBox.options.length; u++) {
             if (selectBox.options[u].label.includes(this.selectedArea)) {
               selectBox.value = this.selectedArea;
@@ -627,14 +618,13 @@ class HotspotWidget extends React.Component {
           }
           break;
         } else if (
-          checkedLayers[a].includes('all_lcc_a_pol') ||
-          checkedLayers[a].includes('all_present_lc_a_pol')
+          this.state.activeLayers[a].includes('all_lcc_a_pol') ||
+          this.state.activeLayers[a].includes('all_present_lc_a_pol')
         ) {
           for (let i = 0; i < dichotomousKLCAreas.length; i++) {
             let option = dichotomousKLCAreas[i];
             selectBox.options.add(new Option(option, option, option));
           }
-          this.checkedLayers = checkedLayers;
           for (let u = 0; u < selectBox.options.length; u++) {
             if (selectBox.options[u].label.includes(this.selectedArea)) {
               selectBox.value = this.selectedArea;
@@ -783,8 +773,6 @@ class HotspotWidget extends React.Component {
    * This method is executed after the rener method is executed
    */
   async componentDidMount() {
-    this.checkedLayers =
-      JSON.parse(sessionStorage.getItem('checkedLayers')) || {};
     await this.getLayerParameters();
     await this.loader();
     this.props.view.ui.add(this.container.current, 'top-right');
@@ -794,14 +782,19 @@ class HotspotWidget extends React.Component {
     window.addEventListener('storage', this.handleStorageChange);
   }
 
+  componentDidUpdate(prevState) {
+    if (prevState.activeLayers !== this.state.activeLayers) {
+      this.getKLCNames(this.dataJSONNames, this.selectedArea);
+    }
+  }
+
   componentWillUnmount() {
     // Remove the event listener when the component is unmounted
     window.removeEventListener('storage', this.handleStorageChange);
   }
 
   handleStorageChange = () => {
-    this.checkedLayers =
-      JSON.parse(sessionStorage.getItem('checkedLayers')) || {};
+    this.setState({ activeLayers: JSON.parse(sessionStorage.checkedLayers) });
     this.forceUpdate();
   };
 }

package/src/components/MapViewer/MenuWidget.jsx

@@ -1669,11 +1669,11 @@ class MenuWidget extends React.Component {
       if (this.props.download || this.location.search !== '') {
         if (
           this.extentInitiated === false &&
-          productContainerId !== 'd764e020485a402598551fa461bf1db2' //hotspot
+          productContainerId !== 'd764e020485a402598551fa461bf1db2' // hotspot
         ) {
           this.extentInitiated = true;
           setTimeout(() => {
-            this.fullExtent(elem);
+            this.FullExtentDataset(elem);
           }, 2000);
         }
       }
@@ -2260,6 +2260,27 @@ class MenuWidget extends React.Component {
       })
       .catch(() => {});
   };
+
+  async FullExtentDataset(elem) {
+    let BBoxes = {};
+    this.findCheckedDataset(elem);
+    if (this.url.toLowerCase().includes('wms')) {
+      await this.getCapabilities(this.url, 'wms');
+      BBoxes = this.parseBBOXWMS(this.xml);
+    } else if (this.url.toLowerCase().includes('wmts')) {
+      await this.getCapabilities(this.url, 'wmts');
+      BBoxes = this.parseBBOXWMTS(this.xml);
+    }
+    let myExtent = new Extent({
+      xmin: BBoxes['dataset'].xmin,
+      ymin: BBoxes['dataset'].ymin,
+      xmax: BBoxes['dataset'].xmax,
+      ymax: BBoxes['dataset'].ymax,
+      // spatialReference: 4326 // by default wkid 4326
+    });
+    this.view.goTo(myExtent); //
+  }
+
   async fullExtent(elem) {
     this.findCheckedDataset(elem);
     let BBoxes = {};
@@ -2294,7 +2315,6 @@ class MenuWidget extends React.Component {
       BBoxes = this.parseBBOXWMS(this.xml);
     } else if (this.url.toLowerCase().includes('wmts')) {
       await this.getCapabilities(this.url, 'wmts');
-
       BBoxes = this.parseBBOXWMTS(this.xml);
     }
     if (
@@ -2308,11 +2328,8 @@ class MenuWidget extends React.Component {
         !this.productId.includes('333e4100b79045daa0ff16466ac83b7f') &&
         this.location.search !== ''
       ) {
-        // firstLayer = BBoxes['dataset'];
         firstLayer = BBoxes.dataset;
       } else if (this.productId.includes('130299ac96e54c30a12edd575eff80f7')) {
-        //corine land cover
-        //
         if (elem.title.includes('LAEA')) {
           firstLayer = BBoxes['dataset'];
         } else if (elem.title.includes('Guadeloupe')) {
@@ -2326,7 +2343,6 @@ class MenuWidget extends React.Component {
         } else if (elem.title.includes('Reunion')) {
           firstLayer = BBoxes[Object.keys(BBoxes)[4]];
         } else {
-          // firstLayer = BBoxes[Object.keys(BBoxes)[Object.keys(BBoxes).length - 1]];
           firstLayer = BBoxes['dataset'];
         }
       } else if (
@@ -2339,7 +2355,6 @@ class MenuWidget extends React.Component {
       } else {
         // Takes the BBOX corresponding to the layer.
         firstLayer = BBoxes[elem.attributes.layerid.value];
-        // firstLayer = BBoxes[Object.keys(BBoxes)[0]];
       }
 
       let myExtent = new Extent({