From 8d1c88c2dbe677384cdbbee2ea970c4a6d97f4d4 Mon Sep 17 00:00:00 2001
From: "rushikesh.padsala" <rushikesh.padsala@hft-stuttgart.de>
Date: Fri, 8 Jan 2021 19:06:33 +0100
Subject: [PATCH] Updated FWEBuilding.xsd with new tags
---
public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd | 33 ++-------------------
1 file changed, 2 insertions(+), 31 deletions(-)
diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index ea4a663..71d0746 100644
--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
@@ -15,18 +15,6 @@
<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"/>
- </sequence>
- </complexType>
- </element>
<element minOccurs="0" name="waterSurveyProperty">
<annotation>
<appinfo>
@@ -39,18 +27,6 @@
</sequence>
</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"/>
- </sequence>
- </complexType>
- </element>
</sequence>
</extension>
</complexContent>
@@ -84,10 +60,10 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="FoodSurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:FoodSurveyType"/>
+ <element name="FoodSurvey" substitutionGroup="gml:_Feature" type="FWEB:FoodSurveyType"/>
<complexType name="FoodSurveyType">
<complexContent>
- <extension base="FWEB:BuildingSurveyType">
+ <extension base="gml:AbstractFeatureType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="foodCategory" type="gml:CodeType"/>
<element minOccurs="0" name="foodDemand" type="double"/>
@@ -166,11 +142,6 @@
</annotation>
</element>
<element name="buildingSurveyProperties" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding">
- <annotation>
- <appinfo>
- <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
- </appinfo>
- </annotation>
<complexType>
<sequence>
<element ref="FWEB:BuildingSurvey"/>
--
GitLab