From affbefa3e7a3bc547477d170db4ca9b656b7f3c9 Mon Sep 17 00:00:00 2001
From: EgbertCasper <cas@citis.de>
Date: Fri, 8 May 2020 10:47:25 +0000
Subject: [PATCH] Replace
 202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml, Schema
 validated for non EnergyADE entries

---
 ...idCompositeSurfaces+EnergyADE+SimStadt.xml | 265 +++++++++++-------
 1 file changed, 160 insertions(+), 105 deletions(-)

diff --git a/HfT Building Models/CityGML 2.0/Bau 07/202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml b/HfT Building Models/CityGML 2.0/Bau 07/202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml
index 13fd42f..002316f 100644
--- a/HfT Building Models/CityGML 2.0/Bau 07/202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml	
+++ b/HfT Building Models/CityGML 2.0/Bau 07/202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml	
@@ -3,32 +3,32 @@
 <!-- NeqModPlus Bau 07 CityGML 2.0 + EnergyADE 1.0 Model in LoD1                                               -->
 <!-- ......................................................................................................... -->
 <!-- Exported with 3DIS GmbH (http://www.3dis.de) CityEditor                                                   -->
-<!-- CityGML EnergyADE entries by Egbert Casper cas@citis.consulting Date: $Date: 2020/03/31 09:44:37 $        -->
+<!-- CityGML EnergyADE entries by Egbert Casper cas@citis.consulting Date: $Date: 2020/05/08 10:45:34 $        -->
 <!-- ......................................................................................................... -->
 <!-- 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_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml,v 1.2 2020/03/31 09:44:37 cas Exp cas $ -->
+<!-- $Id: 202001_bau_07_LoD1_3DIS_SolidCompositeSurfaces+EnergyADE+SimStadt.xml,v 1.3 2020/05/08 10:45:34 cas Exp cas $ -->
 <!-- ......................................................................................................... -->
 <core:CityModel xmlns:core="http://www.opengis.net/citygml/2.0"
-		xmlns:app="http://www.opengis.net/citygml/appearance/2.0"
-		xmlns:bldg="http://www.opengis.net/citygml/building/2.0"
-		xmlns:frn="http://www.opengis.net/citygml/cityfurniture/2.0"
-		xmlns:energy="http://www.sig3d.org/citygml/2.0/energy/1.0"
-		xmlns:grp="http://www.opengis.net/citygml/cityobjectgroup/2.0"
-		xmlns:gen="http://www.opengis.net/citygml/generics/2.0"
-		xmlns:luse="http://www.opengis.net/citygml/landuse/2.0"
-		xmlns:dem="http://www.opengis.net/citygml/relief/2.0"
-		xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0"
-		xmlns:tex="http://www.opengis.net/citygml/texturedsurface/2.0"
-		xmlns:gml="http://www.opengis.net/gml"
-		xmlns:xal="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"
-		xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language"
-		xmlns:smil20="http://www.w3.org/2001/SMIL20/"
-		xmlns:wfs="http://www.opengis.net/wfs"
-		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://www.opengis.net/citygml/2.0 http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd http://www.opengis.net/citygml/appearance/2.0 http://schemas.opengis.net/citygml/appearance/2.0/appearance.xsd http://www.opengis.net/citygml/building/2.0 http://schemas.opengis.net/citygml/building/2.0/building.xsd http://www.opengis.net/citygml/cityfurniture/2.0 http://schemas.opengis.net/citygml/cityfurniture/2.0/cityFurniture.xsd http://www.opengis.net/citygml/cityobjectgroup/2.0 http://schemas.opengis.net/citygml/cityobjectgroup/2.0/cityObjectGroup.xsd http://www.opengis.net/citygml/generics/2.0 http://schemas.opengis.net/citygml/generics/2.0/generics.xsd http://www.opengis.net/citygml/landuse/2.0 http://schemas.opengis.net/citygml/landuse/2.0/landUse.xsd http://www.opengis.net/citygml/relief/2.0 http://schemas.opengis.net/citygml/relief/2.0/relief.xsd http://www.opengis.net/citygml/vegetation/2.0 http://schemas.opengis.net/citygml/vegetation/2.0/vegetation.xsd http://www.opengis.net/citygml/texturedsurface/2.0 http://schemas.opengis.net/citygml/texturedsurface/2.0/texturedSurface.xsd http://www.sig3d.org/citygml/2.0/energy/1.0/EnergyADE.xsd ">
+                xmlns:app="http://www.opengis.net/citygml/appearance/2.0"
+                xmlns:bldg="http://www.opengis.net/citygml/building/2.0"
+                xmlns:frn="http://www.opengis.net/citygml/cityfurniture/2.0"
+                xmlns:energy="http://www.sig3d.org/citygml/2.0/energy/1.0"
+                xmlns:grp="http://www.opengis.net/citygml/cityobjectgroup/2.0"
+                xmlns:gen="http://www.opengis.net/citygml/generics/2.0"
+                xmlns:luse="http://www.opengis.net/citygml/landuse/2.0"
+                xmlns:dem="http://www.opengis.net/citygml/relief/2.0"
+                xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0"
+                xmlns:tex="http://www.opengis.net/citygml/texturedsurface/2.0"
+                xmlns:gml="http://www.opengis.net/gml"
+                xmlns:xal="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"
+                xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language"
+                xmlns:smil20="http://www.w3.org/2001/SMIL20/"
+                xmlns:wfs="http://www.opengis.net/wfs"
+                xmlns:xlink="http://www.w3.org/1999/xlink"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://www.opengis.net/citygml/2.0 http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd http://www.opengis.net/citygml/appearance/2.0 http://schemas.opengis.net/citygml/appearance/2.0/appearance.xsd http://www.opengis.net/citygml/building/2.0 http://schemas.opengis.net/citygml/building/2.0/building.xsd http://www.opengis.net/citygml/cityfurniture/2.0 http://schemas.opengis.net/citygml/cityfurniture/2.0/cityFurniture.xsd http://www.opengis.net/citygml/cityobjectgroup/2.0 http://schemas.opengis.net/citygml/cityobjectgroup/2.0/cityObjectGroup.xsd http://www.opengis.net/citygml/generics/2.0 http://schemas.opengis.net/citygml/generics/2.0/generics.xsd http://www.opengis.net/citygml/landuse/2.0 http://schemas.opengis.net/citygml/landuse/2.0/landUse.xsd http://www.opengis.net/citygml/relief/2.0 http://schemas.opengis.net/citygml/relief/2.0/relief.xsd http://www.opengis.net/citygml/vegetation/2.0 http://schemas.opengis.net/citygml/vegetation/2.0/vegetation.xsd http://www.opengis.net/citygml/texturedsurface/2.0 http://schemas.opengis.net/citygml/texturedsurface/2.0/texturedSurface.xsd http://www.sig3d.org/citygml/2.0/energy/1.0/EnergyADE.xsd ">
 	<gml:description>NeqModPlus Bau 07 CityGML 2.0 + EnergyADE 1.0 Model in LoD1</gml:description>
 	<gml:name>NeqModPlus_Bau_07_LoD1</gml:name>
 	<gml:boundedBy>
@@ -38,7 +38,7 @@
 		</gml:Envelope>
 	</gml:boundedBy>
 	<core:cityObjectMember>
-		<bldg:Building gml:id="GML_cbe6d368-366a-411c-bc61-8857507c6dac">
+		<bldg:Building gml:id="GML_55936011-0edd-40be-b6f2-91aeb62cbf25">
 			<gml:description>NeqModPlus Bau 07 CityGML 2.0 Model in LoD1</gml:description>
 			<gml:name>NeqModPlus_Bau_07_LoD1</gml:name>
 			<core:creationDate>2020-02-02</core:creationDate>
@@ -93,33 +93,88 @@
 			<gen:stringAttribute name="ALKIS Code">
 				<gen:value>31001_3023</gen:value>
 			</gen:stringAttribute>
-			<bldg:roofType>5000</bldg:roofType>
 			<bldg:function>3023</bldg:function>
 			<bldg:yearOfConstruction>1897</bldg:yearOfConstruction>
+			<bldg:roofType>5000</bldg:roofType>
 			<bldg:measuredHeight uom="m">29.0</bldg:measuredHeight>
 			<bldg:storeysAboveGround>5</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>41-43</xal:ThoroughfareNumber>
-										<xal:ThoroughfareName>Kienestrasse</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:CompositeSolid>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_0402d725-2131-4014-a0c4-360a768a0ca7">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_a2ba823e-eb19-446a-b80a-ccad4f43cdfe">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_047208cf-4f50-4710-b527-61aeb9e94c6e">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_f44bda5a-b0cd-449a-a92d-bcb0e2112bd0">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_0332c676-d303-4d21-8a36-e681529a73d1">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_24f72090-848d-410d-a161-a804e44b6d72">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_a0ce650e-1e37-4c7e-b643-eaf364c20b6a">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_8ad0b36b-9b83-4114-9a5b-d8eb6bf942cd">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_a5f15394-8446-42b2-8b9e-43bc50e3aede">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_6bea38bd-cfa3-4120-ab9f-16633d93df96">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_056bde60-bd64-4f41-abc1-3c44df6f0875">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+					<gml:solidMember>
+						<gml:Solid>
+							<gml:exterior xlink:href="#GML_cdd99b46-f97a-4263-a8bd-de8d343f8512">
+							</gml:exterior>
+						</gml:Solid>
+					</gml:solidMember>
+				</gml:CompositeSolid>
+			</bldg:lod2Solid>
 			<bldg:lod2MultiCurve>
 				<gml:MultiCurve>
 					<gml:curveMember>
@@ -132,33 +187,13 @@
 					</gml:curveMember>
 				</gml:MultiCurve>
 			</bldg:lod2MultiCurve>
-			<bldg:lod2Solid>
-				<gml:Solid>
-					<gml:exterior>
-						<gml:CompositeSurface>
-							<gml:surfaceMember xlink:href="#GML_92605f1c-105e-4915-9c43-5221bc646df0"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_56113b69-febd-4dc2-8fc2-96f988823989"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_fb943fe2-1b41-4e56-97d7-5716c736798b"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_643e9093-8c42-4137-b43b-777280849b5f"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_3684705e-34ba-4e56-aeb9-86f87ad10c82"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_47e12e2d-f7dd-43dc-b138-6b560ce6dff6"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_1fcf5738-0fe1-43f6-8569-69e2587bfe88"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_daab2a1a-18bb-441d-b89c-75577922f55e"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_e4fc708d-92b3-47e0-a011-36ca8d12c47f"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_54aef662-248e-48c4-9bf4-096690c63be6"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_3a76e325-561c-4016-b051-d2ce90f0995c"></gml:surfaceMember>
-							<gml:surfaceMember xlink:href="#GML_c606330a-4359-431e-863e-ca378f9cd540"></gml:surfaceMember>
-						</gml:CompositeSurface>
-					</gml:exterior>
-				</gml:Solid>
-			</bldg:lod2Solid>
 			<bldg:boundedBy>
 				<bldg:RoofSurface>
 					<gen:stringAttribute name="Description"><gen:value>Bau 07 Roof</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_c606330a-4359-431e-863e-ca378f9cd540">
+								<gml:Polygon gml:id="GML_cdd99b46-f97a-4263-a8bd-de8d343f8512">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -188,7 +223,7 @@
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_56113b69-febd-4dc2-8fc2-96f988823989">
+								<gml:Polygon gml:id="GML_a2ba823e-eb19-446a-b80a-ccad4f43cdfe">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -208,11 +243,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 East Wing Wall N</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall East Wing N</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_fb943fe2-1b41-4e56-97d7-5716c736798b">
+								<gml:Polygon gml:id="GML_047208cf-4f50-4710-b527-61aeb9e94c6e">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -232,11 +267,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 East Wing Wall E</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall East Wing E</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_643e9093-8c42-4137-b43b-777280849b5f">
+								<gml:Polygon gml:id="GML_f44bda5a-b0cd-449a-a92d-bcb0e2112bd0">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -260,7 +295,7 @@
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_3684705e-34ba-4e56-aeb9-86f87ad10c82">
+								<gml:Polygon gml:id="GML_0332c676-d303-4d21-8a36-e681529a73d1">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -280,11 +315,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 West Wing Wall E</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall West Wing E</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_47e12e2d-f7dd-43dc-b138-6b560ce6dff6">
+								<gml:Polygon gml:id="GML_24f72090-848d-410d-a161-a804e44b6d72">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -304,11 +339,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 East Wing Wall W</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall East Wing W</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_1fcf5738-0fe1-43f6-8569-69e2587bfe88">
+								<gml:Polygon gml:id="GML_a0ce650e-1e37-4c7e-b643-eaf364c20b6a">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -328,11 +363,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 West Wing Wall N</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall West Wing N</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_daab2a1a-18bb-441d-b89c-75577922f55e">
+								<gml:Polygon gml:id="GML_8ad0b36b-9b83-4114-9a5b-d8eb6bf942cd">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -352,11 +387,11 @@
 			</bldg:boundedBy>
 			<bldg:boundedBy>
 				<bldg:WallSurface>
-					<gen:stringAttribute name="Description"><gen:value>Bau 07 West Wing Wall W</gen:value></gen:stringAttribute>
+					<gen:stringAttribute name="Description"><gen:value>Bau 07 Wall West Wing W</gen:value></gen:stringAttribute>
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_e4fc708d-92b3-47e0-a011-36ca8d12c47f">
+								<gml:Polygon gml:id="GML_a5f15394-8446-42b2-8b9e-43bc50e3aede">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -380,7 +415,7 @@
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_54aef662-248e-48c4-9bf4-096690c63be6">
+								<gml:Polygon gml:id="GML_6bea38bd-cfa3-4120-ab9f-16633d93df96">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -404,7 +439,7 @@
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_3a76e325-561c-4016-b051-d2ce90f0995c">
+								<gml:Polygon gml:id="GML_056bde60-bd64-4f41-abc1-3c44df6f0875">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -428,7 +463,7 @@
 					<bldg:lod2MultiSurface>
 						<gml:MultiSurface>
 							<gml:surfaceMember>
-								<gml:Polygon gml:id="GML_92605f1c-105e-4915-9c43-5221bc646df0">
+								<gml:Polygon gml:id="GML_0402d725-2131-4014-a0c4-360a768a0ca7">
 									<gml:exterior>
 										<gml:LinearRing>
 											<gml:posList srsDimension="3">
@@ -452,6 +487,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>41-43</xal:ThoroughfareNumber>
+										<xal:ThoroughfareName>Kienestrasse</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>
@@ -481,18 +537,17 @@
 						<gml:Solid>
 							<gml:exterior>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_92605f1c-105e-4915-9c43-5221bc646df0"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_56113b69-febd-4dc2-8fc2-96f988823989"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_fb943fe2-1b41-4e56-97d7-5716c736798b"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_643e9093-8c42-4137-b43b-777280849b5f"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_3684705e-34ba-4e56-aeb9-86f87ad10c82"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_47e12e2d-f7dd-43dc-b138-6b560ce6dff6"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_1fcf5738-0fe1-43f6-8569-69e2587bfe88"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_daab2a1a-18bb-441d-b89c-75577922f55e"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_e4fc708d-92b3-47e0-a011-36ca8d12c47f"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_54aef662-248e-48c4-9bf4-096690c63be6"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_3a76e325-561c-4016-b051-d2ce90f0995c"></gml:surfaceMember>
-									<gml:surfaceMember xlink:href="#GML_c606330a-4359-431e-863e-ca378f9cd540"></gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_cdd99b46-f97a-4263-a8bd-de8d343f8512"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_056bde60-bd64-4f41-abc1-3c44df6f0875"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_0332c676-d303-4d21-8a36-e681529a73d1"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a2ba823e-eb19-446a-b80a-ccad4f43cdfe"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a5f15394-8446-42b2-8b9e-43bc50e3aede"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_8ad0b36b-9b83-4114-9a5b-d8eb6bf942cd"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_24f72090-848d-410d-a161-a804e44b6d72"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a5f15394-8446-42b2-8b9e-43bc50e3aede"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_047208cf-4f50-4710-b527-61aeb9e94c6e"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_f44bda5a-b0cd-449a-a92d-bcb0e2112bd0"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_0402d725-2131-4014-a0c4-360a768a0ca7"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</gml:exterior>
 						</gml:Solid>
@@ -507,7 +562,7 @@
 							<energy:construction xlink:href="#GML_d446697b-f172-4f07-be18-f920c26d87ac" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_c606330a-4359-431e-863e-ca378f9cd540"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_cdd99b46-f97a-4263-a8bd-de8d343f8512"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -522,7 +577,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_3a76e325-561c-4016-b051-d2ce90f0995c"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_056bde60-bd64-4f41-abc1-3c44df6f0875"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -537,7 +592,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_3684705e-34ba-4e56-aeb9-86f87ad10c82"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_0332c676-d303-4d21-8a36-e681529a73d1"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -552,7 +607,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_56113b69-febd-4dc2-8fc2-96f988823989"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a2ba823e-eb19-446a-b80a-ccad4f43cdfe"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -567,7 +622,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_e4fc708d-92b3-47e0-a011-36ca8d12c47f"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a5f15394-8446-42b2-8b9e-43bc50e3aede"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -582,7 +637,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_daab2a1a-18bb-441d-b89c-75577922f55e"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_8ad0b36b-9b83-4114-9a5b-d8eb6bf942cd"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -597,7 +652,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_47e12e2d-f7dd-43dc-b138-6b560ce6dff6"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_24f72090-848d-410d-a161-a804e44b6d72"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -612,7 +667,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_1fcf5738-0fe1-43f6-8569-69e2587bfe88"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_a5f15394-8446-42b2-8b9e-43bc50e3aede"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -627,7 +682,7 @@
 							<energy:construction xlink:href="#GML_GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_fb943fe2-1b41-4e56-97d7-5716c736798b"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_047208cf-4f50-4710-b527-61aeb9e94c6e"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -642,7 +697,7 @@
 							<energy:construction xlink:href="#GML_1d95ee10-2b3e-424c-afce-6bc4ad6017d2" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_643e9093-8c42-4137-b43b-777280849b5f"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_f44bda5a-b0cd-449a-a92d-bcb0e2112bd0"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -657,7 +712,7 @@
 							<energy:construction xlink:href="#GML_cb005565-8025-4a9c-8ee8-d57f7b225a49" />
 							<energy:surfaceGeometry>
 								<gml:CompositeSurface>
-									<gml:surfaceMember xlink:href="#GML_92605f1c-105e-4915-9c43-5221bc646df0"> </gml:surfaceMember>
+									<gml:surfaceMember xlink:href="#GML_0402d725-2131-4014-a0c4-360a768a0ca7"> </gml:surfaceMember>
 								</gml:CompositeSurface>
 							</energy:surfaceGeometry>
 						</energy:ThermalBoundary>
@@ -1080,7 +1135,7 @@
 					</energy:layerComponent>
 				</energy:Layer>
 			</energy:layer>
-			<energy:layer>^M
+			<energy:layer>
         <energy:Layer gml:id="GML_b05182a7-3a74-4987-900b-63e29ed2c1ab">
 					<energy:layerComponent>
 						<energy:LayerComponent gml:id="GML_b70a3579-4a07-4208-a784-1dfbe1d857ae">
-- 
GitLab