resolve review comments

23-019.adoc

@@ -12,9 +12,11 @@
 :published-date: 2029-03-30
 :fullname: Hylke van der Schaaf
 :fullname_2: Steve Liang
+:fullname_3: Kathi Schleidt
+:fullname_4: Humaid Kidwai
 :docsubtype: implementation
 :keywords: ogcdoc, OGC document, API, OData, openapi, html, MQTT
-:submitting-organizations: Fraunhofer-Gesellschaft, Germany; University of Calgary, Canada; SensorUp Inc., Canada; Keys, USA; DataCove e.U., Austria
+:submitting-organizations: Fraunhofer-Gesellschaft, Germany; University of Calgary, Canada; DataCove e.U., Austria
 :mn-document-class: ogc
 :mn-output-extensions: xml,html,doc,pdf
 :local-cache-only:
@@ -44,25 +46,27 @@ include::sections/clause_05_conventions.adoc[]
 
 include::sections/clause_06_overview.adoc[]
 
-include::sections/clause_07a_meta_model.adoc[]
+include::sections/clause_07a_sensing_core_entities.adoc[]
 
-include::sections/clause_07b_sensing_entities.adoc[]
+include::sections/clause_07b_sensing_OM_extension.adoc[]
 
 include::sections/clause_07c_sampling_entities.adoc[]
 
 include::sections/clause_07d_actuation_entities.adoc[]
 
-include::sections/clause_08a_abstract_api_overview.adoc[]
+include::sections/clause_08a_meta_model.adoc[]
 
-include::sections/clause_08b_rest_api_read.adoc[]
+include::sections/clause_08b_abstract_api_overview.adoc[]
 
-include::sections/clause_08c_rest_api_create_update_delete.adoc[]
+include::sections/clause_08c_rest_api_read.adoc[]
 
-include::sections/clause_08d_rest_api_batch_requests.adoc[]
+include::sections/clause_08d_rest_api_create_update_delete.adoc[]
 
-include::sections/clause_08e_rest_api_data_array.adoc[]
+include::sections/clause_08e_rest_api_batch_requests.adoc[]
 
-include::sections/clause_08f_pubsub_api.adoc[]
+include::sections/clause_08g_pubsub_api.adoc[]
+
+include::sections/clause_08f_rest_api_data_array.adoc[]
 
 include::sections/clause_09a_bindings_http.adoc[]
 

sections/clause_06_overview.adoc

@@ -56,7 +56,9 @@ The Sampling part is a new addition to the SensorThings API.
 As is often the case, an Observation may not be a true representation of the intended Feature's Property that an Observer may be trying to Observe.
 Sampling is a common strategy to understand the characteristics of an otherwise difficult-to-measure Property of any feature-of-interest.
 In order to generate Samplings, a Sampler, that may be any physical device (or even a human being part of a survey campaign), must carefully select a SamplingProcedure.
-A Sampling may be generated by a SamplingProcedure. This SamplingProcedure can be used by multiple Samplers, however a Sampler can not use multiple SamplingProcedures. Hence, any Sampling that is generated by a Sampler is always associated with a unique SamplingProcedure.
+A Sampling may be generated by a SamplingProcedure. 
+This SamplingProcedure can be used by multiple Samplers and conversely, a Sampler may implement multiple SamplingProcedures. 
+However, any Sampling that is generated by a Sampler is always associated with a unique SamplingProcedure.
 In scenarios where a Feature is not directly available for Sampling, a PreparationProcedure composed of multiple PreparationSteps may optionally be used to generate a PreparedSample (Feature entity).
 The entities are explained in detail in <<sampling-entities>>.
 
@@ -146,7 +148,8 @@ SensorThings API uses the term of Sensor to describe the Observer that is used i
 
 === Relation to OASIS-OData
 
-The OGC SensorThings API v2 interface is not an OData interface and does not claim to be an OData service. It specifies a subset of the OData interface, and extends it at the same time.
+The OGC SensorThings API v2 interface is not an OData interface and does not claim to be an OData service. 
+It specifies a subset of the OData interface, and extends it at the same time.
 An SensorThings API Server implementation can implement the full OData specification. An OData client can access a SensorThings API service.
 
 EDITOR: Check if this is true

sections/clause_07a_sensing_core_entities.adoc

@@ -1,5 +1,3 @@
-:sectnums: |,all|
-:sectanchors:
 [[sensing-core]]
 == The SensorThings API Sensing Core Entities
 All data model requirements classes are grouped in the following requirements class:
@@ -34,11 +32,10 @@ image::images/GRP0001.png[Sensing Core, align="center"]
 In this section, we define each entity depicted in <<img-sta-core>> and its relationships with other entities.
 Additionally, we also provide examples to model the entities in different contexts.
 
-==== Requirement Class: Thing
+[[thing]]
+==== Thing
 
 [requirements_class]
-.thing
-
 ====
 [%metadata]
 identifier:: {identifier}/req-class/datamodel/sensing/thing
@@ -889,7 +886,7 @@ Each Feature entity SHALL have the mandatory properties and MAY have the optiona
 [%metadata]
 identifier:: {identifier}/req/datamodel/sensing/feature/relations
 
-Each Thing entity SHALL have the direct relation between a Thing entity and other entity types listed in Table XX.
+Each Feature entity SHALL have the direct relation between a Thing entity and other entity types listed in Table {counter:table-num}.
 ====
 
 

sections/clause_07b_sensing_OM_extension.adoc

@@ -1,5 +1,3 @@
-:sectnums: |,all|
-:sectanchors:
 [[sensing-OM-extension]]
 === Sensing Extension (Observations & Measurements)
 

sections/clause_07c_sampling_entities.adoc

@@ -1,5 +1,3 @@
-:sectnums: |,all|
-:sectanchors:
 [[sampling-entities]]
 === Sampling Entities
 

sections/clause_07d_actuation_entities.adoc

@@ -1,7 +1,7 @@
 :sectnums: |,all|
 :sectanchors:
-[[actuation-entities]]
-=== Actuation Entities
+[[actuation]]
+=== Actuation
 All actuation entites are grouped into the following requirements class:
 
 [requirements_class]