Merge pull request #42 from opengeospatial/chris-little-metanormapatch-1

Chris little metanormapatch 1
opengeospatial · Sep 14, 2023 · a02bbb1 · a02bbb1
2 parents 5d6fa1c + a41eb7b
commit a02bbb1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/23-049/sections/03-references.adoc b/23-049/sections/03-references.adoc
@@ -4,17 +4,17 @@
 
 The following normative documents contain provisions that, through reference in this text, constitute provisions of this document. For dated references, subsequent amendments to, or revisions of, any of these publications do not apply. For undated references, the latest edition of the normative document referred to applies.
 
-* [[[rfc3339,nofetch(IETF RFC 3339)]]] IETF: RFC 3339 _Date and Time on the Internet: Timestamps_. https://www.rfc-editor.org/rfc/rfc3339[https://www.rfc-editor.org/rfc/rfc3339]
+* [[[rfc3339,IETF RFC 3339]]] IETF: RFC 3339 _Date and Time on the Internet: Timestamps_. https://www.rfc-editor.org/rfc/rfc3339[https://www.rfc-editor.org/rfc/rfc3339]
 
-* [[[iso8601,nofetch(ISO 8601:2004)]]] ISO/TC 211: 8601:2004 _Data elements and interchange formats — Information interchange — Representation of dates and times_, 2004, https://www.iso.org/standard/40874.html[https://www.iso.org/standard/40874.html]
+* [[[iso8601,ISO 8601:2004]]] ISO/TC 211: 8601:2004 _Data elements and interchange formats — Information interchange — Representation of dates and times_, 2004, https://www.iso.org/standard/40874.html[https://www.iso.org/standard/40874.html]
 
-* [[[iso19111,nofetch(ISO 19111)]]] ISO/TC 211: ISO 19111:2019, _Geographic information – Referencing by coordinates_, 2019, https://www.iso.org/standard/74039.html[https://www.iso.org/standard/74039.html]
+* [[[iso19111,ISO 19111]]] ISO/TC 211: ISO 19111:2019, _Geographic information – Referencing by coordinates_, 2019, https://www.iso.org/standard/74039.html[https://www.iso.org/standard/74039.html]
 
-* [[[temporal-knowledge,nofetch(Maintaining Knowledge about Temporal Intervals)]]]
+* [[[temporal-knowledge,Maintaining Knowledge about Temporal Intervals]]]
 Allen, J. F.
 _Maintaining Knowledge about Temporal Intervals_
 Communications of the ACM, 1983, vol. 26 pp. 832-843.
 
-* [[[ogc18005,nofetch(OGC 18-005r4)]]] OGC: 18-005, _OGC Abstract Specification Topic 2: Referencing by coordinates Corrigendum_, 2021, https://docs.ogc.org/as/18-005r5/18-005r5.html[https://docs.ogc.org/as/18-005r5/18-005r5.html]
+* [[[ogc18005,OGC 18-005r4]]] OGC: 18-005, _OGC Abstract Specification Topic 2: Referencing by coordinates Corrigendum_, 2021, https://docs.ogc.org/as/18-005r5/18-005r5.html[https://docs.ogc.org/as/18-005r5/18-005r5.html]
 
-* [[[w3cowltime,nofetch(W3C REC-owl-time-20171019)]]] W3C: Time Ontology in OWL, 2017, https://www.w3.org/TR/2017/REC-owl-time-20171019/[https://www.w3.org/TR/2017/REC-owl-time-20171019/]
+* [[[w3cowltime,W3C REC-owl-time-20171019]]] W3C: Time Ontology in OWL, 2017, https://www.w3.org/TR/2017/REC-owl-time-20171019/[https://www.w3.org/TR/2017/REC-owl-time-20171019/]
diff --git a/23-049/sections/04-terms_and_definitions.adoc b/23-049/sections/04-terms_and_definitions.adoc
@@ -6,9 +6,6 @@
 
 description of common concepts and their relationships, particularly in order to facilitate exchange of information between parties within a specific domain. A conceptual model is explicitly chosen to be independent of design or implementation concerns.
 
-[.source]
-<<cen_env_1613,CEN ENV 1613:1995>>
-
 [[coordinate_definition]]
 === coordinate
 

diff --git a/23-049/sections/06-abstract_model.adoc b/23-049/sections/06-abstract_model.adoc
@@ -42,17 +42,17 @@ class SpatialReferenceSystem {
         dimension = 1..*
         applicableLocationTimeOrDomain 
     }
-class TemporalReferenceSystem {
-        <<abstract>>
-        dimension = 1
-        applicableLocationTimeOrDomain 
-    }
 note left of TemporalReferenceSystem 
 	Note: Consists of one only of:
     	TemporalCoordinateReferenceSystem,
         Calendar, or 
         OrdinalTemporalReferenceSystem
-end note      
+end note  
+class TemporalReferenceSystem {
+        <<abstract>>
+        dimension = 1
+        applicableLocationTimeOrDomain 
+    }
 ReferenceSystem <|-- SpatialReferenceSystem : is a
 ReferenceSystem <|-- TemporalReferenceSystem : is a
 class OrdinalTemporalReferenceSystem {
@@ -156,6 +156,7 @@ This gives us a continuous number line to perform theoretical measurements. It i
 
 In this regime, the <<temporal-knowledge,Allen Operators>> also can be used. If A occurs before B and B occurs before C, then we can correctly deduce that A occurs before C. The full set of operators also covers pairs of intervals. So if B occurs in the interval (A,C), we can now perform real number arithmetic operations like (B-A) or (C-A) as we have defined a timescale or measurement, and between any two instants, we can always find an infinite number of other instants.
 
+[example]
 Some examples are:
 
 * Unix milliseconds since 1970-01-01T00:00:00.0Z
@@ -167,7 +168,7 @@ This regime constitutes a Temporal Coordinate Reference System, with a continuou
 
 In this regime, counts and measures of time are related to the various combinations of the rotations of the earth, moon and sun or other astronomical bodies. There is no simple arithmetic, so for example, the current civil year count of years in the Current Era (CE) and Before Current Era (BCE) is a calendar, albeit a very simple one, as there is no year zero. That is, Year 14CE – Year 12CE is a duration of 2 years, and Year 12BCE - Year 14BCE is also two years. However Year 1CE - Year 1BCE is one year, not two as there is no year 0CE or 0BCE.
 
-In this regime, the use of the Allen Operators is not straightforward. If A occurs before B and B occurs before C, then we cannot always easily and correctly deduce that A occurs before C. The full set of Allen Operators also covers pairs of intervals. So in our example, B occurs in the interval (A,C). However, we cannot usually perform simple arithmetic operations like (B-A) or (C-A) as we are dependent on the vagaries of the calendar algorithms, multiple timescales and multiple Units of Measure.
+In this regime, the use of the <<temporal_knowledge,Allen Operators>> is not straightforward. If A occurs before B and B occurs before C, then we cannot always easily and correctly deduce that A occurs before C. The full set of Allen Operators also covers pairs of intervals. So in our example, B occurs in the interval (A,C). However, we cannot usually perform simple arithmetic operations like (B-A) or (C-A) as we are dependent on the vagaries of the calendar algorithms, multiple timescales and multiple Units of Measure.
 
 Calendars are social constructs made by combining several clocks and their associated timescales.
 

diff --git a/23-049/sections/annex-bibliography.adoc b/23-049/sections/annex-bibliography.adoc
@@ -1,48 +1,48 @@
-
+[appendix]
 [bibliography]
 == Bibliography
 
-* [[[astro_algo,nofetch(Astronomical Algorithms)]]], Jean Meeus. _Astronomical Algorithms_. https://www.agopax.it/Libri_astronomia/pdf/Astronomical%20Algorithms.pdf
+* [[[astro_algo,Astronomical Algorithms]]], Jean Meeus. _Astronomical Algorithms_. https://www.agopax.it/Libri_astronomia/pdf/Astronomical%20Algorithms.pdf
 
-* [[[bipm_define,nofetch(Establishment of International Atomic Time and Coordinated Universal Time)]]]
+* [[[bipm_define,Establishment of International Atomic Time and Coordinated Universal Time]]]
 Bureau International des Poids et Mesures (BIPM).
 _Establishment of International Atomic Time and Coordinated Universal Time_.
 https://www.bipm.org/documents/20126/59466374/6_establishment_TAR20.pdf/5b18b648-0d5a-ee02-643d-a60ed6c148fc
 
-* [[[calendrical,nofetch(Calendrical Calculations)]]]
+* [[[calendrical,Calendrical Calculations]]]
 Nachum Dershowitz, Edward M. Reingold.
 _Calendrical Calculations - The Ultimate Edition_.
 Cambridge University Press. 2018.
 ISBN-13: 978-1107683167.
 http://emr.cs.iit.edu/home/reingold/calendar-book/third-edition [last accessed 2023-01]
 
-* [[[history_timekeeping,nofetch(A Brief History of Timekeeping)]]]
+* [[[history_timekeeping,A Brief History of Timekeeping]]]
 Chad Orzell.
 _A Brief History of Timekeeping_.
 Oneworld Publications. 2022.
 ISBN-13: 978-0-86154-321-2.
 
-* [[[iso19108,nofetch(ISO 19108)]]] ISO/TC 211: ISO 19108:2002 _Geographic information — Temporal schema_, 2021, https://www.iso.org/standard/26013.html[https://www.iso.org/standard/26013.html]
+* [[[iso19108,ISO 19108]]] ISO/TC 211: ISO 19108:2002 _Geographic information — Temporal schema_, 2021, https://www.iso.org/standard/26013.html[https://www.iso.org/standard/26013.html]
 
-* [[[OGCgeopose,nofetch(OGC 21-056r10)]]] OGC: _GeoPose Specification draft_, 2021, https://github.com/opengeospatial/GeoPose/
+* [[[OGCgeopose,OGC 21-056r10]]] OGC: _GeoPose Specification draft_, 2021, https://github.com/opengeospatial/GeoPose/
 
-* [[[lorentz_transform,nofetch(Lorentz Transforms)]]]
+* [[[lorentz_transform,Lorentz Transforms]]]
 _Lorentz Transform_.
 Wolfram MathWorld.
 https://mathworld.wolfram.com/LorentzTransformation.html[https://mathworld.wolfram.com/LorentzTransformation.html]
 
-* [[[minkowski,nofetch(Minkowski Space and Time)]]] H. Minkowski. 
+* [[[minkowski,Minkowski Space and Time]]] H. Minkowski. 
 _Space and Time, Minkowski's Papers on Relativity_ 
 Minkowski Institute Press, Montreal 2012. 
 https://minkowskiinstitute.org/ebookstore/book1/[https://minkowskiinstitute.org/ebookstore]
 
-* [[[treatise,nofetch(A Treatise on Time and Space)]]]
+* [[[treatise,Treatise on Time and Space]]]
 J R Lucas.
 _A Treatise on Time and Space_.
 Methuen and Co. Ltd. 1973.
 ISBN 0-416-84190-2.
 
-* [[[unix_time,nofetch(UNIX Time)]]]
+* [[[unix_time,UNIX Time]]]
 The Open Group.
 _UNIX Time_.
 https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_16 [last accessed 2023-01]
diff --git a/23-049/sections/annex-glossary.adoc b/23-049/sections/annex-glossary.adoc
@@ -1,4 +1,4 @@
-[appendix]
+[appendix,obligation="informative"]
 :appendix-caption: Annex
 [[glossary]]
 == Glossary