@eeacms/volto-arcgis-block 0.1.256 → 0.1.257

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.257](https://github.com/eea/volto-arcgis-block/compare/0.1.256...0.1.257) - 7 February 2024
+
+#### :hammer_and_wrench: Others
+
+- Prettier [manuelmartinezbilbomatica - [`00aa2e9`](https://github.com/eea/volto-arcgis-block/commit/00aa2e921b17404b22c848a7bd3d057328555c5e)]
+- [FEAT] Info widget queries hotspot services [manuelmartinezbilbomatica - [`b9354f5`](https://github.com/eea/volto-arcgis-block/commit/b9354f5ba3e2a6ab7ea88e909cc693c0d3a53aee)]
+- Version format issue solved [manuelmartinezbilbomatica - [`7d967cc`](https://github.com/eea/volto-arcgis-block/commit/7d967cc3b8e0f07d6638d0825869db84fc205db0)]
+- Format issue solved by addin if statement with 'application/json'. Why HotStpot capabilities are not read will be solved later [manuelmartinezbilbomatica - [`3471847`](https://github.com/eea/volto-arcgis-block/commit/34718476b5414389d1c85e41cf68566e9765202e)]
 ### [0.1.256](https://github.com/eea/volto-arcgis-block/compare/0.1.255...0.1.256) - 31 January 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -556,6 +556,19 @@ class AreaWidget extends React.Component {
                         htmlFor="download_area_select_nuts"
                       >
                         <span>By NUTS</span>
+                        <a
+                          href={
+                            'https://land.copernicus.eu/en/faq/map-viewer/what-are-nuts'
+                          }
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          onClick={(e) => e.stopPropagation()}
+                          onKeyDown={(e) => e.stopPropagation()}
+                        >
+                          <span className="map-menu-icon nuts-menu-icon">
+                            <FontAwesomeIcon icon={['fa', 'info-circle']} />
+                          </span>
+                        </a>
                       </label>
                     </div>
                     <div className="nuts-form">

package/src/components/MapViewer/InfoWidget.jsx

@@ -390,8 +390,9 @@ class InfoWidget extends React.Component {
     let layerId = this.getLayerName(layer);
     let url = layer.featureInfoUrl ? layer.featureInfoUrl : layer.url;
     return this.wmsCapabilities(url).then((xml) => {
+      // let version = this.parseCapabilities(xml, 'wms_capabilities')[0].attributes['version'];
       let version = this.parseCapabilities(xml, 'wms_capabilities')[0]
-        .attributes['version'];
+        .attributes['version'].nodeValue;
       let format = this.parseFormat(xml, layerId);
       let times = '';
       let nTimes = 1;
@@ -419,9 +420,10 @@ class InfoWidget extends React.Component {
             this.props.view.extent.ymax,
           HEIGHT: this.props.view.height,
           WIDTH: this.props.view.width,
-          X: event.screenPoint.x,
-          Y: event.screenPoint.y,
+          X: Math.round(event.screenPoint.x),
+          Y: Math.round(event.screenPoint.y),
           QUERY_LAYERS: layerId,
+          LAYERS: layerId,
           INFO_FORMAT: format,
           TIME: times ? times[0] + '/' + times[nTimes - 1] : '',
           FEATURE_COUNT: '' + nTimes,
@@ -463,19 +465,26 @@ class InfoWidget extends React.Component {
 
   parseCapabilities(xml, tag) {
     let result = xml.getElementsByTagName(tag);
+
     return result;
   }
 
   parseFormat(xml) {
-    let formats = Array.from(
-      Array.from(this.parseCapabilities(xml, 'getFeatureInfo')).map(
-        (f) => f.children,
-      )[0],
-    ).map((v) => v.textContent);
-    let format = formats.filter((v) => v.includes('json'))[0];
-    if (!format) format = formats.filter((v) => v.includes('html'))[0];
-    if (!format) format = formats.filter((v) => v.includes('text/xml'))[0];
-    if (!format) format = formats[0];
+    // console.log(parseCapabilities(xml, 'getFeatureInfo'));
+    let getFeatureInfo_node = this.parseCapabilities(xml, 'getFeatureInfo');
+    let format = false;
+    if (getFeatureInfo_node.length > 0) {
+      let formats = Array.from(
+        Array.from(getFeatureInfo_node).map((f) => f.children)[0],
+      ).map((v) => v.textContent);
+
+      format = formats.filter((v) => v.includes('json'))[0];
+      if (!format) format = formats.filter((v) => v.includes('html'))[0];
+      if (!format) format = formats.filter((v) => v.includes('text/xml'))[0];
+      if (!format) format = formats[0];
+    } else {
+      format = 'application/json';
+    }
     return format;
   }
 

package/src/components/MapViewer/MenuWidget.jsx

@@ -701,6 +701,16 @@ class MenuWidget extends React.Component {
               }
             }
           }
+          layers.forEach((layer, index) => {
+            let activeLayers = document.querySelectorAll('.active-layer');
+            activeLayers.forEach((item) => {
+              if (layer === item.getAttribute('layer-id')) {
+                item.parentElement.insertBefore(item, activeLayers[index]);
+              }
+            });
+          });
+          this.layersReorder();
+          this.saveLayerOrder();
         }
       });
     });

package/src/components/MapViewer/css/ArcgisMap.css

@@ -331,16 +331,16 @@ div.esri-popover
   padding-top: 0.5rem;
   border-width: 2px;
   border-style: solid none none none;
-  border-top: #a0b128;
+  border-color: #a0b128;
   margin-bottom: 1rem;
   font-weight: bold;
 }
 
-.ccl-form {
+.area-panel .ccl-form {
   padding-bottom: 0.5rem !important;
   border-width: 2px;
   border-style: none none solid none;
-  border-bottom: #a0b128;
+  border-color: #a0b128;
   margin-left: 1rem !important;
 }
 
@@ -348,6 +348,10 @@ div.esri-popover
   margin-top: 0.5rem;
   margin-left: 2rem;
 }
+
+label.ccl-form-radio-label span.nuts-menu-icon {
+  margin-left: 9rem;
+}
 /* Left menu */
 .map-menu {
   position: relative;