Replace 202001_bau_06_LoD1_3DIS_SolidCompositeSurfaces.xml, Schema validated...

Replace 202001_bau_06_LoD1_3DIS_SolidCompositeSurfaces.xml, Schema validated for non EnergyADE entries

HfT Building Models/CityGML 2.0/Bau 06/202001_bau_06_LoD1_3DIS_SolidCompositeSurfaces.xml

@@ -3,12 +3,12 @@
 <!-- NeqModPlus Bau 06 CityGML 2.0 Model in LoD1                                                               -->
 <!-- ......................................................................................................... -->
 <!-- Exported with 3DIS GmbH (http://www.3dis.de) CityEditor                                                   -->
-<!-- Modified by Egbert Casper cas@citis.consulting Date: $Date: 2020/04/23 08:27:06 $                         -->
+<!-- Modified by Egbert Casper cas@citis.consulting Date: $Date: 2020/05/08 08:20:35 $                         -->
 <!-- ......................................................................................................... -->
 <!-- This model is licensed under the Apache License, Version 2.0.                                             -->
 <!-- See https://www.apache.org/licenses/LICENSE-2.0 for more details.                                         -->
 <!-- ......................................................................................................... -->
-<!-- $Id: 202001_bau_06_LoD1_3DIS_SolidCompositeSurfaces.xml,v 1.7 2020/04/23 08:27:06 cas Exp cas $ -->
+<!-- $Id: 202001_bau_06_LoD1_3DIS_SolidCompositeSurfaces.xml,v 1.8 2020/05/08 08:20:35 cas Exp cas $ -->
 <!-- ......................................................................................................... -->
 <core:CityModel xmlns:core="http://www.opengis.net/citygml/2.0"
 		xmlns:app="http://www.opengis.net/citygml/appearance/2.0"
@@ -91,33 +91,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>1965</bldg:yearOfConstruction>
+			<bldg:roofType>1000</bldg:roofType>
 			<bldg:measuredHeight uom="m">11.3</bldg:measuredHeight>
 			<bldg:storeysAboveGround>2</bldg:storeysAboveGround>
 			<bldg:storeysBelowGround>0</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>2B</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:lod2Solid>
 				<gml:Solid>
 					<gml:exterior>
@@ -276,6 +255,27 @@
 					</bldg:lod2MultiSurface>
 				</bldg:GroundSurface>
 			</bldg:boundedBy>
+			<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>2B</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:Building>
 	</core:cityObjectMember>
 </core:CityModel>