various updates (#132)

* examples: update MSC contact roles * add recommendation for media types * fix reference * update KPI calculations for repeatable elements * update links recommendation
wmo-im · Nov 20, 2023 · fc0dd9b · fc0dd9b
1 parent 44833a0
commit fc0dd9b
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 16 deletions.
diff --git a/examples/ca-eccc-msc.cmip5-tt.json b/examples/ca-eccc-msc.cmip5-tt.json
@@ -116,6 +116,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/examples/ca-eccc-msc.daily-climate-observations.json b/examples/ca-eccc-msc.daily-climate-observations.json
@@ -99,6 +99,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/examples/ca-eccc-msc.hydrometric-archive.json b/examples/ca-eccc-msc.hydrometric-archive.json
@@ -116,6 +116,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/examples/ca-eccc-msc.hydrometric-realtime.json b/examples/ca-eccc-msc.hydrometric-realtime.json
@@ -116,6 +116,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/examples/ca-eccc-msc.nwp-gdps.json b/examples/ca-eccc-msc.nwp-gdps.json
@@ -107,6 +107,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/examples/ca-eccc-msc.surface-weather-observations-realtime.json b/examples/ca-eccc-msc.surface-weather-observations-realtime.json
@@ -112,6 +112,7 @@
                     }
                 ],
                 "roles": [
+                    "host",
                     "producer"
                 ]
             }

diff --git a/kpi/core/graphic-overview.adoc b/kpi/core/graphic-overview.adoc
@@ -29,7 +29,7 @@ Product graphic overviews provide the user with a high level preview of the prod
 
 |===
 
-*Total possible score: 3 (100%)*
+*Total possible score: (present link + resolves + image file type) / (total graphic overviews * 3) (100%)
 
 === Guidance to score well on this assessment
 

diff --git a/kpi/core/links-health.adoc b/kpi/core/links-health.adoc
@@ -5,9 +5,9 @@
 Any property with linked information (URLs).
 
 * `links[*].href`
-* `properties[*].href`
-* `properties[*].concepts.url`
-* `properties[*].scheme`
+* `properties.themes[*].concepts[*].url`
+* `properties.themes[*].scheme`
+* `properties.contacts[*].links[*].href`
 
 === What is being measured
 
@@ -27,18 +27,14 @@ HTTPS is increasingly becoming a requirement for numerous agencies as well as th
 |===
 |Rule |Score
 
-|Each valid link present
+|Link resolves successfully
 |1
 
-|Each valid HTTPS link present
+|Link has a valid media type
 |1
-
-|Each valid MQTTS link present
-|1
-
 |===
 
-*Total possible score: (valid links + valid HTTPS links + valid MQTTS links) / (total links * 3) (100%)*
+*Total possible score: (link resolves) / (total links * 1) (100%)*
 
 === Guidance to score well on this assessment
 

diff --git a/kpi/core/time-intervals.adoc b/kpi/core/time-intervals.adoc
@@ -1,6 +1,6 @@
-== Time Intervals
+== Time intervals
 
-=== WCMP Element(s)
+=== WCMP element(s)
 
 * `time.interval`
 * `additionalElements.temporal.interval`
@@ -19,7 +19,7 @@ Temporal information is a significant characteristic of weather/climate/water da
 |===
 |Rule |Score
 
-|The begin is less than or equal to the end or open.
+|The begin is less than the end or open.
 |1
 
 |Only one of the interval extents may be open (begin or end but not both).
@@ -30,7 +30,7 @@ Temporal information is a significant characteristic of weather/climate/water da
 
 |===
 
-*Total possible score: 3 (100%)*
+*Total possible score: (begin less than end + only one interval open + resolution) / (total intervals * 3) (100%)
 
 === Guidance to score well on this assessment
 

diff --git a/standard/recommendations/core/REC_links.adoc b/standard/recommendations/core/REC_links.adoc
@@ -3,4 +3,5 @@
 |===
 ^|*Recommendation {counter:rec-id}* |*/rec/core/links*
 ^|A |A WCMP record's links SHOULD be provided using secure protocols (e.g. HTTPS, MQTTS, etc.).
+^|B |A WCMP record `+links+` property SHOULD provide the `+type`+` property with a valid media type from IANA or as designated by WMO.
 |===
diff --git a/standard/sections/clause_1_scope.adoc b/standard/sections/clause_1_scope.adoc
@@ -14,4 +14,4 @@ may be represented as part of their own metadata or associated through WCMP link
 
 WCMP discovery metadata record provides descriptions at the granularity level of a dataset.  Station, instrument and observation metadata are supported by the _WIGOS Metadata Standard (WMO-No. 1192)_ footnote:[https://library.wmo.int/doc_num.php?explnum_id=10109].
 
-This specification defines the conformance requirements for the WMO Core Metadata Profile.  Annex A defines the abstract test suite. Annex B provides normative information on schemas.  Annex C provides informative examples.  Annex D provides normative information on codelists.
+This specification defines the conformance requirements for the WMO Core Metadata Profile.  Annex A defines the abstract test suite. Annex B provides normative information on schemas.  Annex C provides informative examples.  Annex D provides informative codelists.
diff --git a/standard/sections/clause_3_references.adoc b/standard/sections/clause_3_references.adoc
@@ -8,6 +8,7 @@
 * W3C: Data on the Web Best Practices, W3C Recommendation (2017) footnote:[https://www.w3.org/TR/dwbp]
 * W3C: Data Catalog Vocabulary, W3C Recommendation (2014) footnote:[https://www.w3.org/TR/vocab-dcat]
 * IANA: Link Relation Types (2020) footnote:[https://www.iana.org/assignments/link-relations/link-relations.xml]
+* IANA: Media Types (2023) footnote:[https://www.iana.org/assignments/media-types/media-types.xhtml]
 * Linux Foundation: SPDX License List (2021) footnote:[https://spdx.org/licenses]
 * [[json-schema]] IETF: JSON Schema (2022) footnote:[https://json-schema.org]
 * [[wis2-topic-hierarchy]] WMO: WIS2 Topic Hierarchy (2022) footnote:[https://github.com/wmo-im/wis2-topic-hierarchy]