Replace 202001_bau_05_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE.xml, Schema...

Replace 202001_bau_05_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE.xml, Schema validated for non EnergyADE entries

HfT Building Models/CityGML 2.0/Bau 05/202001_bau_05_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE.xml

@@ -93,33 +93,12 @@
 			<gen:stringAttribute name="ALKIS Code">
 				<gen:value>31001_3023</gen:value>
 			</gen:stringAttribute>
-			<bldg:roofType>1000</bldg:roofType>
 			<bldg:function>3023</bldg:function>
 			<bldg:yearOfConstruction>1986</bldg:yearOfConstruction>
+			<bldg:roofType>1000</bldg:roofType>
 			<bldg:measuredHeight uom="m">22.6</bldg:measuredHeight>
 			<bldg:storeysAboveGround>4</bldg:storeysAboveGround>
 			<bldg:storeysBelowGround>1</bldg:storeysBelowGround>
-			<bldg:address>
-				<core:Address>
-					<core:xalAddress>
-						<xal:AddressDetails>
-							<xal:Country>
-								<xal:CountryName>Germany</xal:CountryName>
-								<xal:Locality Type="Town">
-									<xal:LocalityName>Stuttgart</xal:LocalityName>
-									<xal:Thoroughfare Type="Street">
-										<xal:ThoroughfareNumber>2</xal:ThoroughfareNumber>
-										<xal:ThoroughfareName>Breitscheidstrasse</xal:ThoroughfareName>
-									</xal:Thoroughfare>
-									<xal:PostalCode>
-										<xal:PostalCodeNumber>70174</xal:PostalCodeNumber>
-									</xal:PostalCode>
-								</xal:Locality>
-							</xal:Country>
-						</xal:AddressDetails>
-					</core:xalAddress>
-				</core:Address>
-			</bldg:address>
 			<bldg:lod1Solid>
 				<gml:Solid>
 					<gml:exterior>
@@ -220,6 +199,27 @@
 					</gml:exterior>
 				</gml:Solid>
 			</bldg:lod1Solid>
+			<bldg:address>
+				<core:Address>
+					<core:xalAddress>
+						<xal:AddressDetails>
+							<xal:Country>
+								<xal:CountryName>Germany</xal:CountryName>
+								<xal:Locality Type="Town">
+									<xal:LocalityName>Stuttgart</xal:LocalityName>
+									<xal:Thoroughfare Type="Street">
+										<xal:ThoroughfareNumber>2</xal:ThoroughfareNumber>
+										<xal:ThoroughfareName>Breitscheidstrasse</xal:ThoroughfareName>
+									</xal:Thoroughfare>
+									<xal:PostalCode>
+										<xal:PostalCodeNumber>70174</xal:PostalCodeNumber>
+									</xal:PostalCode>
+								</xal:Locality>
+							</xal:Country>
+						</xal:AddressDetails>
+					</core:xalAddress>
+				</core:Address>
+			</bldg:address>
 			<energy:constructionWeight>medium</energy:constructionWeight>
 			<energy:volume>
 				<energy:VolumeType>