@eeacms/volto-arcgis-block 0.1.206 → 0.1.208

package/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.208](https://github.com/eea/volto-arcgis-block/compare/0.1.207...0.1.208) - 2 October 2023
+
+#### :hammer_and_wrench: Others
+
+- info widget bug when activate/deactivate LLC layer fixed [masanchez85 - [`6cb51a9`](https://github.com/eea/volto-arcgis-block/commit/6cb51a9739718817bc81c860c95c93aeec5f708b)]
+- CLMS-2349, BBOX fixing and text to hyperlink adaptation [masanchez85 - [`7d8dfa2`](https://github.com/eea/volto-arcgis-block/commit/7d8dfa2e0fdd036dad132ef53494314a13fcca9e)]
+### [0.1.207](https://github.com/eea/volto-arcgis-block/compare/0.1.206...0.1.207) - 27 September 2023
+
 ### [0.1.206](https://github.com/eea/volto-arcgis-block/compare/0.1.205...0.1.206) - 26 September 2023
 
 ### [0.1.205](https://github.com/eea/volto-arcgis-block/compare/0.1.204...0.1.205) - 25 September 2023

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -192,6 +192,25 @@ class AreaWidget extends React.Component {
     });
     return index;
   }
+
+  checkExtent(extent) {
+    let extentToCHeck = new Extent({
+      xmin: -4957196.074387185,
+      xmax: 8896862.428240843,
+      ymin: 2252343.9407090154,
+      ymax: 12114555.078173038,
+      spatialReference: { wkid: 102100 },
+    });
+    if (
+      extent.xmin < extentToCHeck.xmin &&
+      extent.xmax > extentToCHeck.xmax &&
+      extent.ymin < extentToCHeck.ymin &&
+      extent.ymax > extentToCHeck.ymax
+    )
+      return true;
+    else return false;
+  }
+
   rectanglehandler() {
     this.clearWidget();
     window.document.querySelector('.pan-container').style.display = 'flex';
@@ -212,10 +231,17 @@ class AreaWidget extends React.Component {
       if (e.action === 'start') {
         if (extentGraphic) this.props.view.graphics.remove(extentGraphic);
         origin = this.props.view.toMap(e);
-        this.setState({
-          showInfoPopup: true,
-          infoPopupType: 'download',
-        });
+        if (extentGraphic && this.checkExtent(extentGraphic.geometry)) {
+          this.setState({
+            showInfoPopup: true,
+            infoPopupType: 'fullDataset',
+          });
+        } else {
+          this.setState({
+            showInfoPopup: true,
+            infoPopupType: 'download',
+          });
+        }
         if (this.props.download) {
           document.querySelector('.drawRectanglePopup-block').style.display =
             'none';
@@ -233,6 +259,17 @@ class AreaWidget extends React.Component {
           }),
           symbol: fillSymbol,
         });
+        if (extentGraphic && this.checkExtent(extentGraphic.geometry)) {
+          this.setState({
+            showInfoPopup: true,
+            infoPopupType: 'fullDataset',
+          });
+        } else {
+          this.setState({
+            showInfoPopup: true,
+            infoPopupType: 'download',
+          });
+        }
         this.props.updateArea({
           origin: { x: origin.longitude, y: origin.latitude },
           end: { x: p.longitude, y: p.latitude },
@@ -530,6 +567,26 @@ class AreaWidget extends React.Component {
                       </div>
                     </>
                   )}
+                  {this.state.infoPopupType === 'fullDataset' && (
+                    <>
+                      <span className="drawRectanglePopup-icon">
+                        <FontAwesomeIcon icon={['fas', 'info-circle']} />
+                      </span>
+                      <div className="drawRectanglePopupWarning-text">
+                        <a
+                          style={{ color: 'black', cursor: 'pointer' }}
+                          className="drawRectanglePopupWarning"
+                          id="drawRectanglePopupWarning"
+                          href="https://clmsdemo.devel6cph.eea.europa.eu/en/how-to-guides/how-to-download-spatial-data/how-to-download-m2m"
+                          target="_blank"
+                          rel="noreferrer"
+                        >
+                          To download the full dataset consult the "How to
+                          download M2M" How to guide.
+                        </a>
+                      </div>
+                    </>
+                  )}
                 </div>
               </div>
             </div>

package/src/components/MapViewer/HotspotWidget.jsx

@@ -817,6 +817,7 @@ class HotspotWidget extends React.Component {
   componentWillUnmount() {
     // Remove the event listener when the component is unmounted
     window.removeEventListener('storage', this.handleStorageChange);
+    //sessionStorage.removeItem("hotspotFilterApplied");
   }
 
   handleStorageChange = () => {

package/src/components/MapViewer/InfoWidget.jsx

@@ -919,6 +919,7 @@ class InfoWidget extends React.Component {
   render() {
     let noData = true;
     if (this.state.pixelInfo) {
+      /* debugger */
       noData = this.infoData[this.state.layerIndex].data.data
         ? this.infoData[this.state.layerIndex].data.data.values.map((a) => {
             return a[
@@ -927,6 +928,7 @@ class InfoWidget extends React.Component {
           }).length === 0
         : true;
     } else if (this.state.popup) {
+      /* debugger */
       noData = this.infoData[this.state.layerIndex].data.length === 0 && true;
     }
     return (

package/src/components/MapViewer/MenuWidget.jsx

@@ -125,21 +125,27 @@ export const AddCartItem = ({
                 (isLoggedIn ? ' logged' : '')
               }
               onClick={(e) => {
-                if (!areaData) {
-                  if (
-                    !mapViewer.activeWidget ||
-                    !mapViewer.activeWidget.container.current.classList.contains(
-                      'area-container',
-                    )
-                  ) {
-                    document.querySelector('#map_area_button').click();
+                if (
+                  !document.getElementsByClassName(
+                    'drawRectanglePopupWarning-text',
+                  ).length > 0
+                ) {
+                  if (!areaData) {
+                    if (
+                      !mapViewer.activeWidget ||
+                      !mapViewer.activeWidget.container.current.classList.contains(
+                        'area-container',
+                      )
+                    ) {
+                      document.querySelector('#map_area_button').click();
+                    }
+                  } else {
+                    checkArea(e);
                   }
-                } else {
-                  checkArea(e);
                 }
               }}
               onKeyDown={(e) => {
-                if (!areaData) {
+                /* if (!areaData) {
                   if (
                     !mapViewer.activeWidget ||
                     !mapViewer.activeWidget.container.current.classList.contains(
@@ -150,16 +156,26 @@ export const AddCartItem = ({
                   }
                 } else {
                   checkArea(e);
-                }
+                } */
               }}
               tabIndex="0"
               role="button"
             >
               <FontAwesomeIcon
-                className={isLoggedIn ? '' : ' locked'}
+                className={
+                  isLoggedIn &&
+                  !document.getElementsByClassName(
+                    'drawRectanglePopupWarning-text',
+                  ).length > 0
+                    ? ''
+                    : ' locked'
+                }
                 icon={['fas', 'download']}
               />
-              {!isLoggedIn && <FontAwesomeIcon icon={['fas', 'lock']} />}
+              {!isLoggedIn ||
+                (document.getElementsByClassName(
+                  'drawRectanglePopupWarning-text',
+                ).length > 0 && <FontAwesomeIcon icon={['fas', 'lock']} />)}
             </span>
           }
           content="Download"
@@ -2833,16 +2849,15 @@ class MenuWidget extends React.Component {
         layers.push(layer);
       }
     });
+    if (layers.length === 0 && document.querySelector('.info-container')) {
+      document.querySelector('.info-container').style.display = 'none';
+    } else if (layers.length > 0) {
+      document.querySelector('.info-container').style.display = 'flex';
+    }
     if (!sessionStorage.getItem('hotspotFilterApplied')) {
-      if (layers.length === 0 && document.querySelector('.info-container')) {
-        this.props.mapViewer.closeActiveWidget();
-        document.querySelector('.info-container').style.display = 'none';
-      } else if (layers.length > 0) {
-        document.querySelector('.info-container').style.display = 'flex';
-      }
+      this.props.mapViewer.closeActiveWidget();
     }
     this.renderHotspot();
-    /**/
   }
 
   getLayerTitle(layer) {