@eeacms/volto-cca-policy 0.3.70 → 0.3.72

package/CHANGELOG.md

@@ -4,15 +4,17 @@ 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.3.70](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.0...0.3.70) - 18 July 2025
+### [0.3.72](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.0...0.3.72) - 23 July 2025
 
 #### :rocket: Dependency updates
 
+- Release @eeacms/volto-searchlib@2.1.2 [EEA Jenkins - [`3f0947a`](https://github.com/eea/volto-cca-policy/commit/3f0947a0b5ab6ee774bff8681f5034180499b1ab)]
 - Release @eeacms/volto-searchlib@2.1.1 [EEA Jenkins - [`a625e3d`](https://github.com/eea/volto-cca-policy/commit/a625e3d4cf3de11644db824b8ddf46fcd56ea7e9)]
 - Release @eeacms/volto-searchlib@2.1.0 [EEA Jenkins - [`e5fc813`](https://github.com/eea/volto-cca-policy/commit/e5fc813f97922df335be28673d6303cb81b3c888)]
 
 #### :bug: Bug Fixes
 
+- fix: prevent Dropdown error when value is null [kreafox - [`6a34c03`](https://github.com/eea/volto-cca-policy/commit/6a34c03d90afe141f6c9ac62a8588585b376f968)]
 - fix: CMSare video URL with query string - #refs 290068 [kreafox - [`d637581`](https://github.com/eea/volto-cca-policy/commit/d637581b12b70f1438576d800d9a7d710c734c11)]
 - fix: remove unused import [kreafox - [`72e419d`](https://github.com/eea/volto-cca-policy/commit/72e419d8d46a05c1fc2c2314f625bf9c4a08a64d)]
 - fix: eslint [kreafox - [`7887ef4`](https://github.com/eea/volto-cca-policy/commit/7887ef453f9099f1606a54b2ae06bfcad03ca5f8)]
@@ -29,11 +31,22 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - style: Automated code fix [eea-jenkins - [`5774f11`](https://github.com/eea/volto-cca-policy/commit/5774f11b505788e71d0810555e28f306f4170ea4)]
 - style: Automated code fix [eea-jenkins - [`88386b8`](https://github.com/eea/volto-cca-policy/commit/88386b8d31edcf5aec1b2591840af3d5a6f0357a)]
+- style: Automated code fix [eea-jenkins - [`1f11a31`](https://github.com/eea/volto-cca-policy/commit/1f11a31a8ccf6fd74840f3d205992068c7427512)]
 - style: Automated code fix [eea-jenkins - [`4c5b5f3`](https://github.com/eea/volto-cca-policy/commit/4c5b5f3f4e0474a7fc2ba1f634229f8fc99c3fb0)]
 
 #### :hammer_and_wrench: Others
 
+- Refs #289437 - wip [Tripon Eugen - [`2073e24`](https://github.com/eea/volto-cca-policy/commit/2073e2404274cbacccbc303d4493860f8c938de8)]
+- Refs #289437 - wip typo [Tripon Eugen - [`62c79a3`](https://github.com/eea/volto-cca-policy/commit/62c79a3c914f1c49d42ea96953a903af9e6e3a21)]
+- Refs #289437 - map popup country name updtes [Tripon Eugen - [`f6b265d`](https://github.com/eea/volto-cca-policy/commit/f6b265dfa6d7710cdfac10fcdcac9de646f8d868)]
+- Refs #289437 - no data Switzerland message [Tripon Eugen - [`b7d6251`](https://github.com/eea/volto-cca-policy/commit/b7d6251dfe136c1631ff112ecccfa8e5eda74101)]
+- Refs #289437 - update legend map [Tripon Eugen - [`80f8f9b`](https://github.com/eea/volto-cca-policy/commit/80f8f9bbc590fc0c10c65514bdba0c67db6de441)]
+- Refs #289437 - update label for some countries [Tripon Eugen - [`1be52e3`](https://github.com/eea/volto-cca-policy/commit/1be52e3f388e2378b9dfec8496eb083fb7d589c9)]
+- Refs #289437 - update map colors [Tripon Eugen - [`47f3112`](https://github.com/eea/volto-cca-policy/commit/47f3112038f89945741abbb4fafde13d150af79c)]
 - Bump version for volto-datablocks [Tiberiu Ichim - [`e6267e0`](https://github.com/eea/volto-cca-policy/commit/e6267e03882362471e60ad150df49c5c2843884e)]
+- Refs #289437 - blue map updates [Tripon Eugen - [`a734405`](https://github.com/eea/volto-cca-policy/commit/a734405cc3907b7fdcdc169421713c3b61405641)]
+- Refs #289437 - blue map update data link no profiles [Tripon Eugen - [`5df8797`](https://github.com/eea/volto-cca-policy/commit/5df8797b8b600850516e0f6ce480b052c1e35bdd)]
+- Refs #289437 - blue map update [Tripon Eugen - [`36de33e`](https://github.com/eea/volto-cca-policy/commit/36de33e41e4d862d201db7cf470d902c67560f71)]
 - No console.log [Tiberiu Ichim - [`fef7eea`](https://github.com/eea/volto-cca-policy/commit/fef7eea74480a455ccbd04f8dc39170ca538cb17)]
 - No need for schema enhancer [Tiberiu Ichim - [`ec71401`](https://github.com/eea/volto-cca-policy/commit/ec7140102081db6bf86940ff7f06c8ff7233565f)]
 - Add extension for DataConnectedEmbed [Tiberiu Ichim - [`2a14949`](https://github.com/eea/volto-cca-policy/commit/2a149490e2ad001a3efc4106de6207c508762675)]
@@ -45,11 +58,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: add tests to increase code coverage [kreafox - [`75e95bf`](https://github.com/eea/volto-cca-policy/commit/75e95bf109369b637eecfbd649cb07280c27c9fe)]
 - Use secondary site id [Tiberiu Ichim - [`461a204`](https://github.com/eea/volto-cca-policy/commit/461a20409ccf8e3b1baea17ee7727378dbb38e23)]
 - Add suport for custom site id for mission [Tiberiu Ichim - [`3a32dfc`](https://github.com/eea/volto-cca-policy/commit/3a32dfc40127a060ea86651a71f043ef7137876b)]
+- Refs #289562 - blue country map change projection [Tripon Eugen - [`8979a20`](https://github.com/eea/volto-cca-policy/commit/8979a20f91a160d5f70f747aa01d0e04a6d6a30d)]
 - add nn missing translations [Tripon Eugen - [`62511df`](https://github.com/eea/volto-cca-policy/commit/62511df2351b231b3973a9a748f307e78ff7f993)]
+- Refs #289437 - country map profile label translation [Tripon Eugen - [`59bc0c7`](https://github.com/eea/volto-cca-policy/commit/59bc0c7135290cd4edb7faa53dee8a5e31376c57)]
+- Refs #289437 - Filter test update after remove filters [Tripon Eugen - [`bd6a0c3`](https://github.com/eea/volto-cca-policy/commit/bd6a0c3d6fe4568072cdc741410ab5c19da7433f)]
+- Refs #289437 - eslint, center and zoom map [Tripon Eugen - [`4c1bd3e`](https://github.com/eea/volto-cca-policy/commit/4c1bd3e10b151cb935b10fa136006056c61d28c4)]
+- Refs #289437 - update map colorse and labels [Tripon Eugen - [`6577fc6`](https://github.com/eea/volto-cca-policy/commit/6577fc640755e394d696932413ddd10b541d193e)]
 - Add some loadable for components [Tiberiu Ichim - [`1793962`](https://github.com/eea/volto-cca-policy/commit/179396211c66a6a2465b2d1b6c0f2afc40fc7189)]
 - Refs #284961 - test [Tripon Eugen - [`c989f1f`](https://github.com/eea/volto-cca-policy/commit/c989f1f8638c0c5233c5c49f8673c9a2cdc7937e)]
 - Refs #284961 - add translations [Tripon Eugen - [`04ee988`](https://github.com/eea/volto-cca-policy/commit/04ee988c086d393b9b37ce1ea8d24f5e84f266aa)]
-### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.69...1.0.0-alpha.0) - 15 July 2025
+### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.71...1.0.0-alpha.0) - 15 July 2025
 
 #### :bug: Bug Fixes
 
@@ -92,8 +110,49 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: Update to volto 17 PR30 [valentinab25 - [`ed03286`](https://github.com/eea/volto-cca-policy/commit/ed032865efa051d6353844737616019b202ea562)]
 - test: update snapshots [ana-oprea - [`94608ad`](https://github.com/eea/volto-cca-policy/commit/94608adc1b3b3655c7ecd5c39dde1f0fcd4b41e9)]
 - test: Update to volto 17 PR30 [valentinab25 - [`2e81033`](https://github.com/eea/volto-cca-policy/commit/2e810334e08366ca77ba62383c064770dde643a1)]
-### [0.3.69](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.1...0.3.69) - 17 July 2025
+### [0.3.71](https://github.com/eea/volto-cca-policy/compare/0.3.70...0.3.71) - 22 July 2025
+
+#### :bug: Bug Fixes
+
+- fix: prevent Dropdown error when value is null [kreafox - [`6a34c03`](https://github.com/eea/volto-cca-policy/commit/6a34c03d90afe141f6c9ac62a8588585b376f968)]
+
+### [0.3.70](https://github.com/eea/volto-cca-policy/compare/0.3.69...0.3.70) - 18 July 2025
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`5774f11`](https://github.com/eea/volto-cca-policy/commit/5774f11b505788e71d0810555e28f306f4170ea4)]
+
+#### :hammer_and_wrench: Others
+
+- Bump version for volto-datablocks [Tiberiu Ichim - [`e6267e0`](https://github.com/eea/volto-cca-policy/commit/e6267e03882362471e60ad150df49c5c2843884e)]
+- No console.log [Tiberiu Ichim - [`fef7eea`](https://github.com/eea/volto-cca-policy/commit/fef7eea74480a455ccbd04f8dc39170ca538cb17)]
+- No need for schema enhancer [Tiberiu Ichim - [`ec71401`](https://github.com/eea/volto-cca-policy/commit/ec7140102081db6bf86940ff7f06c8ff7233565f)]
+- Add extension for DataConnectedEmbed [Tiberiu Ichim - [`2a14949`](https://github.com/eea/volto-cca-policy/commit/2a149490e2ad001a3efc4106de6207c508762675)]
+### [0.3.69](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.5...0.3.69) - 17 July 2025
+
+### [0.3.69-alpha.5](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.4...0.3.69-alpha.5) - 22 July 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #289437 - wip [Tripon Eugen - [`2073e24`](https://github.com/eea/volto-cca-policy/commit/2073e2404274cbacccbc303d4493860f8c938de8)]
+- Refs #289437 - wip typo [Tripon Eugen - [`62c79a3`](https://github.com/eea/volto-cca-policy/commit/62c79a3c914f1c49d42ea96953a903af9e6e3a21)]
+- Refs #289437 - map popup country name updtes [Tripon Eugen - [`f6b265d`](https://github.com/eea/volto-cca-policy/commit/f6b265dfa6d7710cdfac10fcdcac9de646f8d868)]
+### [0.3.69-alpha.4](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.3...0.3.69-alpha.4) - 21 July 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #289437 - no data Switzerland message [Tripon Eugen - [`b7d6251`](https://github.com/eea/volto-cca-policy/commit/b7d6251dfe136c1631ff112ecccfa8e5eda74101)]
+### [0.3.69-alpha.3](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.2...0.3.69-alpha.3) - 21 July 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #289437 - update legend map [Tripon Eugen - [`80f8f9b`](https://github.com/eea/volto-cca-policy/commit/80f8f9bbc590fc0c10c65514bdba0c67db6de441)]
+- Refs #289437 - update label for some countries [Tripon Eugen - [`1be52e3`](https://github.com/eea/volto-cca-policy/commit/1be52e3f388e2378b9dfec8496eb083fb7d589c9)]
+### [0.3.69-alpha.2](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.1...0.3.69-alpha.2) - 21 July 2025
+
+#### :hammer_and_wrench: Others
 
+- Refs #289437 - update map colors [Tripon Eugen - [`47f3112`](https://github.com/eea/volto-cca-policy/commit/47f3112038f89945741abbb4fafde13d150af79c)]
 ### [0.3.69-alpha.1](https://github.com/eea/volto-cca-policy/compare/0.3.69-alpha.0...0.3.69-alpha.1) - 18 July 2025
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.3.70",
+  "version": "0.3.72",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -36,7 +36,7 @@
     "@eeacms/volto-globalsearch": "2.1.2",
     "@eeacms/volto-hero-block": "^7.1.0",
     "@eeacms/volto-openlayers-map": "1.0.1",
-    "@eeacms/volto-searchlib": "2.1.1",
+    "@eeacms/volto-searchlib": "2.1.2",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
     "@elastic/search-ui": "1.21.2",

package/src/cntrg.data

@@ -36729,6 +36729,41 @@
         ]
       }
     },
+    {
+      "type": "Feature",
+      "properties": {
+        "id": "XK",
+        "na": "Kosovo"
+      },
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [20.590246546680227, 41.855408919283626],
+            [20.52295, 42.21787],
+            [20.283754510181893, 42.32025950781508],
+            [20.0707, 42.58863],
+            [20.25758, 42.81275000000011],
+            [20.49679, 42.88469],
+            [20.63508, 43.21671],
+            [20.81448, 43.27205],
+            [20.95651, 43.13094],
+            [21.143395, 43.06868500000013],
+            [21.27421, 42.90959],
+            [21.43866, 42.86255],
+            [21.63302, 42.67717],
+            [21.77505, 42.6827],
+            [21.66292, 42.43922],
+            [21.54332, 42.3202500000001],
+            [21.57663598940212, 42.24522439706186],
+            [21.35270000000014, 42.2068],
+            [20.76216, 42.05186],
+            [20.71731000000011, 41.84711],
+            [20.590246546680227, 41.855408919283626]
+          ]
+        ]
+      }
+    },
     {
       "type": "Feature",
       "properties": {

package/src/components/manage/Blocks/CountryMapProfile/Filter.jsx

@@ -1,89 +1,47 @@
 import React from 'react';
-import { Radio } from 'semantic-ui-react';
-
-function hidePopup() {
-  const collections = document.getElementsByClassName('map-tooltip');
-  for (let i = 0; i < collections.length; i++) {
-    collections[i].style.visibility = 'hidden';
-  }
-}
+import { FormattedMessage } from 'react-intl';
 
 export default function Filter(props) {
-  const { thematicMapMode, setThematicMapMode } = props;
   return (
     <>
-      <p className="title">Choose thematic map:</p>
-      <div id="sections-selector">
-        <Radio
-          label="National adaption policy"
-          name="country-map-section"
-          value="National adaption policy"
-          checked={thematicMapMode === 'National adaption policy'}
-          onChange={(_e, { value }) => {
-            setThematicMapMode(value);
-            hidePopup();
-          }}
-        />
-        <Radio
-          label="Adaptation portals and platforms"
-          name="country-map-section"
-          value="Adaptation portals and platforms"
-          checked={thematicMapMode === 'Adaptation portals and platforms'}
-          onChange={(_e, { value }) => {
-            setThematicMapMode(value);
-            hidePopup();
-          }}
-        />
-      </div>
-
-      {thematicMapMode === 'Adaptation portals and platforms' && (
-        <div className="legend portals-legend">
-          <div className="legend-el">
-            <span className="country-both legend-box"></span>
-            <p className="legend-text">
-              Adaptation portal or platform reported
-            </p>
-          </div>
-          <div className="legend-el">
-            <span className="country-noportal legend-box"></span>
-            <p className="legend-text">No portal or platform reported</p>
-          </div>
-          <div className="legend-el">
-            <span className="country-notreported legend-box"></span>
-            <p className="legend-text">No data reported in 2023</p>
-          </div>
-          <div className="legend-el">
-            <span className="country-outside legend-box"></span>
-            <p className="legend-text">Outside EEA coverage</p>
-          </div>
+      <div className="legend portals-legend">
+        <div className="legend-el">
+          <span className="country-eea-eu-member legend-box"></span>
+          <p className="legend-text">
+            <FormattedMessage
+              id="EU Member States and EEA Member Countries"
+              defaultMessage="EU Member States and EEA Member Countries"
+            />
+          </p>
         </div>
-      )}
-
-      {thematicMapMode === 'National adaption policy' && (
-        <div className="legend nasnap-legend">
-          <div className="legend-el">
-            <span className="country-nasnap legend-box"></span>
-            <p className="legend-text">
-              National adaptation policy reported in 2023
-            </p>
-          </div>
-          <div className="legend-el">
-            <span className="country-nap legend-box"></span>
-            <p className="legend-text">
-              National adaptation policy not reported beyond mandatory reporting
-              in 2023
-            </p>
-          </div>
-          <div className="legend-el">
-            <span className="country-nas legend-box"></span>
-            <p className="legend-text">No data reported in 2023</p>
-          </div>
-          <div className="legend-el">
-            <span className="country-none legend-box"></span>
-            <p className="legend-text">Outside EEA coverage</p>
-          </div>
+        <div className="legend-el">
+          <span className="country-eea-member legend-box"></span>
+          <p className="legend-text">
+            <FormattedMessage
+              id="EEA Member Countries"
+              defaultMessage="EEA Member Countries"
+            />
+          </p>
+        </div>
+        <div className="legend-el">
+          <span className="country-eea-coopereting legend-box"></span>
+          <p className="legend-text">
+            <FormattedMessage
+              id="EEA Cooperating Countries and Energy Community Contracting Parties"
+              defaultMessage="EEA Cooperating Countries and Energy Community Contracting Parties"
+            />
+          </p>
         </div>
-      )}
+        <div className="legend-el">
+          <span className="country-eastern legend-box"></span>
+          <p className="legend-text">
+            <FormattedMessage
+              id="Eastern Parnership Members and Energy Community Contracting Parties"
+              defaultMessage="Eastern Parnership Members and Energy Community Contracting Parties"
+            />
+          </p>
+        </div>
+      </div>
     </>
   );
 }

package/src/components/manage/Blocks/CountryMapProfile/Filter.test.jsx

@@ -32,6 +32,6 @@ describe('Filter', () => {
         </MemoryRouter>
       </Provider>,
     );
-    expect(container.querySelector('#sections-selector')).toBeInTheDocument();
+    expect(container.querySelector('.portals-legend')).toBeInTheDocument();
   });
 });

package/src/components/manage/Blocks/CountryMapProfile/Interactions.jsx

@@ -37,23 +37,66 @@ export const Interactions = ({
       }
       const domEvt = evt.originalEvent;
 
+      if (
+        countries_metadata.length > 0 &&
+        feature &&
+        [
+          'Bosnia and Herzegovina',
+          'Montenegro',
+          'Albania',
+          'North Macedonia',
+          'Kosovo',
+        ].includes(feature.get('na'))
+      ) {
+        map.getTargetElement().style.cursor = 'pointer';
+        let countryName = feature.get('na');
+        const node = tooltipRef.current;
+        const flag = feature.get('flag').src;
+        let tooltipContent =
+          'No data reported through the reporting mechanism of the adapted Governance Regulation for the Energy Community\'s Contracting Parties. More information is available <a href="https://www.energy-community.org/">here</a>.';
+        if (countryName === 'Kosovo') {
+          tooltipContent =
+            tooltipContent +
+            '<hr>This designation is without prejudice to positions on status, and is in line with UNSCR 1244/99 and the ICJ opinion on Kosovo Declaration of Independence';
+        }
+        let tooltipContentDiv = `
+          <div class="country-tooltip">
+            <div id="country-name">
+              <h3>${countryName}</h3>
+              <img class="tooltip-country-flag" src="${flag}" height="33" width="54">
+            </div>
+            <div class="tooltip-content"><span>${tooltipContent}</span></div>
+          </div>`;
+
+        setTooltipVisibility(node, tooltipContentDiv, domEvt, true);
+      }
       if (
         countries_metadata.length > 0 &&
         feature &&
         euCountryNames.includes(feature.get('na'))
       ) {
         let countryName = feature.get('na');
+        let countryNamePrint = feature.get('na');
+        let baseUrlPath = baseUrl;
+        if (!baseUrlPath.includes('countries-regions/countries/')) {
+          baseUrlPath = baseUrlPath + '/countries-regions/countries';
+        }
         let noDataReportedMsg = `
           No data reported through the reporting mechanism of the Governance Regulation.
           Last information is available
-          <a href="${baseUrl}/${countryName.toLowerCase()}">here</a>`;
+          <a href="${baseUrlPath}/${countryName.toLowerCase()}">here</a>`;
 
         if (countryName === 'Türkiye') {
           countryName = 'Turkiye';
           noDataReportedMsg = `
             Data reported in 2021 through the reporting mechanism of the Governance Regulation.
             Information is available
-            <a href="${baseUrl}/${countryName.toLowerCase()}">here</a>`;
+            <a href="${baseUrlPath}/${countryName.toLowerCase()}">here</a>`;
+        }
+
+        if (countryName === 'Switzerland') {
+          noDataReportedMsg = `
+          <span>National Adaptation Strategy </span><ul><li><a href="https://www.bafu.admin.ch/bafu/en/home/topics/climate/publications-studies/publications/adaptation-climate-change-switzerland-2012.html">Adaptation to climate change in Switzerland - First part of the Federal Councils strategy</a><p style="font-style:oblique;">Adopted</p></li></ul><span>National Adaptation Plan </span><ul><li><a href="https://www.bafu.admin.ch/bafu/de/home/themen/klima/publikationen-studien/publikationen/anpassung-klimawandel-schweiz-aktionsplan-2020-2025.html">Adaptation to climate change in Switzerland: Action Plan 2020-2025</a><p style="font-style:oblique;">Adopted</p></li></ul>`;
         }
 
         if (!Object.hasOwn(countries_metadata[0], countryName)) {
@@ -81,10 +124,13 @@ export const Interactions = ({
         const node = tooltipRef.current;
         const flag = feature.get('flag').src;
         const cn = countryName.toLowerCase();
+        if (countryNamePrint === 'Moldova') {
+          countryNamePrint = 'Republic of Moldova';
+        }
         let tooltipContentDiv = `
           <div class="country-tooltip">
             <div id="country-name">
-              <a href="/en/countries-regions/countries/${cn}"><h3>${countryName}</h3></a>
+              <a href="/en/countries-regions/countries/${cn}"><h3>${countryNamePrint}</h3></a>
               <img class="tooltip-country-flag" src="${flag}" height="33" width="54">
             </div>
             <div class="tooltip-content">${tooltipContent}</div>

package/src/components/manage/Blocks/CountryMapProfile/OLView.jsx

@@ -26,7 +26,6 @@ import './styles.less';
 
 const View = (props) => {
   const { geofeatures, projection, ol } = props;
-
   const highlight = React.useRef();
   const [stateHighlight, setStateHighlight] = React.useState();
 
@@ -42,7 +41,7 @@ const View = (props) => {
     'National adaption policy',
   );
   const countries_metadata_url =
-    '/en/countries-regions/countries/@@countries-metadata-extract?langflag=1';
+    '/en/countries-regions/countries/@@countries-metadata-extract-2025?langflag=1';
   const countries_metadata = useCountriesMetadata(
     addAppURL(countries_metadata_url),
   );
@@ -52,52 +51,16 @@ const View = (props) => {
   const euCountryFeatures = React.useRef();
 
   React.useEffect(() => {
-    const features = new ol.format.GeoJSON().readFeatures(geofeatures);
+    const features = new ol.format.GeoJSON().readFeatures(geofeatures, {
+      dataProjection: 'EPSG:4326',
+      featureProjection: 'EPSG:3857',
+    });
     const filtered = features.filter((f) =>
       euCountryNames.includes(f.get('na')),
     );
 
     euCountryFeatures.current = filtered;
 
-    if (countries_metadata.length > 0) {
-      filtered.forEach((feature) => {
-        let countryName = feature.get('na');
-        if (countryName === 'Türkiye') {
-          countryName = 'Turkiye';
-        }
-        if (Object.hasOwn(countries_metadata[0], countryName)) {
-          let metadata = countries_metadata[0][countryName];
-          if (metadata !== undefined) {
-            if (thematicMapMode === 'National adaption policy') {
-              if (metadata[0]?.notreported) {
-                feature.set('fillBlue', 'blue3');
-              } else if (
-                metadata[0]?.nap_mixed?.length ||
-                metadata[0]?.nas_mixed.length ||
-                metadata[0]?.sap_mixed.length
-              ) {
-                feature.set('fillBlue', 'blue1');
-              } else {
-                feature.set('fillBlue', 'blue2');
-              }
-            } else {
-              if (metadata[0]?.notreported) {
-                feature.set('fillBlue', 'blue3');
-              } else if (
-                ['both', 'hazard', 'adaptation', 'not_specified'].includes(
-                  metadata[0]?.focus_info || [],
-                )
-              ) {
-                feature.set('fillBlue', 'blue1');
-              } else {
-                feature.set('fillBlue', 'blue2');
-              }
-            }
-          }
-        }
-      });
-    }
-
     filtered.forEach((feature) => {
       const img = new Image();
       img.onload = function () {
@@ -138,9 +101,6 @@ const View = (props) => {
   //   [baseUrl, history],
   // );
   // console.log('thematicMapMode', thematicMapMode);
-  // console.log('euCountriesSource', euCountriesSource);
-  // console.log('filtered', euCountriesSource?.getFeatures() || 'NOT SET YET');
-
   return (
     <div className="ol-country-map">
       <Grid columns="12">
@@ -148,10 +108,10 @@ const View = (props) => {
           {tileWMSSources ? (
             <Map
               view={{
-                center: ol.proj.fromLonLat([10, 50], projection),
+                center: ol.proj.fromLonLat([14.5, 57], projection),
                 projection,
                 showFullExtent: true,
-                zoom: 4,
+                zoom: 3.3,
               }}
               pixelRatio={1}
             >

package/src/components/manage/Blocks/CountryMapProfile/mapstyle.js

@@ -42,16 +42,57 @@ export const makeStyles = (highlight, ol) => {
   });
 
   const getFillColor = (feature) => {
-    if (feature.get('fillBlue') === 'blue1') {
-      return new ol.style.Fill({ color: 'rgb(0, 75, 127, 1)' });
+    const countryCode = feature.get('id');
+    const countriesUE = [
+      'AT',
+      'BE',
+      'BG',
+      'CH',
+      'CZ',
+      'CY',
+      'DE',
+      'DK',
+      'EE',
+      'EL',
+      'ES',
+      'FI',
+      'FR',
+      'GR',
+      'HR',
+      'HU',
+      'IE',
+      'IS',
+      'IT',
+      'LI',
+      'LT',
+      'LU',
+      'LV',
+      'MT',
+      'NL',
+      'NO',
+      'PL',
+      'PT',
+      'RO',
+      'SE',
+      'SI',
+      'SK',
+      'TR',
+    ];
+    const countriesCoopereting = ['RS', 'BA', 'MK', 'ME', 'AL', 'XK'];
+    const countriesEastern = ['UA', 'MO', 'MD', 'GE'];
+    const countriesEEAMemberCountries = ['IS', 'NO', 'CH', 'LI', 'TR'];
+    if (countriesEEAMemberCountries.includes(countryCode)) {
+      return new ol.style.Fill({ color: '#50B0A4' });
     }
-    if (feature.get('fillBlue') === 'blue2') {
-      return new ol.style.Fill({ color: 'rgb(10, 153, 255, 1)' });
+    if (countriesCoopereting.includes(countryCode)) {
+      return new ol.style.Fill({ color: '#A0E5DC' });
     }
-    if (feature.get('fillBlue') === 'blue3') {
-      return new ol.style.Fill({ color: 'rgb(120, 217, 252, 1)' });
+    if (countriesEastern.includes(countryCode)) {
+      return new ol.style.Fill({ color: '#C8FFF8' });
+    }
+    if (countriesUE.includes(countryCode)) {
+      return new ol.style.Fill({ color: '#007B6C' });
     }
-    // console.log(feature.get('fillBlue'));
     return fill;
   };
 

package/src/components/manage/Blocks/CountryMapProfile/styles.less

@@ -97,7 +97,7 @@
     }
 
     .no-focus {
-      background-color: #efe7d4;
+      background-color: #fff;
     }
 
     .country-notreported {
@@ -107,17 +107,29 @@
     .country-none,
     .country-outside {
       border: 1px solid #ddd;
-      background-color: #fbfae6;
+      background-color: #fff;
     }
   }
 
+  .country-eea-eu-member {
+    background-color: #007b6c;
+  }
+
+  .country-eea-member {
+    background-color: #50b0a4;
+  }
+
+  .country-eea-coopereting {
+    background-color: #a0e5dc;
+  }
+
+  .country-eastern {
+    background-color: #c8fff8;
+  }
+
   .legend.nasnap-legend {
     display: block;
 
-    .country-nasnap {
-      background-color: #004b7f;
-    }
-
     .country-nas {
       background-color: #78d9fc;
     }
@@ -131,7 +143,7 @@
     }
 
     .country-nodata {
-      background-color: #efe7d4;
+      background-color: #fff;
     }
   }
 
@@ -149,13 +161,13 @@
     }
 
     .country-not-specified {
-      background-color: #fff3ac;
+      background-color: #fff;
     }
 
     .country-none,
     .country-outside {
       border: 1px solid #ddd;
-      background-color: #fbfae6;
+      background-color: #fff;
     }
 
     .country-noportal {
@@ -216,7 +228,7 @@
   }
 
   .country-outline.ue path:hover {
-    fill: #8a9c3a;
+    fill: #005248;
   }
 
   // Tooltip for countries
@@ -247,11 +259,19 @@
 
     #country-name {
       padding-bottom: 2em;
+
+      h3 {
+        color: #000;
+      }
     }
 
     p:empty {
       display: none;
     }
+
+    .tooltip-content {
+      color: #000;
+    }
   }
 
   #country-name a {

package/src/components/theme/Widgets/GeocharsWidget.jsx

@@ -46,7 +46,7 @@ const SelectSubRegions = (props) => {
         multiple
         selection
         options={availableRegions}
-        value={regions}
+        value={regions || []}
         onChange={handleSelect}
       />
     </div>
@@ -74,7 +74,7 @@ const SelectMacroRegions = (props) => {
         multiple
         selection
         options={WIDGET_MACRO_TRANS_REGIONS}
-        value={regions}
+        value={regions || []}
         onChange={handleSelect}
       />
     </div>
@@ -92,7 +92,7 @@ const SelectBioRegions = (props) => {
         multiple
         selection
         options={WIDGET_BIOGEOGRAPHICAL_REGIONS}
-        value={regions}
+        value={regions || []}
         onChange={handleSelect}
       />
     </div>
@@ -147,7 +147,7 @@ const GeocharsWidget = (props) => {
   if (value !== null) {
     geoElements = JSON.parse(value).geoElements;
   } else {
-    geoElements = DEFAULT_GEOCHARS;
+    geoElements = DEFAULT_GEOCHARS.geoElements;
   }
 
   const element = geoElements.element;

package/src/express-middleware.js

@@ -34,6 +34,7 @@ export default function (config) {
     [
       '**/@@case-studies-map.arcgis.json',
       '**@countries-metadata-extract',
+      '**@countries-metadata-extract-2025',
       '**@@countries-heat-index-json',
       '**@@translate-this-async',
     ],

package/src/helpers/country_map/countryMap.js

@@ -15,16 +15,20 @@ export const euCountryNames = [
   'Estonia',
   'Finland',
   'France',
+  'Georgia',
   'Germany',
   'Greece',
   'Hungary',
   'Iceland',
   'Ireland',
+  'Kosovo',
   'Italy',
   'Latvia',
   'Lithuania',
   'Luxembourg',
   'Malta',
+  'Moldova',
+  'Moldova, Republic of',
   'Montenegro',
   'Netherlands',
   'North Macedonia',
@@ -37,6 +41,7 @@ export const euCountryNames = [
   'Spain',
   'Sweden',
   'United Kingdom',
+  'Ukraine',
   'Liechtenstein',
   'Norway',
   'Switzerland',

package/src/helpers/country_map/euro-countries-simplified.js

@@ -46191,5 +46191,44 @@ export default {
       },
       geometry: { type: 'MultiPolygon', coordinates: [] },
     },
+    {
+      type: 'Feature',
+      properties: {
+        id: 'XK',
+        CNTR_ID: 'XK',
+        ORIG_NMES: 'Kosovo',
+        SHRT_ENGL: 'Kosovo',
+        ISO3_CODE: 'XKX',
+        FID: 'XK',
+      },
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [20.590246546680227, 41.855408919283626],
+            [20.52295, 42.21787],
+            [20.283754510181893, 42.32025950781508],
+            [20.0707, 42.58863],
+            [20.25758, 42.81275000000011],
+            [20.49679, 42.88469],
+            [20.63508, 43.21671],
+            [20.81448, 43.27205],
+            [20.95651, 43.13094],
+            [21.143395, 43.06868500000013],
+            [21.27421, 42.90959],
+            [21.43866, 42.86255],
+            [21.63302, 42.67717],
+            [21.77505, 42.6827],
+            [21.66292, 42.43922],
+            [21.54332, 42.3202500000001],
+            [21.57663598940212, 42.24522439706186],
+            [21.35270000000014, 42.2068],
+            [20.76216, 42.05186],
+            [20.71731000000011, 41.84711],
+            [20.590246546680227, 41.855408919283626],
+          ],
+        ],
+      },
+    },
   ],
 };

package/src/helpers/country_map/hocs.jsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import geoJsonUrl from '@eeacms/volto-cca-policy/cntrg.data';
 
-const projection = 'EPSG:4326';
+// const projection = 'EPSG:4326';
+const projection = 'EPSG:3857';
 
 export const withGeoJsonData = (WrappedComponent) => {
   function Wrapper(props) {