wmo-im · tomkralidis · Nov 13, 2023 · Nov 12, 2023
diff --git a/examples/NWS-GOES16-Satellite-SST.json b/examples/NWS-GOES16-Satellite-SST.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:us.noaa.nws.ncep:goes_16_ABI-L2-SSTF",
+    "id": "urn:x-wmo:md:us-noaa-nws-ncep:goes_16_ABI-L2-SSTF",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],
@@ -33,11 +33,11 @@
         ]
     },
     "properties": {
-        "identifier": "urn:x-wmo:md:us.noaa.nws.ncep:goes_16_ABI-L2-SSTF",
+        "identifier": "urn:x-wmo:md:us-noaa-nws-ncep:goes_16_ABI-L2-SSTF",
         "externalIds": [
             {
                 "scheme": "default",
-                "value": "urn:x-wmo:md:us.noaa.nws.ncep:goes_16_ABI-L2-SSTF"
+                "value": "urn:x-wmo:md:us-noaa-nws-ncep:goes_16_ABI-L2-SSTF"
             }
         ],
         "created": "2022-08-01T14:16:00Z",
@@ -55,7 +55,7 @@
         ],
         "keywordsCodespace": "http://codes.wmo.int/common/quantity-kind/_seaSurfaceTemperature",
         "language": "en",
-        "externalID": "urn:x-wmo:md:us.noaa.nws.ncep:goes_16_ABI-L2-SSTF",
+        "externalID": "urn:x-wmo:md:us-noaa-nws-ncep:goes_16_ABI-L2-SSTF",
         "themes": [
             {
                 "concepts": [

diff --git a/examples/can.eccc-msc.cmip5-tt.json → examples/ca-eccc-msc.cmip5-tt.json b/examples/can.eccc-msc.cmip5-tt.json → examples/ca-eccc-msc.cmip5-tt.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:climate.cmip5.tt.rcp85.year.2081-2100_pctl5",
+    "id": "urn:x-wmo:md:ca-eccc-msc:climate.cmip5.tt.rcp85.year.2081-2100_pctl5",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/....eccc-msc.daily-climate-observations.json → examples/ca-eccc-msc.daily-climate-obse b/....eccc-msc.daily-climate-observations.json → examples/ca-eccc-msc.daily-climate-obse
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:climate.climate-daily",
+    "id": "urn:x-wmo:md:ca-eccc-msc:climate.climate-daily",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/....eccc-msc.global-discovery-catalogue.json → ...-eccc-msc.global-discovery-catalogue.json b/....eccc-msc.global-discovery-catalogue.json → ...-eccc-msc.global-discovery-catalogue.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:global-discovery-catalogue",
+    "id": "urn:x-wmo:md:ca-eccc-msc:global-discovery-catalogue",
     "type": "Feature",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"

diff --git a/...les/can.eccc-msc.hydrometric-archive.json → ...ples/ca-eccc-msc.hydrometric-archive.json b/...les/can.eccc-msc.hydrometric-archive.json → ...ples/ca-eccc-msc.hydrometric-archive.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:hydrometric.hydat",
+    "id": "urn:x-wmo:md:ca-eccc-msc:hydrometric.hydat",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/...es/can.eccc-msc.hydrometric-realtime.json → ...les/ca-eccc-msc.hydrometric-realtime.json b/...es/can.eccc-msc.hydrometric-realtime.json → ...les/ca-eccc-msc.hydrometric-realtime.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:hydrometric.realtime",
+    "id": "urn:x-wmo:md:ca-eccc-msc:hydrometric.realtime",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/examples/can.eccc-msc.nwp-gdps.json → examples/ca-eccc-msc.nwp-gdps.json b/examples/can.eccc-msc.nwp-gdps.json → examples/ca-eccc-msc.nwp-gdps.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc:nwp.msc_nwp_gdps",
+    "id": "urn:x-wmo:md:ca-eccc-msc:nwp.msc_nwp_gdps",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/...urface-weather-observations-realtime.json → ...urface-weather-observations-realtime.json b/...urface-weather-observations-realtime.json → ...urface-weather-observations-realtime.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:can:eccc-msc: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"
     ],

diff --git a/.../chn.cma.wp.gra_geps_glb.12_m31.f354.json → ...s/cn-cma.wp.gra_geps_glb.12_m31.f354.json b/.../chn.cma.wp.gra_geps_glb.12_m31.f354.json → ...s/cn-cma.wp.gra_geps_glb.12_m31.f354.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:cn.cma.wmc-bj::nwp.gra_geps_glb.12_m31.f354",
+    "id": "urn:x-wmo:md:cn-cma-wmc-bj::nwp.gra_geps_glb.12_m31.f354",
     "type": "Feature",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"

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

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

diff --git a/examples/fra.meteo-france.global-broker.json → examples/fr-meteo-france.global-broker.json b/examples/fra.meteo-france.global-broker.json → examples/fr-meteo-france.global-broker.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:fra:meteo-france:global-broker",
+    "id": "urn:x-wmo:md:fr-meteo-france:global-broker",
     "type": "Feature",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"

diff --git a/examples/xxf.eumetsat.seviri.json → examples/int-eumetsat.seviri.json b/examples/xxf.eumetsat.seviri.json → examples/int-eumetsat.seviri.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:int.eumetsat::EO:EUM:DAT:MSG:HRSEVIRI",
+    "id": "urn:x-wmo:md:int-eumetsat::EO:EUM:DAT:MSG:HRSEVIRI",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/examples/nws-gfs-10deg.json b/examples/nws-gfs-10deg.json
@@ -1,5 +1,5 @@
 {
-    "id": "urn:x-wmo:md:us.noaa.nws.ncep:nwp.gfs_1deg",
+    "id": "urn:x-wmo:md:us-noaa-nws-ncep:nwp.gfs_1deg",
     "conformsTo": [
         "http://wis.wmo.int/spec/wcmp/2/conf/core"
     ],

diff --git a/standard/abstract_tests/core/ATS_test_identifier.adoc b/standard/abstract_tests/core/ATS_test_identifier.adoc
@@ -14,7 +14,7 @@ Check for the existence of an `+id+` property in the WCMP record.
 
 [.component,class=step]
 --
-In the WCMP record's `+id+` property, check that there are at least **six** tokens, delimited by `+:+`.
+In the WCMP record's `+id+` property, check that there are at least **five** tokens, delimited by `+:+`.
 --
 
 [.component,class=step]
@@ -24,12 +24,7 @@ In the WCMP record's `+id+` property, delimiting the value on `+:+`, check that
 
 [.component,class=step]
 --
-In the WCMP record's `+id+` property, delimiting the value on `+:+`, check that the fourth token is a country based on the WIS2 Topic Hierarchy and controlled vocabulary.
---
-
-[.component,class=step]
---
-In the WCMP record's `+id+` property, delimiting the value on `+:+`, check that the fifth token is a centre id based on the WIS2 Topic Hierarchy and controlled vocabulary.
+In the WCMP record's `+id+` property, delimiting the value on `+:+`, check that the fourth token is a centre id based on the WIS2 Topic Hierarchy and controlled vocabulary.
 --
 
 [.component,class=step]

diff --git a/standard/requirements/core/REQ_identifier.adoc b/standard/requirements/core/REQ_identifier.adoc
@@ -3,9 +3,8 @@
 |===
 ^|*Requirement {counter:req-id}* |*/req/core/identifier*
 ^|A |A WCMP record SHALL have an identifier via the `+id+` property.
-^|B |A WCMP record identifier SHALL have the following notation: `+urn:x-wmo:md:{country}:{centre_id}:{local_identifier}+`.
-^|C |A WCMP record identifier SHALL include a ``country`` based on the associated vocabulary as specified in the WIS <<wis2-topic-hierarchy, topic hierarchy>>.
-^|D |A WCMP record identifier SHALL include a ``centre_id`` based on the associated vocabulary specified in the WIS <<wis2-topic-hierarchy, topic hierarchy>>.
-^|E |A WCMP record identifier SHALL include a local identifier as defined by the data publisher.  The local identifier SHALL NOT have spaces or special or accented characters.
+^|B |A WCMP record identifier SHALL have the following notation: `+urn:x-wmo:md:{centre_id}:{local_identifier}+`.
+^|C |A WCMP record identifier SHALL include a ``centre_id`` based on the associated vocabulary specified in the WIS <<wis2-topic-hierarchy, topic hierarchy>>.
+^|D |A WCMP record identifier SHALL include a local identifier as defined by the data publisher.  The local identifier SHALL NOT have spaces or special or accented characters.
 |===
 
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:can:eccc-msc:observations.swob"
+"id": "urn:x-wmo:md:can-eccc-msc:observations.swob"
 ----
 
 ==== Conformance

diff --git a/standard/sections/clause_8_gdc.adoc b/standard/sections/clause_8_gdc.adoc
@@ -11,6 +11,6 @@ The API of the GDC, in addition to allowing for spatial/temporal/attribute queri
 may choose to apply facets to WCMP records.  Facets are effective when applied against controlled
 vocabularies and classifications.  The following WCMP required properties would be subject to faceting by a GDC:
 
-- ``country`` and ``centre-id`` as defined in <<_identifier>>
+- ``centre-id`` as defined in <<_identifier>>
 - <<_properties_type>>
 - <<_properties_wmo_data_policy>>