From 5be8c970d134c1e16f728f22d0247dcee484dd27 Mon Sep 17 00:00:00 2001
From: TatjanaKutzner <kutzner@tum.de>
Date: Tue, 19 Jan 2021 18:29:33 +0100
Subject: [PATCH] Implemented issues opengeospatial/CityGML-3.0CM#118 and
 opengeospatial/CityGML-3.0CM#119

---
 CityGML/Schema/building.xsd     | 2 --
 CityGML/Schema/cityGMLBase.xsd  | 8 ++++----
 CityGML/Schema/construction.xsd | 2 +-
 CityGML/Schema/dynamizer.xsd    | 2 +-
 CityGML/Schema/generics.xsd     | 2 +-
 CityGML/Schema/relief.xsd       | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CityGML/Schema/building.xsd b/CityGML/Schema/building.xsd
index 22e003c..7ba80ea 100644
--- a/CityGML/Schema/building.xsd
+++ b/CityGML/Schema/building.xsd
@@ -650,7 +650,6 @@
               <documentation>Relates to the storeys on which the BuildingUnit is located.</documentation>
               <appinfo>
                 <targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:Storey</targetElement>
-                <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">bldg:buildingUnit</reversePropertyName>
               </appinfo>
             </annotation>
           </element>
@@ -723,7 +722,6 @@
               <documentation>Relates to the building units that belong to the Storey.</documentation>
               <appinfo>
                 <targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:BuildingUnit</targetElement>
-                <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">bldg:storey</reversePropertyName>
               </appinfo>
             </annotation>
           </element>
diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd
index e2d0080..0ea9df8 100644
--- a/CityGML/Schema/cityGMLBase.xsd
+++ b/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. 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>
+    <documentation>The Core module defines the basic components of the CityGML conceptual 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"/>
@@ -266,7 +266,7 @@
   </complexType>
   <element abstract="true" name="AbstractCityObject" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractCityObjectType">
     <annotation>
-      <documentation>AbstractCityObject is the abstract superclass of all thematic classes within the CityGML data model.</documentation>
+      <documentation>AbstractCityObject is the abstract superclass of all thematic classes within the CityGML conceptual model.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="AbstractCityObjectType">
@@ -369,7 +369,7 @@
   </complexType>
   <element abstract="true" name="AbstractFeature" substitutionGroup="gml:AbstractFeature" type="core:AbstractFeatureType">
     <annotation>
-      <documentation>AbstractFeature is the abstract superclass of all feature types within the CityGML data model.</documentation>
+      <documentation>AbstractFeature is the abstract superclass of all feature types within the CityGML conceptual model.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="AbstractFeatureType">
@@ -992,7 +992,7 @@
       </element>
       <element name="featureMember">
         <annotation>
-          <documentation>Specifies the feature objects that are part of the CityModel. It allows to include objects that are not derived from a class defined in the CityGML data model, but from the ISO 19109 class AnyFeature.</documentation>
+          <documentation>Specifies the feature objects that are part of the CityModel. It allows to include objects that are not derived from a class defined in the CityGML conceptual model, but from the ISO 19109 class AnyFeature.</documentation>
         </annotation>
         <complexType>
           <complexContent>
diff --git a/CityGML/Schema/construction.xsd b/CityGML/Schema/construction.xsd
index ebcc65f..8f954d7 100644
--- a/CityGML/Schema/construction.xsd
+++ b/CityGML/Schema/construction.xsd
@@ -392,7 +392,7 @@
   </complexType>
   <element abstract="true" name="AbstractFillingElement" substitutionGroup="core:AbstractOccupiedSpace" type="con:AbstractFillingElementType">
     <annotation>
-      <documentation>AbstractFillingElement is the abstract superclass for different kinds of elements that fill the openings of constructive elements.</documentation>
+      <documentation>AbstractFillingElement is the abstract superclass for different kinds of elements that fill the openings of a construction.</documentation>
     </annotation>
   </element>
   <complexType abstract="true" name="AbstractFillingElementType">
diff --git a/CityGML/Schema/dynamizer.xsd b/CityGML/Schema/dynamizer.xsd
index c37898b..ff4fdc7 100644
--- a/CityGML/Schema/dynamizer.xsd
+++ b/CityGML/Schema/dynamizer.xsd
@@ -623,7 +623,7 @@
       <documentation>TimeseriesTypeValue enumerates the possible value types for GenericTimeseries and TimeValuePair.</documentation>
     </annotation>
     <restriction base="string">
-      <enumeration value="integer">
+      <enumeration value="int">
         <annotation>
           <documentation>Indicates that the values of the GenericTimeseries are of type "Integer".</documentation>
         </annotation>
diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd
index 8c7bf65..60b13bc 100644
--- a/CityGML/Schema/generics.xsd
+++ b/CityGML/Schema/generics.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:gen="http://www.opengis.net/citygml/generics/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/generics/3.0" version="3.0.0">
   <annotation>
-    <documentation>The Generics module supports application-specific extensions to the CityGML data model. These extensions may be used to model and exchange additional attributes and features not covered by the predefined thematic classes of CityGML. Generic extensions shall only be used if appropriate thematic classes or attributes are not provided by any other CityGML module.</documentation>
+    <documentation>The Generics module supports application-specific extensions to the CityGML conceptual model. These extensions may be used to model and exchange additional attributes and features not covered by the predefined thematic classes of CityGML. Generic extensions shall only be used if appropriate thematic classes or attributes are not provided by any other CityGML module.</documentation>
   </annotation>
   <import namespace="http://www.opengis.net/citygml/3.0" schemaLocation="./cityGMLBase.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/CityGML/Schema/relief.xsd b/CityGML/Schema/relief.xsd
index 4c48e6b..ecc1523 100644
--- a/CityGML/Schema/relief.xsd
+++ b/CityGML/Schema/relief.xsd
@@ -227,7 +227,7 @@
   </complexType>
   <element name="ReliefFeature" substitutionGroup="core:AbstractSpaceBoundary" type="dem:ReliefFeatureType">
     <annotation>
-      <documentation>A ReliefFeature is a collection of terrain components representing the Earth's surface, a.k.a. the Digital Terrain Model.</documentation>
+      <documentation>A ReliefFeature is a collection of terrain components representing the Earth's surface, also known as the Digital Terrain Model.</documentation>
     </annotation>
   </element>
   <complexType name="ReliefFeatureType">