@eeacms/volto-arcgis-block 0.1.224 → 0.1.226

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.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
 
 ### [0.1.223](https://github.com/eea/volto-arcgis-block/compare/0.1.222...0.1.223) - 25 October 2023

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -32,7 +32,8 @@ class AreaWidget extends React.Component {
       'esri-icon-cursor-marquee esri-widget--button esri-widget esri-interactive';
     // Enable defaultPopup option to charge popup and highlifght feature
     this.props.mapViewer.view.popup.defaultPopupTemplateEnabled = true;
-    this.nutsUrl = '';
+    this.nutsUrl =
+      'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/NUTS_2021_Improved/MapServer/0/query?f=json&text=&objectIds=&time=&timeRelation=esriTimeRelationOverlaps&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&distance=&units=esriSRUnit_Foot&relationParam=&outFields=*&returnGeometry=false&returnTrueCurves=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&historicMoment=&returnDistinctValues=false&resultOffset=&resultRecordCount=&returnExtentOnly=false&sqlFormat=none&datumTransformation=&parameterValues=&rangeValues=&quantizationParameters=&featureEncoding=esriDefault&';
     this.initFMI = this.initFMI.bind(this);
   }
 

package/src/components/MapViewer/HotspotWidget.jsx

@@ -824,14 +824,16 @@ class HotspotWidget extends React.Component {
     this.props.view.ui.add(this.container.current, 'top-right');
     this.layerModelInit();
     this.getBBoxData();
-    this.props.view.map.layers.on('change', () => {
-      this.setState({
-        activeLayersArray: Array.from(
-          document.querySelectorAll('.active-layer'),
-        ),
+    this.props.view.when(() => {
+      this.props.view.map.layers.on('change', () => {
+        this.setState({
+          activeLayersArray: Array.from(
+            document.querySelectorAll('.active-layer'),
+          ),
+        });
+        const newHotspotData = this.props.hotspotData;
+        this.props.hotspotDataHandler(newHotspotData);
       });
-      const newHotspotData = this.props.hotspotData;
-      this.props.hotspotDataHandler(newHotspotData);
     });
   }
 

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';
@@ -227,10 +227,10 @@ class LegendWidget extends React.Component {
     if (prevState.loading !== this.state.loading) {
       if (this.state.loading === true) {
         setTimeout(() => {
-          this.brokenLegendImagePatch();
           if (this.props.download) {
             this.hideNutsLegend();
           }
+          this.brokenLegendImagePatch();
           this.setState({ loading: false });
         }, 2000);
       }

package/src/components/MapViewer/MenuWidget.jsx

@@ -648,8 +648,10 @@ class MenuWidget extends React.Component {
     loadCss();
     await this.loader();
     await this.getTMSLayersJSON();
-    this.prepareHotspotLayers();
-    this.getHotspotLayerIds();
+    if (!this.props.download) {
+      this.prepareHotspotLayers();
+      this.getHotspotLayerIds();
+    }
     this.props.view.ui.add(this.container.current, 'top-left');
     if (this.props.download) {
       setTimeout(() => {
@@ -1897,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]);
       }
@@ -1915,7 +1917,9 @@ class MenuWidget extends React.Component {
     ) {
       this.toggleCustomLegendItem(this.layers[elem.id]);
     }
-    this.activeLayersToHotspotData(elem.id);
+    if (!this.props.download) {
+      this.activeLayersToHotspotData(elem.id);
+    }
   }
 
   getHotspotLayerIds() {
@@ -2595,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({