@eeacms/volto-arcgis-block 0.1.171 → 0.1.173

package/CHANGELOG.md

@@ -4,7 +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.171](https://github.com/eea/volto-arcgis-block/compare/0.1.170...0.1.171) - 14 July 2023
+### [0.1.173](https://github.com/eea/volto-arcgis-block/compare/0.1.172...0.1.173) - 17 July 2023
+
+### [0.1.172](https://github.com/eea/volto-arcgis-block/compare/0.1.171...0.1.172) - 17 July 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-2318 (feat): Hardcoded urls in LegendWidget and HotspotWidget now are readed from config.js [Urkorue - [`9f7adc3`](https://github.com/eea/volto-arcgis-block/commit/9f7adc30b818de8940d778b1eafcbfe210352470)]
+### [0.1.171](https://github.com/eea/volto-arcgis-block/compare/0.1.170...0.1.171) - 17 July 2023
 
 ### [0.1.170](https://github.com/eea/volto-arcgis-block/compare/0.1.169...0.1.170) - 13 July 2023
 

package/package.json

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

package/src/components/MapViewer/HotspotWidget.jsx

@@ -44,6 +44,7 @@ class HotspotWidget extends React.Component {
     this.selectedArea = null;
     this.lcYear = null;
     this.lccYear = null;
+    this.urls = this.props.urls;
   }
 
   loader() {
@@ -59,7 +60,7 @@ class HotspotWidget extends React.Component {
   }
 
   getBBoxData = () => {
-    const url = 'https://land.copernicus.eu/global/hsm/php/klc_bbox.php';
+    const url = this.urls.klc_bbox;
     return esriRequest(url, {
       responseType: 'json',
     }).then((response) => {
@@ -102,15 +103,12 @@ class HotspotWidget extends React.Component {
   }
 
   addLegendNameToUrl(legend) {
-    const legendLinkUrl =
-      'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=';
+    const legendLinkUrl = this.urls.legendLinkUrl;
     return legendLinkUrl + legend;
   }
 
   layerModelInit() {
-    const serviceUrl =
-      'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/wms';
-
+    const serviceUrl = this.urls.serviceUrl;
     this.esriLayer_lcc = new WMSLayer({
       url: serviceUrl,
       //featureInfoFormat: "application/json",
@@ -397,7 +395,7 @@ class HotspotWidget extends React.Component {
   }
 
   getLayerParameters() {
-    fetch('https://land.copernicus.eu/global/hsm/all_geo_klc_json')
+    fetch(this.urls.all_geo_klc)
       .then((data) => {
         if (data.status === 200) {
           return data.json();

package/src/components/MapViewer/LegendWidget.jsx

@@ -21,6 +21,7 @@ class LegendWidget extends React.Component {
     this.mapViewer = this.props.mapViewer;
     this.menuClass =
       'esri-icon-legend esri-widget--button esri-widget esri-interactive';
+    this.urls = this.props.urls;
   }
 
   hideNutsLegend() {
@@ -55,53 +56,28 @@ class LegendWidget extends React.Component {
       if (!(img.complete && img.naturalHeight !== 0)) {
         // If img src returns a broken link
         if (img?.src?.includes('all_present_lc_a_pol')) {
-          //img.src =
-          //  'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-reference-land-cover.png/@@images/image-283-df1c7b022cfd505c9bab4b4be08cd4f5.png';
-
-          //prod
-          img.src =
-            'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-reference-land-cover.png/@@images/image-800-8e5528b4247acef813af4b91d30a22d1.png';
+          img.src = this.urls.all_present_lc_a_pol;
 
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';
           return;
         } else if (img?.src?.includes('all_present_lc_b_pol')) {
-          //img.src =
-          //  'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-reference-land-cover.png/@@images/image-312-a552fdf4af5b831c1af6cd039ad9ae2b.png';
-
-          //prod
-          img.src =
-            'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-reference-land-cover.png/@@images/image-800-97f58b15239b2b3ea85d701e171eaf64.png';
+          img.src = this.urls.all_present_lc_b_pol;
 
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';
         } else if (img?.src?.includes('all_lcc_a_pol')) {
-          //img.src =
-          //  'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-land-cover-change.png/@@images/image-324-83819bb107020e7fdab5764d199b000d.png';
-
-          //prod
-          img.src =
-            'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-land-cover-change.png/@@images/image-800-e77885afc5da8e0535f648b563e60408.png';
+          img.src = this.urls.all_lcc_a_pol;
 
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';
         } else if (img?.src?.includes('all_lcc_b_pol')) {
-          //img.src =
-          //  'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-land-cover-change.png/@@images/image-314-30a9e6f64333da441b830fc31875c011.png';
-
-          //prod
-          img.src =
-            'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-land-cover-change.png/@@images/image-800-7e36e74d09ddd7e3f94fb502f0b5be8e.png';
+          img.src = this.urls.all_lcc_b_pol;
 
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';
         } else if (img?.src?.includes('cop_klc')) {
-          //img.src =
-          //  'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/key-landscapes-for-conservation-borders.png/@@images/image-278-ebd9539bdc95d6a1028a01cd59efd680.png';
-
-          //prod
-          img.src =
-            'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/key-landscapes-for-conservation-borders.png/@@images/image-800-28ced0e8616b9a414ea5076399a5ba4e.png';
+          img.src = this.urls.cop_klc;
 
           img.parentNode.parentNode.parentNode.parentNode.firstElementChild.style.display =
             'none';

package/src/components/MapViewer/MapViewer.jsx

@@ -279,6 +279,7 @@ class MapViewer extends React.Component {
           view={this.view}
           mapViewer={this}
           download={this.props.mapviewer_config.Download}
+          urls={this.cfgUrls}
         />
       );
   }
@@ -325,6 +326,7 @@ class MapViewer extends React.Component {
           mapViewer={this}
           layers={sessionStorage}
           mapCfg={this.mapCfg}
+          urls={this.cfgUrls}
         />
       );
   }

package/src/components/MapViewer/MenuWidget.jsx

@@ -1006,7 +1006,6 @@ class MenuWidget extends React.Component {
     let style = this.props.download
       ? { paddingLeft: dataset.HandlingLevel ? '0' : '1rem' }
       : {};
-
     if (dataset.HandlingLevel) {
       this.layerGroups[dataset.DatasetId] = [];
     }
@@ -1157,11 +1156,8 @@ class MenuWidget extends React.Component {
                     {description ? (
                       <Popup
                         trigger={
-                          (checkedLayers &&
-                            checkedLayers.includes(dataset.Layer.LayerId) &&
-                            dataset.ProductId ===
-                              '8474c3b080fa42cc837f1d2338fcf096') ||
-                          dataset.Product === 'Snow and Ice Parameters' ? (
+                          dataset.ProductId ===
+                          '8474c3b080fa42cc837f1d2338fcf096' ? (
                             <div class="zoom-in-message-container">
                               <span>{dataset.DatasetTitle}</span>
                               <div class="zoom-in-message zoom-in-message-dataset">
@@ -1178,9 +1174,7 @@ class MenuWidget extends React.Component {
                         style={{ transform: 'translateX(-4rem)' }}
                       />
                     ) : dataset.ProductId ===
-                        '8474c3b080fa42cc837f1d2338fcf096' ||
-                      dataset.Product ===
-                        'High Resolution Snow and Ice Parameters' ? (
+                      '8474c3b080fa42cc837f1d2338fcf096' ? (
                       <div class="zoom-in-message-container">
                         <span>{dataset.DatasetTitle}</span>
                         <div class="zoom-in-message">

package/src/components/MapViewer/config.js

@@ -218,6 +218,21 @@ const config = {
       'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/NUTS_2021_Improved/MapServer/',
     outsideEu:
       'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/World_countries_except_EU37/MapServer',
+    all_present_lc_a_pol:
+      'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-reference-land-cover.png/@@images/image-800-8e5528b4247acef813af4b91d30a22d1.png',
+    all_present_lc_b_pol:
+      'https://clmsdemo.devel6cph.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-reference-land-cover.png/@@images/image-800-97f58b15239b2b3ea85d701e171eaf64.png',
+    all_lcc_a_pol:
+      'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/dichotomous-land-cover-change.png/@@images/image-800-e77885afc5da8e0535f648b563e60408.png',
+    all_lcc_b_pol:
+      'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/modular-land-cover-change.png/@@images/image-800-7e36e74d09ddd7e3f94fb502f0b5be8e.png',
+    cop_klc:
+      'https://clms-prod.eea.europa.eu/en/products/lclcc-hot-spots/static-legends/key-landscapes-for-conservation-borders.png/@@images/image-800-28ced0e8616b9a414ea5076399a5ba4e.png',
+    klc_bbox: 'https://land.copernicus.eu/global/hsm/php/klc_bbox.php',
+    legendLinkUrl:
+      'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=',
+    serviceUrl: 'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/wms',
+    all_geo_klc: 'https://land.copernicus.eu/global/hsm/all_geo_klc_json',
   },
 };
 export default config;