diff --git a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
index 45de5a346b005b7a9b5717f304e680f15abef10b..9ed34d198354f9942b9f4d2cef35ea2efef66d55 100644
--- a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
+++ b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
@@ -7,74 +7,6 @@
<import namespace="http://www.opengis.net/citygml/landuse/2.0" schemaLocation="http://schemas.opengis.net/citygml/landuse/2.0/landUse.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/-->
- <element name="EnergySurvey" substitutionGroup="FWEL:LandUseSurvey" type="FWEL:EnergySurveyType"/>
- <complexType name="EnergySurveyType">
- <complexContent>
- <extension base="FWEL:LandUseSurveyType">
- <sequence>
- <element minOccurs="0" name="spaceHeatingDemand" type="double"/>
- <element minOccurs="0" name="spaceHeatingDemandUnit" type="string"/>
- <element minOccurs="0" name="spaceCoolingDemand" type="double"/>
- <element minOccurs="0" name="spaceCoolingDemandUnit" type="string"/>
- <element minOccurs="0" name="residentialElectricityDemand" type="double"/>
- <element minOccurs="0" name="residentialElectricityDemandUnit" type="string"/>
- <element minOccurs="0" name="electricityPotentialFromPVBuildings" type="double"/>
- <element minOccurs="0" name="electricityPotentialFromPVBuildingsUnit" type="string"/>
- <element minOccurs="0" name="vegetationCoverCategory" type="gml:CodeType"/>
- <element minOccurs="0" name="biomassPrimaryEnergyPotential" type="double"/>
- <element minOccurs="0" name="biomassPrimaryEnergyPotentialUnit" type="string"/>
- <element minOccurs="0" name="biomassToEnergyWoods" type="double"/>
- <element minOccurs="0" name="biomassToEnergyWoodsUnit" type="string"/>
- <element minOccurs="0" name="biomassToBiogas" type="double"/>
- <element minOccurs="0" name="biomassToBiogasUnit" type="string"/>
- <element minOccurs="0" name="biomassToPlantOil" type="double"/>
- <element minOccurs="0" name="biomassToPlantOilUnit" type="string"/>
- <element minOccurs="0" name="biomassToBioethanol" type="double"/>
- <element minOccurs="0" name="biomassToBioethanolUnit" type="string"/>
- <element minOccurs="0" name="biomassToResidualSolidFuel" type="double"/>
- <element minOccurs="0" name="biomassToResidualSolidFuelUnit" type="string"/>
- <element minOccurs="0" name="biomassToSolidFuel" type="double"/>
- <element minOccurs="0" name="biomassToSolidFuelUnit" type="string"/>
- <element minOccurs="0" name="biomassToElectricityPotential" type="double"/>
- <element minOccurs="0" name="biomassToElectricityPotentialUnit" type="string"/>
- <element minOccurs="0" name="biomassToThermalPotential" type="double"/>
- <element minOccurs="0" name="biomassToThermalPotentialUnit" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="EnergySurveyPropertyType">
- <sequence minOccurs="0">
- <element ref="FWEL:EnergySurvey"/>
- </sequence>
- <attributeGroup ref="gml:AssociationAttributeGroup"/>
- </complexType>
- <element name="FoodSurvey" substitutionGroup="FWEL:LandUseSurvey" type="FWEL:FoodSurveyType"/>
- <complexType name="FoodSurveyType">
- <complexContent>
- <extension base="FWEL:LandUseSurveyType">
- <sequence>
- <element maxOccurs="unbounded" minOccurs="0" name="foodCategory" type="gml:CodeType"/>
- <element minOccurs="0" name="foodDemand" type="double"/>
- <element minOccurs="0" name="foodDemandUnit" type="string"/>
- <element minOccurs="0" name="foodProduction" type="double"/>
- <element minOccurs="0" name="foodProductionUnit" type="string"/>
- <element minOccurs="0" name="foodProductionWaterDemand" type="double"/>
- <element minOccurs="0" name="foodProductionWaterDemandUnit" type="string"/>
- <element minOccurs="0" name="foodProductionEnergyDemand" type="double"/>
- <element minOccurs="0" name="foodProductionEngeryDemandUnit" type="string"/>
- <element minOccurs="0" name="foodConsumption" type="double"/>
- <element minOccurs="0" name="foodConsumptionUnit" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="FoodSurveyPropertyType">
- <sequence minOccurs="0">
- <element ref="FWEL:FoodSurvey"/>
- </sequence>
- <attributeGroup ref="gml:AssociationAttributeGroup"/>
- </complexType>
<element name="fweAreaName" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="string">
<annotation>
<appinfo>
@@ -89,7 +21,6 @@
</appinfo>
</annotation>
</element>
- <element name="consistsOfFWESurvey" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="FWEL:LandUseSurveyPropertyType"/>
<element name="LandUseSurvey" substitutionGroup="gml:_Feature" type="FWEL:LandUseSurveyType"/>
<complexType name="LandUseSurveyType">
<complexContent>
@@ -101,27 +32,7 @@
<element minOccurs="0" name="population" type="integer"/>
<element minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
<element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEL:FoodSurveyPropertyType">
- <annotation>
- <appinfo>
- <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
- </appinfo>
- </annotation>
- </element>
- <element maxOccurs="unbounded" minOccurs="0" name="waterSurvey" type="FWEL:WaterSurveyPropertyType">
- <annotation>
- <appinfo>
- <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
- </appinfo>
- </annotation>
- </element>
- <element maxOccurs="unbounded" minOccurs="0" name="energySurvey" type="FWEL:EnergySurveyPropertyType">
- <annotation>
- <appinfo>
- <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
- </appinfo>
- </annotation>
- </element>
+ <element maxOccurs="unbounded" minOccurs="0" name="consistsOfFWEsurvey" type="FWEL:LandUsePropertyType"/>
</sequence>
</extension>
</complexContent>
@@ -132,31 +43,4 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="WaterSurvey" substitutionGroup="FWEL:LandUseSurvey" type="FWEL:WaterSurveyType"/>
- <complexType name="WaterSurveyType">
- <complexContent>
- <extension base="FWEL:LandUseSurveyType">
- <sequence>
- <element minOccurs="0" name="domesticWaterDemand" type="double"/>
- <element minOccurs="0" name="domesticWaterDemandUnit" type="string"/>
- <element minOccurs="0" name="domesticHotWaterDemand" type="double"/>
- <element minOccurs="0" name="domesticHotWaterDemandUnit" type="string"/>
- <element minOccurs="0" name="domesticHotWaterEnergyDemand" type="double"/>
- <element minOccurs="0" name="domesticHotWaterEnergyDemandUnit" type="string"/>
- <element minOccurs="0" name="domesticWaterWaste" type="double"/>
- <element minOccurs="0" name="domesticWaterWasteUnit" type="string"/>
- <element minOccurs="0" name="domesticSolidWaste" type="double"/>
- <element minOccurs="0" name="domesticSolidWasteUnit" type="string"/>
- <element minOccurs="0" name="totalDomesticWaste" type="double"/>
- <element minOccurs="0" name="totalDomesticWasteUnit" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="WaterSurveyPropertyType">
- <sequence minOccurs="0">
- <element ref="FWEL:WaterSurvey"/>
- </sequence>
- <attributeGroup ref="gml:AssociationAttributeGroup"/>
- </complexType>
</schema>