diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index a5240cd4febb9e3312e9e25f6256216dfc124dd9..e58623d393bd2cd4fcb4f7ec32014f9271433481 100644
--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEB="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" xmlns:bldg="http://www.opengis.net/citygml/building/2.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" version="2.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEB="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" xmlns:bldg="http://www.opengis.net/citygml/building/2.0" xmlns:gml="http://www.opengis.net/gml" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" version="2.1">
<annotation>
<documentation>This is the FWE ADE for CityGML building datasets developed in the IN-SOURCE project.</documentation>
</annotation>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://shapechange.net/resources/schema/ShapeChangeAppinfo.xsd"/>
<import namespace="http://www.opengis.net/citygml/building/2.0" schemaLocation="http://schemas.opengis.net/citygml/building/2.0/building.xsd"/>
<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
<!--XML Schema document created by ShapeChange - http://shapechange.net/-->
@@ -10,11 +11,16 @@
<complexContent>
<extension base="gml:AbstractFeatureType">
<sequence>
- <element minOccurs="0" name="surveyYear" type="integer"/>
+ <element minOccurs="0" name="surveyYear" type="gml:PositiveIntegerPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
<element minOccurs="0" name="population" type="integer"/>
<element maxOccurs="unbounded" minOccurs="0" name="foodSurveyProperties">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="FWEB:FoodSurvey"/>
@@ -22,6 +28,11 @@
</complexType>
</element>
<element minOccurs="0" name="waterSurveyProperty">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="FWEB:WaterSurvey"/>
@@ -29,6 +40,11 @@
</complexType>
</element>
<element minOccurs="0" name="energySurveyProperty">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="FWEB:EnergySurvey"/>
@@ -121,10 +137,38 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="buildingFootprintArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType"/>
- <element name="totalFloorArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType"/>
- <element name="fweAreaName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string"/>
- <element name="fweSystemName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string"/>
+ <element name="buildingFootprintArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="minOccurs">0</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="totalFloorArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="minOccurs">0</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="fweAreaName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="minOccurs">0</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="fweSystemName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="minOccurs">0</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
<element name="buildingSurveyProperties" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding">
<complexType>
<sequence>