@eeacms/volto-arcgis-block 0.1.320 → 0.1.321

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.321](https://github.com/eea/volto-arcgis-block/compare/0.1.320...0.1.321) - 9 December 2024
+
+#### :hammer_and_wrench: Others
+
+- CLMS-3264 (bug): Downloading map image layer datasets functions correctly. [Unai Bolivar - [`e11271c`](https://github.com/eea/volto-arcgis-block/commit/e11271c7ec621231207ca3069b6470f814eea7e2)]
+- CLMS-3264 (bug): pointing to correct db. Resetting local host to run tests. Saving before hand. [Unai Bolivar - [`3dca534`](https://github.com/eea/volto-arcgis-block/commit/3dca5348668b69b7fa65b39371d28e4111e0b2e8)]
 ### [0.1.320](https://github.com/eea/volto-arcgis-block/compare/0.1.319...0.1.320) - 9 December 2024
 
 ### [0.1.319](https://github.com/eea/volto-arcgis-block/compare/0.1.318...0.1.319) - 2 December 2024

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -15,7 +15,8 @@ var WMSLayer,
   Extent,
   MapImageLayer,
   projection,
-  SpatialReference;
+  SpatialReference,
+  WebMercatorUtils;
 
 const popupSettings = {
   basic: true,
@@ -91,6 +92,9 @@ export const AddCartItem = ({
     let areaExtent = null;
     let check = document.querySelector('.area-panel input:checked')?.value;
     let fileUpload = sessionStorage.getItem('fileUploadLayer') ? true : false;
+    let isMapServer = dataset.ViewService.toLowerCase().endsWith('/mapserver')
+      ? true
+      : false;
     if (check === 'area' || fileUpload) {
       areaExtent = new Extent({
         xmin: Math.min(areaData.end.x, areaData.origin.x),
@@ -98,6 +102,13 @@ export const AddCartItem = ({
         ymin: Math.min(areaData.end.y, areaData.origin.y),
         ymax: Math.max(areaData.end.y, areaData.origin.y),
       });
+    } else if (isMapServer) {
+      areaExtent = new Extent({
+        xmin: areaData.geometry.extent.xmin,
+        ymin: areaData.geometry.extent.ymin,
+        xmax: areaData.geometry.extent.xmax,
+        ymax: areaData.geometry.extent.ymax,
+      });
     } else {
       areaExtent = areaData.geometry;
     }
@@ -133,7 +144,14 @@ export const AddCartItem = ({
               ymax: 20037508.342789,
             });
           }
-          if (layerExtent.intersects(areaExtent)) {
+          if ((check === 'area' || fileUpload) && isMapServer) {
+            const transformedLayerExtent = WebMercatorUtils.webMercatorToGeographic(
+              layerExtent,
+            );
+            if (transformedLayerExtent.intersects(areaExtent)) {
+              intersection = true;
+            }
+          } else if (layerExtent.intersects(areaExtent)) {
             intersection = true;
           }
         }
@@ -475,6 +493,7 @@ class MenuWidget extends React.Component {
       'esri/layers/MapImageLayer',
       'esri/geometry/projection',
       'esri/geometry/SpatialReference',
+      'esri/geometry/support/webMercatorUtils',
     ]).then(
       ([
         _WMSLayer,
@@ -486,6 +505,7 @@ class MenuWidget extends React.Component {
         _MapImageLayer,
         _projection,
         _SpatialReference,
+        _WebMercatorUtils,
       ]) => {
         [
           WMSLayer,
@@ -497,6 +517,7 @@ class MenuWidget extends React.Component {
           MapImageLayer,
           projection,
           SpatialReference,
+          WebMercatorUtils,
         ] = [
           _WMSLayer,
           _WMTSLayer,
@@ -507,6 +528,7 @@ class MenuWidget extends React.Component {
           _MapImageLayer,
           _projection,
           _SpatialReference,
+          _WebMercatorUtils,
         ];
       },
     );