opengeospatial · jerstlouis · Sep 24, 2024 · May 2, 2025 · cportele · Oct 7, 2024
diff --git a/extensions/schemas/standard/annex_bibliography.adoc b/extensions/schemas/standard/annex_bibliography.adoc
@@ -11,6 +11,8 @@
 
 [[OpenAPI]] OpenAPI Initiative (OAI). **OpenAPI Specification 3.0** [online, viewed 2023-10-14]. 2020. Available at http://spec.openapis.org/oas/v3.0.3
 
+[[qudt]] QUDT.org. **QUDT Ontologies, derived models and vocabularies 2.1**. Edited by R. Hodgson. 2024. Available at https://www.qudt.org/
+
 [[rfc6906]] Internet Engineering Task Force (IETF). RFC 6906: **The 'profile' Link Relation Type**. Edited by E. Wilde. 2013. Available at https://www.rfc-editor.org/rfc/rfc6906.html
 
 [[rfc8288]] Internet Engineering Task Force (IETF). RFC 8288: **Web Linking**. Edited by M. Nottingham. 2017. Available at https://www.rfc-editor.org/rfc/rfc8288.html
diff --git a/extensions/schemas/standard/clause_7_schemas.adoc b/extensions/schemas/standard/clause_7_schemas.adoc
@@ -27,7 +27,7 @@ The Requirements Class "Schemas" specifies basic provisions for schemas of items
 ^|B |The schema SHALL have the following characteristics:
 
 * "$schema" is "\https://json-schema.org/draft/2020-12/schema";
-* "$id" is a HTTP(S) URI without query parameters that returns the schema, if requested with the header "Accept: application/schema+json"; and 
+* "$id" is a HTTP(S) URI without query parameters that returns the schema, if requested with the header "Accept: application/schema+json"; and
 * "type" is "object".
 |===
 
@@ -60,11 +60,11 @@ The following recommendations are intended to simplify parsing a schema and to h
 ^|E |Properties that represent a UUID SHOULD be represented as a string with format "uuid".
 ^|F |For string properties, "minLength", "maxLength", "enum" and/or "pattern" SHOULD be provided, where applicable.
 ^|G |For numeric properties, "multipleOf", "minimum", "exclusiveMinimum", "maximum", "exclusiveMaximum" SHOULD be provided, where applicable.
-^|H |For integer properties that represent enumerated values, "enum" SHOULD be provided.
+^|H |For integer properties that represent enumerated values (except for codelist values), "enum" SHOULD be provided.
 ^|I |For string or integer properties that represent codelist values, one of the profiles "codelist-inline" or "codelist-ref" (see <<rc_profile-codelists>>) SHOULD be applied.
 ^|J |For array properties, the property SHOULD consist of items that are strings or numbers.
 ^|K |Required properties SHOULD be included in "required".
-^|L |The JSON Schema keywords SHOULD be constrained to the those mentioned in this recommendation and requirement `/req/{req-class}/properties`.
+^|L |The JSON Schema keywords SHOULD be constrained to those mentioned in this recommendation, requirement `/req/{req-class}/properties` and requirements in the _additional keywords_ section below.
 |===
 
 [#additional-keywords]
@@ -80,7 +80,7 @@ In order to be able to map the logical schema to a format-specific schema, exten
 ^|A |Additional keywords SHALL start with "x-ogc-".
 |===
 
-CAUTION: The next version of JSON Schema will likely restrict the use of additional keywords. As a result, this Standard may need to change the prefix or change the way as to how the vocabulary is extended.
+CAUTION: The next version of JSON Schema will likely restrict the use of additional keywords. As a result, this Standard may need to change the prefix or change how the vocabulary is extended.
 
 :req: role
 [#{req-class}_{req}]
@@ -123,9 +123,9 @@ In geospatial data, numeric property values often represent a measurement and ha
 ^|A |The keyword "x-ogc-unit" SHALL be used to declare the unit of measure of the property.
 ^|B |The value of the keyword "x-ogc-unit" SHALL be a string representing the unit of measure.
 ^|C |The value of the keyword "x-ogc-unit" SHALL be the case sensitive UCUM representation ("c/s") unless a different language / register for units is identified in keyword "x-ogc-unitLang".
-^|D |The value for UCUM, if explicitly declared as the language for units in keyword "x-ogc-unitLang", SHALL be "UCUM". 
-^|E |The value for the QUDT Units Vocabulary, if declared as the language for units in keyword "x-ogc-unitLang", SHALL be "QUDT". 
-^|F |The value of the keyword "x-ogc-unit" SHALL be the URI of the unit for values from the QUDT Units Vocabulary.
+^|D |The value for UCUM, if explicitly declared as the language for units in keyword "x-ogc-unitLang", SHALL be "UCUM".
+^|E |For specifying a unit from QUDT Units Vocabulary, "x-ogc-unitLang", SHALL be "QUDT".
+^|F |For specifying a unit from QUDT Units Vocabulary, the value of the keyword "x-ogc-unit" SHALL be the URI of the unit.
 |===
 
 Communities or other OGC Standards can specify additional values for other unit languages, e.g., https://www.opengis.net/def/uom[units registered in the OGC Rainbow]. For each language it must be specified how units have to be represented in the "x-ogc-unit" value.
@@ -143,12 +143,21 @@ NOTE: For example, the value for hectopascal is `hPa` in UCUM and `\https://qudt
 ^|B |The value of the keyword "x-ogc-definition" SHALL be a URI.
 |===
 
+:req: nilvalues
+[#{req-class}_{req}]
+[width="90%",cols="2,7a"]
+|===
+^|*Requirement {counter:req-num}* |/req/{req-class}/{req}
+^|A |The keyword "x-ogc-nilValues" SHALL be used to identify the values considered nil.
+^|B |The value of the keyword "x-ogc-nilValues" SHALL be an array of objects, each including a mandatory "const" value and an optional "title" explanation of the meaning of that particular nil value.
+|===
+
 === Examples
 
 The following example is the schema of a feature type representing cultural entities. The schema includes additional keywords that apply to feature data (specified in the next Clause).
 
 [[example_7_1]]
-.Schema of a "Cultural (Points)" feature type 
+.Schema of a "Cultural (Points)" feature type
 ====
 [source,JSON]
 ----
@@ -202,6 +211,9 @@ The following example is the schema of a feature type representing cultural enti
     "ZI037_REL" : {
       "title" : "Religious Designation",
       "enum" : [ -999999, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ],
+      "x-ogc-nilValues": [
+         { "const": -999999, "title": "unknown" }
+      ],
       "type" : "integer",
       "x-ogc-propertySeq": 8
     },
@@ -264,3 +276,34 @@ The next example is the schema of a feature type representing observations of at
 }
 ----
 ====
+
+The next example is the schema of a land cover collection.
+
+[[example_7_3]]
+.Schema of a land cover collection
+====
+[source,JSON]
+----
+{
+   "$schema" : "https://json-schema.org/draft/2020-12/schema",
+   "$id" : "https://example.com/ogcapi/collections/landcover/schema",
+   "title" : "Land Cover",
+   "type" : "object",
+   "properties" : { "LC" : {
+      "title" : "Land Cover",
+      "type" : "integer",
+      "x-ogc-propertySeq" : 1,
+      "oneOf": [
+         { "const": 0 },
+         { "const": 1, "title": "vegetation" },
+         { "const": 2, "title": "bare soils" },
+         { "const": 3, "title": "water" },
+         { "const": 4, "title": "clouds" }
+      ],
+      "x-ogc-nilValues": [
+         { "const": 0, "title": "no data" }
+      ]
+   }
+}
+----
+====
diff --git a/extensions/schemas/standard/clause_8_core_roles_for_features.adoc b/extensions/schemas/standard/clause_8_core_roles_for_features.adoc
@@ -1,28 +1,28 @@
-:req-class: core-roles-features
+:req-class: property-roles
 [#rc_{req-class}]
-== Requirements Class "Core roles for features"
+== Requirements Class "Property roles"
 
-The Requirements Class "Core roles for features" specifies additional property roles for feature data.
+The Requirements Class "Property roles" specifies additional property roles for data collections.
 
 [cols="2,7",width="90%"]
 |===
-^|*Requirements Class* |http://www.opengis.net/spec/{standard}/{m_n}/req/{req-class} 
+^|*Requirements Class* |http://www.opengis.net/spec/{standard}/{m_n}/req/{req-class}
 |Target type |Web resource
 |Dependency |<<rc_schemas>>
 |===
 
-To understand how features are encoded in a specific format, additional property roles need to be identified in the logical schema. These roles depend on the format.
+To understand how data is encoded in a specific format, additional property roles need to be identified in the logical schema. These roles depend on the format.
 
 For example, the role "primary-geometry" is needed in feature types with multiple spatial properties to decide:
 
 * Which geometry is encoded as the geometry of a feature in formats such as FlatGeobuf, Shapefile or Mapbox Vector Tiles, which only support a single geometry; or,
 * Which geometry is encoded in the "geometry" member in GeoJSON.
 
-The other roles specified in this requirements class support feature formats that support representing primary temporal information or the type of the feature, such as JSON-FG.
+The other roles specified in this requirements class support formats that support representing primary temporal information or the type of a feature, such as supported by JSON-FG.
 
 === Primary geometry
 
-If the features have multiple spatial properties, the role "primary-geometry" can be used to identify the primary geometry of the features.
+If the schema defines multiple spatial properties for the collection, the role "primary-geometry" can be used to identify the primary geometry.
 
 :req: role-primary-geometry
 [#{req-class}_{req}]
@@ -38,15 +38,15 @@ NOTE: Since only a single property can be tagged in the schema as the primary ge
 
 === Primary temporal information
 
-If the features have multiple temporal properties, the roles "primary-instant", "primary-interval-start" and "primary-interval-end" can be used to identify the primary temporal information of the features.
+If the schema defines multiple temporal properties for the collection, the roles "primary-instant", "primary-interval-start" and "primary-interval-end" can be used to identify the primary temporal information.
 
 :req: role-primary-instant
 [#{req-class}_{req}]
 [width="90%",cols="2,7a"]
 |===
 ^|*Requirement {counter:req-num}* |/req/{req-class}/{req}
 ^|A |A property with "x-ogc-role" set to "primary-instant" SHALL be a temporal property.
-^|B |At most one property in a schema SHALL have "x-ogc-role" with a value "primary-instant".
+^|B |At most one property in a schema SHALL have "x-ogc-role" with a value of "primary-instant".
 ^|C |If the schema has only one temporal property, the property SHALL be the primary temporal information even if the property is not explicitly tagged with the role "primary-instant".
 |===
 
@@ -81,7 +81,7 @@ NOTE: FUTURE WORK? Consider adding a role "primary-interval" with a proper repre
 
 === Feature type
 
-If the features have a property that represents the feature type, the role "type" can be used for this property.
+If the data is organized as features with a property representing the feature type, the role "type" can be used for this property.
 
 :req: role-type
 [#{req-class}_{req}]
@@ -99,7 +99,7 @@ The previous Clause includes <<example_7_1,an example>> with the roles "id", "pr
 The following example is the schema of a feature type with the roles "id", "primary-geometry", "primary-interval-start" and "primary-interval-end".
 
 [[example_8_1]]
-.Schema example of a feature type 
+.Schema example of a feature type
 ====
 [source,JSON]
 ----