@eeacms/volto-arcgis-block 0.1.165 → 0.1.167

package/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.167](https://github.com/eea/volto-arcgis-block/compare/0.1.166...0.1.167) - 5 July 2023
+
+#### :hammer_and_wrench: Others
+
+- LINT [manuelmartinezbilbomatica - [`0fd14f1`](https://github.com/eea/volto-arcgis-block/commit/0fd14f153088c272884939c73d7fc5b535ccf764)]
+- LINT [manuelmartinezbilbomatica - [`725d36c`](https://github.com/eea/volto-arcgis-block/commit/725d36cce3fd03e0eecc5302f94d24a331096af7)]
+- FIX: Full Extent to whole dataset working from Custom Mapviewer and General Mapviewer [manuelmartinezbilbomatica - [`0d90358`](https://github.com/eea/volto-arcgis-block/commit/0d903585e0b37311da39f5b80516ce5145801393)]
+### [0.1.166](https://github.com/eea/volto-arcgis-block/compare/0.1.165...0.1.166) - 4 July 2023
+
 ### [0.1.165](https://github.com/eea/volto-arcgis-block/compare/0.1.164...0.1.165) - 4 July 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -296,7 +296,12 @@ class AreaWidget extends React.Component {
             if (graphic) {
               let geometry = graphic.geometry;
               if (geometry.type === 'polygon') {
-                let nuts = graphic.attributes.NUTS_ID;
+                let nuts;
+                if ('countries'.includes(graphic.layer.id)) {
+                  nuts = graphic.attributes.ISO_2DIGIT;
+                } else {
+                  nuts = graphic.attributes.NUTS_ID;
+                }
                 this.props.updateArea(nuts);
                 let symbol = new SimpleFillSymbol(
                   'solid',

package/src/components/MapViewer/MenuWidget.jsx

@@ -1669,11 +1669,11 @@ class MenuWidget extends React.Component {
       if (this.props.download || this.location.search !== '') {
         if (
           this.extentInitiated === false &&
-          productContainerId !== 'd764e020485a402598551fa461bf1db2' //hotspot
+          productContainerId !== 'd764e020485a402598551fa461bf1db2' // hotspot
         ) {
           this.extentInitiated = true;
           setTimeout(() => {
-            this.fullExtent(elem);
+            this.FullExtentDataset(elem);
           }, 2000);
         }
       }
@@ -2260,6 +2260,27 @@ class MenuWidget extends React.Component {
       })
       .catch(() => {});
   };
+
+  async FullExtentDataset(elem) {
+    let BBoxes = {};
+    this.findCheckedDataset(elem);
+    if (this.url.toLowerCase().includes('wms')) {
+      await this.getCapabilities(this.url, 'wms');
+      BBoxes = this.parseBBOXWMS(this.xml);
+    } else if (this.url.toLowerCase().includes('wmts')) {
+      await this.getCapabilities(this.url, 'wmts');
+      BBoxes = this.parseBBOXWMTS(this.xml);
+    }
+    let myExtent = new Extent({
+      xmin: BBoxes['dataset'].xmin,
+      ymin: BBoxes['dataset'].ymin,
+      xmax: BBoxes['dataset'].xmax,
+      ymax: BBoxes['dataset'].ymax,
+      // spatialReference: 4326 // by default wkid 4326
+    });
+    this.view.goTo(myExtent); //
+  }
+
   async fullExtent(elem) {
     this.findCheckedDataset(elem);
     let BBoxes = {};
@@ -2294,7 +2315,6 @@ class MenuWidget extends React.Component {
       BBoxes = this.parseBBOXWMS(this.xml);
     } else if (this.url.toLowerCase().includes('wmts')) {
       await this.getCapabilities(this.url, 'wmts');
-
       BBoxes = this.parseBBOXWMTS(this.xml);
     }
     if (
@@ -2308,11 +2328,8 @@ class MenuWidget extends React.Component {
         !this.productId.includes('333e4100b79045daa0ff16466ac83b7f') &&
         this.location.search !== ''
       ) {
-        // firstLayer = BBoxes['dataset'];
         firstLayer = BBoxes.dataset;
       } else if (this.productId.includes('130299ac96e54c30a12edd575eff80f7')) {
-        //corine land cover
-        //
         if (elem.title.includes('LAEA')) {
           firstLayer = BBoxes['dataset'];
         } else if (elem.title.includes('Guadeloupe')) {
@@ -2326,7 +2343,6 @@ class MenuWidget extends React.Component {
         } else if (elem.title.includes('Reunion')) {
           firstLayer = BBoxes[Object.keys(BBoxes)[4]];
         } else {
-          // firstLayer = BBoxes[Object.keys(BBoxes)[Object.keys(BBoxes).length - 1]];
           firstLayer = BBoxes['dataset'];
         }
       } else if (
@@ -2339,7 +2355,6 @@ class MenuWidget extends React.Component {
       } else {
         // Takes the BBOX corresponding to the layer.
         firstLayer = BBoxes[elem.attributes.layerid.value];
-        // firstLayer = BBoxes[Object.keys(BBoxes)[0]];
       }
 
       let myExtent = new Extent({