update MSC centre-id

wmo-im · Nov 28, 2023 · c32d5c1 · c32d5c1
1 parent d1f481b
commit c32d5c1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/examples/ca-eccc-msc.daily-climate-observations.json b/examples/ca-eccc-msc.daily-climate-observations.json
@@ -144,7 +144,7 @@
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc-dcpc/data/core/climate/observations",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/climate/observations",
             "type": "application/json",
             "title": "Data notifications"
         }

diff --git a/examples/ca-eccc-msc.hydrometric-archive.json b/examples/ca-eccc-msc.hydrometric-archive.json
@@ -149,7 +149,7 @@
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc-dcpc/data/core/hydrology",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/hydrology",
             "type": "application/json",
             "title": "Data notifications"
         },

diff --git a/examples/ca-eccc-msc.hydrometric-realtime.json b/examples/ca-eccc-msc.hydrometric-realtime.json
@@ -144,7 +144,7 @@
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc-dcpc/data/core/hydrology",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/hydrology",
             "type": "application/json",
             "title": "Data notifications"
         },

diff --git a/examples/ca-eccc-msc.nwp-gdps.json b/examples/ca-eccc-msc.nwp-gdps.json
@@ -139,7 +139,7 @@
         },
         {
             "rel": "items",
-            "channel": "origin/a/wis2/ca-eccc-msc-dcpc/data/core/weather/nwp/global",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/nwp/global",
             "href": "mqtts://example.org",
             "type": "application/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
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:ca-eccc-msc-dcpc:weather.observations.swob-realtime",
+    "id": "urn:x-wmo:md:ca-eccc-msc:weather.observations.swob-realtime",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],
@@ -151,7 +151,7 @@
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc-dcpc/data/core/weather/observations/surface-land/landFixed",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/observations/surface-land/landFixed",
             "type": "application/json",
             "title": "Data notifications"
         }

diff --git a/examples/de-dwd.global-cache.json b/examples/de-dwd.global-cache.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:de-dwd-offenbach:global-cache-service",
+    "id": "urn:x-wmo:md:de-dwd:global-cache-service",
     "type": "Feature",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"

diff --git a/examples/de-dwd.icon-eps-all.json b/examples/de-dwd.icon-eps-all.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:de-dwd-offenbach:icon-eps.ALL",
+    "id": "urn:x-wmo:md:de-dwd:icon-eps.ALL",
     "type": "Feature",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
@@ -136,8 +136,7 @@
                 ],
                 "contactInstructions": "email",
                 "roles": [
-                    "pointOfContact",
-                    "originator"
+                    "host"
                 ]
             }
         ],
@@ -185,10 +184,10 @@
             "href": "https://opendata.dwd.de/weather/wmc/icon-eps/data/grib"
         },
         {
-            "rel": "subscribe",
+            "rel": "items",
             "type": "application/json",
             "title": "Global Broker (Toulouse)",
-            "href": "mqtts://[yourAccount]:[yourPassword]@wis2.dwd.de:8883/",
+            "href": "mqtts://everyone:[email protected]:8883",
             "channel": "cache/a/wis2/deu/dwd-offenbach/data/core/weather/analysis-prediction/forecast/model/#"
         }
     ]

diff --git a/examples/urnx-wmo-md-int.wmo.wis-AOCI21BABJ.json b/examples/urnx-wmo-md-int.wmo.wis-AOCI21BABJ.json
@@ -1,8 +1,8 @@
 {
-    "id": "urn:x-wmo:md:int.wmo.wis::AOCI21BABJ",
+    "id": "urn:x-wmo:md:cn-cma:AOCI21BABJ",
     "type": "Feature",
     "conformsTo": [
-        "http://wis.wmo.int/spec/wcmp/2.0"
+        "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],
     "time": {
         "interval": [

diff --git a/standard/sections/clause_7_normative_text.adoc b/standard/sections/clause_7_normative_text.adoc
@@ -125,7 +125,7 @@ include::../recommendations/core/PER_identifier.adoc[]
 
 [source,json]
 ----
-"id": "urn:x-wmo:md:ca-eccc-msc-dcpc:observations.swob"
+"id": "urn:x-wmo:md:ca-eccc-msc:observations.swob"
 ----
 
 ==== Conformance
@@ -786,7 +786,7 @@ include::../recommendations/core/REC_links.adoc[]
     "type" : "application/json",
     "title": "WIS2 notification service",
     "href" : "mqtts://example.org",
-    "channel": "cache/a/wis2/ca-eccc-msc-dcpc/data/core/weather/surface-based-observations"
+    "channel": "cache/a/wis2/ca-eccc-msc/data/core/weather/surface-based-observations"
   }
 ]
 ----