Merge pull request #44 from TatjanaKutzner/master

Update definitions and typos in UML model

CityGML/Schema/appearance.xsd

@@ -240,7 +240,7 @@
   </simpleType>
   <element name="GeoreferencedTexture" substitutionGroup="app:AbstractTexture" type="app:GeoreferencedTextureType">
     <annotation>
-      <documentation>A GeoreferencedTexture is a texture that uses a planimetric projection. It contains an implicit parameterization that is either stored within the image file, an acompanying world file or specified using the orientation and referencePoint elements.</documentation>
+      <documentation>A GeoreferencedTexture is a texture that uses a planimetric projection. It contains an implicit parameterization that is either stored within the image file, an accompanying world file or specified using the orientation and referencePoint elements.</documentation>
     </annotation>
   </element>
   <complexType name="GeoreferencedTextureType">
@@ -249,12 +249,12 @@
         <sequence>
           <element default="true" minOccurs="0" name="preferWorldFile" type="boolean">
             <annotation>
-              <documentation>Indicates whether the georeference from the image file or the accompanying world file should be prefered.</documentation>
+              <documentation>Indicates whether the georeference from the image file or the accompanying world file should be preferred.</documentation>
             </annotation>
           </element>
           <element minOccurs="0" name="referencePoint" type="gml:PointPropertyType">
             <annotation>
-              <documentation>Relates to the 2D Point Geometry that represents the center of the upper left image pixel in world space.</documentation>
+              <documentation>Relates to the 2D Point geometry that represents the center of the upper left image pixel in world space.</documentation>
             </annotation>
           </element>
           <element minOccurs="0" name="orientation" type="core:TransformationMatrix2x2Type">

CityGML/Schema/building.xsd

@@ -711,7 +711,7 @@
   </complexType>
   <element name="Storey" substitutionGroup="bldg:AbstractBuildingSubdivision" type="bldg:StoreyType">
     <annotation>
-      <documentation>A Storey is a horizontal section of a Building.</documentation>
+      <documentation>A Storey is typically a horizontal section of a Building. Storeys are not always defined according to the building structure, but can also be defined according to logical considerations.</documentation>
     </annotation>
   </element>
   <complexType name="StoreyType">

CityGML/Schema/cityGMLBase.xsd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.opengis.net/citygml/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xAL="urn:oasis:names:tc:ciq:xal:3" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/3.0" version="3.0.0">
   <annotation>
-    <documentation>The Core module defines the basic components of the CityGML data model. The Core module defines abstract base classes that define the core properties of more specialized thematic classes defined in other modules. The Core module also defines concrete classes that are common to other modules, for example basic data types.</documentation>
+    <documentation>The Core module defines the basic components of the CityGML data model. This includes abstract base classes that define the core properties of more specialized thematic classes defined in other modules as well as concrete classes that are common to other modules, for example basic data types.</documentation>
   </annotation>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <import namespace="urn:oasis:names:tc:ciq:xal:3" schemaLocation="http://docs.oasis-open.org/ciq/v3.0/cs02/xsd/default/xsd/xAL.xsd"/>
@@ -413,12 +413,12 @@
           </element>
           <element minOccurs="0" name="validFrom" type="dateTime">
             <annotation>
-              <documentation>Indicates the date at wich a CityGML feature started to exist in the real world.</documentation>
+              <documentation>Indicates the date at which a CityGML feature started to exist in the real world.</documentation>
             </annotation>
           </element>
           <element minOccurs="0" name="validTo" type="dateTime">
             <annotation>
-              <documentation>Indicates the date at wich a CityGML feature ended to exist in the real world.</documentation>
+              <documentation>Indicates the date at which a CityGML feature ended to exist in the real world.</documentation>
             </annotation>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="adeOfAbstractFeatureWithLifespan" type="core:ADEOfAbstractFeatureWithLifespanPropertyType">
@@ -891,7 +891,7 @@
         <sequence>
           <element minOccurs="0" name="engineeringCRS">
             <annotation>
-              <documentation>Specifies the local coordinate reference system of the CityModel.</documentation>
+              <documentation>Specifies the local engineering coordinate reference system of the CityModel that can be provided inline the CityModel instead of referencing a well-known CRS definition. The definition of an engineering CRS requires an anchor point which relates the origin of the local coordinate system to a point on the earth’s surface in order to facilitate the transformation of coordinates from the local engineering CRS.</documentation>
             </annotation>
             <complexType>
               <complexContent>
@@ -1101,7 +1101,7 @@
       </element>
       <element minOccurs="0" name="relationType" type="anyURI">
         <annotation>
-          <documentation>Specifies an URI that additionally qualifies the ExternalReference. The URI can point to a definition from an external ontology (e.g. the sameAs relation from OWL) and allows for mapping the ExternalReference to RDF triples.</documentation>
+          <documentation>Specifies a URI that additionally qualifies the ExternalReference. The URI can point to a definition from an external ontology (e.g. the sameAs relation from OWL) and allows for mapping the ExternalReference to RDF triples.</documentation>
         </annotation>
       </element>
     </sequence>
@@ -1311,7 +1311,7 @@
       </enumeration>
       <enumeration value="temporarilyAboveAndBelowWaterSurface">
         <annotation>
-          <documentation>Indicates that city object is temporarily located above or below the water level, because the height of the water surface is varying.</documentation>
+          <documentation>Indicates that the city object is temporarily located above or below the water level, because the height of the water surface is varying.</documentation>
         </annotation>
       </enumeration>
     </restriction>

CityGML/Schema/construction.xsd

@@ -267,7 +267,7 @@
   </complexType>
   <element abstract="true" name="AbstractConstruction" substitutionGroup="core:AbstractOccupiedSpace" type="con:AbstractConstructionType">
     <annotation>
-      <documentation>AbstractConstruction is the abstract superclass for objects that are manufactured by humans from construction materials, are connected to earth and are intended to be permanent. A connection with the ground also exists when the construction rests by its own weight on the ground or is moveable limited on stationary rails or if the construction  is intended to be used mainly stationary.</documentation>
+      <documentation>AbstractConstruction is the abstract superclass for objects that are manufactured by humans from construction materials, are connected to earth, and are intended to be permanent. A connection with the ground also exists when the construction rests by its own weight on the ground or is moveable limited on stationary rails or if the construction  is intended to be used mainly stationary.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="AbstractConstructionType">

CityGML/Schema/dynamizer.xsd

@@ -293,7 +293,7 @@
   </complexType>
   <element name="SensorConnection" substitutionGroup="gml:AbstractObject" type="dyn:SensorConnectionType">
     <annotation>
-      <documentation>A SensorConnection provides all details that are required to retrieve a specific datastream from an external sensor web service. It comprises the service type (e.g. OGC SensorThings API, OGC Sensor Observation Services, MQTT, proprietary platforms), the URL of the sensor service, the identifier for the sensor or thing and its observed property as well as information about the required authentication method.</documentation>
+      <documentation>A SensorConnection provides all details that are required to retrieve a specific datastream from an external sensor web service. It comprises the service type (e.g. OGC SensorThings API, OGC Sensor Observation Services, MQTT, proprietary platforms), the URL of the sensor service, the identifier for the sensor or thing, and its observed property as well as information about the required authentication method.</documentation>
     </annotation>
   </element>
   <complexType name="SensorConnectionType">
@@ -350,7 +350,7 @@
       </element>
       <element minOccurs="0" name="mqttTopic" type="string">
         <annotation>
-          <documentation>Names the specific datastream that is retrieved by the SensorConnection.</documentation>
+          <documentation>Names the specific datastream that is retrieved by the SensorConnection. This attribute is relevant when the MQTT Protocol is used to connect to a Sensor API.</documentation>
         </annotation>
       </element>
       <element minOccurs="0" name="linkToObservation" type="string">
@@ -417,7 +417,7 @@
   </complexType>
   <element name="TabulatedFileTimeseries" substitutionGroup="dyn:AbstractAtomicTimeseries" type="dyn:TabulatedFileTimeseriesType">
     <annotation>
-      <documentation>A TabulatedFileTimeseries represents time-varying data of a specific data type for a single contiguous time interval. The data is provided in an external file referenced in the TabulatedFileTimeseries. The file shall contain table structured data using an appropriate file format like comma separated values (CSV), Microsoft Excel (XLSX) or Google Spreadsheet. The timestamps and the values are given in specific columns of the table. Each row represents a single time-value-pair. A subset of rows can be selected using the idColumn and idValue attributes.</documentation>
+      <documentation>A TabulatedFileTimeseries represents time-varying data of a specific data type for a single contiguous time interval. The data is provided in an external file referenced in the TabulatedFileTimeseries. The file shall contain table structured data using an appropriate file format like comma-separated values (CSV), Microsoft Excel (XLSX) or Google Spreadsheet. The timestamps and the values are given in specific columns of the table. Each row represents a single time-value-pair. A subset of rows can be selected using the idColumn and idValue attributes.</documentation>
     </annotation>
   </element>
   <complexType name="TabulatedFileTimeseriesType">
@@ -512,7 +512,7 @@
   </complexType>
   <element name="TimeValuePair" substitutionGroup="gml:AbstractObject" type="dyn:TimeValuePairType">
     <annotation>
-      <documentation>A TimeValuePair represents a value that is valid for a given timepoint. For each TimeValuePair only one of the value properties can be used mutually exclusive. Which value property has to be provided depends on the selected value type in the GenericTimeSeries feature, in which the TimeValuePair is included.</documentation>
+      <documentation>A TimeValuePair represents a value that is valid for a given timepoint. For each TimeValuePair, only one of the value properties can be used mutually exclusive. Which value property has to be provided depends on the selected value type in the GenericTimeSeries feature, in which the TimeValuePair is included.</documentation>
     </annotation>
   </element>
   <complexType name="TimeValuePairType">

CityGML/Schema/landUse.xsd

@@ -20,7 +20,7 @@
   </complexType>
   <element name="LandUse" substitutionGroup="core:AbstractThematicSurface" type="luse:LandUseType">
     <annotation>
-      <documentation>A LandUse object is an area of the earth's surface dedicated to a specific land use or having a specific land cover with or without vegetation, such as sand, rock, mud flats, forest, or grasslands.</documentation>
+      <documentation>A LandUse object is an area of the earth's surface dedicated to a specific land use or having a specific land cover with or without vegetation, such as sand, rock, mud flats, forest, grasslands, or wetlands.</documentation>
     </annotation>
   </element>
   <complexType name="LandUseType">

CityGML/Schema/relief.xsd

@@ -85,7 +85,7 @@
   </complexType>
   <element abstract="true" name="AbstractReliefComponent" substitutionGroup="core:AbstractSpaceBoundary" type="dem:AbstractReliefComponentType">
     <annotation>
-      <documentation>An AbstractReliefComponent represents an element of the terrain surface - either a TIN, a Grid, mass points or break lines.</documentation>
+      <documentation>An AbstractReliefComponent represents an element of the terrain surface - either a TIN, a raster or grid, mass points or break lines.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="AbstractReliefComponentType">

CityGML/Schema/transportation.xsd

@@ -20,7 +20,7 @@
   </complexType>
   <element abstract="true" name="ADEOfAuxiliaryTrafficArea" substitutionGroup="gml:AbstractObject" type="tran:ADEOfAuxiliaryTrafficAreaType">
     <annotation>
-      <documentation>ADEOfAuxiliaryTrafficAra acts as a hook to define properties within an ADE that are to be added to an AuxiliaryTrafficArea.</documentation>
+      <documentation>ADEOfAuxiliaryTrafficArea acts as a hook to define properties within an ADE that are to be added to an AuxiliaryTrafficArea.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="ADEOfAuxiliaryTrafficAreaType">
@@ -379,7 +379,7 @@
           </element>
           <element name="granularity" type="tran:GranularityValueType">
             <annotation>
-              <documentation>Defines whether auxiliary traffic spaces are represented by individual ways or by individual lanes, depending on the desired level of detail.</documentation>
+              <documentation>Defines whether auxiliary traffic spaces are represented by individual ways or by individual lanes, depending on the desired level of spatial and semantic decomposition.</documentation>
             </annotation>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="adeOfAuxiliaryTrafficSpace" type="tran:ADEOfAuxiliaryTrafficSpacePropertyType">
@@ -933,7 +933,7 @@
           </element>
           <element name="granularity" type="tran:GranularityValueType">
             <annotation>
-              <documentation>Defines whether traffic spaces are represented by individual ways or by individual lanes, depending on the desired level of detail.</documentation>
+              <documentation>Defines whether traffic spaces are represented by individual ways or by individual lanes, depending on the desired level of spatial and semantic decomposition.</documentation>
             </annotation>
           </element>
           <element minOccurs="0" name="trafficDirection" type="tran:TrafficDirectionValueType">