From 57af37c796c005f5c42509d88457441848c162a2 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 27 Mar 2024 06:54:49 -0400 Subject: [PATCH] update examples (#198) (#201) * update examples (#198) * fix * update media types * Update examples/us-noaa-nws.goes16-satellite-sst.json --------- Co-authored-by: Anna Milan --- ...cc-msc-gdc.global-discovery-catalogue.json | 2 +- examples/ca-eccc-msc.cmip5-tt.json | 11 +++- ...a-eccc-msc.daily-climate-observations.json | 6 +- examples/ca-eccc-msc.hydrometric-archive.json | 23 +++++--- .../ca-eccc-msc.hydrometric-realtime.json | 13 ++++- examples/ca-eccc-msc.nwp-gdps.json | 15 +++-- ...surface-weather-observations-realtime.json | 15 +++-- .../cn-cma-babj.nmic.prediction-forecast.json | 17 ++---- ...-babj.nmic.surface-based-observations.json | 2 +- examples/us-noaa-nws.gfs-10deg.json | 55 +++++++++++-------- .../us-noaa-nws.goes16-satellite-sst.json | 53 +++++++++++++++--- 11 files changed, 141 insertions(+), 71 deletions(-) diff --git a/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json b/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json index 1778a16..b11803c 100644 --- a/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json +++ b/examples/ca-eccc-msc-gdc.global-discovery-catalogue.json @@ -136,7 +136,7 @@ "rel": "archives", "type": "text/html", "title": "Open Data Server DWD (Metadata Archive)", - "href": "https://example.org/cache_metadata" + "href": "https://opendata.dwd.de/test/wis2/cache_metadata" } ] } diff --git a/examples/ca-eccc-msc.cmip5-tt.json b/examples/ca-eccc-msc.cmip5-tt.json index 29ada3a..60b0af6 100644 --- a/examples/ca-eccc-msc.cmip5-tt.json +++ b/examples/ca-eccc-msc.cmip5-tt.json @@ -153,7 +153,7 @@ { "rel": "service", "href": "https://geo.weather.gc.ca/geomet-climate?lang=F&service=WMS&request=GetCapabilities&layer=CMIP5.TT.RCP85.YEAR.2081-2100_PCTL50", - "type": "image/png", + "type": "application/xml", "title": "CMIP5.TT.RCP85.YEAR.2081-2100_PCTL50" }, { @@ -167,7 +167,14 @@ "href": "https://dd.weather.gc.ca/climate/cmip5/netcdf/scenarios/RCP8.5/annual/avg_20years", "type": "text/html", "hreflang": "en", - "title": "Raw data download (NetCDF files)" + "title": "Raw data download (NetCDF files)", + "distribution": { + "availableFormat": [ + { + "name": "NetCDF" + } + ] + } } ] } diff --git a/examples/ca-eccc-msc.daily-climate-observations.json b/examples/ca-eccc-msc.daily-climate-observations.json index 74d6156..bcdd57e 100644 --- a/examples/ca-eccc-msc.daily-climate-observations.json +++ b/examples/ca-eccc-msc.daily-climate-observations.json @@ -116,7 +116,7 @@ { "rel": "stations", "href": "https://api.weather.gc.ca/collections/climate-stations/items", - "type": "application/json", + "type": "application/geo+json", "title": "Stations associated with this dataset" }, { @@ -134,7 +134,7 @@ { "rel": "items", "href": "https://api.weather.gc.ca/collections/climate-daily/items", - "type": "application/json", + "type": "application/geo+json", "title": "Climate daily data access API interface" }, { @@ -146,7 +146,7 @@ { "rel": "items", "href": "mqtts://example.org", - "channel": "origin/a/wis2/ca-eccc-msc/data/core/climate/observations", + "channel": "origin/a/wis2/ca-eccc-msc/data/core/climate", "type": "application/geo+json", "title": "Data notifications" } diff --git a/examples/ca-eccc-msc.hydrometric-archive.json b/examples/ca-eccc-msc.hydrometric-archive.json index bd7c990..e2fc9c0 100644 --- a/examples/ca-eccc-msc.hydrometric-archive.json +++ b/examples/ca-eccc-msc.hydrometric-archive.json @@ -134,7 +134,14 @@ "rel": "related", "href": "https://www.canada.ca/en/environment-climate-change/services/water-overview/quantity/monitoring/survey/data-products-services/national-archive-hydat.html", "type": "text/html", - "title": "Archive database download" + "title": "Archive database download", + "distribution": { + "availableFormats": [ + { + "name": "SQLite3" + } + ] + } }, { "rel": "license", @@ -145,12 +152,12 @@ { "rel": "service", "href": "https://geo.weather.gc.ca/geomet-climate?lang=F&service=WMS&request=GetCapabilities", - "type": "image/png", + "type": "application/xml", "title": "HYDROMETRIC.STATIONS" }, { "rel": "items", - "href": "mqtts://example.org", + "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883", "channel": "origin/a/wis2/ca-eccc-msc/data/core/hydrology", "type": "application/geo+json", "title": "Data notifications" @@ -158,31 +165,31 @@ { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-stations/items", - "type": "application/json", + "type": "application/geo+json", "title": "hydrometric-stations" }, { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-daily-mean/items", - "type": "application/json", + "type": "application/geo+json", "title": "hydrometric-daily-mean" }, { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-monthly-mean/items", - "type": "application/json", + "type": "application/geo+json", "title": "hydrometric-monthly-mean" }, { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-annual-statistics/items", - "type": "application/json", + "type": "application/geo+json", "title": "hydrometric-annual-statistics" }, { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-annual-peaks/items", - "type": "application/json", + "type": "application/geo+json", "title": "hydrometric-annual-peaks" } ] diff --git a/examples/ca-eccc-msc.hydrometric-realtime.json b/examples/ca-eccc-msc.hydrometric-realtime.json index 596be59..fb4ab89 100644 --- a/examples/ca-eccc-msc.hydrometric-realtime.json +++ b/examples/ca-eccc-msc.hydrometric-realtime.json @@ -135,7 +135,14 @@ "href": "https://dd.weather.gc.ca/hydrometric/csv", "type": "text/html", "hreflang": "en", - "title": "Raw data download (CSV files)" + "title": "Raw data download (CSV files)", + "distribution": { + "availableFormats": [ + { + "name": "CSV" + } + ] + } }, { "rel": "license", @@ -145,7 +152,7 @@ }, { "rel": "items", - "href": "mqtts://example.org", + "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883", "channel": "origin/a/wis2/ca-eccc-msc/data/core/hydrology", "type": "application/geo+json", "title": "Data notifications" @@ -153,7 +160,7 @@ { "rel": "items", "href": "https://api.weather.gc.ca/collections/hydrometric-realtime/items", - "type": "application/json", + "type": "application/geo+json", "hreflang": "en", "title": "Data access API" } diff --git a/examples/ca-eccc-msc.nwp-gdps.json b/examples/ca-eccc-msc.nwp-gdps.json index 9089fda..e4c313a 100644 --- a/examples/ca-eccc-msc.nwp-gdps.json +++ b/examples/ca-eccc-msc.nwp-gdps.json @@ -125,7 +125,14 @@ "rel": "data", "href": "https://dd.weather.gc.ca/model_gem_global", "type": "text/html", - "title": "MSC Datamart" + "title": "MSC Datamart", + "distribution": { + "availableFormats": [ + { + "name": "GRIB2" + } + ] + } }, { "rel": "license", @@ -136,13 +143,13 @@ { "rel": "service", "href": "https://geo.weather.gc.ca/geomet?lang=en&service=WMS&request=GetCapabilities&layers=GDPS.ETA_TT", - "type": "image/png", - "title": "Air temperature [\u00b0C]" + "type": "application/xml", + "title": "Air temperature [degrees]" }, { "rel": "items", "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/nwp/global", - "href": "mqtts://example.org", + "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883", "type": "application/geo+json", "title": "Data notifications" } diff --git a/examples/ca-eccc-msc.surface-weather-observations-realtime.json b/examples/ca-eccc-msc.surface-weather-observations-realtime.json index 03d1968..f64a636 100644 --- a/examples/ca-eccc-msc.surface-weather-observations-realtime.json +++ b/examples/ca-eccc-msc.surface-weather-observations-realtime.json @@ -134,14 +134,21 @@ { "rel": "data", "href": "https://dd.weather.gc.ca/observations/swob-ml", - "type": "application/xml", + "type": "text/html", "hreflang": "en", - "title": "Raw data download (XML files)" + "title": "Raw data download (XML files)", + "distribution": { + "availableFormats": [ + { + "name": "XML" + } + ] + } }, { "rel": "items", "href": "https://api.weather.gc.ca/collections/swob-realtime/items", - "type": "application/json", + "type": "application/geo+json", "title": "Data access API interface" }, { @@ -152,7 +159,7 @@ }, { "rel": "items", - "href": "mqtts://example.org", + "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883", "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/surface-based-observations/synop", "type": "application/geo+json", "title": "Data notifications" diff --git a/examples/cn-cma-babj.nmic.prediction-forecast.json b/examples/cn-cma-babj.nmic.prediction-forecast.json index fd28ebd..4788327 100644 --- a/examples/cn-cma-babj.nmic.prediction-forecast.json +++ b/examples/cn-cma-babj.nmic.prediction-forecast.json @@ -73,16 +73,7 @@ "title": "Space Weather" } ], - "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/index.csv" - }, - { - "concepts": [ - { - "id": "global-broker", - "title": "Global Broker" - } - ], - "scheme": "https://github.com/wmo-im/wcmp2-codelists/blob/main/codelists/global-service-type.csv" + "scheme": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline" } ], "contacts": [ @@ -127,7 +118,7 @@ "language": "en", "type": "dataset", "created": "2023-04-23T12:00:00Z", - "updated": "2024-01-15T12:00:00Z", + "updated": "2024-03-13T12:00:00Z", "keywords": [ "WIS2", "forecast", @@ -144,10 +135,10 @@ }, { "rel": "items", - "channel": "origin/a/wis2/cn-cma-babj/weather/prediction/forecast/#", + "channel": "origin/a/wis2/cn-cma-babj/weather/prediction/forecast/shortrange/probabilistic/global", "type": "application/geo+json", "title": "Data notifications - WMO WIS Global Broker - CMA", - "href": "mqtts://everyone:everyone@example.org:8883" + "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883" } ] } diff --git a/examples/cn-cma-babj.nmic.surface-based-observations.json b/examples/cn-cma-babj.nmic.surface-based-observations.json index 1a45c78..1df06eb 100644 --- a/examples/cn-cma-babj.nmic.surface-based-observations.json +++ b/examples/cn-cma-babj.nmic.surface-based-observations.json @@ -49,7 +49,7 @@ "title": "Weather" } ], - "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/weather/index.csv" + "scheme": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline" } ], "contacts": [ diff --git a/examples/us-noaa-nws.gfs-10deg.json b/examples/us-noaa-nws.gfs-10deg.json index eca23fd..6da7d23 100644 --- a/examples/us-noaa-nws.gfs-10deg.json +++ b/examples/us-noaa-nws.gfs-10deg.json @@ -41,7 +41,6 @@ "created": "2022-06-23T18:36:00Z", "updated": "2022-06-23T18:36:00Z", "wmo:dataPolicy": "core", - "rights": "access", "type": "dataset", "title": "Global Forecast System 1 Degree Resolution", "description": "The Global Forecast System is a weather forecast model produced by the National Centers for Environmental Prediction.", @@ -215,50 +214,53 @@ "id": "weather" } ], - "scheme": "https://github.com/wmo-im/wis2-topic-hierarchy/blob/main/topic-hierarchy/earth-system-discipline/index.csv" + "scheme": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline" }, { "concepts": [ { - "id": "meteorology" - } - ], - "scheme": "http://wis.wmo.int/2012/codelists/WMOCodeLists#WMO_CategoryCode" - }, - { - "concepts": [ - { - "id": "Absolute vorticity" + "title": "Absolute vorticity", + "id": "0-2-10" }, { - "id": "Albedo" + "title": "Albedo", + "id": "0-19-1" }, { - "id": "Pressure reduced to MSL" + "title": "Pressure reduced to MSL", + "id": "0-3-1" }, { - "id": "Snow cover" + "title": "Snow cover", + "id": "0-1-42" }, { - "id": "Snow depth" + "title": "Snow depth", + "id": "0-1-11" }, { - "id": "Soil temperature" + "title": "Soil temperature", + "id": "2-3-18" }, { - "id": "v-component of wind" + "title": "v-component of wind", + "id": "0-2-3" }, { - "id": "v-component storm motion" + "title": "v-component storm motion", + "id": "0-2-28" }, { - "id": "Vegetation" + "title": "Vegetation", + "id": "2-0-4" }, { - "id":"Vertical velocity (geometric))" + "title": "Vertical velocity (geometric))", + "id": "0-2-9" }, { - "id":"Vertical velocity (pressure)" + "title": "Vertical velocity (pressure)", + "id": "0-2-8" } ], "scheme": "https://codes.wmo.int/grib2/codeflag/_4.2" @@ -308,8 +310,15 @@ { "rel": "data", "href": "https://nomads.ncep.noaa.gov/pub/data/nccf/com/gfs/prod/", - "type": "application/x-grib", - "title": "NOAA Operational Model Archive and Distribution System (NOMADS)" + "type": "text/html", + "title": "NOAA Operational Model Archive and Distribution System (NOMADS)", + "distribution": { + "availableFormats": [ + { + "name": "GRIB2" + } + ] + } } ] } diff --git a/examples/us-noaa-nws.goes16-satellite-sst.json b/examples/us-noaa-nws.goes16-satellite-sst.json index f7bdf93..c13468a 100644 --- a/examples/us-noaa-nws.goes16-satellite-sst.json +++ b/examples/us-noaa-nws.goes16-satellite-sst.json @@ -38,12 +38,12 @@ ] }, "properties": { - "created": "2022-08-01T14:16:00Z", - "updated": "2022-08-01T14:16:00Z", + "created": "2022-08-01T12:00:00Z", + "updated": "2024-03-13T12:00:00Z", "wmo:dataPolicy": "core", "type": "dataset", "title": "Goes 16 Advanced Baseline Imager Level 2 Sea Surface Temperature", - "description": "Sea Surface Temperature for each cloud-free pixel over water The Sea Surface Temperature algorithm employed on GOES 18 will use hybrid physical-regression retrieval in order to produce a more accurate product.", + "description": "Sea Surface Temperature for each cloud-free pixel over water. The Sea Surface Temperature algorithm employed on GOES 16 will use hybrid physical-regression retrieval in order to produce a more accurate product.", "keywords": [ "Sea Surface Temperature", "Geostationary Operational Environmental Satellite 16 (GOES-16)", @@ -65,7 +65,6 @@ "Atmosphere", "meteorology" ], - "keywordsCodespace": "http://codes.wmo.int/common/quantity-kind/_seaSurfaceTemperature", "language": "en", "themes": [ { @@ -74,9 +73,39 @@ "id": "weather", "title": "Weather", "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/weather" + }, + { + "id": "climate", + "title": "Climate", + "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/climate" + }, + { + "id": "ocean", + "title": "Ocean", + "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/ocean" } ], "scheme": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline" + }, + { + "concepts": [ + { + "id": "seaSurfaceTemperature", + "title": "Sea surface temperature", + "url": "http://codes.wmo.int/common/quantity-kind/seaSurfaceTemperature" + } + ], + "scheme": "http://codes.wmo.int/common/quantity-kind" + }, + { + "concepts": [ + { + "id": "95", + "title": "Sea surface temperature", + "url": "http://codes.wmo.int/wmdr/ObservedVariableOcean/95" + } + ], + "scheme": "https://codes.wmo.int/wmdr/ObservedVariableOcean" } ], "contacts": [ @@ -120,15 +149,21 @@ "formats": [ "NetCDF" ], - "license": "There are no restrictions on the use of this data.", - "rights": "access" + "rights": "There are no restrictions on the use of this data." }, "links": [ { "rel": "data", "href": "https://noaa-goes16.s3.amazonaws.com/index.html#ABI-L2-SSTF", - "type": "application/netcdf", - "title": "NOAA Geostationary Operational Environmental Satellites (GOES) 16 Registry of Open Data on AWS" + "type": "text/html", + "title": "NOAA Geostationary Operational Environmental Satellites (GOES) 16 Registry of Open Data on AWS", + "distribution": { + "availableFormats": [ + { + "name": "NetCDF" + } + ] + } }, { "rel": "data", @@ -138,7 +173,7 @@ }, { "rel": "data", - "href": "https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16/ABI-L2-SSTF?pageState=(%22StorageObjectListTable%22:(%22f%22:%22%255B%255D%22))&prefix=&forceOnObjectsSortingFiltering=false", + "href": "https://console.cloud.google.com/storage/browser/gcp-public-data-goes-16/ABI-L2-SSTF", "type": "text/html", "title": "Google Cloud GOES-16 L2 Sea Surface Temperature" },