From a9cc2696f2f37371f26f0b86d86b111b2b68daed Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Wed, 4 Oct 2023 14:57:07 +0200 Subject: [PATCH 1/4] add missing N1 and N2 EG Jaxa trilateral --- collections/N1_NO2_jaxa_eg.yaml | 22 ++++++++++++++++++++++ collections/N2_CO2_jaxa_gosat_eg.yaml | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 collections/N1_NO2_jaxa_eg.yaml create mode 100644 collections/N2_CO2_jaxa_gosat_eg.yaml diff --git a/collections/N1_NO2_jaxa_eg.yaml b/collections/N1_NO2_jaxa_eg.yaml new file mode 100644 index 00000000..377d6fba --- /dev/null +++ b/collections/N1_NO2_jaxa_eg.yaml @@ -0,0 +1,22 @@ +Name: N1_NO2_jaxa_eg +Title: NO2 JAXA +EodashIdentifier: N2 +Subtitle: NO2 JAXA +Description: N1_NO2/N1.md +Themes: + - atmosphere +Tags: + - placeholder +Satellite: + - placeholder +Sensor: + - NO2 +Agency: + - JAXA +Resources: + - EndPoint: https://ogcpreview2.restecmap.com/examind/api/WS/wms/default + Name: WMS + Type: Time + LayerId: NO2-TROPOMI-Cairo-Daily + OverwriteBBox: [30, 29, 32, 31] # WMS layer description provides incorrect BBox +Legend: N1_NO2_jaxa_eg/cm_legend.png diff --git a/collections/N2_CO2_jaxa_gosat_eg.yaml b/collections/N2_CO2_jaxa_gosat_eg.yaml new file mode 100644 index 00000000..3b711ce3 --- /dev/null +++ b/collections/N2_CO2_jaxa_gosat_eg.yaml @@ -0,0 +1,22 @@ +Name: N2_CO2_jaxa_gosat_eg +Title: CO2 JAXA GOSAT +EodashIdentifier: N2 +Subtitle: CO2 JAXA GOSAT +Description: N2_greenhouse_gases/N2.md +Themes: + - atmosphere +Tags: + - placeholder +Satellite: + - GOSAT +Sensor: + - GOSAT-CO2 +Agency: + - JAXA +Resources: + - EndPoint: https://ogcpreview2.restecmap.com/examind/api/WS/wms/default + Name: WMS + Type: Time + LayerId: XCO2-GOSAT-Cairo + OverwriteBBox: [30, 29, 32, 31] # WMS layer description provides incorrect BBox +Legend: N2_CO2_jaxa_gosat/cm_legend.png From 34d65892bd9742484d92eef13810b86daadc31a5 Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Wed, 4 Oct 2023 15:22:46 +0200 Subject: [PATCH 2/4] chore: add to catalog forgotten --- catalogs/trilateral.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalogs/trilateral.yaml b/catalogs/trilateral.yaml index 5aa5fa55..52070035 100644 --- a/catalogs/trilateral.yaml +++ b/catalogs/trilateral.yaml @@ -67,5 +67,6 @@ collections: - E10d_regional_cropland - Lakes_ALOS2_HH - Lakes_ALOS2_HV - + - N1_NO2_jaxa_eg + - N2_CO2_jaxa_gosat_eg From fc895eae85b0c7a9f4199e97a73abcdd0d23bf6d Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Fri, 6 Oct 2023 08:52:44 +0200 Subject: [PATCH 3/4] update indicator code of JAXA EG indicators --- collections/{N1_NO2_jaxa_eg.yaml => N1_NO2_jaxa.yaml} | 8 ++++---- .../{N2_CO2_jaxa_gosat_eg.yaml => N2_CO2_jaxa_gosat.yaml} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename collections/{N1_NO2_jaxa_eg.yaml => N1_NO2_jaxa.yaml} (76%) rename collections/{N2_CO2_jaxa_gosat_eg.yaml => N2_CO2_jaxa_gosat.yaml} (82%) diff --git a/collections/N1_NO2_jaxa_eg.yaml b/collections/N1_NO2_jaxa.yaml similarity index 76% rename from collections/N1_NO2_jaxa_eg.yaml rename to collections/N1_NO2_jaxa.yaml index 377d6fba..b46cd292 100644 --- a/collections/N1_NO2_jaxa_eg.yaml +++ b/collections/N1_NO2_jaxa.yaml @@ -1,7 +1,7 @@ -Name: N1_NO2_jaxa_eg +Name: N1_NO2_jaxa Title: NO2 JAXA -EodashIdentifier: N2 -Subtitle: NO2 JAXA +EodashIdentifier: N1_NO2_jaxa +Subtitle: NO2 TROPOMI JAXA Cairo Description: N1_NO2/N1.md Themes: - atmosphere @@ -19,4 +19,4 @@ Resources: Type: Time LayerId: NO2-TROPOMI-Cairo-Daily OverwriteBBox: [30, 29, 32, 31] # WMS layer description provides incorrect BBox -Legend: N1_NO2_jaxa_eg/cm_legend.png +Legend: N1_NO2_jaxa/cm_legend.png diff --git a/collections/N2_CO2_jaxa_gosat_eg.yaml b/collections/N2_CO2_jaxa_gosat.yaml similarity index 82% rename from collections/N2_CO2_jaxa_gosat_eg.yaml rename to collections/N2_CO2_jaxa_gosat.yaml index 3b711ce3..9dd783dd 100644 --- a/collections/N2_CO2_jaxa_gosat_eg.yaml +++ b/collections/N2_CO2_jaxa_gosat.yaml @@ -1,7 +1,7 @@ -Name: N2_CO2_jaxa_gosat_eg +Name: N2_CO2_jaxa_gosat Title: CO2 JAXA GOSAT -EodashIdentifier: N2 -Subtitle: CO2 JAXA GOSAT +EodashIdentifier: N2_CO2_jaxa_gosat +Subtitle: XCO2 JAXA GOSAT Cairo Description: N2_greenhouse_gases/N2.md Themes: - atmosphere From 41f425a8285e7621e864223f4acbabf02cb36e6a Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Fri, 6 Oct 2023 09:14:43 +0200 Subject: [PATCH 4/4] fix reference --- catalogs/trilateral.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogs/trilateral.yaml b/catalogs/trilateral.yaml index 52070035..33ae3597 100644 --- a/catalogs/trilateral.yaml +++ b/catalogs/trilateral.yaml @@ -67,6 +67,6 @@ collections: - E10d_regional_cropland - Lakes_ALOS2_HH - Lakes_ALOS2_HV - - N1_NO2_jaxa_eg - - N2_CO2_jaxa_gosat_eg + - N1_NO2_jaxa + - N2_CO2_jaxa_gosat