@eeacms/volto-arcgis-block 0.1.225 → 0.1.227

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.227](https://github.com/eea/volto-arcgis-block/compare/0.1.226...0.1.227) - 30 October 2023
+
+#### :hammer_and_wrench: Others
+
+- Update LegendWidget.jsx [Urkorue - [`64b069d`](https://github.com/eea/volto-arcgis-block/commit/64b069d32573befac63e68adf11a328f365595ae)]
+### [0.1.226](https://github.com/eea/volto-arcgis-block/compare/0.1.225...0.1.226) - 27 October 2023
+
 ### [0.1.225](https://github.com/eea/volto-arcgis-block/compare/0.1.224...0.1.225) - 26 October 2023
 
 ### [0.1.224](https://github.com/eea/volto-arcgis-block/compare/0.1.223...0.1.224) - 25 October 2023

package/package.json

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

package/src/components/MapViewer/LegendWidget.jsx

@@ -122,7 +122,7 @@ class LegendWidget extends React.Component {
           ].FilterStaticImageLegend;
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.textContent =
             'Protected Areas in Key Landscapes for Conservation borders in selected hot-spots';
-        } else if (img.style) {
+        } /*  else if (img.style) {
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';
           img.style.display = 'none';
@@ -132,12 +132,12 @@ class LegendWidget extends React.Component {
           let span = document.createElement('span');
           span.innerHTML = 'No legend available';
           element.parentNode.appendChild(span);
-        }
+        } */
         if (
-          img.closest('.esri-legend__service').firstElementChild.nodeName ===
+          img?.closest('.esri-legend__service')?.firstElementChild?.nodeName ===
             'H3' &&
-          img.closest('.esri-legend__service').firstElementChild.textContent ===
-            'WMS'
+          img?.closest('.esri-legend__service')?.firstElementChild
+            ?.textContent === 'WMS'
         ) {
           img.closest('.esri-legend__service').firstElementChild.style.display =
             'none';
@@ -229,9 +229,8 @@ class LegendWidget extends React.Component {
         setTimeout(() => {
           if (this.props.download) {
             this.hideNutsLegend();
-          } else {
-            this.brokenLegendImagePatch();
           }
+          this.brokenLegendImagePatch();
           this.setState({ loading: false });
         }, 2000);
       }

package/src/components/MapViewer/MapViewer.jsx

@@ -338,7 +338,7 @@ class MapViewer extends React.Component {
           view={this.view}
           mapViewer={this}
           map={this.map}
-          layers={this.layers}
+          layers={this.state.layers}
         />
       );
   }

package/src/components/MapViewer/MenuWidget.jsx

@@ -1899,7 +1899,7 @@ class MenuWidget extends React.Component {
       this.deleteFilteredLayer(elem.id);
       let mapLayer = this.map.findLayerById(elem.id);
       if (mapLayer) {
-        mapLayer.clear();
+        if (mapLayer.type && mapLayer.type !== 'base-tile') mapLayer.clear();
         mapLayer.destroy();
         this.map.remove(this.layers[elem.id]);
       }
@@ -2599,7 +2599,9 @@ class MenuWidget extends React.Component {
         firstLayer = BBoxes['all_present_lc_a_pol'];
       } else {
         // Takes the BBOX corresponding to the layer.
-        firstLayer = BBoxes[elem.attributes.layerid.value];
+        if (this.productId.includes('333e4100b79045daa0ff16466ac83b7f')) {
+          firstLayer = BBoxes[0];
+        } else firstLayer = BBoxes[elem.attributes.layerid.value];
       }
 
       let myExtent = new Extent({

package/src/components/MapViewer/SwipeWidget.jsx

@@ -121,12 +121,69 @@ class SwipeWidget extends React.Component {
     );
     selectTrailingLayer.options[0].disabled = true;
     this.map.layers.forEach((layer) => {
-      selectLeadingLayer.options.add(
-        new Option(this.getLayerTitle(layer), layer.id, layer.id),
-      );
-      selectTrailingLayer.options.add(
-        new Option(this.getLayerTitle(layer), layer.id, layer.id),
-      );
+      let layerId = layer.id;
+      if (this.layers['lcc_filter']) {
+        if (
+          layer.id === this.layers['all_lcc_a_pol_1_4_1_0'].id ||
+          layer.id === this.layers['all_lcc_b_pol_1_4_1_1'].id
+        ) {
+          layerId = this.layers['lcc_filter'].id;
+        }
+        if (layer.id !== this.layers['lcc_filter'].id) {
+          selectLeadingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+          selectTrailingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+        }
+      } else if (this.layers['lc_filter']) {
+        if (
+          layer.id === this.layers['all_present_lc_a_pol_1_4_0_0'].id ||
+          layer.id === this.layers['all_present_lc_b_pol_1_4_0_1'].id
+        ) {
+          layerId = this.layers['lc_filter'].id;
+        }
+        if (layer.id !== this.layers['lc_filter'].id) {
+          selectLeadingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+          selectTrailingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+        }
+      } else if (this.layers['klc_filter']) {
+        if (layer.id === this.layers['cop_klc_1_4_2_0'].id) {
+          layerId = this.layers['klc_filter'].id;
+        }
+        if (layer.id !== this.layers['klc_filter'].id) {
+          selectLeadingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+          selectTrailingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+        }
+      } else if (this.layers['pa_filter']) {
+        if (layer.id === this.layers['protected_areas_1_4_3_0'].id) {
+          layerId = this.layers['pa_filter'].id;
+        }
+        if (layer.id !== this.layers['pa_filter'].id) {
+          selectLeadingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+          selectTrailingLayer.options.add(
+            new Option(this.getLayerTitle(layer), layerId, layerId),
+          );
+        }
+      } else {
+        selectLeadingLayer.options.add(
+          new Option(this.getLayerTitle(layer), layerId, layerId),
+        );
+        selectTrailingLayer.options.add(
+          new Option(this.getLayerTitle(layer), layerId, layerId),
+        );
+      }
     });
   }
   removeOptions(selectElement) {
@@ -185,7 +242,39 @@ class SwipeWidget extends React.Component {
   loadVisibleLayers() {
     let vl = JSON.parse(sessionStorage.getItem('visibleLayers'));
     this.map.layers.forEach((layer) => {
-      layer.visible = true;
+      if (this.layers['lcc_filter']) {
+        if (
+          layer.id === this.layers['all_lcc_a_pol_1_4_1_0'].id ||
+          layer.id === this.layers['all_lcc_b_pol_1_4_1_1'].id
+        ) {
+          layer.visible = false;
+        } else {
+          layer.visible = true;
+        }
+      } else if (this.layers['lc_filter']) {
+        if (
+          layer.id === this.layers['all_present_lc_a_pol_1_4_0_0'].id ||
+          layer.id === this.layers['all_present_lc_b_pol_1_4_0_1'].id
+        ) {
+          layer.visible = false;
+        } else {
+          layer.visible = true;
+        }
+      } else if (this.layers['klc_filter']) {
+        if (layer.id === this.layers['cop_klc_1_4_2_0'].id) {
+          layer.visible = false;
+        } else {
+          layer.visible = true;
+        }
+      } else if (this.layers['pa_filter']) {
+        if (layer.id === this.layers['protected_areas_1_4_3_0'].id) {
+          layer.visible = false;
+        } else {
+          layer.visible = true;
+        }
+      } else {
+        layer.visible = true;
+      }
       if (vl) {
         for (const key in vl) {
           if (this.layers[key].id === layer.id) {