@eeacms/volto-arcgis-block 0.1.203 → 0.1.204

package/CHANGELOG.md

@@ -4,6 +4,8 @@ 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.204](https://github.com/eea/volto-arcgis-block/compare/0.1.203...0.1.204) - 22 September 2023
+
 ### [0.1.203](https://github.com/eea/volto-arcgis-block/compare/0.1.202...0.1.203) - 21 September 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/BasemapWidget.jsx

@@ -26,6 +26,7 @@ class BasemapWidget extends React.Component {
     this.menuClass =
       'esri-icon-basemap esri-widget--button esri-widget esri-interactive';
     this.loadFirst = true;
+    this.urls = this.props.urls;
   }
 
   loader() {
@@ -171,7 +172,7 @@ class BasemapWidget extends React.Component {
               baseLayers: [
                 new WebTileLayer({
                   urlTemplate: ${url}.replace('{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}', '/${proj}/{z}/{x}/{y}'),
-                  copyright: '&copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> (and) contributors, CC-BY-SA',
+                  copyright: '© OpenStreetMap (and) contributors, CC-BY-SA',
                 })
               ]
             });
@@ -190,14 +191,11 @@ class BasemapWidget extends React.Component {
       // Only 3 basemaps
       this.positronCompositeBasemap = new Basemap({
         title: 'Positron composite',
-        thumbnailUrl:
-          'https://gisco-services.ec.europa.eu/maps/wmts/OSMPositronComposite/EPSG3857/0/0/0.png',
+        thumbnailUrl: this.urls.positronCompositeThumbnail,
         baseLayers: [
           new WebTileLayer({
-            urlTemplate:
-              'https://gisco-services.ec.europa.eu/maps/tiles/OSMPositronComposite/EPSG3857/{z}/{x}/{y}.png',
-            copyright:
-              '&copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> (and) contributors, CC-BY-SA',
+            urlTemplate: this.urls.positronCompositeTemplate,
+            copyright: '© OpenStreetMap (and) contributors, CC-BY-SA',
           }),
         ],
         // referenceLayers: [
@@ -207,14 +205,11 @@ class BasemapWidget extends React.Component {
 
       this.blossomCompositeBasemap = new Basemap({
         title: 'Blossom composite',
-        thumbnailUrl:
-          'https://gisco-services.ec.europa.eu/maps/wmts/OSMBlossomComposite/EPSG3857/0/0/0.png',
+        thumbnailUrl: this.urls.blossomCompositeThumbnail,
         baseLayers: [
           new WebTileLayer({
-            urlTemplate:
-              'https://gisco-services.ec.europa.eu/maps/tiles/OSMBlossomComposite/EPSG3857/{z}/{x}/{y}.png',
-            copyright:
-              '&copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> (and) contributors, CC-BY-SA',
+            urlTemplate: this.urls.blossomCompositeTemplate,
+            copyright: '© OpenStreetMap (and) contributors, CC-BY-SA',
           }),
         ],
         // referenceLayers: [
@@ -224,14 +219,11 @@ class BasemapWidget extends React.Component {
 
       this.worldBoundariesBasemap = new Basemap({
         title: 'World boundaries',
-        thumbnailUrl:
-          'https://gisco-services.ec.europa.eu/maps/wmts/CountriesWorld/EPSG3857/0/0/0.png',
+        thumbnailUrl: this.urls.countriesWorldThumbnail,
         baseLayers: [
           new WebTileLayer({
-            urlTemplate:
-              'https://gisco-services.ec.europa.eu/maps/tiles/CountriesWorld/EPSG3857/{z}/{x}/{y}.png',
-            copyright:
-              '&copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> (and) contributors, CC-BY-SA',
+            urlTemplate: this.urls.countriesWorldTemplate,
+            copyright: '© OpenStreetMap (and) contributors, CC-BY-SA',
           }),
         ],
         // referenceLayers: [

package/src/components/MapViewer/MapViewer.jsx

@@ -137,14 +137,11 @@ class MapViewer extends React.Component {
     await this.waitForDataFill(this.compCfg);
     this.positronCompositeBasemap = new Basemap({
       title: 'Positron composite',
-      thumbnailUrl:
-        'https://gisco-services.ec.europa.eu/maps/wmts/OSMPositronComposite/EPSG3857/0/0/0.png',
+      thumbnailUrl: this.cfgUrls.positronCompositeThumbnail,
       baseLayers: [
         new WebTileLayer({
-          urlTemplate:
-            'https://gisco-services.ec.europa.eu/maps/tiles/OSMPositronComposite/EPSG3857/{z}/{x}/{y}.png',
-          copyright:
-            '&copy; <a href="https://www.openstreetmap.org/about" target="_blank">OpenStreetMap</a> (and) contributors, CC-BY-SA',
+          urlTemplate: this.cfgUrls.positronCompositeTemplate,
+          copyright: '© OpenStreetMap (and) contributors, CC-BY-SA',
         }),
       ],
       // referenceLayers: [
@@ -282,7 +279,10 @@ class MapViewer extends React.Component {
    */
   renderBasemap() {
     if (this.props.mapviewer_config.Download) return;
-    if (this.view) return <BasemapWidget view={this.view} mapViewer={this} />;
+    if (this.view)
+      return (
+        <BasemapWidget view={this.view} mapViewer={this} urls={this.cfgUrls} />
+      );
   }
 
   renderLegend() {

package/src/components/MapViewer/config.js

@@ -233,6 +233,18 @@ const config = {
       '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',
+    positronCompositeThumbnail:
+      'https://gisco-services.ec.europa.eu/maps/wmts/OSMPositronComposite/EPSG3857/0/0/0.png',
+    positronCompositeTemplate:
+      'https://gisco-services.ec.europa.eu/maps/tiles/OSMPositronComposite/EPSG3857/{z}/{x}/{y}.png',
+    blossomCompositeThumbnail:
+      'https://gisco-services.ec.europa.eu/maps/wmts/OSMBlossomComposite/EPSG3857/0/0/0.png',
+    blossomCompositeTemplate:
+      'https://gisco-services.ec.europa.eu/maps/tiles/OSMBlossomComposite/EPSG3857/{z}/{x}/{y}.png',
+    countriesWorldThumbnail:
+      'https://gisco-services.ec.europa.eu/maps/wmts/CountriesWorld/EPSG3857/0/0/0.png',
+    countriesWorldTemplate:
+      'https://gisco-services.ec.europa.eu/maps/tiles/CountriesWorld/EPSG3857/{z}/{x}/{y}.png',
   },
 };
 export default config;