Comments for clm

spec/conceptual-model/UML/attributes.uml

@@ -1,6 +1,8 @@
-classDiagram
+@startuml
 
    class AttributesStore {
      dataType = ATTRIBUTES
    }
    EntityStore <|.. AttributesStore
+
+@enduml

spec/conceptual-model/UML/core.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class CoordinateReferenceSystem {
      title: String
@@ -50,13 +50,15 @@ classDiagram
      valueType: ValueType
    }
    GeoPackage o-- "3..n" CoordinateReferenceSystem
-   EntityStore ..> CoordinateReferenceSystem
-   EntityStore ..> "0..1" BoundingBox
-   BoundingBox ..> CoordinateReferenceSystem
+   EntityStore --> CoordinateReferenceSystem
+   EntityStore --> "0..1" BoundingBox
+   BoundingBox --> CoordinateReferenceSystem
    GeoPackage o-- "*" EntityStore: contents
    EntityStore o-- "*" Entity
    EntityStore o-- EntityType
    EntityType o-- "*" AttributeType
-   Entity ..> EntityType
+   Entity --> EntityType
    Entity o-- "*" Attribute
-   Attribute ..> AttributeType
+   Attribute --> AttributeType
+
+@enduml

spec/conceptual-model/UML/extensions.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class Extension {
      title: String
@@ -13,4 +13,6 @@ classDiagram
    GeoPackage o-- "*" Extension
    Extension --> "*" EntityStore
    Extension --> "*" AttributeType
-   EntityStore o-- "*" AttributeType
+   EntityStore o-- "*" AttributeType
+
+@enduml

spec/conceptual-model/UML/features.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class GeometryAttributeType {
      valueType = Geometry
@@ -43,17 +43,18 @@ classDiagram
    class FeatureStore {
      dataType = features
    }
-   EntityStore <|.. FeatureStore
-   EntityType <|.. FeatureType
-   Entity <|.. Feature
+   EntityStore <|-- FeatureStore
+   EntityType <|-- FeatureType
+   Entity <|-- Feature
    FeatureStore o-- FeatureType
    AttributeType <|-- GeometryAttributeType
    FeatureStore o-- "*" Feature: features
    GeometryAttributeType --o FeatureType
-   GeometryAttributeType ..> CoordinateReferenceSystem  : crs
-   Feature ..> FeatureType
-   Attribute ..> AttributeType
-   GeometryAttribute ..> GeometryAttributeType
+   GeometryAttributeType --> CoordinateReferenceSystem  : crs
+   Feature --> FeatureType
+   Attribute --> AttributeType
+   GeometryAttribute --> GeometryAttributeType
    Feature o-- GeometryAttribute: geometry
    Attribute <|-- GeometryAttribute
-
+
+@enduml

spec/conceptual-model/UML/metadata.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class MetadataEntityStore {
    }
@@ -56,11 +56,12 @@ classDiagram
    MetadataEntityStore o-- "*" MetadataReference
    MetadataEntityStore --|> EntityStore
    Attribute <|-- MetadataAttribute
-   Metadata ..> MetadataAttribute
+   Metadata --> MetadataAttribute
    MetadataAttributeType --|> AttributeType
    Metadata --|> Entity
-   MetadataAttribute ..> MetadataAttributeType
+   MetadataAttribute --> MetadataAttributeType
    MetadataAttribute *-- MetadataDocument
    EntityType <|-- MetadataEntityType
-   Metadata ..> MetadataEntityType
-   MetadataEntityType ..> MetadataAttributeType
+   Metadata --> MetadataEntityType
+   MetadataEntityType --> MetadataAttributeType
+@enduml

spec/conceptual-model/UML/rte.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class RelationStore {
      type: RelationName
@@ -14,6 +14,7 @@ classDiagram
    GeoPackage o-- "*" RelationStore
 
    EntityStore <|-- RelationStore
-   RelationStore ..> "2" EntityStore
+   RelationStore --> "2" EntityStore
    RelationStore o-- Relation
-   Relation ..> "2" Entity
+   Relation --> "2" Entity
+@enduml

spec/conceptual-model/UML/schema.uml

@@ -1,4 +1,5 @@
-classDiagram
+@startuml
+
    class SchemaStore {
    }
    class AttributeType {
@@ -29,7 +30,9 @@ classDiagram
    GeoPackage o-- "*" SchemaStore
    EntityStore <|-- SchemaStore
    SchemaStore o-- "*" Constraint
-   Constraint ..> AttributeType
-   Constraint ..> EntityStore
+   Constraint --> AttributeType
+   Constraint --> EntityStore
    SchemaStore o-- "*" EntityStore
-   SchemaStore o-- "*" AttributeType
+   SchemaStore o-- "*" AttributeType
+
+@enduml

spec/conceptual-model/UML/tgce.uml

@@ -1,4 +1,4 @@
-classDiagram
+@startuml
 
    class TiledGriddedCoverage {
      id: Integer
@@ -36,4 +36,6 @@ classDiagram
    TilePyramid <|-- TiledGriddedCoverage
    Tile <|-- CoverageTile
    TiledGriddedCoverage o-- "*" CoverageTile
-   TilePyramid o-- "*" Tile
+   TilePyramid o-- "*" Tile
+
+@enduml

spec/conceptual-model/annex-history.adoc

@@ -9,4 +9,6 @@
 |2021-06-21 |0.2 |Jeff Yutzler |all |code complete
 |2021-07-31 |0.3 |Amy Youmans |all |review for clarity
 |2021-08-18 |0.4 |Carl Reed   |1, 7   |review for clarity and consistency
+|2022-04-27 |0.5 |Gobe Hobona |8   |consistency
+|2022-04-28 |0.51 |Irina Bastrakova |4   |consistency
 |===

spec/conceptual-model/clause_3_references.adoc

@@ -1,6 +1,12 @@
 == References
 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.
 
+[[ISO-19115-1]]
+ISO: ISO 19115-1:2016, Geographic information — Metadata — Part 1: Fundamentals (2014) https://www.iso.org/standard/53798.html
+
+[[ISO-19115-3]]
+ISO: ISO 19115-3:2016, Geographic information — Metadata — Part 3: XML schema implementation for fundamental concepts (2016) https://www.iso.org/standard/32579.html
+
 [[OGC-06-103r4]]
 OGC: OGC 06-103r4, OpenGIS Implementation Standard for Geographic Information - Simple feature access - Part 1: Common architecture (2011) https://portal.ogc.org/files/?artifact_id=25355
 

spec/conceptual-model/clause_7_conceptual_model.adoc

@@ -7,31 +7,37 @@ _Since most readers will be familiar with the GES, an indication of how GeoPacka
 All GeoPackages conform to Core.
 
 Attribute::
-  a value for a particular attribute type for a particular entity.
+  A characteristic of an entity. (SOURCE: Adapted from ISO 19101-1:2014)
   _In the GES, an attribute is realized through a column value of a user-defined table._
 
 Attribute Type::
-  a characteristic of an entity.
+  A characteristic of an entity type.
   An attribute type has a name, a data type, and a value domain associated to it.
   No restrictions are implied as to the type of attributes a user-defined type may have.
-  Not all entity types have attributes. (SOURCE: Adapted from ISO19101)
+  Not all entity types have attributes. (SOURCE: Adapted from ISO 19101-1:2014)
   _In the GES, an attribute is realized through a column of a user-defined table._
 
 Coordinate Reference System (CRS)::
 A coordinate reference system, or spatial reference system, is a set of mathematical rules for specifying how coordinates are to be assigned to points that is related to an object by a datum. (SOURCE: ISO 19111:2019)
 _The GES uses the term "spatial reference system." In the GES, a spatial reference system is realized through a `gpkg_spatial_ref_sys` row._
 
 Entity::
-  For the purposes of this standard, an entity is simply a unit of content contained in a GeoPackage.
-  This is deliberately open-ended so as not to prejudice the content that a GeoPackage may contain.
+  An individual item that is perceivable or conceivable. (SOURCE: ISO/IEC 21838-1:2021)
   _In the GES, an entity is realized through a row of a user-defined table._
+
+[NOTE]
+====
+In this standard, "entity" is used to denote the concept that is denoted "particular" in ISO/IEC 21838-1:2021).
+For the purposes of this standard, an entity is simply a unit of content contained in a GeoPackage.
+This is deliberately open-ended so as not to prejudice the content that a GeoPackage may contain.
+====
 
 Entity Store::
   a container for entities.
   _In the GES, an entity store is realized through a user-defined table and a row in `gpkg_contents`._
 
 Entity Type::
-  the characteristics of an entity, including attribute types (if any).
+  A class of entities having common characteristics. (SOURCE: Adapted from 19156:2011)
   _In the GES, an entity type is realized through the schema of a user-defined table._
 
 GeoPackage::
@@ -48,29 +54,35 @@ The Features Requirements Class implements Simple Features as per OGC 06-103r4.
 The definitions of the concepts below are from that document unless otherwise indicated.
 
 Feature::
-  abstraction of real world phenomena (SOURCE: ISO 19101).
+  An abstraction of real world phenomena. (SOURCE: ISO 19101)
   For the purposes of this document, it refers to an individual realization thereof.
-  _In the GES, a feature is realized through a row of a user-defined features table._
+  Features can be classified as _geographic_ and _non-geographic_.
+  _In the GES, the Features Requirements Class is for geographic features._
+  _For non-geographic features, see <<Attributes>> below._
 
 Feature Store::
-   a container for features.
-   _In the GES, an attributes store is realized through a user-defined features table._  
+  A container for features.
+  _In the GES, a feature store is realized through a user-defined features table (for geographic features) or attributes table (for non-geographic features; see below)._
 
 Feature Type::
-    the attributes that comprise a class of a feature.
-    _In the GES, a feature type is realized through the schema of a user-defined features table._
+  A class of features having common characteristics. (SOURCE: Adapted from ISO 19101)
+  _In the GES, a feature type is realized through the schema of a user-defined features table (for geographic features) or attributes table (for non-geographic features; see below)._
+
+Geographic Feature::
+  A representation of real world phenomenon associatied with a location relative to the Earth. (SOURCE: ISO 19125-2:2004)
+  _In the GES, a geographic feature is realized through a row of a user-defined features table._
 
 Geometry::
-  spatial object representing a geometric set (SOURCE: ISO19107)
+  A spatial object representing a geometric set. (SOURCE: ISO 19107)
   _In the GES, a geometry is realized through a Well Known Binary value for a geometry attribute for a feature in a user-defined features table._
 
 Geometry Attribute::
-   a specialization of attribute for geometry values.
-   _In the GES, a geometry attribute is realized through a column of a user-defined features table._
+  A specialization of attribute for geometry values.
+  _In the GES, a geometry attribute is realized through a column of a user-defined features table._
 
 Geometry Attribute Type::
-   a specialization of attribute types for a geometry data type.
-   _In the GES, a geometry attribute type is realized through a row of `gpkg_geometry_columns`._
+  A specialization of attribute types for a geometry data type.
+  _In the GES, a geometry attribute type is realized through a row of `gpkg_geometry_columns`._
 
 === Tiles
 
@@ -117,27 +129,28 @@ Tiling Scheme::
 A tiling scheme is not restricted to a coordinate reference system or a tile matrix set and allows for other spatial reference systems such as DGGS and other organizations including irregular ones.
 ====
 
+[[attributes]]
 === Attributes
 
 GeoPackages that conform to the Attributes Requirements Class contain the content represented in <<Attributes_Classes>>.
 
-Attributes Set::
+Attributes Store::
+  a container for attributes sets.
+  _In the GES, an attributes store is realized through a user-defined attributes table._
+
+Non-Geographic Feature Set::
   a user-defined type with one or attributes, none of which is a geometry.
-  _In the GES, an attributes set is realized through a row of a user-defined attributes table._
+  _In the GES, a non-geographic feature set is realized through a row of a user-defined attributes table._
 
 [NOTE]
 ====
 OGC 12-128 defined this concept as "attributes".
 However, this conflicts with the standard definition of an attribute as a member of a class.
 ====
 
-Attributes Set Type::
-   the characteristics (attribute types) of an attributes set.
-   _In the GES, an attributes set type is realized through the schema of a user-defined attributes table._
-
-Attributes Store::
-   a container for attributes sets.
-   _In the GES, an attributes store is realized through a user-defined attributes table._  
+Non-Geograpic Feature Set Type::
+  A class of features having common characteristics. (SOURCE: Adapted from ISO 19101)
+  _In the GES, an non-geographic feature set type is realized through the schema of a user-defined attributes table._
 
 [[extensions]]
 === Extensions
@@ -153,7 +166,7 @@ Extension::
 GeoPackages that conform to the Metadata Requirements Class contain the content represented here.
 
 Metadata::
-  for the purposes of this document, a discrete unit of data about data. (SOURCE: ISO 19115)
+  for the purposes of this document, a discrete unit of data about data. (SOURCE: ISO 19115-1)
   _In the GES, metadata is realized through rows of `gpkg_metadata`._
 
 Metadata Reference::

spec/conceptual-model/clause_8_logical_model.adoc

@@ -1,6 +1,6 @@
-== GeoPackage Conceptual Model (Normative)
-This section presents the normative definition of the GeoPackage Conceptual Model (CM).
-The CM is primarily presented as UML diagrams but are augmented with text where needed.
+== GeoPackage Logical Model (Normative)
+This section presents the normative definition of the GeoPackage Logical Model (LM).
+The LM is primarily presented as UML diagrams but are augmented with text where needed.
 The diagrams are intended to be normative, but if there is any discrepancy between the diagrams and the text then the text takes priority.
 
 [NOTE]

spec/conceptual-model/standard_document.adoc

@@ -111,5 +111,5 @@ Bibliography should be the last annex
 ////
 include::annex-history.adoc[]
 
-<<<
-include::annex-bibliography.adoc[]
+//<<<
+//include::annex-bibliography.adoc[]