Updated FWEBuilding.xsd with new tags

public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd

@@ -15,41 +15,26 @@
           <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">
+          <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEB:FoodSurveyPropertyType">
             <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">
+          <element minOccurs="0" name="waterSurvey" type="FWEB:WaterSurveyPropertyType">
             <annotation>
               <appinfo>
                 <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
               </appinfo>
             </annotation>
-            <complexType>
-              <sequence>
-                <element ref="FWEB:WaterSurvey"/>
-              </sequence>
-            </complexType>
           </element>
-          <element minOccurs="0" name="energySurveyProperty">
+          <element minOccurs="0" name="energySurvey" type="FWEB:EnergySurveyPropertyType">
             <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>
@@ -61,10 +46,10 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="EnergySurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:EnergySurveyType"/>
+  <element name="EnergySurvey" substitutionGroup="gml:_Feature" type="FWEB:EnergySurveyType"/>
   <complexType name="EnergySurveyType">
     <complexContent>
-      <extension base="FWEB:BuildingSurveyType">
+      <extension base="gml:AbstractFeatureType">
         <sequence>
           <element minOccurs="0" name="spaceHeatingDemand" type="double"/>
           <element minOccurs="0" name="spaceHeatingDemandUnit" type="string"/>
@@ -84,10 +69,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"/>
@@ -110,10 +95,10 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="WaterSurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:WaterSurveyType"/>
+  <element name="WaterSurvey" substitutionGroup="gml:_Feature" type="FWEB:WaterSurveyType"/>
   <complexType name="WaterSurveyType">
     <complexContent>
-      <extension base="FWEB:BuildingSurveyType">
+      <extension base="gml:AbstractFeatureType">
         <sequence>
           <element minOccurs="0" name="domesticWaterDemand" type="double"/>
           <element minOccurs="0" name="domesticWaterDemandUnit" type="string"/>
@@ -165,6 +150,5 @@
       </appinfo>
     </annotation>
   </element>
-  <element name="buildingSurveyProperties" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding"
-  type="FWEB:BuildingSurveyPropertyType"/>
+  <element name="buildingSurvey" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType"/>
 </schema>