adding trilateral instance collections (#51)

* chore: adding trilateral instance collections * chore: added new example config for NPPN indicator; fixed naming; removed incorrectly defined collection * fix: made subtitle optional, fixed citation publication adding * chore: removed referenced collection no longer used
eurodatacube · Sep 28, 2023 · f7cc22b · f7cc22b
1 parent 05dd4f8
commit f7cc22b
Show file tree

Hide file tree

Showing 15 changed files with 283 additions and 39 deletions.
diff --git a/catalogs/trilateral.yaml b/catalogs/trilateral.yaml
@@ -15,8 +15,8 @@ collections:
   - OMI_trno2-COG
   - co2-diff 
   - NPP_ocean_primary_productivity
+  - NPPN_net_primary_production
   - IS2SITMOGR4-cog
-  - MO_NPP_npp_vgpm
   - nceo_africa_2017
   - grdi-v1-built
   - grdi-v1-raster
@@ -38,4 +38,23 @@ collections:
   - SMC_soil_moisture_anomaly
   - PRC_precipitation_anomaly
   - PRCG_precipitation
+  - E10a1_agricultural_production_productive_area
+  - E10a2_agricultural_production_area
+  - E10a3_agricultural_production_area_change
+  - E10a6_harvested_parcels_evolution
+  - E10a8_winter_cereals
+  - E10c_rice_planting
+  - N2_greenhouse_gases
+  - VITS_vegetation_index_timeseries
+  - SMCTS_soil_moisture_timeseries
+  - PRCTS_precipitation_timeseries
+  - LWE_lake_water_extent
+  - LWL_lake_water_level
+  - SMCG_soil_moisture_content
+  - E13b_parked_planes
+  - E13b_airport_throughput
+  - E13b_parked_planes
+  - E13c_cruises_impact
+  - SIF_solar_induced_chlorophyll_fluorescence
+
 
diff --git a/collections/E10c_rice_planting.yaml b/collections/E10c_rice_planting.yaml
@@ -0,0 +1,25 @@
+Name: rice_planting
+Title: Rice planting
+EodashIdentifier: E10c
+Subtitle: Early Rice Planting in Sacramento, California, USA
+Description: E10c_rice_planting/E10c.md
+Themes:
+    - agriculture
+Tags:
+    - placeholder
+Satellite:
+    - ALOS-2 PALSAR-2
+    - GCOM-C
+    - Sentinel-2
+    - Landsat-8
+Sensor:
+    - placeholder
+Agency:
+    - NASA
+    - JAXA
+    - ESA
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: E10c_tri
diff --git a/collections/LWE_lake_water_extent.yaml b/collections/LWE_lake_water_extent.yaml
@@ -0,0 +1,22 @@
+Name: lake_water_extent
+Title: Lake water extent
+EodashIdentifier: LWE
+Subtitle: Lake water extent
+Description: LWE_lake_water_extent/LWE.md
+Themes:
+    - oceans
+Tags:
+    - placeholder
+Satellite:
+    - multiple
+Sensor:
+    - CCI
+Agency:
+    - ESA
+Provider:
+    - Name: PLES
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: Lake_water_extent_tri_timeseries
diff --git a/collections/LWL_lake_water_level.yaml b/collections/LWL_lake_water_level.yaml
@@ -0,0 +1,22 @@
+Name: lake_water_level
+Title: Lake water level
+EodashIdentifier: LWL
+Subtitle: Lake water level
+Description: LWL_lake_water_level/LWL.md
+Themes:
+    - oceans
+Tags:
+    - placeholder
+Satellite:
+    - multiple
+Sensor:
+    - CCI
+Agency:
+    - ESA
+Provider:
+    - Name: PLES
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: Lake_water_level_tri_timeseries
diff --git a/collections/MO_NPP_npp_vgpm.yaml b/collections/MO_NPP_npp_vgpm.yaml
diff --git a/collections/N2_greenhouse_gases.yaml b/collections/N2_greenhouse_gases.yaml
@@ -0,0 +1,22 @@
+Name: greenhouse_gases
+Title: Greenhouse gases
+EodashIdentifier: N2
+Subtitle: The Impact of the COVID-19 Pandemic on Atmospheric CO2
+Description: N2_greenhouse_gases/N2.md
+Themes:
+    - agriculture
+Tags:
+    - placeholder
+Satellite:
+    - GOSAT_XCO2
+Sensor:
+    - GOSAT
+Agency:
+    - NASA
+    - JAXA
+    - ESA
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: N2_tri
diff --git a/collections/NPPN_net_primary_production.yaml b/collections/NPPN_net_primary_production.yaml
@@ -0,0 +1,45 @@
+Name: net_primary_production
+Title: Net primary production
+EodashIdentifier: NPPN
+Description: NPPN_net_primary_production/NPPN.md
+Themes:
+  - water
+Tags:
+  - model
+  - photosynthesis
+  - organic material
+  - chlorophyll
+Satellite:
+  - Aqua
+Sensor:
+  - MODIS
+Agency:
+  - NASA
+Provider:
+  - Name: Ocean Productivity
+    Url: http://science.oregonstate.edu/ocean.productivity/index.php
+    Description: The purpose of this website is, first and foremost, to provide the science and broader communities with global, updated ocean productivity estimates. In addition, the website provides information on the models employed, access to model code and ancillary data sets, and comparisons of productivity estimates for alternative models. Field data sets relevant to ocean productivity modeling are also provided and will be continually expanded as new data become available. Educational material and background information on phytoplankton ecology and physiology will also be added in the future.
+    Roles: 
+      - producer
+  - Name: VEDA
+    Url: https://www.earthdata.nasa.gov/esds/veda
+    Description: NASA's Visualization, Exploration, and Data Analysis (VEDA) project is an open-source science cyberinfrastructure for data processing, visualization, exploration, and geographic information systems (GIS) capabilities.
+    Roles:
+      - host
+Citation:
+  - Citation: Data from Ocean Productivity site (http://science.oregonstate.edu/ocean.productivity/index.php)
+  - Publication:
+      - Citation: "Behrenfeld, MJ, PG Falkowski - Limnology and Oceanography (1997a, Volume 42: 1-20); Photosynthetic rates derived from satellite-based chlorophyll concentration;"
+        DOI: 10.4319/lo.1997.42.1.0001
+Services:
+  - Endpoint: https://services.sentinel-hub.com/api/v1/statistics
+    Name: VEDA Statistics
+Resources:
+  - EndPoint: https://staging-stac.delta-backend.com/
+    Type: cog
+    Name: VEDA
+    CollectionId: MO_NPP_npp_vgpm
+    ColormapName: jet
+    Rescale: [0.0,1500.0]
+    Bidx: 1
+Legend: NPPN_net_primary_production/cm_legend.png
diff --git a/collections/NPP_ocean_primary_productivity.yaml b/collections/NPP_ocean_primary_productivity.yaml
@@ -1,22 +1,33 @@
 Name: ocean_primary_productivity
-Title: Ocean Primary Productivity (BICEP)
+Title: Net primary production
 EodashIdentifier: NPP
-Subtitle: Ocean Primary Productivity (BICEP) Subtitle
 Description: NPP_ocean_primary_productivity/NPP.md
 Themes:
   - water
 Tags:
-  - placeholder
+  - model
+  - photosynthesis
+  - organic material
+  - chlorophyll
 Satellite:
-  - placeholder
+  - Aqua
 Sensor:
-  - placeholder
+  - MODIS
 Agency:
-  - ESA
+  - NASA
+Provider:
+  - Name: Ocean Productivity
+    Url: http://science.oregonstate.edu/ocean.productivity/index.php
+    Description: The purpose of this website is, first and foremost, to provide the science and broader communities with global, updated ocean productivity estimates. In addition, the website provides information on the models employed, access to model code and ancillary data sets, and comparisons of productivity estimates for alternative models. Field data sets relevant to ocean productivity modeling are also provided and will be continually expanded as new data become available. Educational material and background information on phytoplankton ecology and physiology will also be added in the future.
+Citation:
+  - Citation: Data from Ocean Productivity site (http://science.oregonstate.edu/ocean.productivity/index.php)
+  - Publication:
+      - Citation: "Behrenfeld, MJ, PG Falkowski - Limnology and Oceanography (1997a, Volume 42: 1-20); Photosynthetic rates derived from satellite-based chlorophyll concentration;"
+        DOI: 10.4319/lo.1997.42.1.0001
 Resources:
   - EndPoint: https://services.sentinel-hub.com
     Name: Sentinel Hub
     Type: zarr
     CollectionId: a216afca-8a65-4072-87a5-8ed7aa21e08a
     LayerId: BICEP_NPP_VIS_PP2
-# Legend: NPP_ocean_primary_productivity/cm_legend.png
+# Legend: NPP_ocean_primary_productivity/cm_legend.png
diff --git a/collections/PRCG_precipitation.yaml b/collections/PRCG_precipitation.yaml
@@ -1,7 +1,7 @@
 Name: precipitation
-Title: Precipitation Anomaly
+Title: Precipitation
 EodashIdentifier: PRCG
-Subtitle: Precipitation Anomaly
+Subtitle: Precipitation
 Description: PRCG_precipitation/PRCG.md
 Themes:
   - agriculture

diff --git a/collections/PRCTS_precipitation_timeseries.yaml b/collections/PRCTS_precipitation_timeseries.yaml
@@ -0,0 +1,20 @@
+Name: precipitation_timeseries
+Title: Precipitation Timeseries
+EodashIdentifier: PRCTS
+Subtitle: Precipitation Timeseries
+Description: PRCTS_precipitation_timeseries/PRCTS.md
+Themes:
+    - agriculture
+Tags:
+    - placeholder
+Satellite:
+    - JASMAI
+Sensor:
+    - GCOM-W
+Agency:
+    - JAXA
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: PRCTS_Precipitation_Timeseries
diff --git a/collections/SIF_solar_induced_chlorophyll_fluorescence.yaml b/collections/SIF_solar_induced_chlorophyll_fluorescence.yaml
@@ -0,0 +1,22 @@
+Name: solar_induced_chlorophyll_fluorescence
+Title: Solar induced chlorophyll fluorescence
+EodashIdentifier: SIF
+Subtitle: Solar induced chlorophyll fluorescence
+Description: SIF_solar_induced_chlorophyll_fluorescence/SIF.md
+Themes:
+  - agriculture
+Tags:
+  - placeholder
+Satellite:
+  - placeholder
+Sensor:
+  - GCOM-W
+Agency:
+  - JAXA
+Resources:
+  - EndPoint: https://ogcpreview2.restecmap.com/examind/api/WS/wms/default
+    Name: WMS
+    Type: Time
+    LayerId: SIF-TROPOMI-Cairo-Monthly
+    OverwriteBBox: [30, 29, 32, 31] # WMS layer description provides incorrect BBox
+Legend: SIF_solar_induced_chlorophyll_fluorescence/cm_legend.png
diff --git a/collections/SMCG_soil_moisture_content.yaml b/collections/SMCG_soil_moisture_content.yaml
@@ -0,0 +1,21 @@
+Name: soil_moisture_content
+Title: Soil moisture content
+EodashIdentifier: SMCG
+Subtitle: Soil moisture content
+Description: SMCG_soil_moisture_content/SMCG.md
+Themes:
+  - agriculture
+Tags:
+  - placeholder
+Satellite:
+  - placeholder
+Sensor:
+  - GCOM-W
+Agency:
+  - JAXA
+Resources:
+  - EndPoint: https://ogcpreview2.restecmap.com/examind/api/WS/wms/default
+    Name: WMS
+    Type: Time
+    LayerId: SMC-GCOMW-World-Monthly
+Legend: SMCG_soil_moisture_content/cm_legend.png
diff --git a/collections/SMCTS_soil_moisture_timeseries.yaml b/collections/SMCTS_soil_moisture_timeseries.yaml
@@ -0,0 +1,20 @@
+Name: soil_moisture_timeseries
+Title: Soil moisture
+EodashIdentifier: SMCTS
+Subtitle: Soil moisture
+Description: SMCTS_soil_moisture_timeseries/SMCTS.md
+Themes:
+    - agriculture
+Tags:
+    - placeholder
+Satellite:
+    - JASMAI
+Sensor:
+    - GCOM
+Agency:
+    - JAXA
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: SMCTS_Soil_Moisture_Timeseries
diff --git a/collections/VITS_vegetation_index_timeseries.yaml b/collections/VITS_vegetation_index_timeseries.yaml
@@ -0,0 +1,21 @@
+Name: vegetation_index_timeseries
+Title: Vegetation index
+EodashIdentifier: VITS
+Subtitle: Vegetation index
+Description: VITS_vegetation_index_timeseries/VITS.md
+Themes:
+    - agriculture
+Tags:
+    - placeholder
+Satellite:
+    - MODIS
+    - Aqua
+Sensor:
+    - Terra
+Agency:
+    - JAXA
+Resources:
+    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+      Name: GeoDB
+      Database: eodash
+      CollectionId: VITS_Vegetation_Index_Timeseries
diff --git a/generators/generate_indicators.py b/generators/generate_indicators.py
@@ -296,7 +296,8 @@ def add_to_catalog(collection, catalog, endpoint, data):
     # Disabling bubbling up of description as now it is considered to be
     # used as markdown loading would increase the catalog size unnecessarily
     # link.extra_fields["description"] = collection.description
-    link.extra_fields["subtitle"] = data["Subtitle"]
+    if "Subtitle" in data:
+        link.extra_fields["subtitle"] = data["Subtitle"]
     link.extra_fields["title"] = collection.title
     link.extra_fields["code"] = data["EodashIdentifier"]
     link.extra_fields["themes"] = ",".join(data["Themes"])
@@ -581,7 +582,7 @@ def add_collection_information(config, collection, data):
             collection.providers = [
                 Provider(
                     # convert information to lower case
-                    **dict((k.lower(), v.lower()) for k,v in provider.items())
+                    **dict((k.lower(), v) for k,v in provider.items())
                 ) for provider in data["Provider"]
             ]
         except: