Merge branch 'opengeospatial:main' into main

opengeospatial · Sep 4, 2024 · 34445cc · 34445cc
2 parents 048d23c + 202c4cf
commit 34445cc
Show file tree

Hide file tree

Showing 41 changed files with 2,326 additions and 4,738 deletions.
diff --git a/21-049/21-049.adoc b/21-049/21-049.adoc
@@ -7,7 +7,7 @@
 :draft: 0.1.1
 :external-id: http://www.opengis.net/doc/is/poi/1.0
 :docnumber: 21-049
-:received-date: 2024-05-21
+:received-date: 2024-07-10
 :issued-date: 2024-03-20
 :published-date: 2024-03-20
 :fullname: Charles Heazel
@@ -46,8 +46,6 @@ include::./sections/clause_7-2_data_model.adoc[]
 
 include::sections/annex-a.adoc[]
 
-include::./sections/annex-b_ISO_model.adoc[]
-
 ////
 add or remove annexes after "A" as necessary
 

diff --git a/21-049/21-049.err.html b/21-049/21-049.err.html
diff --git a/21-049/21-049.html b/21-049/21-049.html
diff --git a/21-049/21-049.pdf b/21-049/21-049.pdf
diff --git a/21-049/21-049.pdf.err b/21-049/21-049.pdf.err
@@ -1,6 +1,2 @@
-The contents of fo:region-body on page 21 exceed its viewport by 9295 millipoints. (See position 1:1490)
-Page 17: Unresolved ID reference "_9c170b5b-7f83-4dc8-68e4-1c91200ed601" found.
-Page 18: Unresolved ID reference "req_core_poi-payload" found.
-Page 29: Unresolved ID reference "req_core_poi_contactinfo" found.
-Page 31: Unresolved ID reference "req_core_poi-payload" found.
-Page 34: Unresolved ID reference "iso19109" found.
+The contents of fo:region-body on page 22 exceed its viewport by 9295 millipoints. (See position 1:1490)
+Page 18: Unresolved ID reference "_9c170b5b-7f83-4dc8-68e4-1c91200ed601" found.
diff --git a/21-049/21-049.presentation.xml b/21-049/21-049.presentation.xml
diff --git a/21-049/21-049.xml b/21-049/21-049.xml
diff --git a/21-049/21-04920240711-1-59er8e.xml_tmp b/21-049/21-04920240711-1-59er8e.xml_tmp
diff --git a/21-049/UML/POI_model-current.qea b/21-049/UML/POI_model-current.qea
diff --git a/21-049/abstract_tests/ATS_Core.adoc b/21-049/abstract_tests/ATS_Core.adoc
@@ -1,5 +1,7 @@
 [[ats_core]]
 
+The following Abstract Test Suite is independent of any implementing technology. It is not to be used to assess conformance of a POI implementation. Rather, it is intended for use by developers of Implementation Specifications. It provides a baseline to be extended with the technology-specific details necessary to create an Executable Test Script. It is the technology-specific Executable Test Scripts which are used to assess conformance of POI implementations.    
+
 === Conformance Class Core
 
 [conformance_class]

diff --git a/21-049/abstract_tests/Core/ATS_Core_AbstractFeature.adoc b/21-049/abstract_tests/Core/ATS_Core_AbstractFeature.adoc
@@ -45,7 +45,7 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and type of the `description` attribute.
 
-part:: Validate that no more than one 'description' attribute is allowed in an AbstractFeature class.
+part:: Validate that zero, one, or more 'description' attributes are allowed in an AbstractFeature class.
 
 part:: Validate that the `description` attribute is a valid implementation of the CharacterString class from <<ISO19103,ISO 19103>>. 
 ====
@@ -64,7 +64,9 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and type of the `featureId` attribute.
 
-part:: Validate that one and only one 'featureId' attribute is allowed in an AbstractFeature class.
+part:: Validate that one 'featureId' attribute is required in an AbstractFeature class.
+
+part:: Validate that more than one 'featureId' attributes are allowed in an AbstractFeature class.
 
 part:: Validate that the `featureId` attribute is a valid implementation of the GenericName class from <<ISO19103,ISO 19103>>.  
 ====
@@ -83,7 +85,7 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and type of the `identifier` attribute.
 
-part:: Validate that no more than one 'identifier' attribute is allowed in an AbstractFeature class.
+part:: Validate that zero, one, or more 'identifier' attributes are allowed in an AbstractFeature class.
 
 part:: Validate that the `identifier` attribute is a valid implementation of the ScopedName class from <<ISO19103,ISO 19103>>.  
 ====
@@ -102,7 +104,7 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and type of the `name` attribute.
 
-part:: Validate that zero or more 'name' attributes are allowed in an AbstractFeature class.
+part:: Validate that zero, one, or more 'name' attributes are allowed in an AbstractFeature class.
 
 part:: Validate that the `name` attribute is a valid implementation of the GenericName class from <<ISO19103,ISO 19103>>.
 ====

diff --git a/21-049/abstract_tests/Core/ATS_Core_AbstractPOI.adoc b/21-049/abstract_tests/Core/ATS_Core_AbstractPOI.adoc
@@ -168,7 +168,7 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and target class of the `hasPayload` aggregation.
 
-part:: Validate that zero or more `hasPayload` aggregation are allowed in an AbstractPOI class.
+part:: Validate that zero or more `hasPayload` aggregations are allowed in an AbstractPOI class.
 
 part:: Validate that the target of the `hasPayload` aggregation is a valid implementation of the POI_Payload class using the <<ats_core_poi-payload,/conf/core/poi-payload>> test.
 ====

diff --git a/21-049/abstract_tests/Core/ATS_Core_POI_Payload.adoc b/21-049/abstract_tests/Core/ATS_Core_POI_Payload.adoc
@@ -36,7 +36,7 @@ test-method-type:: Manual Inspection
 
 description:: Validate the cardinality and target class of the `usesSchema` aggregation.
 
-part:: Validate that at least one `usesSchema` aggregation is allowed in a POI_Payload class.
+part:: Validate that at least one `usesSchema` aggregation is required in a POI_Payload class.
 
 part:: Validate that the target of the `usesSchema` aggregation is a valid schema for the implementing technology.
 ====

diff --git a/21-049/images/ISO_Extensions.png b/21-049/images/ISO_Extensions.png
diff --git a/21-049/images/POI.png b/21-049/images/POI.png
diff --git a/21-049/images/POI_Extensions.png b/21-049/images/POI_Extensions.png
diff --git a/21-049/relaton/cache/iso/iso_1087-1.xml b/21-049/relaton/cache/iso/iso_1087-1.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Terminology work</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Vocabulary</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 1: Theory and application</title>
@@ -55,7 +55,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Terminology work</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Vocabulary</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Part 1: Theory and application</title>

diff --git a/21-049/relaton/cache/iso/iso_19103.xml b/21-049/relaton/cache/iso/iso_19103.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Conceptual schema language</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Conceptual schema language</title>
@@ -51,7 +51,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Conceptual schema language</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Conceptual schema language</title>

diff --git a/21-049/relaton/cache/iso/iso_19104.xml b/21-049/relaton/cache/iso/iso_19104.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Terminology</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Terminology</title>
@@ -45,7 +45,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Terminology</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Terminology</title>

diff --git a/21-049/relaton/cache/iso/iso_19112.xml b/21-049/relaton/cache/iso/iso_19112.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Spatial referencing by geographic identifiers</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Spatial referencing by geographic identifiers</title>
@@ -11,7 +11,7 @@
   <uri type="rss">https://www.iso.org/contents/data/standard/07/07/70742.detail.rss</uri>
   <docidentifier type="ISO" primary="true">ISO 19112</docidentifier>
   <docidentifier type="iso-reference">ISO 19112(E)</docidentifier>
-  <docidentifier type="URN">urn:iso:std:iso:19112:stage-90.20</docidentifier>
+  <docidentifier type="URN">urn:iso:std:iso:19112:stage-90.93</docidentifier>
   <docnumber>19112</docnumber>
   <contributor>
     <role type="publisher"/>
@@ -27,7 +27,7 @@
   <script>Latn</script>
   <status>
     <stage>90</stage>
-    <substage>20</substage>
+    <substage>93</substage>
   </status>
   <copyright>
     <from>2019</from>
@@ -45,7 +45,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Spatial referencing by geographic identifiers</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Spatial referencing by geographic identifiers</title>
@@ -57,7 +57,7 @@
       <uri type="rss">https://www.iso.org/contents/data/standard/07/07/70742.detail.rss</uri>
       <docidentifier type="ISO" primary="true">ISO 19112:2019</docidentifier>
       <docidentifier type="iso-reference">ISO 19112:2019(E)</docidentifier>
-      <docidentifier type="URN">urn:iso:std:iso:19112:stage-90.20</docidentifier>
+      <docidentifier type="URN">urn:iso:std:iso:19112:stage-90.93</docidentifier>
       <docnumber>19112</docnumber>
       <date type="published">
         <on>2019-02</on>
@@ -84,7 +84,7 @@ Le présent document permet aux producteurs de données de définir des système
 Le présent document est applicable aux données géographiques numériques et ses principes peuvent être élargis à d'autres types de données géographiques tels que les cartes, les tableaux et les textes.</abstract>
       <status>
         <stage>90</stage>
-        <substage>20</substage>
+        <substage>93</substage>
       </status>
       <copyright>
         <from>2019</from>

diff --git a/21-049/relaton/cache/iso/iso_19118.xml b/21-049/relaton/cache/iso/iso_19118.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Encoding</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Encoding</title>
@@ -45,7 +45,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Encoding</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Encoding</title>

diff --git a/21-049/relaton/cache/iso/iso_19133.xml b/21-049/relaton/cache/iso/iso_19133.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Location-based services</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Tracking and navigation</title>
@@ -41,7 +41,7 @@
   </copyright>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Location-based services</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Tracking and navigation</title>

diff --git a/21-049/relaton/cache/iso/iso_19136-1.xml b/21-049/relaton/cache/iso/iso_19136-1.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Geography Markup Language (GML)</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 1: Fundamentals</title>
@@ -47,7 +47,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Geography Markup Language (GML)</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Part 1: Fundamentals</title>

diff --git a/21-049/relaton/cache/iso/iso_19143.xml b/21-049/relaton/cache/iso/iso_19143.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Filter encoding</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Filter encoding</title>
@@ -39,7 +39,7 @@
   </copyright>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Filter encoding</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Filter encoding</title>

diff --git a/21-049/relaton/cache/iso/iso_19150-1.notfound b/21-049/relaton/cache/iso/iso_19150-1.notfound
@@ -1 +1 @@
-not_found 2024-04-26
+not_found 2024-06-26
diff --git a/21-049/relaton/cache/iso/iso_19150-2.xml b/21-049/relaton/cache/iso/iso_19150-2.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Ontology</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 2: Rules for developing ontologies in the Web Ontology Language (OWL)</title>
@@ -50,7 +50,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Ontology</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Part 2: Rules for developing ontologies in the Web Ontology Language (OWL)</title>

diff --git a/21-049/relaton/cache/iso/iso_19150-4.xml b/21-049/relaton/cache/iso/iso_19150-4.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Ontology</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 4: Service ontology</title>
@@ -41,7 +41,7 @@
   </copyright>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Ontology</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Part 4: Service ontology</title>

diff --git a/21-049/relaton/cache/iso/iso_19155.xml b/21-049/relaton/cache/iso/iso_19155.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
   <title type="title-main" format="text/plain" language="en" script="Latn">Place Identifier (PI) architecture</title>
   <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Place Identifier (PI) architecture</title>
@@ -39,7 +39,7 @@
   </copyright>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-intro" format="text/plain" language="en" script="Latn">Geographic information</title>
       <title type="title-main" format="text/plain" language="en" script="Latn">Place Identifier (PI) architecture</title>
       <title type="main" format="text/plain" language="en" script="Latn">Geographic information - Place Identifier (PI) architecture</title>

diff --git a/21-049/relaton/cache/iso/iso_19160-4.xml b/21-049/relaton/cache/iso/iso_19160-4.xml
@@ -1,5 +1,5 @@
 <bibdata type="standard" schema-version="v1.2.8">
-  <fetched>2024-04-26</fetched>
+  <fetched>2024-06-26</fetched>
   <title type="title-main" format="text/plain" language="en" script="Latn">Addressing</title>
   <title type="title-part" format="text/plain" language="en" script="Latn">Part 4: International postal address components and template language</title>
   <title type="main" format="text/plain" language="en" script="Latn">Addressing - Part 4: International postal address components and template language</title>
@@ -45,7 +45,7 @@
   </relation>
   <relation type="instanceOf">
     <bibitem type="standard">
-      <fetched>2024-04-26</fetched>
+      <fetched>2024-06-26</fetched>
       <title type="title-main" format="text/plain" language="en" script="Latn">Addressing</title>
       <title type="title-part" format="text/plain" language="en" script="Latn">Part 4: International postal address components and template language</title>
       <title type="main" format="text/plain" language="en" script="Latn">Addressing - Part 4: International postal address components and template language</title>