final review

ghobona · ghobona · commit f2d6b4b8d0ed · 2025-07-15T13:02:12.000+01:00
diff --git a/sensorml/standard/abstract_tests/model/advancedProcess/ATS_class.adoc b/sensorml/standard/abstract_tests/model/advancedProcess/ATS_class.adoc
@@ -6,8 +6,8 @@ identifier:: /conf/model/advancedProcess
 target:: /req/model/advancedProcess
 classification:: Target Type: Derived Encoding and Software Implementation
 inherit:: /conf/model/coreProcess
-inherit:: http://www.opengis.net/spec/SWE/2.0/req/uml-block-components
-inherit:: http://www.opengis.net/spec/SWE/2.0/req/uml-choice-components
+inherit:: http://www.opengis.net/spec/SWE/3.0/req/uml-block-components
+inherit:: http://www.opengis.net/spec/SWE/3.0/req/uml-choice-components
 
 conformance-test:: /conf/model/advancedProcess/dependency-core 
 conformance-test:: /conf/model/advancedProcess/package-fully-implemented
diff --git a/sensorml/standard/abstract_tests/model/advancedProcess/ATS_test1.adoc b/sensorml/standard/abstract_tests/model/advancedProcess/ATS_test1.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/advancedProcess/dependency-core
 target:: /req/model/advancedProcess/dependency-core 
 test-purpose:: Verify that the target implementation passes the "Abstract Core Process" conformance test class.
 test-method:: 
-Apply all tests described in section A.2.
+Apply all tests described in <<annex_core_abstract_process>>.
 ====
diff --git a/sensorml/standard/abstract_tests/model/aggregateProcess/ATS_test1.adoc b/sensorml/standard/abstract_tests/model/aggregateProcess/ATS_test1.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/aggregateProcess/dependency-core
 target:: /req/model/aggregateProcess/dependency-core 
 test-purpose:: Verify that the target implementation passes the test class.
 test-method:: 
-Apply all tests described in section A.2. 
+Apply all tests described in <<annex_core_abstract_process>>. 
 ====
diff --git a/sensorml/standard/abstract_tests/model/configurableProcess/ATS_test1.adoc b/sensorml/standard/abstract_tests/model/configurableProcess/ATS_test1.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/configurableProcess/dependency-core
 target:: /req/model/configurableProcess/dependency-core 
 test-purpose:: Verify that the target implementation passes the "Core Abstract Process" conformance test class.
 test-method:: 
-Apply all tests described in section A.2. 
+Apply all tests described in <<annex_core_abstract_process>>. 
 ====
diff --git a/sensorml/standard/abstract_tests/model/coreProcess/ATS_class.adoc b/sensorml/standard/abstract_tests/model/coreProcess/ATS_class.adoc
@@ -6,8 +6,8 @@ identifier:: /conf/model/coreProcess
 target:: /req/model/coreProcess
 classification:: Target Type: Derived Models, Encodings, and Software Implementations 
 inherit:: /conf/core
-inherit:: http://www.opengis.net/spec/SWE/2.0/req/uml-block-components
-inherit:: ISO 19115:2006 (All Metadata)
+inherit:: http://www.opengis.net/spec/SWE/3.0/req/uml-block-components
+inherit:: ISO 19115:2003/Cor.1:2006 (All Metadata)
 
 conformance-test:: /conf/model/coreProcess/dependency-core
 conformance-test:: /conf/model/coreProcess/package-fully-implemented
diff --git a/sensorml/standard/abstract_tests/model/coreProcess/ATS_test1.adoc b/sensorml/standard/abstract_tests/model/coreProcess/ATS_test1.adoc
@@ -9,5 +9,5 @@ target:: /req/model/coreProcess/dependency-core
 test-purpose:: Verify that the target implementation passes the "Core Concepts" conformance test class.
 
 test-method:: 
-Apply all tests described in section A.1
+Apply all tests described in <<annex_core_concepts>>. 
 ====
diff --git a/sensorml/standard/abstract_tests/model/deployment/ATS_class.adoc b/sensorml/standard/abstract_tests/model/deployment/ATS_class.adoc
@@ -6,8 +6,8 @@ identifier:: /conf/model/deployment
 target:: /req/model/deployment
 classification:: Target Type: Derived Models, Encodings, and Software Implementations 
 inherit:: /conf/core
-inherit:: http://www.opengis.net/spec/SWE/2.0/req/uml-block-components
-inherit:: ISO 19115:2006 (All Metadata)
+inherit:: http://www.opengis.net/spec/SWE/3.0/req/uml-block-components
+inherit:: ISO 19115:2003/Cor.1:2006 (All Metadata)
 
 conformance-test:: /conf/model/deployment/package-fully-implemented
 ====
diff --git a/sensorml/standard/abstract_tests/model/derivedProperty/ATS_class.adoc b/sensorml/standard/abstract_tests/model/derivedProperty/ATS_class.adoc
@@ -6,8 +6,8 @@ identifier:: /conf/model/derived-property
 target:: /req/model/derived-property
 classification:: Target Type: Derived Models, Encodings, and Software Implementations 
 inherit:: /conf/core
-inherit:: http://www.opengis.net/spec/SWE/2.0/req/uml-block-components
-inherit:: ISO 19115:2006 (All Metadata)
+inherit:: http://www.opengis.net/spec/SWE/3.0/req/uml-block-components
+inherit:: ISO 19115:2003/Cor.1:2006 (All Metadata)
 
 conformance-test:: /conf/model/derived-property/package-fully-implemented
 ====
diff --git a/sensorml/standard/abstract_tests/model/physicalComponent/ATS_test2.adoc b/sensorml/standard/abstract_tests/model/physicalComponent/ATS_test2.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/physicalComponent/dependency-core
 target:: /req/model/physicalComponent/dependency-core 
 test-purpose:: Verify that the target implementation correctly passes the "Core Abstract Process" comformance test class.
 test-method:: 
-Apply all tests described in section A.2. 
+Apply all tests described in <<annex_core_abstract_process>>. 
 ====
diff --git a/sensorml/standard/abstract_tests/model/physicalSystem/ATS_test3.adoc b/sensorml/standard/abstract_tests/model/physicalSystem/ATS_test3.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/physicalSystem/dependency-core
 target:: /req/model/physicalSystem/dependency-core 
 test-purpose:: Verify that the target implementation correctly passes the "Physical Component" conformance test class.
 test-method:: 
-Apply all tests described in section A.5. 
+Apply all tests described in <<annex_physical_component>>. 
 ====
diff --git a/sensorml/standard/abstract_tests/model/simpleProcess/ATS_test1.adoc b/sensorml/standard/abstract_tests/model/simpleProcess/ATS_test1.adoc
@@ -7,5 +7,5 @@ identifier:: /conf/model/simpleProcess/dependency-core
 target:: /req/model/simpleProcess/dependency-core 
 test-purpose:: Verify that the target implementation passes the test class.
 test-method:: 
-Apply all tests described in section A.2. 
+Apply all tests described in <<annex_core_abstract_process>>. 
 ====
diff --git a/sensorml/standard/requirements/model/coreProcess/requirement7.adoc b/sensorml/standard/requirements/model/coreProcess/requirement7.adoc
@@ -3,5 +3,5 @@
 [%metadata]
 identifier:: /req/model/coreProcess/SWE-Common-dependency1
 
-Any derived model or encoding for process shall utilize ObservableProperty or SWE Common Data Components as values for inputs, outputs, and parameters, and shall at a minimum conform to the SWE Common Data “Block Components Package” class (http://www.opengis.net/spec/SWE/2.0/req/uml-block-components).
+Any derived model or encoding for process shall utilize ObservableProperty or SWE Common Data Components as values for inputs, outputs, and parameters, and shall at a minimum conform to the SWE Common Data “Block Components Package” class (http://www.opengis.net/spec/SWE/3.0/req/uml-block-components).
 ====
diff --git a/sensorml/standard/requirements/model/coreProcess/requirements_class.adoc b/sensorml/standard/requirements/model/coreProcess/requirements_class.adoc
@@ -7,7 +7,7 @@ identifier:: /req/model/coreProcess
 subject:: Derived Encoding or Software Implementation
 inherit:: /req/core
 inherit:: {swecommon-spec-url}/req/uml-record-components
-inherit:: ISO 19115:2006 (All Metadata)
+inherit:: ISO 19115:2003/Cor.1:2006 (All Metadata)
 
 requirement:: /req/model/coreProcess/dependency-core
 requirement:: /req/model/coreProcess/package-fully-implemented
diff --git a/sensorml/standard/requirements/model/simpleProcess/requirements_class.adoc b/sensorml/standard/requirements/model/simpleProcess/requirements_class.adoc
@@ -6,7 +6,7 @@ type:: class
 identifier:: /req/model/simpleProcess
 subject:: Derived Encoding or Software Implementation
 inherit:: /req/model/coreProcess
-inherit:: ISO 19115:2006 (All Metadata)
+inherit:: ISO 19115:2003/Cor.1:2006 (All Metadata)
 
 requirement:: /req/model/simpleProcess/dependency-core
 requirement:: /req/model/simpleProcess/package-fully-implemented
diff --git a/sensorml/standard/sections/annex-abstract-test-suite.adoc b/sensorml/standard/sections/annex-abstract-test-suite.adoc
@@ -2,6 +2,7 @@
 [[abstract_test_suite]]
 == Conformance Class Abstract Test Suite
 
+[[annex_core_concepts]]
 === Core Concepts
 
 Tests described in this section shall be used to test conformance of software and encoding models implementing the Requirements Class: Core Concepts (normative core).
@@ -10,6 +11,7 @@ include::../abstract_tests/core/ATS_class.adoc[]
 
 === UML Models
 
+[[annex_core_abstract_process]]
 ==== Core Abstract Process
 Tests described in this section shall be used to test conformance of software and encoding models implementing the conceptual models defined in Requirements Class: Core Abstract Process
 include::../abstract_tests/model/coreProcess/ATS_class.adoc[]
@@ -22,6 +24,7 @@ include::../abstract_tests/model/simpleProcess/ATS_class.adoc[]
 Tests described in this section shall be used to test conformance of software and encoding models implementing the conceptual models defined in Requirements Class: Aggregate Process.
 include::../abstract_tests/model/aggregateProcess/ATS_class.adoc[]
 
+[[annex_physical_component]]
 ==== Physical Component
 Tests described in this section shall be used to test conformance of software and encoding models implementing the conceptual models defined in Requirements Class: Physical Component.
 include::../abstract_tests/model/physicalComponent/ATS_class.adoc[]
diff --git a/sensorml/standard/sections/clause_0_front_material.adoc b/sensorml/standard/sections/clause_0_front_material.adoc
@@ -5,26 +5,26 @@ The primary focus of the Sensor Model Language (SensorML) is to provide a robust
 
 The main objective is to enable interoperability, first at the syntactic level and later at the semantic level (by using ontologies and semantic mediation), so that sensors and processes can be better understood by machines, utilized automatically in complex workflows, and easily shared between intelligent sensor web nodes. 
 
-This standard is one of several implementation standards produced under OGC’s Sensor Web Enablement (SWE) activity. This standard is a revision of content that was previously integrated in the SensorML version 1.0 standard (OGC 07-000).
+This standard is one of several implementation standards produced under OGC’s Sensor Web Enablement (SWE) activity. This standard is a revision of content that was previously integrated in the SensorML version 1.0 standard (OGC 07-000), version 2.0 (OGC 12-000), and version 2.1 (OGC 12-000r2).
 
 == Preface
 
-This Standard arises from work undertaken by the Connected Systems Working Group of the OGC, with the aim of modernizing the Sensor Web Enablement (SWE) suite of Standards. The working group is concerned with establishing interfaces and encodings that will enable a “Sensor Web” through which applications and services will be able to access connected systems of all types (e.g., sensors, actuators, robots), the observations generated by them, as well as provide command and control functionalities.
+This Standard arises from work undertaken by the *OGC API - Connected Systems Standards Working Group* of the OGC, with the aim of modernizing the Sensor Web Enablement (SWE) suite of Standards. The working group is concerned with establishing interfaces and encodings that will enable a “Sensor Web” through which applications and services will be able to access connected systems of all types (e.g., sensors, actuators, robots), the observations generated by them, as well as provide command and control functionalities.
 
 This Standard specifies models and a JSON implementation for the SensorML.
 
-This document deprecates and replaces OGC® Sensor Model Language (SensorML) Specification version 2.1 (OGC 12-000r2).
+This document supersedes and replaces OGC® Sensor Model Language (SensorML) Specification version 2.1 (OGC 12-000r2).
 
-The main changes of SensorML 3.0 from SensorML version 2.0 are:
+The main changes of SensorML 3.0 from SensorML version 2.1 are:
 
 - Addition of the JSON encodings and schemas
 - Addition of the Deployment class
 - Addition of the Derived Property class
 - Removal of the XML encodings
 
-This release is fully backward compatible with version 2.0.
+This release is fully backward compatible with version 2.1.
 
-SensorML is well-suited for describing sensor model imaging geometries – the SensorML 2.0 RFC contains examples of a frame camera sensor model based on the Community Standard Model from NGA (NGA.SIG.0002_2.1).  Additional (and more complete) sensor model descriptions are being compiled into a sensor model repository by the OGC Naming Authority, based on work by Gobe Hobona [OGC 18-042r3 (unpublished)].  In addition, work to connect OGC grid coverages to SensorML 2 that began in 2013 is now completed, which involved extending CIS 1.0 [OGC 09-146r2] via the ReferenceableGridCoverage Extension [OGC 16-083r3] to support SensorML 2 descriptions.  Version 2.1 of the GMLJP2 imagery standard [OGC 08-083r8] takes advantage of this coverage extension standard to support embedded and externally located SensorML 2 descriptions, thereby giving GMLJP2 the ability to support “raw” sensor model imagery.
+SensorML is well-suited for describing sensor model imaging geometries – the https://portal.ogc.org/files/51140[SensorML 2.0 RFC] contains examples of a frame camera sensor model based on the Community Standard Model from NGA (NGA.SIG.0002_2.1).  Additional (and more complete) sensor model descriptions are being compiled into a sensor model repository by the OGC Naming Authority, based on work by Gobe Hobona [OGC 18-042r3 (unpublished)].  In addition, work to connect OGC grid coverages to SensorML 2 that began in 2013 is now completed, which involved extending CIS 1.0 [OGC 09-146r2] via the ReferenceableGridCoverage Extension [OGC 16-083r3] to support SensorML 2 descriptions.  Version 2.1 of the GMLJP2 imagery standard [OGC 08-083r8] takes advantage of this coverage extension standard to support embedded and externally located SensorML 2 descriptions, thereby giving GMLJP2 the ability to support “raw” sensor model imagery.
 
 == Security considerations
 
diff --git a/sensorml/standard/sections/clause_3_references.adoc b/sensorml/standard/sections/clause_3_references.adoc
@@ -21,6 +21,8 @@ The following normative documents contain provisions that, through reference in
 
 * [[[ISO19111, ISO 19111:2007]]], Spatial Referencing by Coordinates
 
+* [[[ISO19115, ISO 19115:2003/Cor.1:2006]]], Metadata
+
 * [[[UCUM, UCUM]]], Unified Code for Units of Measure (UCUM), Version 2.1, November 2017, https://ucum.org/ucum
 
 * [[[JSON, IETF RFC 8259]]], The JavaScript Object Notation (JSON) Data Interchange Format, https://www.rfc-editor.org/rfc/rfc8259
diff --git a/sensorml/standard/sections/clause_4_terms_and_definitions.adoc b/sensorml/standard/sections/clause_4_terms_and_definitions.adoc
@@ -89,21 +89,21 @@ NOTE: definition includes content from [OGC20-082r4].
 
 === Observation
 
-Act of observing a property or phenomenon.
+Act of measuring or otherwise determining the value of a property.
 
 NOTE: The goal of an observation may be to measure, estimate or otherwise determine the value of a property.
 
 .[source]
-<<ISO 19156, ISO 19156, definition 4.10>>
+<<ISO19156, ISO 19156:2011, definition 4.11>>
 
 === Observation Procedure
 
-Method, algorithm or instrument, or system of these which may be used in making an observation.
+Method, algorithm or instrument, or system of these, which may be used in making an observation.
 
 NOTE: In the context of the sensor web, an observation procedure is often composed of one or more sensors that transform a real world phenomenon into digital information, plus additional processing steps.
 
 .[source]
-<<ISO 19156, ISO 19156, definition 4.11>>
+<<ISO19156, ISO 19156:2011, definition 4.12>>
 
 === Observed Value
 
diff --git a/sensorml/standard/sections/clause_5_conventions.adoc b/sensorml/standard/sections/clause_5_conventions.adoc
@@ -35,7 +35,7 @@ In this document the following abbreviations and acronyms are used or introduced
 - UCUM:	Unified Code for Units of Measure
 - UML:	Unified Modeling Language
 - UTC:	Coordinated Universal Time
-- XML:	eXtended Markup Language
+- XML:	eXtensible Markup Language
 - 1D:	One Dimensional
 - 2D:	Two Dimensional
 - 3D:	Three Dimensional
diff --git a/sensorml/standard/sections/clause_7.2_uml_core_abstract_process.adoc b/sensorml/standard/sections/clause_7.2_uml_core_abstract_process.adoc
@@ -7,6 +7,7 @@ All major classes in SensorML are based on a process model, as presented in the
 include::../requirements/model/coreProcess/requirement1.adoc[]
 include::../requirements/model/coreProcess/requirement2.adoc[]
 
+[[ObservableProperty_definition]]
 ==== ObservableProperty
 An ObservableProperty is a physical property of a phenomenon that can be observed and measured (e.g., temperature, gravitational force, position, chemical concentration, orientation, number-of-individuals, physical switch status, etc.), or a characteristic of one or more feature types, the value for which must be estimated by application of some procedure in an observation. It is thus a physical stimulus that can be sensed by a detector or created by an actuator.
 
@@ -27,21 +28,23 @@ As shown in the UML model below, the DescribedObject class provides a specific s
 
 include::../requirements/model/coreProcess/requirement4.adoc[]
 
-Metadata about each process is essential to supporting identification, discovery, and qualification of the process. Metadata is provided by the base class, DescribedObject, from which AbstractProcess is derived. While these metadata may provide relevant information to understand quality of output from the process, the values of properties within the DescribedObject should not be required for execution of the process. The model for the DescribedObject is shown in Figure 9, while the models for the individual property values are provided in either Figure 10 or in the ISO 19115 models in Figure 11.
+Metadata about each process is essential to supporting identification, discovery, and qualification of the process. Metadata is provided by the base class, DescribedObject, from which AbstractProcess is derived. While these metadata may provide relevant information to understand quality of output from the process, the values of properties within the DescribedObject should not be required for execution of the process. The model for the DescribedObject is shown in <<img_DescribedObject>>, while the models for the individual property values are provided in either <<img_MetadataLists>> or in the ISO 19115 models in <<img_History>>.
 
 The DescribedObject includes several descriptive properties that support rapid discovery (keywords, identification, and classification), constraints (validTime, securityConstraints, legalConstraints), qualification (characteristics and capabilities), references (contacts and documentation), and history. These are each grouped in lists, which provide for easy separation and parsing of these properties.
 
 ===== Extension Property
 The extension property allows one to add domain or community-specific content to a DescribedObject instance. This might include, for example, security taggings, vendor or community-specific metadata, or information encoded in other models or schema. Extension properties must exist in a separate namespace and SensorML-compliant software is not required to understand or utilize the information contained within the extension property.
 
-The constraints on the extension property include: (a) the extension model must be defined in a separate namespace, (b) the information added by the extension model must not be required for execution of the process, and (c) SensorML-compliant parsers may parse and utilize the information within these extensions but they are not required to do so in order to be compliant to the SensorML standard.
+The constraints on the extension property include: a) the extension model must be defined in a separate namespace, b) the information added by the extension model must not be required for execution of the process, and c) SensorML-compliant parsers may parse and utilize the information within these extensions but they are not required to do so in order to be compliant to the SensorML standard.
 
 include::../requirements/model/coreProcess/requirement5.adoc[]
 include::../requirements/model/coreProcess/requirement6.adoc[]
 
+[[img_DescribedObject]]
 .DescribedObject with Metadata Properties
 image::figures/DescribedObject.png[]
 
+[[img_MetadataLists]]
 .Models for Metadata Elements
 image::figures/MetadataLists.png[]
 
@@ -133,6 +136,7 @@ Documentation can be provided which provides further clarification about the Des
 
 Within SensorML, the history of a process can be provided through a collection of Event objects. These are provided within an EventList that serves as the value of the history property. Events might for instance, specify calibration or maintenance history of a sensor, changes to an algorithm or parameter within a computational process, or deployment and maintenance events.
 
+[[img_History]]
 .Model for history events
 image::figures/History.png[]
 
@@ -238,7 +242,7 @@ A concrete implementation of a Settings class will be provided in a later Confor
 ==== SWE Common Data Types
 Many properties in the DescribedObject and AbstractProcess classes described above are of type AbstractDataComponent as defined in the SWE Common Data Model standard. This data type is used for defining inputs, outputs and parameters, as well as for other metadata properties.
 
-This requirements class only mandates the support of the “Simple Components” and “Record Components” as defined in the SWE Common Data Model standard. These includes the scalar data types Boolean, Text, Count, Quantity, Category, Time and their range equivalents, as well as DataRecord and Vector.
+This requirements class only mandates the support of the “Simple Components” and “Record Components” as defined in the SWE Common Data Model standard. These include the scalar data types Boolean, Text, Count, Quantity, Category, Time and their range equivalents, as well as DataRecord and Vector.
 
 include::../requirements/model/coreProcess/requirement12.adoc[]
 
diff --git a/sensorml/standard/sections/clause_7.3_uml_simple_process.adoc b/sensorml/standard/sections/clause_7.3_uml_simple_process.adoc
diff --git a/sensorml/standard/sections/clause_7.4_uml_aggregate_process.adoc b/sensorml/standard/sections/clause_7.4_uml_aggregate_process.adoc
diff --git a/sensorml/standard/sections/clause_7.5_uml_physical_component.adoc b/sensorml/standard/sections/clause_7.5_uml_physical_component.adoc
diff --git a/sensorml/standard/sections/clause_7.6_uml_physical_system.adoc b/sensorml/standard/sections/clause_7.6_uml_physical_system.adoc
diff --git a/sensorml/standard/sections/clause_7.8_uml_configurable_processes.adoc b/sensorml/standard/sections/clause_7.8_uml_configurable_processes.adoc
diff --git a/sensorml/standard/sections/clause_7_uml_conceptual_models.adoc b/sensorml/standard/sections/clause_7_uml_conceptual_models.adoc
