Merge pull request #463 from opengeospatial/Fix-inconsistencies-in-ma…

…ster-branch

Fix inconsistencies in master branch identified in Issue #459

core/standard/requirements/edr/REQ_rc-collection-info.adoc

@@ -52,7 +52,7 @@ If the `links` parameter includes a link to a `Radius` query there SHALL be a `d
 ---
 *J:*
 
-Every Collection within a collections array SHALL have an `f` parameter containing an array of values which describe the output formats supported by the collection.
+Every Collection within a collections array SHALL have an `output_formats` parameter containing an array of values which describe the output formats supported by the collection.
 
 ---
 *K:*

core/standard/requirements/edr/REQ_rc-common-query-type.adoc

@@ -22,7 +22,7 @@ A `link` property SHALL include a `rel` property
 ---
 *D:*
 
-A `link` property SHALL include a `variables` property
+A `link` property of a `<<col-data_queries,data_queries>>` object SHALL include a `variables` property 
 
 ---
 *E:*

core/standard/requirements/edr/REQ_rc-crs.adoc

@@ -7,7 +7,7 @@ identifier:: /req/edr/rc-crs
 
 *A:*
 
-A crs object SHALL have a unique (to the collection) `name` property, it MAY be an EPSG code.
+A crs object SHALL have a unique (to the collection) `crs` property, it MAY be an EPSG code.
 
 ---
 *B:*

core/standard/requirements/edr/REQ_rc-parameters.adoc

@@ -22,32 +22,21 @@ A parameter object MAY have a member with the name "id" where the value SHALL be
 ---
 *D:*
 
-A parameter object MAY have a member with the name "label" where the value SHALL be an i18n object that is the name of the parameter and which SHOULD be short. Note that this SHOULD be left out if it would be identical to the "label" of the "observedProperty" member.
+A parameter object MAY have a member with the name "label" where the value SHALL be a string that is the name of the parameter and which SHOULD be short. Note that this SHOULD be left out if it would be identical to the "label" of the "observedProperty" member.
 
 ---
 *E:*
 
-A parameter object MAY have a member with the name "description" where the value SHALL be an i18n object which is a, perhaps lengthy, textual description of the parameter.
+A parameter object MAY have a member with the name "description" where the value SHALL be a string which is a, perhaps lengthy, textual description of the parameter.
 
 ---
 *F:*
 
-A parameter object SHALL have a member with the name "observedProperty" where the value is an object which SHALL have the members "label" and "id" and which MAY have the members "description", and "categories". The value of "label" SHALL be an i18n object that is the name of the observed property and which SHOULD be short. The value of "id" SHALL be a string and SHOULD be a common identifier. If given, the value of "description" SHALL be an i18n object with a textual description of the observed property. If given, the value of "categories" SHALL be a non-empty array of category objects. A category object SHALL an "id" and a "label" member, and MAY have a "description" member. The value of "id" SHALL be a valid URI string and SHOULD resolve to more detailed information. The value of "label" SHALL be an i18n object of the name of the category and SHOULD be short. If given, the value of "description" SHALL be an i18n object with a textual description of the category.
+A parameter object SHALL have a member with the name "observedProperty" where the value is an object which SHALL have the members "label" and "id" and which MAY have the members "description". The value of "label" SHALL be a string which is the name of the observed property and which SHOULD be short. The value of "id" SHALL be a string and SHOULD be a common identifier. If given, the value of "description" SHALL be a string with a textual description of the observed property. 
 
 ---
 *G:*
 
-A parameter object MAY have a member with the name "categoryEncoding" where the value is an object where each key is equal to an "id" value of the "categories" array within the "observedProperty" member of the parameter object. There SHALL be no duplicate keys. The value is either an integer or an array of integers where each integer SHALL be unique within the object.
-
----
-*H:*
-
-A parameter object MAY have a member with the name "unit" where the value is an object which SHALL have either or both the members "label" or/and “symbol”, and which MAY have the member "id". If given, the value of "symbol" SHALL either be a string of the symbolic notation of the unit, or an object with the members "value" and "type" where "value" is the symbolic unit notation and "type" references the unit serialization scheme that is used. "type" SHALL HAVE the value "http://www.opengis.net/def/uom/UCUM/” if UCUM is used, or a custom value as recommended in section “Extensions”. If given, the value of "label" SHALL be an i18n object of the name of the unit and SHOULD be short. If given, the value of "id" SHALL be a string and SHOULD be a common identifier. It is RECOMMENDED to reference a unit serialization scheme to allow automatic unit conversion.
-
----
-*I:*
-
-A parameter object SHALL NOT have a "unit" member if the "observedProperty" member has a "categories" member.
-
+A parameter object MAY have a member with the name "unit" where the value is an object which SHALL have either or both the members "label" or/and “symbol”, and which MAY have the member "id". If given, the value of "symbol" SHALL either be a string of the symbolic notation of the unit, or an object with the members "value" and "type" where "value" is the symbolic unit notation and "type" references the unit serialization scheme that is used. "type" SHALL HAVE the value "http://www.opengis.net/def/uom/UCUM/” if UCUM is used, or a custom value as recommended in section “Extensions”. If given, the value of "label" SHALL be a string of the name of the unit and SHOULD be short. If given, the value of "id" SHALL be a string and SHOULD be a common identifier. It is RECOMMENDED to reference a unit serialization scheme to allow automatic unit conversion.
 
 ====

core/standard/sections/annex_collection_response.adoc

@@ -58,7 +58,7 @@ The variables object provides fields to describe information that only applies t
 |Field Name|Type|Required|Description
 |title  | String |No| A short text label for the query
 |description |String|No|  A description of the query
-|query_type  | String |No| One of: `position`, `radius`, `area`, `cube`, `trajectory`, `corridor`, `items`, `locations`, `instances`
+|query_type  | String |Yes| One of: `position`, `radius`, `area`, `cube`, `trajectory`, `corridor`, `items`, `locations`, `instances`
 |coords |String|No|  An example of valid `coords` query parameter values
 |within_units |String Array|No|  A list of the valid `within` units for radius queries
 |width_units |String Array|No|  A list of the valid `width` units
@@ -249,8 +249,8 @@ The data queries object provides the extra metadata required for the queries sup
 |cube  |<<col-edr_query,EDRQuery>> object|No| Cube query metadata
 |trajectory  |<<col-edr_query,EDRQuery>> object|No| Trajectory query metadata
 |corridor  |<<col-edr_query,EDRQuery>> object|No| Corridor query metadata
-|item  |<<col-edr_query,EDRQuery>> object|No| Item query metadata
-|location  |<<col-edr_query,EDRQuery>> object|No| Location query metadata
+|items  |<<col-edr_query,EDRQuery>> object|No| Item query metadata
+|locations  |<<col-edr_query,EDRQuery>> object|No| Location query metadata
 |==========================