From 86a745611f96b2a06e5fc83ba7df8b7556074e0e Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 12 Nov 2023 17:31:44 -0500 Subject: [PATCH] merge country and centre-id (#58) (#64) * merge country and centre-id (#58) * update existing centre ids * Update topic-hierarchy.csv * update annex examples --- standard/abstract_tests/ATS_class_core.adoc | 20 ++ .../core/ATS_test_centre-id.adoc | 16 ++ .../core/ATS_test_conventions.adoc | 24 ++ .../recommendations/core/PER_centre-id.adoc | 8 + .../recommendations/core/REC_centre-id.adoc | 8 + standard/requirements/core/REQ_centre-id.adoc | 12 + .../requirements/core/REQ_conventions.adoc | 2 +- .../requirements/core/REQ_management.adoc | 4 +- .../requirements/core/REQ_versioning.adoc | 2 +- standard/sections/annex_b_examples.adoc | 4 +- standard/sections/clause_3_references.adoc | 1 + .../clause_4_terms_and_definitions.adoc | 6 + .../sections/clause_6_informative_text.adoc | 2 +- .../sections/clause_7_normative_text.adoc | 12 +- topic-hierarchy.csv | 11 +- topic-hierarchy/centre-id.csv | 11 +- topic-hierarchy/country.csv | 257 ------------------ topic-hierarchy/system.csv | 2 +- 18 files changed, 123 insertions(+), 279 deletions(-) create mode 100644 standard/abstract_tests/core/ATS_test_centre-id.adoc create mode 100644 standard/abstract_tests/core/ATS_test_conventions.adoc create mode 100644 standard/recommendations/core/PER_centre-id.adoc create mode 100644 standard/recommendations/core/REC_centre-id.adoc create mode 100644 standard/requirements/core/REQ_centre-id.adoc delete mode 100644 topic-hierarchy/country.csv diff --git a/standard/abstract_tests/ATS_class_core.adoc b/standard/abstract_tests/ATS_class_core.adoc index 97dc4e1..a216e0d 100644 --- a/standard/abstract_tests/ATS_class_core.adoc +++ b/standard/abstract_tests/ATS_class_core.adoc @@ -5,3 +5,23 @@ label:: http://www.wmo.int/spec/wth/1/conf/core subject:: Requirements Class "core" classification:: Target Type:Topic Classification ==== + +==== Management + +This requirement is not applicable to ATS testing. + +==== Versioning + +This requirement is not applicable to ATS testing. + +==== Conventions + +include::./core/ATS_test_conventions.adoc[] + +==== Centre identification + +include::./core/ATS_test_centre-id.adoc[] + +==== Publishing guidelines + +This requirement is not applicable to ATS testing. diff --git a/standard/abstract_tests/core/ATS_test_centre-id.adoc b/standard/abstract_tests/core/ATS_test_centre-id.adoc new file mode 100644 index 0000000..3a7640f --- /dev/null +++ b/standard/abstract_tests/core/ATS_test_centre-id.adoc @@ -0,0 +1,16 @@ +[[ats_core_centre-id]] +==== +[%metadata] +label:: /conf/core/centre-id +subject:: /req/core/centre-id +test-purpose:: Validate that a centre identifier is valid. + +[.component,class=test method] +===== +[.component,class=step] +-- +Check that the first component of the centre identifier is a valid TLD as defined by IANAfootnote:[https://data.iana.org/TLD]. +-- + +===== +==== diff --git a/standard/abstract_tests/core/ATS_test_conventions.adoc b/standard/abstract_tests/core/ATS_test_conventions.adoc new file mode 100644 index 0000000..5cac465 --- /dev/null +++ b/standard/abstract_tests/core/ATS_test_conventions.adoc @@ -0,0 +1,24 @@ +[[ats_core_conventions]] +==== +[%metadata] +label:: /conf/core/conventions +subject:: /req/core/conventions +test-purpose:: Validate that a given topic meets the conventions of WTH. + +[.component,class=test method] +===== +[.component,class=step] +-- +Check that all characters in the topic are lowercase. +-- + +-- +Check that all characters in the topic are based on ASCII T.50. +-- + +-- +Check that no characters in the topic contain dots (``.``). +-- + +===== +==== diff --git a/standard/recommendations/core/PER_centre-id.adoc b/standard/recommendations/core/PER_centre-id.adoc new file mode 100644 index 0000000..e518e01 --- /dev/null +++ b/standard/recommendations/core/PER_centre-id.adoc @@ -0,0 +1,8 @@ +[[per_core_centre-id]] +[width="90%",cols="2,6a"] +|=== +^|*Permission {counter:req-id}* |*/per/core/centre-id* +^|A |A centre identifier's ``centre-name`` component MAY contain dashes. +^|B |Larger organizations providing multiple centres MAY use dashes in the ``centre-name`` component to further delineate a centre function (e.g. ``int-org1-nwp``, ``int-org1-ozone``). +^|C |A centre providing a WIS service MAY further qualify the function within the ``centre-name`` component (e.g. ``int-org1-global-cache``). +|=== diff --git a/standard/recommendations/core/REC_centre-id.adoc b/standard/recommendations/core/REC_centre-id.adoc new file mode 100644 index 0000000..a8e9649 --- /dev/null +++ b/standard/recommendations/core/REC_centre-id.adoc @@ -0,0 +1,8 @@ +[[rec_core_centre-id]] +[width="90%",cols="2,6a"] +|=== +^|*Recommendation {counter:req-id}* |*/rec/core/centre-id* +^|A |Organizations operating with a ``gov`` or similar TLD SHOULD use the TLD based on their country to define the TLD component of their centre identifier. +^|B |International organizations operating with a ``int``, ``org`` or similar TLD SHOULD reuse these to define the TLD component of their centre identifier. +^|C |Organizations wishing to test their WIS2 Node or Global Service MAY provide the ``-test`` suffix to their centre identifier (e.g. ``int-org1-test``). +|=== diff --git a/standard/requirements/core/REQ_centre-id.adoc b/standard/requirements/core/REQ_centre-id.adoc new file mode 100644 index 0000000..318537f --- /dev/null +++ b/standard/requirements/core/REQ_centre-id.adoc @@ -0,0 +1,12 @@ +[[req_core_centre-id]] +[width="90%",cols="2,6a"] +|=== +^|*Requirement {counter:req-id}* |*/req/core/centre-id* +^|A +a|A centre identifier SHALL be formatted as ``tld-centre-name``, where: + +- `tld` is based on a TLD as defined by IANAfootnote:[https://data.iana.org/TLD] +- `centre-name` is based on a centre name as defined by the member +^|B | The `test` TLD SHALL be used only for WIS internal system testing purposes. + +|=== diff --git a/standard/requirements/core/REQ_conventions.adoc b/standard/requirements/core/REQ_conventions.adoc index fd58629..e161109 100644 --- a/standard/requirements/core/REQ_conventions.adoc +++ b/standard/requirements/core/REQ_conventions.adoc @@ -5,7 +5,7 @@ ^|A |All topic level definitions SHALL be lowercase. ^|B |All topic level definitions SHALL following ASCII T.50. ^|C |All topic level definitions SHALL NOT utilize dots (``.``). -^|D |All topic level definitions SHALL utilize dashes (``-``). +^|D |All topic level definitions SHALL utilize dashes (``-``) to separate words (e.g. ``sea-ice``). ^|E |All topic level definitions at a given level SHALL be unique. ^|F |The topic structure levels imply a fixed sequence and SHALL NOT be re-ordered. |=== diff --git a/standard/requirements/core/REQ_management.adoc b/standard/requirements/core/REQ_management.adoc index c1cbb37..89fc2fe 100644 --- a/standard/requirements/core/REQ_management.adoc +++ b/standard/requirements/core/REQ_management.adoc @@ -3,8 +3,8 @@ |=== ^|*Requirement {counter:req-id}* |*/req/core/management* ^|A |Primary levels 1-8 SHALL be determined by the WMO Task Team on WIS Metadata. -^|B |Domain specific levels (level 9 and beyond) SHALL be determined by domain experts and user communities. -^|C |Domain specific levels (level 9 and beyond) SHALL be coordinated and integrated by the WMO Task Team on WIS Metadata. +^|B |Domain specific levels (level 8 and beyond) SHALL be determined by domain experts and user communities. +^|C |Domain specific levels (level 8 and beyond) SHALL be coordinated and integrated by the WMO Task Team on WIS Metadata. ^|D a|Domain specific level updates SHALL be implemented using the following steps: diff --git a/standard/requirements/core/REQ_versioning.adoc b/standard/requirements/core/REQ_versioning.adoc index 8d40291..a60be7c 100644 --- a/standard/requirements/core/REQ_versioning.adoc +++ b/standard/requirements/core/REQ_versioning.adoc @@ -8,5 +8,5 @@ ^|D |A new topic SHALL NOT result in any version update. ^|E |A major version SHALL result in a change / bump to the version level (i.e. ``a`` -> ``b``). ^|F |A minor version SHALL NOT result in any changes to the version level. -^|G |A renaming or removal in the WMO Notification Message Format SHALL result in a major version update. +^|G |A renaming or removal in the WMO Notification Message encoding SHALL result in a major version update. |=== diff --git a/standard/sections/annex_b_examples.adoc b/standard/sections/annex_b_examples.adoc index d5ce049..536ac2d 100644 --- a/standard/sections/annex_b_examples.adoc +++ b/standard/sections/annex_b_examples.adoc @@ -8,11 +8,11 @@ .Example: WIS Node data publishing (surface weather observations) from Environment and Climate Change Canada, Meteorological Service of Canada [source,text] ---- -origin/a/wis2/can/eccc-msc/data/core/weather/surface-based-observations/synop +origin/a/wis2/ca-eccc-msc/data/core/weather/surface-based-observations/synop ---- .Example: WIS Node metadata publishing from Deutscher Wetterdienst [source,text] ---- -cache/a/wis2/deu/dwd/metadata/core/wcmp2 +cache/a/wis2/de-dwd/metadata/core/wcmp2 ---- diff --git a/standard/sections/clause_3_references.adoc b/standard/sections/clause_3_references.adoc index a97802b..b4c2b6a 100644 --- a/standard/sections/clause_3_references.adoc +++ b/standard/sections/clause_3_references.adoc @@ -4,3 +4,4 @@ * OASIS: MQTT Version 3.1.1 (2014) footnote:[http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html] * Wikipedia: Publish-subscribe pattern (2023) footnote:[https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern] * International Telecommunications Union (ITU): T.50 : International Reference Alphabet (IRA) (Formerly International Alphabet No. 5 or IA5) - Information technology - 7-bit coded character set for information interchange footnote:[https://www.itu.int/rec/T-REC-T.50] +* IANA: Root Zone Database (2023) footnote:[https://www.iana.org/domains/root/db] diff --git a/standard/sections/clause_4_terms_and_definitions.adoc b/standard/sections/clause_4_terms_and_definitions.adoc index 0d7c15a..0de625c 100644 --- a/standard/sections/clause_4_terms_and_definitions.adoc +++ b/standard/sections/clause_4_terms_and_definitions.adoc @@ -48,6 +48,12 @@ The following additional terms and definitions also apply. |PubSub |Publish / Subscribe +|PR +|Permanent Representative + +|TLD +|Top-level domain + |URI |Uniform Resource Identifier diff --git a/standard/sections/clause_6_informative_text.adoc b/standard/sections/clause_6_informative_text.adoc index dec5adc..d72403f 100644 --- a/standard/sections/clause_6_informative_text.adoc +++ b/standard/sections/clause_6_informative_text.adoc @@ -16,6 +16,6 @@ Users can discover datasets from the Global Discovery Catalogue (GDC). Once a us The structure of the topic hierarchy underpins the discovery and sharing of data in WIS, and requires standardization across all WIS services to provide consistent filter and access to the user. -Recalling that WIS is designed to support the WMO Unified Data Policy, the topic hierarchy must be aligned with WMO Res. 1 Cg-EXT-21 - Unified Data Policy.:footnote:[https://ane4bf-datap1.s3-eu-west-1.amazonaws.com/wmocms/s3fs-public/ckeditor/files/Cg-Ext2021-d04-1-WMO-UNIFIED-POLICY-FOR-THE-INTERNATIONAL-approved_en_0.pdf?4pv38FtU6R4fDNtwqOxjBCndLIfntWeR] +Recalling that WIS is designed to support the WMO Unified Data Policy, the topic hierarchy must be aligned with WMO Res. 1 Cg-EXT-21 - Unified Data Policyfootnote:[https://ane4bf-datap1.s3-eu-west-1.amazonaws.com/wmocms/s3fs-public/ckeditor/files/Cg-Ext2021-d04-1-WMO-UNIFIED-POLICY-FOR-THE-INTERNATIONAL-approved_en_0.pdf?4pv38FtU6R4fDNtwqOxjBCndLIfntWeR]. Final approval of the WTH updates will go through the WMO fast-track amendment process.footnote:[https://community.wmo.int/en/activity-areas/wis/amendment-processes-wis-manuals-and-guides] diff --git a/standard/sections/clause_7_normative_text.adoc b/standard/sections/clause_7_normative_text.adoc index f537561..49c152c 100644 --- a/standard/sections/clause_7_normative_text.adoc +++ b/standard/sections/clause_7_normative_text.adoc @@ -18,8 +18,8 @@ The WTH is managed by the WMO Task Team on WIS Metadata. Updates to the WTH are The WIS Topic Hierarchy has been developed according to the classification of the Earth System domains in Annex 1 of Resolution 1 Cg-Ext(2021), and it is managed in two parts: -1. Primary topic levels (levels 1-8): topic structure applies to all data and services in WIS -2. Domain specific topic subcategory levels (level 9 and beyond): topic structure proposed by domain experts and user communities. Note that the number of levels in this part may vary according to the requirements of various domains. +1. Primary topic levels (levels 1-7): topic structure applies to all data and services in WIS +2. Domain specific topic subcategory levels (level 8 and beyond): topic structure proposed by domain experts and user communities. Note that the number of levels in this part may vary according to the requirements of various domains. include::../requirements/core/REQ_management.adoc[] @@ -35,6 +35,14 @@ All levels of the topic hierarchy are defined in a consistent manner to support include::../requirements/core/REQ_conventions.adoc[] +==== Centre identification + +The centre identifier (``centre-id``) is an acronym as specified by the member and endorsed by the PR of the country and WMO. It is a single identifier comprised of a TLD and centre name, and represents the data publisher, distributor or issuing centre of a given dataset or data product/granule. + +include::../requirements/core/REQ_centre-id.adoc[] +include::../recommendations/core/REC_centre-id.adoc[] +include::../recommendations/core/PER_centre-id.adoc[] + ==== Publishing guidelines For maximum utility and efficient management of topics, data, metadata, and reports need to be published to a minimum level. This helps with avoiding "pollution" of messages in higher level topics which are used to delineate core concepts (centre identification, notification types, data policy, etc.). diff --git a/topic-hierarchy.csv b/topic-hierarchy.csv index 02a6519..49c3a01 100644 --- a/topic-hierarchy.csv +++ b/topic-hierarchy.csv @@ -2,9 +2,8 @@ Level,Name,Description 1,channel,Location of where the data originates from (data providers [origin] or global services [cache]) 2,version,Alphabetical version of the topic hierarchy 3,system,Fixed value of wis2 for WIS2 -4,country,Lower case representation of ISO3166 3-letter code. Includes extensions for partner organizations -5,centre-id,Acronym as specified by member and endorsed by the PR of the country and by WMO -6,notification-type,"WIS2 notification types (data, metadata, reports [from monitoring activities])" -7,data-policy,Data policy as defined by the WMO Unified Data Policy. core data are available from the Global Caches with open access on a free and unrestricted basis. Notifications for core and recommended data are available by subscription to Global Brokers. recommended data are downloaded from the original NC/DCPC and may require authentication/authorisation -8,earth-system-discipline,As per Annex 1 of resolution 1 Cg-Ext-2021 -9,earth-system-discipline-subcategory,As proposed by domain experts and further approved by INFCOM +4,centre-id,Acronym as specified by member and endorsed by the PR of the country and WMO +5,notification-type,"WIS2 notification types (data, metadata, reports [from monitoring activities])" +6,data-policy,Data policy as defined by the WMO Unified Data Policy. core data are available from the Global Caches with open access on a free and unrestricted basis. Notifications for core and recommended data are available by subscription to Global Brokers. recommended data are downloaded from the original NC/DCPC and may require authentication/authorisation +7,earth-system-discipline,As per Annex 1 of resolution 1 Cg-Ext-2021 +8,earth-system-discipline-subcategory,As proposed by domain experts and further approved by INFCOM diff --git a/topic-hierarchy/centre-id.csv b/topic-hierarchy/centre-id.csv index 70ef876..a7119fa 100644 --- a/topic-hierarchy/centre-id.csv +++ b/topic-hierarchy/centre-id.csv @@ -1,7 +1,6 @@ Name,Description,Child -eccc-msc,"Environment and Climate Change Canada, Meteorological Service of Canada",notification-type -woudc,World Ozone and Ultraviolet Radiation Data Centre,notification-type -meteo-france,Météo-France,notification-type -dwd,Deutscher Wetterdienst,notification-type -ecmwf,European Centre for Medium-Range Weather Forecasts,notification-type -my-centre,my centre,notification-type +can-eccc-msc,"Environment and Climate Change Canada, Meteorological Service of Canada",notification-type +org-woudc,World Ozone and Ultraviolet Radiation Data Centre,notification-type +fr-meteo-france,Météo-France,notification-type +de-dwd,Deutscher Wetterdienst,notification-type +int-ecmwf,European Centre for Medium-Range Weather Forecasts,notification-type diff --git a/topic-hierarchy/country.csv b/topic-hierarchy/country.csv deleted file mode 100644 index 5e2bbc5..0000000 --- a/topic-hierarchy/country.csv +++ /dev/null @@ -1,257 +0,0 @@ -Name,Description,Child -afg,Afghanistan,centre-id -ala,Åland Islands,centre-id -alb,Albania,centre-id -dza,Algeria,centre-id -asm,American Samoa,centre-id -and,Andorra,centre-id -ago,Angola,centre-id -aia,Anguilla,centre-id -ata,Antarctica,centre-id -atg,Antigua and Barbuda,centre-id -arg,Argentina,centre-id -arm,Armenia,centre-id -abw,Aruba,centre-id -aus,Australia,centre-id -aut,Austria,centre-id -aze,Azerbaijan,centre-id -bhs,Bahamas,centre-id -bhr,Bahrain,centre-id -bgd,Bangladesh,centre-id -brb,Barbados,centre-id -blr,Belarus,centre-id -bel,Belgium,centre-id -blz,Belize,centre-id -ben,Benin,centre-id -bmu,Bermuda,centre-id -btn,Bhutan,centre-id -bol,Bolivia (Plurinational State of),centre-id -bes,"Bonaire, Sint Eustatius and Saba",centre-id -bih,Bosnia and Herzegovina,centre-id -bwa,Botswana,centre-id -bvt,Bouvet Island,centre-id -bra,Brazil,centre-id -iot,British Indian Ocean Territory,centre-id -brn,Brunei Darussalam,centre-id -bgr,Bulgaria,centre-id -bfa,Burkina Faso,centre-id -bdi,Burundi,centre-id -cpv,Cabo Verde,centre-id -khm,Cambodia,centre-id -cmr,Cameroon,centre-id -can,Canada,centre-id -cym,Cayman Islands,centre-id -caf,Central African Republic,centre-id -tcd,Chad,centre-id -chl,Chile,centre-id -chn,China,centre-id -cxr,Christmas Island,centre-id -cck,Cocos (Keeling) Islands,centre-id -col,Colombia,centre-id -com,Comoros,centre-id -cog,Congo,centre-id -cod,"Congo, Democratic Republic of the",centre-id -cok,Cook Islands,centre-id -cri,Costa Rica,centre-id -civ,Côte d'Ivoire,centre-id -hrv,Croatia,centre-id -cub,Cuba,centre-id -cuw,Curaçao,centre-id -cyp,Cyprus,centre-id -cze,Czechia,centre-id -dnk,Denmark,centre-id -dji,Djibouti,centre-id -dma,Dominica,centre-id -dom,Dominican Republic,centre-id -ecu,Ecuador,centre-id -egy,Egypt,centre-id -slv,El Salvador,centre-id -gnq,Equatorial Guinea,centre-id -eri,Eritrea,centre-id -est,Estonia,centre-id -swz,Eswatini,centre-id -eth,Ethiopia,centre-id -flk,Falkland Islands (Malvinas),centre-id -fro,Faroe Islands,centre-id -fji,Fiji,centre-id -fin,Finland,centre-id -fra,France,centre-id -guf,French Guiana,centre-id -pyf,French Polynesia,centre-id -atf,French Southern Territories,centre-id -gab,Gabon,centre-id -gmb,Gambia,centre-id -geo,Georgia,centre-id -deu,Germany,centre-id -gha,Ghana,centre-id -gib,Gibraltar,centre-id -grc,Greece,centre-id -grl,Greenland,centre-id -grd,Grenada,centre-id -glp,Guadeloupe,centre-id -gum,Guam,centre-id -gtm,Guatemala,centre-id -ggy,Guernsey,centre-id -gin,Guinea,centre-id -gnb,Guinea-Bissau,centre-id -guy,Guyana,centre-id -hti,Haiti,centre-id -hmd,Heard Island and McDonald Islands,centre-id -vat,Holy See,centre-id -hnd,Honduras,centre-id -hkg,Hong Kong,centre-id -hun,Hungary,centre-id -isl,Iceland,centre-id -ind,India,centre-id -idn,Indonesia,centre-id -irn,Iran (Islamic Republic of),centre-id -irq,Iraq,centre-id -irl,Ireland,centre-id -imn,Isle of Man,centre-id -isr,Israel,centre-id -ita,Italy,centre-id -jam,Jamaica,centre-id -jpn,Japan,centre-id -jey,Jersey,centre-id -jor,Jordan,centre-id -kaz,Kazakhstan,centre-id -ken,Kenya,centre-id -kir,Kiribati,centre-id -prk,Korea (Democratic People's Republic of),centre-id -kor,"Korea, Republic of",centre-id -kwt,Kuwait,centre-id -kgz,Kyrgyzstan,centre-id -lao,Lao People's Democratic Republic,centre-id -lva,Latvia,centre-id -lbn,Lebanon,centre-id -lso,Lesotho,centre-id -lbr,Liberia,centre-id -lby,Libya,centre-id -lie,Liechtenstein,centre-id -ltu,Lithuania,centre-id -lux,Luxembourg,centre-id -mac,Macao,centre-id -mdg,Madagascar,centre-id -mwi,Malawi,centre-id -mys,Malaysia,centre-id -mdv,Maldives,centre-id -mli,Mali,centre-id -mlt,Malta,centre-id -mhl,Marshall Islands,centre-id -mtq,Martinique,centre-id -mrt,Mauritania,centre-id -mus,Mauritius,centre-id -myt,Mayotte,centre-id -mex,Mexico,centre-id -fsm,Micronesia (Federated States of),centre-id -mda,"Moldova, Republic of",centre-id -mco,Monaco,centre-id -mng,Mongolia,centre-id -mne,Montenegro,centre-id -msr,Montserrat,centre-id -mar,Morocco,centre-id -moz,Mozambique,centre-id -mmr,Myanmar,centre-id -nam,Namibia,centre-id -nru,Nauru,centre-id -npl,Nepal,centre-id -nld,Netherlands,centre-id -ncl,New Caledonia,centre-id -nzl,New Zealand,centre-id -nic,Nicaragua,centre-id -ner,Niger,centre-id -nga,Nigeria,centre-id -niu,Niue,centre-id -nfk,Norfolk Island,centre-id -mkd,North Macedonia,centre-id -mnp,Northern Mariana Islands,centre-id -nor,Norway,centre-id -omn,Oman,centre-id -pak,Pakistan,centre-id -plw,Palau,centre-id -pse,"Palestine, State of",centre-id -pan,Panama,centre-id -png,Papua New Guinea,centre-id -pry,Paraguay,centre-id -per,Peru,centre-id -phl,Philippines,centre-id -pcn,Pitcairn,centre-id -pol,Poland,centre-id -prt,Portugal,centre-id -pri,Puerto Rico,centre-id -qat,Qatar,centre-id -reu,Réunion,centre-id -rou,Romania,centre-id -rus,Russian Federation,centre-id -rwa,Rwanda,centre-id -blm,Saint Barthélemy,centre-id -shn,"Saint Helena, Ascension and Tristan da Cunha",centre-id -kna,Saint Kitts and Nevis,centre-id -lca,Saint Lucia,centre-id -maf,Saint Martin (French part),centre-id -spm,Saint Pierre and Miquelon,centre-id -vct,Saint Vincent and the Grenadines,centre-id -wsm,Samoa,centre-id -smr,San Marino,centre-id -stp,Sao Tome and Principe,centre-id -sau,Saudi Arabia,centre-id -sen,Senegal,centre-id -srb,Serbia,centre-id -syc,Seychelles,centre-id -sle,Sierra Leone,centre-id -sgp,Singapore,centre-id -sxm,Sint Maarten (Dutch part),centre-id -svk,Slovakia,centre-id -svn,Slovenia,centre-id -slb,Solomon Islands,centre-id -som,Somalia,centre-id -zaf,South Africa,centre-id -sgs,South Georgia and the South Sandwich Islands,centre-id -ssd,South Sudan,centre-id -esp,Spain,centre-id -lka,Sri Lanka,centre-id -sdn,Sudan,centre-id -sur,Suriname,centre-id -sjm,Svalbard and Jan Mayen,centre-id -swe,Sweden,centre-id -che,Switzerland,centre-id -syr,Syrian Arab Republic,centre-id -twn,"Taiwan, Province of China",centre-id -tjk,Tajikistan,centre-id -tza,"Tanzania, United Republic of",centre-id -tha,Thailand,centre-id -tls,Timor-Leste,centre-id -tgo,Togo,centre-id -tkl,Tokelau,centre-id -ton,Tonga,centre-id -tto,Trinidad and Tobago,centre-id -tun,Tunisia,centre-id -tur,Turkey,centre-id -tkm,Turkmenistan,centre-id -tca,Turks and Caicos Islands,centre-id -tuv,Tuvalu,centre-id -uga,Uganda,centre-id -ukr,Ukraine,centre-id -are,United Arab Emirates,centre-id -gbr,United Kingdom of Great Britain and Northern Ireland,centre-id -usa,United States of America,centre-id -umi,United States Minor Outlying Islands,centre-id -ury,Uruguay,centre-id -uzb,Uzbekistan,centre-id -vut,Vanuatu,centre-id -ven,Venezuela (Bolivarian Republic of),centre-id -vnm,Viet Nam,centre-id -vgb,Virgin Islands (British),centre-id -vir,Virgin Islands (U.S.),centre-id -wlf,Wallis and Futuna,centre-id -esh,Western Sahara,centre-id -yem,Yemen,centre-id -zmb,Zambia,centre-id -zwe,Zimbabwe,centre-id -xxa,WMO Regional Association I,centre-id -xxb,WMO Regional Association II,centre-id -xxc,WMO Regional Association III,centre-id -xxd,WMO Regional Association IV,centre-id -xxe,WMO Regional Association V,centre-id -xxf,WMO Regional Association VI,centre-id -xxg,WMO Global Services,centre-id diff --git a/topic-hierarchy/system.csv b/topic-hierarchy/system.csv index 55be932..3695f96 100644 --- a/topic-hierarchy/system.csv +++ b/topic-hierarchy/system.csv @@ -1,2 +1,2 @@ Name,Description,Child -wis2,WIS2 topic hierarchy,country +wis2,WIS2 topic hierarchy,centre-id