From cd28ee7a5da1d3f12e8feee02a560f40356140d6 Mon Sep 17 00:00:00 2001
From: "rushikesh.padsala" <rushikesh.padsala@hft-stuttgart.de>
Date: Sat, 9 Jan 2021 21:10:04 +0100
Subject: [PATCH] Updated tags for all XSDs
---
public/FWELanduse/v2.1/XSD/FWELanduse.xsd | 124 +++++++++++++++++++++-
1 file changed, 123 insertions(+), 1 deletion(-)
diff --git a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
index 9ed34d1..ec53bed 100644
--- a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
+++ b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
@@ -7,6 +7,74 @@
<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>
@@ -21,6 +89,13 @@
</appinfo>
</annotation>
</element>
+ <element name="consistsOfFWEsurvey" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="FWEL:LandUseSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
<element name="LandUseSurvey" substitutionGroup="gml:_Feature" type="FWEL:LandUseSurveyType"/>
<complexType name="LandUseSurveyType">
<complexContent>
@@ -32,7 +107,27 @@
<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="consistsOfFWEsurvey" type="FWEL:LandUsePropertyType"/>
+ <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>
</sequence>
</extension>
</complexContent>
@@ -43,4 +138,31 @@
</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>
--
GitLab