update sections on granularity (#47) (#77)

wmo-im · Nov 25, 2022 · fdfb3e0 · fdfb3e0
1 parent d07e23d
commit fdfb3e0
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 44 deletions.
diff --git a/standard/recommendations/core/REC_granularity.adoc b/standard/recommendations/core/REC_granularity.adoc
@@ -2,8 +2,5 @@
 [width="90%",cols="2,6a"]
 |===
 ^|*Recommendation {counter:rec-id}* |*/rec/core/granularity*
-^|A |A WCMP record SHOULD provide a high level description of a dataset to facilitate simple information search queries.
-^|B |A WCMP record SHOULD provide enough information to facilitate further interaction with a dataset (parameters, variables, spatiotemporal dimensions) as part of an associated service or capability.
-^|C |A WCMP record SHOULD describe dataset parameters and variables as themes/concepts with an associated vocabulary <<themes>>.
-^|D |When dataset properties (parameters, variables, spatiotemporal extents) are made available via a data service or API, a WCMP record SHOULD provide templated links to facilitate easier data queries and filtering. See the <<distribution>> section.
+^|A |A WCMP record SHOULD describe dataset parameters and variables as themes/concepts with an associated vocabulary.
 |===
diff --git a/standard/sections/clause_6_informative_text.adoc b/standard/sections/clause_6_informative_text.adoc
@@ -38,6 +38,10 @@ In order to provide discovery metadata of value, it is important to clarify the
 are to provide describing their data and associated services.  Articulating the level of granularity will reduce catalogue "pollution"
 and bring the user closer to the data via their search criteria.
 
+A WCMP record provides a description at the granularity of a dataset, which facilitates clear
+cataloguing and discovery workflow, in combination with data services or APIs, which provide
+access, queries, and filters at a lower level of granularity (parameter, variable, spatiotemporal extents).
+
 The <<metadata-discovery-workflow>> below illustrates example metadata publication and discovery workflows against
 common meteorological data types:
 

diff --git a/standard/sections/clause_7_normative_text.adoc b/standard/sections/clause_7_normative_text.adoc
@@ -108,44 +108,6 @@ The WCMP record schema is based on  _OGC API - Records - Part 1: Core: Requireme
 
 include::../requirements/core/REQ_validation.adoc[]
 
-==== Granularity
-
-A WCMP record provides a description at the granularity of a dataset, which facilitates clear
-cataloguing and discovery workflow, in combination with data services or APIs, which provide
-access, queries, and filters at a lower level of granularity (parameter, variable, spatiotemporal extents).
-
-include::../recommendations/core/REC_granularity.adoc[]
-
-.Examples
-
-[source,json]
-----
-"themes": [
-  {
-    "concepts": [
-      "Temperature",
-      "Relative humidity",
-      "u-component of Wind",
-      "v-component of Wind"
-    ],
-    "scheme": "http://codes.wmo.int/grib2/codeflag/4.2"
-  }
-]
-----
-
-[source,json]
-----
-"themes": [
-  {
-    "concepts": [
-      "Temperature/air temperature",
-      "Dewpoint temperature"
-    ],
-    "scheme": "http://codes.wmo.int/bufr4/b"
-  }
-]
-----
-
 ==== Identifier
 
 The `+id+` property is a unique identifier
@@ -250,15 +212,15 @@ include::../recommendations/core/REC_keywords.adoc[]
 }
 ----
 
-==== Properties / Themes and Topic Hierarchy [[themes]]
+==== Properties / Themes and Topic Hierarchy
 
 The `+themes+` property is a list of concepts that are referenced to a vocabulary or knowledge organization system used to classify the dataset.  A WCMP metadata record can have one or more themes.  The WIS2 Topic Hierarchy is a required concept and and it should be consistent with the topic as defined in distribution links
 advertising broker services.
 
 include::../requirements/core/REQ_themes_topic_hierarchy.adoc[]
+include::../recommendations/core/REC_granularity.adoc[]
 
 .Examples
-
 [source,json]
 ----
 "properties": {
@@ -291,6 +253,34 @@ include::../requirements/core/REQ_themes_topic_hierarchy.adoc[]
 }
 ----
 
+[source,json]
+----
+"themes": [
+  {
+    "concepts": [
+      "Temperature",
+      "Relative humidity",
+      "u-component of Wind",
+      "v-component of Wind"
+    ],
+    "scheme": "http://codes.wmo.int/grib2/codeflag/4.2"
+  }
+]
+----
+
+[source,json]
+----
+"themes": [
+  {
+    "concepts": [
+      "Temperature/air temperature",
+      "Dewpoint temperature"
+    ],
+    "scheme": "http://codes.wmo.int/bufr4/b"
+  }
+]
+----
+
 ==== Geospatial and Temporal Extents
 
 ===== Geospatial Extent