From bbc5fae4eba0bd39752b1b6990eb7e93e1cdbde1 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:21:31 +0100
Subject: [PATCH 01/28] Update C1_ports_shipping_aq.yaml

Test to understand if the nested DataSource element can be used for the YAML files + integration of the new References element inside the YAML
---
 collections/C1_ports_shipping_aq.yaml | 29 ++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/collections/C1_ports_shipping_aq.yaml b/collections/C1_ports_shipping_aq.yaml
index 7c194a8f..069c71de 100644
--- a/collections/C1_ports_shipping_aq.yaml
+++ b/collections/C1_ports_shipping_aq.yaml
@@ -7,17 +7,36 @@ Themes:
     - economy
     - air
 Tags:
-    - placeholder
-Satellite:
-    - Sentinel-5P
-Sensor:
-    - placeholder
+    - Air quality
+    - NO2
+    - Ports
+    - Multi-sensors
+DataSource:
+    - Spaceborne:
+        Satellite:
+        - Sentinel-5P
+        - GNSS
+        Sensor:
+        - TROPOMI
+    - InSitu:
+        - AIS
+        - Mobile
 Agency:
     - ESA
 Provider:
     - Name: e-GEOS
+      Url: https://www.e-geos.it/#/
     - Name: ExpertLab
+      Url: http://www.expertlab.it/
     - Name: CherryData
+      Url: https://www.cherry-data.com/
+References:
+    - Name: AIS data
+      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+    - Name: TomTom data
+      Url: https://www.tomtom.com/products/traffic-and-travel-information/
+    - Name: Oxford University’s coronavirus government response tracker
+      Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
     - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
       Name: GeoDB

From 0dd3f89ee1783370b57b5894e49c563ff14c31a4 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 16 Feb 2024 16:23:36 +0100
Subject: [PATCH 02/28] Update CDS3_wind_10m_u.yaml

---
 collections/CDS3_wind_10m_u.yaml | 102 ++++++++++---------------------
 1 file changed, 31 insertions(+), 71 deletions(-)

diff --git a/collections/CDS3_wind_10m_u.yaml b/collections/CDS3_wind_10m_u.yaml
index 56ea574d..f242d4ea 100644
--- a/collections/CDS3_wind_10m_u.yaml
+++ b/collections/CDS3_wind_10m_u.yaml
@@ -2,87 +2,47 @@ Name: wind_10m_u
 Title: Wind U Field
 EodashIdentifier: CDS3
 Subtitle: Gridded ERA5 is the fifth generation ECMWF reanalysis for the global climate and weather for the past 4 to 7 decades. This parameter is the wind U field
-Description: CDS3_wind_10m_u/README.MD
-Story: CDS3_wind_10m_u/CDS.md
+Description: CDS3_wind_10m_u/CDS3_wind_10m_u.MD
 Themes:
   - air
 Tags:
-  - copernicus services
+  - Copernicus Services
   - C3S
-  - open data
-  - sentinel hub
-  - raster
-  - race challenges
-Satellite:
-  - METEOSAT
-Sensor:
-  - SEVIRI
+  - CDS
+  - Open data
+DataSource:
+    - Other:
+        - ERA5
 Agency:
-  - EUMETSAT
-  - ESA
-Provider: 
-    - Name: COPERNICUS
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.6860a573?tab=overview)
+  - European Commission
+  - ECMWF
 License: |
-  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land-monthly-means?tab=overview))
-Services:
-  - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
-    Name: Statistical API
-    Type: byoc
-    CollectionId: 067fbb53-b1c3-4a57-9c81-adf2488a47ee
-    Script: CDS3_wind_10m_u/script.js
+  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
+Provider: 
+    - Name: Copernicus Climate Change Service
+      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+    - Name: Climate Data Store
+      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Citation:
+    Citation: |
+        Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+        The results contain modified Copernicus Climate Change Service information 2020. 
+        Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+    DOI: 10.24381/cds.68d2bb30
+    Publication:
+        - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+        DOI: 10.1038/s41467-020-19546-7
+Image: CDS3_wind_10m_u/CDS3_wind_10m_u.png
+Legend: CDS3_wind_10m_u/CDS3_legend.png
 Resources:
-  - Group: Sentinel Hub Resources
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Role: processor
     Type: byoc
     CollectionId: 067fbb53-b1c3-4a57-9c81-adf2488a47ee
     LayerId: AWS_VIS_WIND_U_10M
-    Primary: True
-OpenEOPID: ERA5_WIND_U
-AdditionalInfoExternal:
-  Title: Additional info
-  Path: CDS3_wind_10m_u/README.MD
-Image: CDS3_wind_10m_u/thumbnail.png
-EDCBrowser: https://browser.eurodatacube.com/?zoom=1&lat=0.00005&lng=0.00001&collectionId=wind_10m_u&layerId=Wind%20U-component&type=sentinel-hub-edc&fromTime=2019-12-01T00%3A00%3A00.000Z&toTime=2020-12-01T00%3A00%3A00.000Z
-Resolution: 0.25° x 0.25°
-BandInformation: windu10m
-Contact: "[COPERNICUS SUPPORT](copernicus-support@ecmwf.int)"
-ManagedBy: "[ESA](http://www.esa.int/)"
-Configurations:
-  - href: "https://docs.sentinel-hub.com/api/latest/api/process/"
-    rel: "about"
-    type: "text/html"
-    title: "Details about running Evalscripts"
-  - href: "https://raw.githubusercontent.com/eurodatacube/public-collections/main/collections/wind_10m_u/script.js"
-    rel: "processing-expression"
-    type: "application/javascript"
-    title: "Evalscript to generate Wind U-component imagery"
-    sentinelhub:layer_name: "Wind U-component"
-    sentinelhub:mosaicking_order: "mostRecent"
-    sentinelhub:upsampling: "BICUBIC"
-CubeDimensions:
-  x:
-    type: spatial
-    axis: x
-    extent:
-      - -179.999755859375
-      - 179.99977453631897
-  y:
-    type: spatial
-    axis: y
-    extent:
-      - -90.12489004526765
-      - 90.125
-  t:
-    type: temporal
-    extent:
-      - "2019-01-01T00:00:00Z"
-      - "2022-04-01T00:00:00Z"
-  bands:
-    type: bands
-    values:
-      - windu10m
-RegistryEntryAdded: "2021-05-07"
-RegistryEntryLastModified: "2022-07-21"
+Services:
+  - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
+    Name: Statistical API
+    CollectionId: 067fbb53-b1c3-4a57-9c81-adf2488a47ee
+    Script: CDS3_wind_10m_u/CDS3_wind_10m_u.js

From 165a676b87f01445bb38dee1418517433943a71f Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:47:11 +0100
Subject: [PATCH 03/28] Update C2_ports_cars_aq.yaml

---
 collections/C2_ports_cars_aq.yaml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/collections/C2_ports_cars_aq.yaml b/collections/C2_ports_cars_aq.yaml
index 38ffc31f..eb2ab8d4 100644
--- a/collections/C2_ports_cars_aq.yaml
+++ b/collections/C2_ports_cars_aq.yaml
@@ -2,22 +2,41 @@ Name: ports_cars_aq
 Title: Ports and cars - impact on air quality
 EodashIdentifier: C2
 Subtitle: Port Activities, sources of pollution and NO2 levels
-Description: "C2_ports_cars_aq/C2.md"
+Description: C2_ports_cars_aq/C2_ports_cars_aq.md
 Themes:
     - economy
     - air
 Tags:
-    - placeholder
-Satellite:
-    - Sentinel-5P
-Sensor:
-    - placeholder
+    - Air quality
+    - NO2
+    - Ports
+    - Multi-sensors
+DataSource:
+    - Spaceborne:
+        Satellite:
+        - Sentinel-5P
+        - GNSS
+        Sensor:
+        - TROPOMI
+    - InSitu:
+        - AIS
+        - Mobile
 Agency:
     - ESA
 Provider:
     - Name: e-GEOS
+      Url: https://www.e-geos.it/#/
     - Name: ExpertLab
+      Url: http://www.expertlab.it/
     - Name: CherryData
+      Url: https://www.cherry-data.com/
+References:
+    - Name: AIS data
+      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+    - Name: TomTom data
+      Url: https://www.tomtom.com/products/traffic-and-travel-information/
+    - Name: Oxford University’s coronavirus government response tracker
+      Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
     - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
       Name: GeoDB

From 82129501bcdb1fbe211fbbf7429bbd801218f5c9 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:47:41 +0100
Subject: [PATCH 04/28] Update C3_ports_people_aq.yaml

---
 collections/C3_ports_people_aq.yaml | 31 +++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/collections/C3_ports_people_aq.yaml b/collections/C3_ports_people_aq.yaml
index 239c8094..e08b04ae 100644
--- a/collections/C3_ports_people_aq.yaml
+++ b/collections/C3_ports_people_aq.yaml
@@ -2,22 +2,41 @@ Name: ports_people_aq
 Title: Ports and people - impact on air quality
 EodashIdentifier: C3
 Subtitle: Port Activities, sources of pollution and NO2 levels
-Description: "C3_ports_people_aq/C3.md"
+Description: C3_ports_people_aq/C3_ports_people_aq.md
 Themes:
     - economy
     - air
 Tags:
-    - placeholder
-Satellite:
-    - Sentinel-5P
-Sensor:
-    - placeholder
+    - Air quality
+    - NO2
+    - Ports
+    - Multi-sensors
+DataSource:
+    - Spaceborne:
+        Satellite:
+        - Sentinel-5P
+        - GNSS
+        Sensor:
+        - TROPOMI
+    - InSitu:
+        - AIS
+        - Mobile
 Agency:
     - ESA
 Provider:
     - Name: e-GEOS
+      Url: https://www.e-geos.it/#/
     - Name: ExpertLab
+      Url: http://www.expertlab.it/
     - Name: CherryData
+      Url: https://www.cherry-data.com/
+References:
+    - Name: AIS data
+      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+    - Name: TomTom data
+      Url: https://www.tomtom.com/products/traffic-and-travel-information/
+    - Name: Oxford University’s coronavirus government response tracker
+      Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
     - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
       Name: GeoDB

From ec9f9e05c5cfca98e3003abdacfc8b897cdf19c4 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:49:38 +0100
Subject: [PATCH 05/28] Update C1_ports_shipping_aq.yaml

---
 collections/C1_ports_shipping_aq.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/collections/C1_ports_shipping_aq.yaml b/collections/C1_ports_shipping_aq.yaml
index 069c71de..9259baff 100644
--- a/collections/C1_ports_shipping_aq.yaml
+++ b/collections/C1_ports_shipping_aq.yaml
@@ -2,7 +2,7 @@ Name: ports_shipping_aq
 Title: Ports and shipping - impact on air quality
 EodashIdentifier: C1
 Subtitle: Port Activities, sources of pollution and NO2 levels
-Description: "C1_ports_shipping_aq/C1.md"
+Description: C1_ports_shipping_aq/C1_ports_shipping_aq.md
 Themes:
     - economy
     - air

From 9765bd5f726bad65fc335b701a4772522001f040 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:13:07 +0100
Subject: [PATCH 06/28] Update E13o_vessel_density_all.yaml

---
 collections/E13o_vessel_density_all.yaml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/collections/E13o_vessel_density_all.yaml b/collections/E13o_vessel_density_all.yaml
index a1d3d011..0d70acba 100644
--- a/collections/E13o_vessel_density_all.yaml
+++ b/collections/E13o_vessel_density_all.yaml
@@ -2,28 +2,32 @@ Name: vessel_density_all
 Title: Vessel density
 EodashIdentifier: E13o
 Subtitle: Vessel density description
-Description: E13o_vessel_density_all/E13o.md
+Description: E13o_vessel_density_all/E13o_vessel_density_all.md
 Themes:
   - water
 Tags:
-  - placeholder
-Satellite:
-  - Sentinel-2
-Sensor:
-  - placeholder
+  - Maritime
+  - Traffic
+  - Open data
+DataSource:
+    - InSitu:
+        - AIS
 Agency:
   - ESA
+Provider:
+    - Name: EMODnet
+      Url: https://emodnet.ec.europa.eu/en
+Image: E13o_vessel_density_all/E13o_vessel_density_all.png
+Legend: E13o_vessel_density_all/E13o_legend.png
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Type: byoc
     CollectionId: beee9b47-b1ab-4044-baa5-0958d3465f12
     LayerId: AWS_VIS_VESSELDENSITY_ALL
-Legend: E13o_vessel_density_all/cm_legend.png
-Image: E13o_vessel_density_all/thumbnail.png
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: beee9b47-b1ab-4044-baa5-0958d3465f12
-    Script: E13o_vessel_density_all/script.js
+    Script: E13o_vessel_density_all/E13o_vessel_density_all.js

From c8dc149a3b8cfe641510cf2ecde757b35930d518 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Wed, 21 Feb 2024 11:59:37 +0100
Subject: [PATCH 07/28] Update E13p_vessel_density_cargo.yaml

---
 collections/E13p_vessel_density_cargo.yaml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/collections/E13p_vessel_density_cargo.yaml b/collections/E13p_vessel_density_cargo.yaml
index 150771e4..9bcf853a 100644
--- a/collections/E13p_vessel_density_cargo.yaml
+++ b/collections/E13p_vessel_density_cargo.yaml
@@ -2,28 +2,32 @@ Name: vessel_density_cargo
 Title: Vessel density for cargo
 EodashIdentifier: E13p
 Subtitle: Vessel density for cargo description
-Description: E13p_vessel_density_cargo/E13o.md
+Description: E13p_vessel_density_cargo/E13p_vessel_density_cargo.md
 Themes:
   - water
 Tags:
-  - placeholder
-Satellite:
-  - Sentinel-2
-Sensor:
-  - placeholder
+  - Maritime
+  - Traffic
+  - Open data
+DataSource:
+    - InSitu:
+        - AIS
 Agency:
   - ESA
+Provider:
+    - Name: EMODnet
+      Url: https://emodnet.ec.europa.eu/en
+Image: E13p_vessel_density_cargo/E13p_vessel_density_cargo.png
+Legend: E13o_vessel_density_all/E13p_legend.png
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Type: byoc
     CollectionId: 093a3988-6ed6-4bb0-ae37-e356f14d7daf
     LayerId: AWS_VIS_VESSELDENSITY_CARGO
-Legend: E13o_vessel_density_all/cm_legend.png
-Image: E13p_vessel_density_cargo/thumbnail.png
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: 093a3988-6ed6-4bb0-ae37-e356f14d7daf
-    Script: E13p_vessel_density_cargo/script.js
+    Script: E13p_vessel_density_cargo/E13p_vessel_density_cargo.js

From 415cfc27f5bfe8694214afb8938f51a04e8e683c Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:00:17 +0100
Subject: [PATCH 08/28] Update E13q_vessel_density_tanker.yaml

---
 collections/E13q_vessel_density_tanker.yaml | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/collections/E13q_vessel_density_tanker.yaml b/collections/E13q_vessel_density_tanker.yaml
index c16778be..79f3c650 100644
--- a/collections/E13q_vessel_density_tanker.yaml
+++ b/collections/E13q_vessel_density_tanker.yaml
@@ -2,28 +2,32 @@ Name: vessel_density_tanker
 Title: Vessel density for tanker
 EodashIdentifier: E13q
 Subtitle: Vessel density for tanker description
-Description: E13q_vessel_density_tanker/E13o.md
+Description: E13q_vessel_density_tanker/E13q_vessel_density_tanker.md
 Themes:
   - water
 Tags:
-  - placeholder
-Satellite:
-  - Sentinel-2
-Sensor:
-  - placeholder
+  - Maritime
+  - Traffic
+  - Open data
+DataSource:
+    - InSitu:
+        - AIS
 Agency:
   - ESA
+Provider:
+    - Name: EMODnet
+      Url: https://emodnet.ec.europa.eu/en
+Image: E13q_vessel_density_tanker/E13q_vessel_density_tanker.png
+Legend: E13o_vessel_density_all/E13q_legend.png
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Type: byoc
     CollectionId: 49f706b3-53dc-46fb-aafd-0f9e5f8cef47
     LayerId: AWS_VIS_VESSELDENSITY_TANKER
-Legend: E13o_vessel_density_all/cm_legend.png
-Image: E13q_vessel_density_tanker/thumbnail.png
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: 49f706b3-53dc-46fb-aafd-0f9e5f8cef47
-    Script: E13q_vessel_density_tanker/script.js
+    Script: E13q_vessel_density_tanker/E13q_vessel_density_tanker.js

From d705e28e9fab830e8aea1283272dd5bb93ee1dcc Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:00:48 +0100
Subject: [PATCH 09/28] Update E13r_vessel_density_others.yaml

---
 collections/E13r_vessel_density_others.yaml | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/collections/E13r_vessel_density_others.yaml b/collections/E13r_vessel_density_others.yaml
index a943fe21..3c1db256 100644
--- a/collections/E13r_vessel_density_others.yaml
+++ b/collections/E13r_vessel_density_others.yaml
@@ -2,28 +2,32 @@ Name: vessel_density_others
 Title: Vessel density for non tanker or cargo
 EodashIdentifier: E13r
 Subtitle: Vessel density for non tanker or cargo vessels
-Description: E13r_vessel_density_others/E13o.md
+Description: E13r_vessel_density_others/E13r_vessel_density_others.md
 Themes:
   - water
 Tags:
-  - placeholder
-Satellite:
-  - Sentinel-2
-Sensor:
-  - placeholder
+  - Maritime
+  - Traffic
+  - Open data
+DataSource:
+    - InSitu:
+        - AIS
 Agency:
   - ESA
+Provider:
+    - Name: EMODnet
+      Url: https://emodnet.ec.europa.eu/en
+Image: E13r_vessel_density_others/E13r_vessel_density_others.png
+Legend: E13o_vessel_density_all/E13r_legend.png
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Type: byoc
     CollectionId: cc0a4c72-870d-4e9f-84d0-ba4e3d785693
     LayerId: AWS_VIS_VESSELDENSITY_OTHER
-Legend: E13o_vessel_density_all/cm_legend.png
-Image: E13r_vessel_density_others/E13r.png
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     Type: byoc
     CollectionId: cc0a4c72-870d-4e9f-84d0-ba4e3d785693
-    Script: E13r_vessel_density_others/script.js
+    Script: E13r_vessel_density_others/E13r_vessel_density_others.js

From b7fe69a13ef6986d4984e3bfc406ad139f57d0c3 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:17:05 +0100
Subject: [PATCH 10/28] Update CDS4_wind_10m_v.yaml

---
 collections/CDS4_wind_10m_v.yaml | 105 +++++++++----------------------
 1 file changed, 31 insertions(+), 74 deletions(-)

diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index 2eac4b73..cabb365c 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -3,90 +3,47 @@ Title: Wind V Field
 EodashIdentifier: CDS4
 Subtitle: Gridded ERA5 is the fifth generation ECMWF reanalysis for the global climate and weather for the past 4 to 7 decades. This parameter is the wind V field
 Description: CDS4_wind_10m_v/README.MD
-Story: CDS4_wind_10m_v/CDS.md
+Story: CDS4_wind_10m_v/CDS4_wind_10m_v.md
 Themes:
   - air
 Tags:
-  - copernicus services
+  - Copernicus Services
   - C3S
-  - open data
-  - sentinel hub
-  - raster
-  - race challenges
-Satellite:
-  - METEOSAT
-Sensor:
-  - SEVIRI
+  - CDS
+  - Open data
+DataSource:
+    - Other:
+        - ERA5
 Agency:
-  - EUMETSAT
-  - ESA
-Provider: 
-    - Name: COPERNICUS
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.6860a573?tab=overview)"
+  - European Commission
+  - ECMWF
 License: |
-  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-land-monthly-means?tab=overview))
-Services:
-  - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
-    Name: Statistical API
-    Type: byoc
-    CollectionId: 3043d07f-3c20-410c-9a87-7da720942ab8
-    Script: CDS4_wind_10m_v/script.js
+  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
+Provider: 
+    - Name: Copernicus Climate Change Service
+      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+    - Name: Climate Data Store
+      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Citation:
+    Citation: |
+        Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+        The results contain modified Copernicus Climate Change Service information 2020. 
+        Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+    DOI: 10.24381/cds.68d2bb30
+    Publication:
+        - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+        DOI: 10.1038/s41467-020-19546-7
+Image: CDS4_wind_10m_v/CDS4_wind_10m_v.png
+Legend: CDS4_wind_10m_v/CDS4_legend.png
 Resources:
-  - Group: Sentinel Hub Resources
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Role: processor
     Type: byoc
     CollectionId: 3043d07f-3c20-410c-9a87-7da720942ab8
     LayerId: AWS_VIS_WIND_V_10M
-    Primary: true
-Image: CDS4_wind_10m_v/thumbnail.png
-Legend: CDS4_wind_10m_v/cm_legend.png
-
-OpenEOPID: ERA5_WIND_V
-AdditionalInfoExternal:
-  Title: Additional info
-  Path: CDS4_wind_10m_v/README.MD
-EDCBrowser: https://browser.eurodatacube.com/?zoom=1&lat=0.00005&lng=0.00001&collectionId=wind_10m_v&layerId=Wind%20V-component&type=sentinel-hub-edc&fromTime=2019-12-01T00%3A00%3A00.000Z&toTime=2020-12-01T00%3A00%3A00.000Z
-Resolution: 0.25° x 0.25°
-GeographicalCoverage: -179.999755859375, -90.12489004526765, 179.99977453631897, 90.125
-TemporalAvailability: 2019-01-01 - 2022-04-01
-BandInformation: windv10m
-Contact: "[COPERNICUS SUPPORT](copernicus-support@ecmwf.int)"
-ManagedBy: "[ESA](http://www.esa.int/)"
-Configurations:
-  - href: "https://docs.sentinel-hub.com/api/latest/api/process/"
-    rel: "about"
-    type: "text/html"
-    title: "Details about running Evalscripts"
-  - href: "https://raw.githubusercontent.com/eurodatacube/public-collections/main/collections/wind_10m_v/script.js"
-    rel: "processing-expression"
-    type: "application/javascript"
-    title: "Evalscript to generate Wind V-component imagery"
-    sentinelhub:layer_name: "Wind V-component"
-    sentinelhub:mosaicking_order: "mostRecent"
-    sentinelhub:upsampling: "BICUBIC"
-CubeDimensions:
-  x:
-    type: spatial
-    axis: x
-    extent:
-      - -179.999755859375
-      - 179.99977453631897
-  y:
-    type: spatial
-    axis: y
-    extent:
-      - -90.12489004526765
-      - 90.125
-  t:
-    type: temporal
-    extent:
-      - "2019-01-01T00:00:00Z"
-      - "2022-04-01T00:00:00Z"
-  bands:
-    type: bands
-    values:
-      - windv10m
-RegistryEntryAdded: "2021-05-07"
-RegistryEntryLastModified: "2022-07-21"
+Services:
+  - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
+    Name: Statistical API
+    CollectionId: 3043d07f-3c20-410c-9a87-7da720942ab8
+    Script: CDS4_wind_10m_v/CDS4_wind_10m_v.js

From 2079ff91312d4eba4e18666d94b8f97ee4e7e30c Mon Sep 17 00:00:00 2001
From: Daniel Santillan <daniel.santillan@eox.at>
Date: Wed, 21 Feb 2024 16:08:29 +0100
Subject: [PATCH 11/28] Fixes to make catalog generation run in yaml_test (#97)

* fix: invalids yaml indentation; made type optional for service sh endpoint

* chore: fixing DataSource structure, reapplying yaml formatting

* feat: implemented loading of DataSource options

* chore: removed no longer needed code
---
 collections/C1_ports_shipping_aq.yaml       | 64 ++++++++++-----------
 collections/C2_ports_cars_aq.yaml           | 64 ++++++++++-----------
 collections/C3_ports_people_aq.yaml         | 64 ++++++++++-----------
 collections/CDS3_wind_10m_u.yaml            | 32 +++++------
 collections/CDS4_wind_10m_v.yaml            | 30 +++++-----
 collections/E13o_vessel_density_all.yaml    |  8 +--
 collections/E13p_vessel_density_cargo.yaml  |  8 +--
 collections/E13q_vessel_density_tanker.yaml |  8 +--
 collections/E13r_vessel_density_others.yaml |  8 +--
 generators/generate_indicators.py           | 51 +++++++++-------
 10 files changed, 172 insertions(+), 165 deletions(-)

diff --git a/collections/C1_ports_shipping_aq.yaml b/collections/C1_ports_shipping_aq.yaml
index 9259baff..715d18f2 100644
--- a/collections/C1_ports_shipping_aq.yaml
+++ b/collections/C1_ports_shipping_aq.yaml
@@ -4,41 +4,41 @@ EodashIdentifier: C1
 Subtitle: Port Activities, sources of pollution and NO2 levels
 Description: C1_ports_shipping_aq/C1_ports_shipping_aq.md
 Themes:
-    - economy
-    - air
+  - economy
+  - air
 Tags:
-    - Air quality
-    - NO2
-    - Ports
-    - Multi-sensors
+  - Air quality
+  - NO2
+  - Ports
+  - Multi-sensors
 DataSource:
-    - Spaceborne:
-        Satellite:
-        - Sentinel-5P
-        - GNSS
-        Sensor:
-        - TROPOMI
-    - InSitu:
-        - AIS
-        - Mobile
+  Spaceborne:
+    Satellite:
+      - Sentinel-5P
+      - GNSS
+    Sensor:
+      - TROPOMI
+  InSitu:
+    - AIS
+    - Mobile
 Agency:
-    - ESA
+  - ESA
 Provider:
-    - Name: e-GEOS
-      Url: https://www.e-geos.it/#/
-    - Name: ExpertLab
-      Url: http://www.expertlab.it/
-    - Name: CherryData
-      Url: https://www.cherry-data.com/
+  - Name: e-GEOS
+    Url: https://www.e-geos.it/#/
+  - Name: ExpertLab
+    Url: http://www.expertlab.it/
+  - Name: CherryData
+    Url: https://www.cherry-data.com/
 References:
-    - Name: AIS data
-      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
-    - Name: TomTom data
-      Url: https://www.tomtom.com/products/traffic-and-travel-information/
-    - Name: Oxford University’s coronavirus government response tracker
-      Url: https://covidtracker.bsg.ox.ac.uk/
+  - Name: AIS data
+    Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+  - Name: TomTom data
+    Url: https://www.tomtom.com/products/traffic-and-travel-information/
+  - Name: Oxford University’s coronavirus government response tracker
+    Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: C1
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: C1
diff --git a/collections/C2_ports_cars_aq.yaml b/collections/C2_ports_cars_aq.yaml
index eb2ab8d4..37959359 100644
--- a/collections/C2_ports_cars_aq.yaml
+++ b/collections/C2_ports_cars_aq.yaml
@@ -4,41 +4,41 @@ EodashIdentifier: C2
 Subtitle: Port Activities, sources of pollution and NO2 levels
 Description: C2_ports_cars_aq/C2_ports_cars_aq.md
 Themes:
-    - economy
-    - air
+  - economy
+  - air
 Tags:
-    - Air quality
-    - NO2
-    - Ports
-    - Multi-sensors
+  - Air quality
+  - NO2
+  - Ports
+  - Multi-sensors
 DataSource:
-    - Spaceborne:
-        Satellite:
-        - Sentinel-5P
-        - GNSS
-        Sensor:
-        - TROPOMI
-    - InSitu:
-        - AIS
-        - Mobile
+  Spaceborne:
+    Satellite:
+      - Sentinel-5P
+      - GNSS
+    Sensor:
+      - TROPOMI
+  InSitu:
+    - AIS
+    - Mobile
 Agency:
-    - ESA
+  - ESA
 Provider:
-    - Name: e-GEOS
-      Url: https://www.e-geos.it/#/
-    - Name: ExpertLab
-      Url: http://www.expertlab.it/
-    - Name: CherryData
-      Url: https://www.cherry-data.com/
+  - Name: e-GEOS
+    Url: https://www.e-geos.it/#/
+  - Name: ExpertLab
+    Url: http://www.expertlab.it/
+  - Name: CherryData
+    Url: https://www.cherry-data.com/
 References:
-    - Name: AIS data
-      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
-    - Name: TomTom data
-      Url: https://www.tomtom.com/products/traffic-and-travel-information/
-    - Name: Oxford University’s coronavirus government response tracker
-      Url: https://covidtracker.bsg.ox.ac.uk/
+  - Name: AIS data
+    Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+  - Name: TomTom data
+    Url: https://www.tomtom.com/products/traffic-and-travel-information/
+  - Name: Oxford University’s coronavirus government response tracker
+    Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: C2
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: C2
diff --git a/collections/C3_ports_people_aq.yaml b/collections/C3_ports_people_aq.yaml
index e08b04ae..8b408efd 100644
--- a/collections/C3_ports_people_aq.yaml
+++ b/collections/C3_ports_people_aq.yaml
@@ -4,41 +4,41 @@ EodashIdentifier: C3
 Subtitle: Port Activities, sources of pollution and NO2 levels
 Description: C3_ports_people_aq/C3_ports_people_aq.md
 Themes:
-    - economy
-    - air
+  - economy
+  - air
 Tags:
-    - Air quality
-    - NO2
-    - Ports
-    - Multi-sensors
+  - Air quality
+  - NO2
+  - Ports
+  - Multi-sensors
 DataSource:
-    - Spaceborne:
-        Satellite:
-        - Sentinel-5P
-        - GNSS
-        Sensor:
-        - TROPOMI
-    - InSitu:
-        - AIS
-        - Mobile
+  Spaceborne:
+    Satellite:
+      - Sentinel-5P
+      - GNSS
+    Sensor:
+      - TROPOMI
+  InSitu:
+    - AIS
+    - Mobile
 Agency:
-    - ESA
+  - ESA
 Provider:
-    - Name: e-GEOS
-      Url: https://www.e-geos.it/#/
-    - Name: ExpertLab
-      Url: http://www.expertlab.it/
-    - Name: CherryData
-      Url: https://www.cherry-data.com/
+  - Name: e-GEOS
+    Url: https://www.e-geos.it/#/
+  - Name: ExpertLab
+    Url: http://www.expertlab.it/
+  - Name: CherryData
+    Url: https://www.cherry-data.com/
 References:
-    - Name: AIS data
-      Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
-    - Name: TomTom data
-      Url: https://www.tomtom.com/products/traffic-and-travel-information/
-    - Name: Oxford University’s coronavirus government response tracker
-      Url: https://covidtracker.bsg.ox.ac.uk/
+  - Name: AIS data
+    Url: https://www.imo.org/en/OurWork/Safety/Pages/AIS.aspx
+  - Name: TomTom data
+    Url: https://www.tomtom.com/products/traffic-and-travel-information/
+  - Name: Oxford University’s coronavirus government response tracker
+    Url: https://covidtracker.bsg.ox.ac.uk/
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: C3
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: C3
diff --git a/collections/CDS3_wind_10m_u.yaml b/collections/CDS3_wind_10m_u.yaml
index acd12c31..b1ed9ab1 100644
--- a/collections/CDS3_wind_10m_u.yaml
+++ b/collections/CDS3_wind_10m_u.yaml
@@ -11,27 +11,27 @@ Tags:
   - CDS
   - Open data
 DataSource:
-    - Other:
-        - ERA5
+  Other:
+    - ERA5
 Agency:
   - European Commission
   - ECMWF
 License: |
   Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
-Provider: 
-    - Name: Copernicus Climate Change Service
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
-    - Name: Climate Data Store
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Provider:
+  - Name: Copernicus Climate Change Service
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+  - Name: Climate Data Store
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
 Citation:
-    Citation: |
-        Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
-        The results contain modified Copernicus Climate Change Service information 2020. 
-        Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
-    DOI: 10.24381/cds.68d2bb30
-    Publication:
-        - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
-        DOI: 10.1038/s41467-020-19546-7
+  Citation: |
+    Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+    The results contain modified Copernicus Climate Change Service information 2020. 
+    Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+  DOI: 10.24381/cds.68d2bb30
+  Publication:
+    - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+      DOI: 10.1038/s41467-020-19546-7
 Image: CDS3_wind_10m_u/CDS3_wind_10m_u.png
 Legend: CDS3_wind_10m_u/CDS3_legend.png
 Resources:
@@ -44,4 +44,4 @@ Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
     CollectionId: 067fbb53-b1c3-4a57-9c81-adf2488a47ee
-    Script: CDS3_wind_10m_u/CDS3_wind_10m_u.js
\ No newline at end of file
+    Script: CDS3_wind_10m_u/CDS3_wind_10m_u.js
diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index cabb365c..366881b4 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -12,27 +12,27 @@ Tags:
   - CDS
   - Open data
 DataSource:
-    - Other:
-        - ERA5
+  Other:
+    - ERA5
 Agency:
   - European Commission
   - ECMWF
 License: |
   Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
-Provider: 
-    - Name: Copernicus Climate Change Service
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
-    - Name: Climate Data Store
-      Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+Provider:
+  - Name: Copernicus Climate Change Service
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
+  - Name: Climate Data Store
+    Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
 Citation:
-    Citation: |
-        Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
-        The results contain modified Copernicus Climate Change Service information 2020. 
-        Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
-    DOI: 10.24381/cds.68d2bb30
-    Publication:
-        - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
-        DOI: 10.1038/s41467-020-19546-7
+  Citation: |
+    Muñoz Sabater, J., (2019) was downloaded from the Copernicus Climate Change Service (2021).
+    The results contain modified Copernicus Climate Change Service information 2020. 
+    Neither the European Commission nor ECMWF is responsible for any use that may be made of the Copernicus information or data it contains.
+  DOI: 10.24381/cds.68d2bb30
+  Publication:
+    - Citation: Zaitchik, B.F., Sweijd, N., Shumake-Guillemot, J. et al. A framework for research linking weather, climate and COVID-19. Nat Commun 11, 5730 (2020).
+      DOI: 10.1038/s41467-020-19546-7
 Image: CDS4_wind_10m_v/CDS4_wind_10m_v.png
 Legend: CDS4_wind_10m_v/CDS4_legend.png
 Resources:
diff --git a/collections/E13o_vessel_density_all.yaml b/collections/E13o_vessel_density_all.yaml
index 0d70acba..32fccbaa 100644
--- a/collections/E13o_vessel_density_all.yaml
+++ b/collections/E13o_vessel_density_all.yaml
@@ -10,13 +10,13 @@ Tags:
   - Traffic
   - Open data
 DataSource:
-    - InSitu:
-        - AIS
+  InSitu:
+    - AIS
 Agency:
   - ESA
 Provider:
-    - Name: EMODnet
-      Url: https://emodnet.ec.europa.eu/en
+  - Name: EMODnet
+    Url: https://emodnet.ec.europa.eu/en
 Image: E13o_vessel_density_all/E13o_vessel_density_all.png
 Legend: E13o_vessel_density_all/E13o_legend.png
 Resources:
diff --git a/collections/E13p_vessel_density_cargo.yaml b/collections/E13p_vessel_density_cargo.yaml
index 9bcf853a..ff664e94 100644
--- a/collections/E13p_vessel_density_cargo.yaml
+++ b/collections/E13p_vessel_density_cargo.yaml
@@ -10,13 +10,13 @@ Tags:
   - Traffic
   - Open data
 DataSource:
-    - InSitu:
-        - AIS
+  InSitu:
+    - AIS
 Agency:
   - ESA
 Provider:
-    - Name: EMODnet
-      Url: https://emodnet.ec.europa.eu/en
+  - Name: EMODnet
+    Url: https://emodnet.ec.europa.eu/en
 Image: E13p_vessel_density_cargo/E13p_vessel_density_cargo.png
 Legend: E13o_vessel_density_all/E13p_legend.png
 Resources:
diff --git a/collections/E13q_vessel_density_tanker.yaml b/collections/E13q_vessel_density_tanker.yaml
index 79f3c650..a0a17460 100644
--- a/collections/E13q_vessel_density_tanker.yaml
+++ b/collections/E13q_vessel_density_tanker.yaml
@@ -10,13 +10,13 @@ Tags:
   - Traffic
   - Open data
 DataSource:
-    - InSitu:
-        - AIS
+  InSitu:
+    - AIS
 Agency:
   - ESA
 Provider:
-    - Name: EMODnet
-      Url: https://emodnet.ec.europa.eu/en
+  - Name: EMODnet
+    Url: https://emodnet.ec.europa.eu/en
 Image: E13q_vessel_density_tanker/E13q_vessel_density_tanker.png
 Legend: E13o_vessel_density_all/E13q_legend.png
 Resources:
diff --git a/collections/E13r_vessel_density_others.yaml b/collections/E13r_vessel_density_others.yaml
index 3c1db256..6716884c 100644
--- a/collections/E13r_vessel_density_others.yaml
+++ b/collections/E13r_vessel_density_others.yaml
@@ -10,13 +10,13 @@ Tags:
   - Traffic
   - Open data
 DataSource:
-    - InSitu:
-        - AIS
+  InSitu:
+    - AIS
 Agency:
   - ESA
 Provider:
-    - Name: EMODnet
-      Url: https://emodnet.ec.europa.eu/en
+  - Name: EMODnet
+    Url: https://emodnet.ec.europa.eu/en
 Image: E13r_vessel_density_others/E13r_vessel_density_others.png
 Legend: E13o_vessel_density_all/E13r_legend.png
 Resources:
diff --git a/generators/generate_indicators.py b/generators/generate_indicators.py
index 080c2a14..8c36131b 100644
--- a/generators/generate_indicators.py
+++ b/generators/generate_indicators.py
@@ -425,26 +425,43 @@ def add_to_catalog(collection, catalog, endpoint, data):
     link.extra_fields["title"] = collection.title
     link.extra_fields["code"] = data["EodashIdentifier"]
     link.extra_fields["id"] = data["Name"]
-    link.extra_fields["themes"] = data["Themes"]
     # Check for summaries and bubble up info
     if collection.summaries.lists:
         for sum in collection.summaries.lists:
             link.extra_fields[sum] = collection.summaries.lists[sum]
+    
+    add_extra_fields(link, data)
+    return link
+
+def add_extra_fields(stac_object, data):
+    if "yAxis" in data:
+        stac_object.extra_fields["yAxis"] = data["yAxis"]
+    if "Themes" in data:
+        stac_object.extra_fields["themes"] = data["Themes"]
     if "Locations" in data or "Subcollections" in data:
-        link.extra_fields["locations"] = True
+        stac_object.extra_fields["locations"] = True
     if "Tags" in data:
-        link.extra_fields["tags"] = data["Tags"]
+        stac_object.extra_fields["tags"] = data["Tags"]
     if "Satellite" in data:
-        link.extra_fields["satellite"] = data["Satellite"]
+        stac_object.extra_fields["satellite"] = data["Satellite"]
     if "Sensor" in data:
-        link.extra_fields["sensor"] = data["Sensor"]
+        stac_object.extra_fields["sensor"] = data["Sensor"]
     if "Agency" in data:
-        link.extra_fields["agency"] = data["Agency"]
+        stac_object.extra_fields["agency"] = data["Agency"]
     if "yAxis" in data:
-        link.extra_fields["yAxis"] = data["yAxis"]
-    return link
-
+        stac_object.extra_fields["yAxis"] = data["yAxis"]
+    if "DataSource" in data:
+        if "Spaceborne" in data["DataSource"]:
+            if "Sensor" in data["DataSource"]["Spaceborne"]:
+                stac_object.extra_fields["sensor"] = data["DataSource"]["Spaceborne"]["Sensor"]
+            if "Satellite" in data["DataSource"]["Spaceborne"]:
+                stac_object.extra_fields["satellite"] = data["DataSource"]["Spaceborne"]["Satellite"]
+        if "InSitu" in data["DataSource"]:
+            stac_object.extra_fields["insituSources"] = data["DataSource"]["InSitu"]
+        if "Other" in data["DataSource"]:
+            stac_object.extra_fields["otherSources"] = data["DataSource"]["Other"]
 
+    
 def handle_GeoDB_endpoint(config, endpoint, data, catalog):
     collection, _ = get_or_create_collection(catalog, endpoint["CollectionId"], data, config, endpoint)
     select = "?select=aoi,aoi_id,country,city,time"
@@ -597,6 +614,7 @@ def add_example_info(stac_object, data, endpoint, config):
     if "Services" in data:
         for service in data["Services"]:
             if service["Name"] == "Statistical API":
+                service_type = "byoc" if "Type" not in service else service["Type"]
                 stac_object.add_link(
                     Link(
                         rel="example",
@@ -605,7 +623,7 @@ def add_example_info(stac_object, data, endpoint, config):
                         media_type="application/javascript",
                         extra_fields={
                             "example:language": "JavaScript",
-                            "dataId": "%s-%s"%(service["Type"], service["CollectionId"]),
+                            "dataId": "%s-%s"%(service_type, service["CollectionId"]),
                         },
                     )
                 )
@@ -1079,18 +1097,7 @@ def add_collection_information(config, collection, data):
             ),
         )
     # Add extra fields to collection if available
-    if "yAxis" in data:
-        collection.extra_fields["yAxis"] = data["yAxis"]
-    if "Themes" in data:
-        collection.extra_fields["themes"] = data["Themes"]
-    if "Tags" in data:
-        collection.extra_fields["keywords"] = data["Tags"]
-    if "Satellite" in data:
-        collection.extra_fields["satellite"] = data["Satellite"]
-    if "Sensor" in data:
-        collection.extra_fields["sensor"] = data["Sensor"]
-    if "Agency" in data:
-        collection.extra_fields["agency"] = data["Agency"]
+    add_extra_fields(collection, data)
 
 
 def process_catalogs(folder_path, options):

From 45c8e02f1d88806d37b40871cd31c1cdfc190df9 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 13:57:43 +0100
Subject: [PATCH 12/28] Update CDS3_wind_10m_u.yaml

---
 collections/CDS3_wind_10m_u.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/collections/CDS3_wind_10m_u.yaml b/collections/CDS3_wind_10m_u.yaml
index b1ed9ab1..061363ab 100644
--- a/collections/CDS3_wind_10m_u.yaml
+++ b/collections/CDS3_wind_10m_u.yaml
@@ -16,8 +16,10 @@ DataSource:
 Agency:
   - European Commission
   - ECMWF
-License: |
-  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
+License:
+  - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
+    Type: application/pdf
+    Title: Licence to Use Copernicus Products
 Provider:
   - Name: Copernicus Climate Change Service
     Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
@@ -43,5 +45,6 @@ Resources:
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
+    Type: byoc
     CollectionId: 067fbb53-b1c3-4a57-9c81-adf2488a47ee
     Script: CDS3_wind_10m_u/CDS3_wind_10m_u.js

From fa7dec660b638fc36b870aeaa418ca74e27c2835 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 13:58:42 +0100
Subject: [PATCH 13/28] Update CDS4_wind_10m_v.yaml

---
 collections/CDS4_wind_10m_v.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index 366881b4..793cffcd 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -17,8 +17,10 @@ DataSource:
 Agency:
   - European Commission
   - ECMWF
-License: |
-  Free of charge, worldwide, non-exclusive, royalty free and perpetual ([details](https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf))
+License:
+  - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
+    Type: application/pdf
+    Title: Licence to Use Copernicus Products
 Provider:
   - Name: Copernicus Climate Change Service
     Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
@@ -45,5 +47,6 @@ Resources:
 Services:
   - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
     Name: Statistical API
+    Type: byoc
     CollectionId: 3043d07f-3c20-410c-9a87-7da720942ab8
     Script: CDS4_wind_10m_v/CDS4_wind_10m_v.js

From 774ce741437203a70578a92aeda531d165bd9f47 Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:14:59 +0100
Subject: [PATCH 14/28] Update CDS4_wind_10m_v.yaml

---
 collections/CDS4_wind_10m_v.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index 793cffcd..cc145691 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -2,8 +2,7 @@ Name: wind_10m_v
 Title: Wind V Field
 EodashIdentifier: CDS4
 Subtitle: Gridded ERA5 is the fifth generation ECMWF reanalysis for the global climate and weather for the past 4 to 7 decades. This parameter is the wind V field
-Description: CDS4_wind_10m_v/README.MD
-Story: CDS4_wind_10m_v/CDS4_wind_10m_v.md
+Description: CDS4_wind_10m_v/CDS4_wind_10m_v.md
 Themes:
   - air
 Tags:
@@ -21,7 +20,7 @@ License:
   - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
     Type: application/pdf
     Title: Licence to Use Copernicus Products
-Provider:
+Provider: 
   - Name: Copernicus Climate Change Service
     Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
   - Name: Climate Data Store
@@ -40,7 +39,6 @@ Legend: CDS4_wind_10m_v/CDS4_legend.png
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
-    Role: processor
     Type: byoc
     CollectionId: 3043d07f-3c20-410c-9a87-7da720942ab8
     LayerId: AWS_VIS_WIND_V_10M

From 8b77c5fc3c30a030741afb574d443aaf515ee95d Mon Sep 17 00:00:00 2001
From: FedericoRondoni <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:15:23 +0100
Subject: [PATCH 15/28] Update CDS3_wind_10m_u.yaml

---
 collections/CDS3_wind_10m_u.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/collections/CDS3_wind_10m_u.yaml b/collections/CDS3_wind_10m_u.yaml
index 061363ab..969688e7 100644
--- a/collections/CDS3_wind_10m_u.yaml
+++ b/collections/CDS3_wind_10m_u.yaml
@@ -2,7 +2,7 @@ Name: wind_10m_u
 Title: Wind U Field
 EodashIdentifier: CDS3
 Subtitle: Gridded ERA5 is the fifth generation ECMWF reanalysis for the global climate and weather for the past 4 to 7 decades. This parameter is the wind U field
-Description: CDS3_wind_10m_u/CDS3_wind_10m_u.MD
+Description: CDS3_wind_10m_u/CDS3_wind_10m_u.md
 Themes:
   - air
 Tags:
@@ -20,7 +20,7 @@ License:
   - Url: https://cds.climate.copernicus.eu/api/v2/terms/static/licence-to-use-copernicus-products.pdf
     Type: application/pdf
     Title: Licence to Use Copernicus Products
-Provider:
+Provider: 
   - Name: Copernicus Climate Change Service
     Url: https://cds.climate.copernicus.eu/cdsapp#!/dataset/10.24381/cds.68d2bb30
   - Name: Climate Data Store

From 6c7d8ce203a9129eef19e0a51f70b6cefc675ae1 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 15:57:43 +0100
Subject: [PATCH 16/28] Update CDS1_temperature.yaml

---
 collections/CDS1_temperature.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/collections/CDS1_temperature.yaml b/collections/CDS1_temperature.yaml
index 5764aa75..e4fd1542 100644
--- a/collections/CDS1_temperature.yaml
+++ b/collections/CDS1_temperature.yaml
@@ -9,6 +9,7 @@ Tags:
   - Copernicus Services
   - C3S
   - CDS
+  - Multi-sensors
   - Open data
 DataSource:
   Other:

From 2fb444481e3f8c4761f1ebbd74458958b4d05ff5 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 15:57:55 +0100
Subject: [PATCH 17/28] Update CDS2_relative_humidity.yaml

---
 collections/CDS2_relative_humidity.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/collections/CDS2_relative_humidity.yaml b/collections/CDS2_relative_humidity.yaml
index df2f6cbd..e9916f2c 100644
--- a/collections/CDS2_relative_humidity.yaml
+++ b/collections/CDS2_relative_humidity.yaml
@@ -9,6 +9,7 @@ Tags:
   - Copernicus Services
   - C3S
   - CDS
+  - Multi-sensors
   - Open data
 DataSource:
   Other:

From 8b0cb921ecc473dcbf7774345decc910ffffb664 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 15:58:06 +0100
Subject: [PATCH 18/28] Update CDS3_wind_10m_u.yaml

---
 collections/CDS3_wind_10m_u.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/collections/CDS3_wind_10m_u.yaml b/collections/CDS3_wind_10m_u.yaml
index 969688e7..f6909a1b 100644
--- a/collections/CDS3_wind_10m_u.yaml
+++ b/collections/CDS3_wind_10m_u.yaml
@@ -9,6 +9,7 @@ Tags:
   - Copernicus Services
   - C3S
   - CDS
+  - Multi-sensors
   - Open data
 DataSource:
   Other:

From dfe579759eed167b66e56dec4fd91ce543ab5ec5 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Fri, 23 Feb 2024 15:58:18 +0100
Subject: [PATCH 19/28] Update CDS4_wind_10m_v.yaml

---
 collections/CDS4_wind_10m_v.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index cc145691..91ead892 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -8,7 +8,8 @@ Themes:
 Tags:
   - Copernicus Services
   - C3S
-  - CDS
+  - CD
+  - Multi-sensors
   - Open data
 DataSource:
   Other:

From f4009074b90903568daba56d926874ab2d1879a0 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:50:12 +0100
Subject: [PATCH 20/28] Update CDS4_wind_10m_v.yaml

---
 collections/CDS4_wind_10m_v.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/collections/CDS4_wind_10m_v.yaml b/collections/CDS4_wind_10m_v.yaml
index 91ead892..f55e9313 100644
--- a/collections/CDS4_wind_10m_v.yaml
+++ b/collections/CDS4_wind_10m_v.yaml
@@ -8,7 +8,7 @@ Themes:
 Tags:
   - Copernicus Services
   - C3S
-  - CD
+  - CDS
   - Multi-sensors
   - Open data
 DataSource:

From b00a4fa6c09f3014b8605ce691a43a69894148ce Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 14 Mar 2024 16:34:48 +0100
Subject: [PATCH 21/28] Update C1_ports_shipping_aq.yaml


From 9cc834552d678046de4c98dcdca67f502c3dfa4c Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 10:21:34 +0200
Subject: [PATCH 22/28] Update and rename C3_ports_people_aq.yaml to
 C3_ports_cars_aq.yaml

---
 .../{C3_ports_people_aq.yaml => C3_ports_cars_aq.yaml}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename collections/{C3_ports_people_aq.yaml => C3_ports_cars_aq.yaml} (90%)

diff --git a/collections/C3_ports_people_aq.yaml b/collections/C3_ports_cars_aq.yaml
similarity index 90%
rename from collections/C3_ports_people_aq.yaml
rename to collections/C3_ports_cars_aq.yaml
index 9f1e75c6..72482461 100644
--- a/collections/C3_ports_people_aq.yaml
+++ b/collections/C3_ports_cars_aq.yaml
@@ -1,8 +1,8 @@
-Name: ports_people_aq
-Title: People sources
+Name: ports_cars_aq
+Title: Car sources
 EodashIdentifier: C3
 Subtitle: Port Activities, sources of pollution and NO2 levels
-Description: C3_ports_people_aq/C3_ports_people_aq.md
+Description: C3_ports_cars_aq/C3_ports_cars_aq.md
 Themes:
   - economy
   - air

From 50326940bf862fdae204964e2db7443225f9c39f Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 10:22:17 +0200
Subject: [PATCH 23/28] Update and rename C2_ports_cars_aq.yaml to
 C2_ports_people_aq.yaml

---
 .../{C2_ports_cars_aq.yaml => C2_ports_people_aq.yaml}      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename collections/{C2_ports_cars_aq.yaml => C2_ports_people_aq.yaml} (90%)

diff --git a/collections/C2_ports_cars_aq.yaml b/collections/C2_ports_people_aq.yaml
similarity index 90%
rename from collections/C2_ports_cars_aq.yaml
rename to collections/C2_ports_people_aq.yaml
index ef9a18a0..6c156739 100644
--- a/collections/C2_ports_cars_aq.yaml
+++ b/collections/C2_ports_people_aq.yaml
@@ -1,8 +1,8 @@
-Name: ports_cars_aq
-Title: Car sources
+Name: ports_people_aq
+Title: People sources
 EodashIdentifier: C2
 Subtitle: Port Activities, sources of pollution and NO2 levels
-Description: C2_ports_cars_aq/C2_ports_cars_aq.md
+Description: C2_ports_people_aq/C2_ports_people_aq.md
 Themes:
   - economy
   - air

From e44cf7e779dba307abc369aabcbdc83f0d7a5a07 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 10:23:50 +0200
Subject: [PATCH 24/28] Update CAQ_ports_air_quality.yaml

---
 indicators/CAQ_ports_air_quality.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indicators/CAQ_ports_air_quality.yaml b/indicators/CAQ_ports_air_quality.yaml
index d4a2bdc0..ab09eadf 100644
--- a/indicators/CAQ_ports_air_quality.yaml
+++ b/indicators/CAQ_ports_air_quality.yaml
@@ -4,5 +4,5 @@ EodashIdentifier: CAQ
 Description: "C1_ports_shipping_aq/C1_ports_shipping_aq.md"
 Collections:
   - C1_ports_shipping_aq
-  - C2_ports_cars_aq
-  - C3_ports_people_aq
+  - C2_ports_people_aq
+  - C3_ports_cars_aq

From fd2b8dccddbba96f7a74df3af727772a71a43da8 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:37:33 +0200
Subject: [PATCH 25/28] Add C3S collections

---
 indicators/C3S_meteorological_variables.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 indicators/C3S_meteorological_variables.yml

diff --git a/indicators/C3S_meteorological_variables.yml b/indicators/C3S_meteorological_variables.yml
new file mode 100644
index 00000000..d57fc583
--- /dev/null
+++ b/indicators/C3S_meteorological_variables.yml
@@ -0,0 +1,9 @@
+Name: meteorological_variables
+Title: C3S meteorological variables
+EodashIdentifier: C3S
+Description: These indicators show global variations for meteorological variables on a monthly basis from 1959 to 2023
+Collections:
+  - CDS1_temperature
+  - CDS2_relative_humidity
+  - CDS3_wind_10m_u
+  - CDS4_wind_10m_v
\ No newline at end of file

From 97e49358b684cd180ebb42d9d5f15e047e1df309 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:37:55 +0200
Subject: [PATCH 26/28] Rename C3S_meteorological_variables.yml to
 C3S_meteorological_variables.yaml

---
 ...ological_variables.yml => C3S_meteorological_variables.yaml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename indicators/{C3S_meteorological_variables.yml => C3S_meteorological_variables.yaml} (93%)

diff --git a/indicators/C3S_meteorological_variables.yml b/indicators/C3S_meteorological_variables.yaml
similarity index 93%
rename from indicators/C3S_meteorological_variables.yml
rename to indicators/C3S_meteorological_variables.yaml
index d57fc583..37a5038a 100644
--- a/indicators/C3S_meteorological_variables.yml
+++ b/indicators/C3S_meteorological_variables.yaml
@@ -6,4 +6,4 @@ Collections:
   - CDS1_temperature
   - CDS2_relative_humidity
   - CDS3_wind_10m_u
-  - CDS4_wind_10m_v
\ No newline at end of file
+  - CDS4_wind_10m_v

From d95244b3b3a3bdfa28789223e52465eb45fedeb0 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:39:27 +0200
Subject: [PATCH 27/28] Update race.yaml

---
 catalogs/race.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/catalogs/race.yaml b/catalogs/race.yaml
index 695fc225..fa7c538e 100644
--- a/catalogs/race.yaml
+++ b/catalogs/race.yaml
@@ -4,10 +4,11 @@ description: "Rapid Action for Citizens with Earth Observation"
 endpoint: "https://eurodatacube.github.io/eodash-catalog/RACE/"
 assets_endpoint: "https://raw.githubusercontent.com/eurodatacube/eodash-assets/main/collections"
 collections:
-  - CDS1_temperature
-  - CDS2_relative_humidity
-  - CDS3_wind_10m_u
-  - CDS4_wind_10m_v
+  # - CDS1_temperature
+  # - CDS2_relative_humidity
+  # - CDS3_wind_10m_u
+  # - CDS4_wind_10m_v
+  - C3S_meteorological_variables
   # - E1_S2_shipment_metallic_ores
   - E10a6_harvested_parcels_evolution
   - E11_shopping_center_activity

From 62b28f98304765a8bd875e76e86a20af1223fa96 Mon Sep 17 00:00:00 2001
From: Federico <72614374+FedericoRondoni@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:46:16 +0200
Subject: [PATCH 28/28] Update C1_ports_shipping_aq.yaml