@eeacms/volto-arcgis-block 0.1.205 → 0.1.207

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.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
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.205",
+  "version": "0.1.207",
   "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,17 @@ class AreaWidget extends React.Component {
     });
     return index;
   }
+
+  checkExtent(extent) {
+    if (
+      extent.xmin < -31.27 &&
+      extent.xmax > 44.82 &&
+      extent.ymin < 27.64 &&
+      extent.ymax > 80.83
+    )
+      return true;
+  }
+
   rectanglehandler() {
     this.clearWidget();
     window.document.querySelector('.pan-container').style.display = 'flex';
@@ -212,10 +223,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 +251,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 +559,17 @@ class AreaWidget extends React.Component {
                       </div>
                     </>
                   )}
+                  {this.state.infoPopupType === 'fullDataset' && (
+                    <>
+                      <span className="drawRectanglePopup-icon">
+                        <FontAwesomeIcon icon={['fas', 'info-circle']} />
+                      </span>
+                      <div className="drawRectanglePopupWarning-text">
+                        Full dataset's only downloadable through the M2M API,
+                        AOI isn't sent to cart
+                      </div>
+                    </>
+                  )}
                 </div>
               </div>
             </div>

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"
@@ -1434,7 +1450,6 @@ class MenuWidget extends React.Component {
     let selectedUrl;
     let zoom = this.view.get('zoom');
     if (layer.LayerUrl && Object.keys(layer.LayerUrl).length > 0) {
-      // replace testingUrl with layer.LayerUrl
       zoom < 10
         ? (selectedUrl = layer.LayerUrl['longZoom'])
         : (selectedUrl = layer.LayerUrl['shortZoom']);
@@ -1510,7 +1525,7 @@ class MenuWidget extends React.Component {
       selectedUrl,
     );
     if (customTileLayer === null || customTileLayer === undefined) return;
-    if (this.layers[checkboxId]) {
+    if (this.layers[checkboxId] && this.activeLayersJSON[checkboxId]) {
       if (customTileLayer.urlTemplate !== this.layers[checkboxId].urlTemplate) {
         this.map.remove(this.layers[checkboxId]);
         this.layers[checkboxId] = customTileLayer;
@@ -3007,7 +3022,10 @@ class MenuWidget extends React.Component {
    */
   eyeLayer(elem) {
     this.findCheckedDataset(elem);
-    if (this.visibleLayers[elem.id][1] === 'eye') {
+    if (
+      this.visibleLayers[elem.id] &&
+      this.visibleLayers[elem.id][1] === 'eye'
+    ) {
       this.layers[elem.id].visible = false;
       this.visibleLayers[elem.id] = ['fas', 'eye-slash'];
       if (this.layers['lcc_filter'] && elem.id.includes('all_lcc')) {