Updated FWEBuilding.xsd with new tags

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

@@ -6,8 +6,8 @@
   <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/-->
-  <element name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
-  <complexType name="BuildingSurveyType">
+  <element abstract="true" name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
+  <complexType abstract="true" name="BuildingSurveyType">
     <complexContent>
       <extension base="gml:AbstractFeatureType">
         <sequence>
@@ -46,10 +46,10 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="EnergySurvey" substitutionGroup="gml:_Feature" type="FWEB:EnergySurveyType"/>
+  <element name="EnergySurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:EnergySurveyType"/>
   <complexType name="EnergySurveyType">
     <complexContent>
-      <extension base="gml:AbstractFeatureType">
+      <extension base="FWEB:BuildingSurveyType">
         <sequence>
           <element minOccurs="0" name="spaceHeatingDemand" type="double"/>
           <element minOccurs="0" name="spaceHeatingDemandUnit" type="string"/>
@@ -69,10 +69,10 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="FoodSurvey" substitutionGroup="gml:_Feature" type="FWEB:FoodSurveyType"/>
+  <element name="FoodSurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:FoodSurveyType"/>
   <complexType name="FoodSurveyType">
     <complexContent>
-      <extension base="gml:AbstractFeatureType">
+      <extension base="FWEB:BuildingSurveyType">
         <sequence>
           <element maxOccurs="unbounded" minOccurs="0" name="foodCategory" type="gml:CodeType"/>
           <element minOccurs="0" name="foodDemand" type="double"/>
@@ -95,10 +95,10 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="WaterSurvey" substitutionGroup="gml:_Feature" type="FWEB:WaterSurveyType"/>
+  <element name="WaterSurvey" substitutionGroup="FWEB:BuildingSurvey" type="FWEB:WaterSurveyType"/>
   <complexType name="WaterSurveyType">
     <complexContent>
-      <extension base="gml:AbstractFeatureType">
+      <extension base="FWEB:BuildingSurveyType">
         <sequence>
           <element minOccurs="0" name="domesticWaterDemand" type="double"/>
           <element minOccurs="0" name="domesticWaterDemandUnit" type="string"/>