diff --git a/CityGMLTutorial/LoD2SolidCityGML2/LOD2Solid_CityGML2.gml b/CityGMLTutorial/LoD2SolidCityGML2/LOD2Solid_CityGML2.gml
index 32f723001487cc1ffd21579ef91980352e7d2566..d222ad85452c31f19aaf05a80f85c2018f2a7b8f 100644
--- a/CityGMLTutorial/LoD2SolidCityGML2/LOD2Solid_CityGML2.gml
+++ b/CityGMLTutorial/LoD2SolidCityGML2/LOD2Solid_CityGML2.gml
@@ -3,46 +3,35 @@
<gml:boundedBy>
<gml:Envelope srsDimension="3">
<gml:lowerCorner>0 0 0</gml:lowerCorner>
- <gml:upperCorner>0.32999999999999996 0.42000000000000004 0.48000000000000004</gml:upperCorner>
+ <gml:upperCorner>0.33 0.42 0.48</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
- <app:appearanceMember>
- <app:Appearance>
- <app:theme>FMETheme</app:theme>
- <app:surfaceDataMember>
- <app:X3DMaterial>
- <app:diffuseColor>1 0.19607843137254902 0.19607843137254902</app:diffuseColor>
- <app:target>#fme-gen-ab5df31c-c755-4fa8-96a8-0f6d8892de42</app:target>
- </app:X3DMaterial>
- </app:surfaceDataMember>
- </app:Appearance>
- </app:appearanceMember>
<core:cityObjectMember>
- <bldg:Building gml:id="UUID_6e94cff4-17ff-4a21-be30-318476ce501f">
+ <bldg:Building gml:id="UUID_4e01becd-3ce8-4255-9fd3-cabc27c46f77">
<bldg:lod2Solid>
<gml:Solid>
<gml:exterior>
<gml:CompositeSurface>
- <gml:surfaceMember xlink:href="#UUID_e6fd5d5b-a6ff-460e-a15a-459358fccfe3"/>
- <gml:surfaceMember xlink:href="#fme-gen-ab5df31c-c755-4fa8-96a8-0f6d8892de42"/>
- <gml:surfaceMember xlink:href="#UUID_c2d1891a-f51a-4105-860c-12f0b4453c3a"/>
- <gml:surfaceMember xlink:href="#UUID_4ac74152-05e3-4cba-ac18-e2f48246b8a6"/>
- <gml:surfaceMember xlink:href="#UUID_53db8c61-40b4-47bf-bdf1-df13df408fa7"/>
- <gml:surfaceMember xlink:href="#UUID_918bd056-0232-4d33-be90-6821181810f6"/>
- <gml:surfaceMember xlink:href="#UUID_fb0469b5-dfc3-4cdb-91bc-374bf6088131"/>
+ <gml:surfaceMember xlink:href="#UUID_84d2c110-4dd3-472a-a659-8a354466267b"/>
+ <gml:surfaceMember xlink:href="#UUID_7c15e8e0-a75a-4df1-b0c8-bfe793b7c2c1"/>
+ <gml:surfaceMember xlink:href="#UUID_e348da6b-e8f3-487d-b1ab-770147adce47"/>
+ <gml:surfaceMember xlink:href="#UUID_ec1a3ece-e34d-48eb-bbef-5d4df92ff895"/>
+ <gml:surfaceMember xlink:href="#UUID_87dfcb81-dd89-4015-96cc-c918e38eeb01"/>
+ <gml:surfaceMember xlink:href="#UUID_b6e0e830-816a-450a-bd3a-9999b2df50e5"/>
+ <gml:surfaceMember xlink:href="#UUID_e881e8e2-9384-4a6c-a1b5-63627ed5ca29"/>
</gml:CompositeSurface>
</gml:exterior>
</gml:Solid>
</bldg:lod2Solid>
<bldg:boundedBy>
- <bldg:GroundSurface gml:id="UUID_99563847-9252-4d3a-9fae-25a7a16ab538">
+ <bldg:GroundSurface gml:id="UUID_445e250c-2d5e-4a7e-a558-0e281cfbf247">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_e6fd5d5b-a6ff-460e-a15a-459358fccfe3">
+ <gml:Polygon gml:id="UUID_84d2c110-4dd3-472a-a659-8a354466267b">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0.32999999999999996 0.42000000000000004 0 0.32999999999999996 0 0 0 0 0 0 0.42000000000000004 0 0.32999999999999996 0.42000000000000004 0</gml:posList>
+ <gml:posList>0.33 0.42 0 0.33 0 0 0 0 0 0 0.42 0 0.33 0.42 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -52,14 +41,14 @@
</bldg:GroundSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:RoofSurface gml:id="UUID_c4d13496-a129-4a7a-9914-727322e547fe">
+ <bldg:RoofSurface gml:id="UUID_0c90d1c8-30ac-48fc-8472-00113eca90f9">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="fme-gen-ab5df31c-c755-4fa8-96a8-0f6d8892de42">
+ <gml:Polygon gml:id="UUID_7c15e8e0-a75a-4df1-b0c8-bfe793b7c2c1">
<gml:exterior>
- <gml:LinearRing gml:id="UUID_f943b63f-b63a-4f6e-958a-c77eaa958dbb">
- <gml:posList>0 0 0.31 0.16499999999999998 0 0.48000000000000004 0.16499999999999998 0.42000000000000004 0.48000000000000004 0 0.42000000000000004 0.31 0 0 0.31</gml:posList>
+ <gml:LinearRing>
+ <gml:posList>0 0 0.31 0.16 0 0.48 0.16 0.42 0.48 0 0.42 0.31 0 0 0.31</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -69,14 +58,14 @@
</bldg:RoofSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:WallSurface gml:id="UUID_c7abf2c5-be2e-478b-acd4-b83daca93c59">
+ <bldg:WallSurface gml:id="UUID_0356c3da-4a37-4055-84a2-6c05e5618e16">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_c2d1891a-f51a-4105-860c-12f0b4453c3a">
+ <gml:Polygon gml:id="UUID_e348da6b-e8f3-487d-b1ab-770147adce47">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0.32999999999999996 0 0 0.32999999999999996 0.42000000000000004 0 0.32999999999999996 0.42000000000000004 0.31 0.32999999999999996 0 0.31 0.32999999999999996 0 0</gml:posList>
+ <gml:posList>0.33 0 0 0.33 0.42 0 0.33 0.42 0.31 0.33 0 0.31 0.33 0 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -86,14 +75,14 @@
</bldg:WallSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:WallSurface gml:id="UUID_35b90a77-a1ef-45c3-97c0-8d4add3f8de5">
+ <bldg:WallSurface gml:id="UUID_8bf1bf9a-dbf4-42ba-b81d-4fef2cd2850c">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_4ac74152-05e3-4cba-ac18-e2f48246b8a6">
+ <gml:Polygon gml:id="UUID_ec1a3ece-e34d-48eb-bbef-5d4df92ff895">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0 0 0 0.32999999999999996 0 0 0.32999999999999996 0 0.31 0.16499999999999998 0 0.48000000000000004 0 0 0.31 0 0 0</gml:posList>
+ <gml:posList>0 0 0 0.33 0 0 0.33 0 0.31 0.16 0 0.48 0 0 0.31 0 0 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -103,14 +92,14 @@
</bldg:WallSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:WallSurface gml:id="UUID_237010bf-380c-438d-afc4-6763b85652b4">
+ <bldg:WallSurface gml:id="UUID_a18ca8c5-cce6-4c4e-8eb2-7d1e7cd74b12">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_53db8c61-40b4-47bf-bdf1-df13df408fa7">
+ <gml:Polygon gml:id="UUID_87dfcb81-dd89-4015-96cc-c918e38eeb01">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0 0.42000000000000004 0 0 0 0 0 0 0.31 0 0.42000000000000004 0.31 0 0.42000000000000004 0</gml:posList>
+ <gml:posList>0 0.42 0 0 0 0 0 0 0.31 0 0.42 0.31 0 0.42 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -120,14 +109,14 @@
</bldg:WallSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:WallSurface gml:id="UUID_c1bdb9f2-6255-4a88-a3d4-a3a31dcd2f18">
+ <bldg:WallSurface gml:id="UUID_d0f89c86-cf4d-407f-a7aa-78b7a375f91a">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_918bd056-0232-4d33-be90-6821181810f6">
+ <gml:Polygon gml:id="UUID_b6e0e830-816a-450a-bd3a-9999b2df50e5">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0.32999999999999996 0.42000000000000004 0 0 0.42000000000000004 0 0 0.42000000000000004 0.31 0.16499999999999998 0.42000000000000004 0.48000000000000004 0.32999999999999996 0.42000000000000004 0.31 0.32999999999999996 0.42000000000000004 0</gml:posList>
+ <gml:posList>0.33 0.42 0 0 0.42 0 0 0.42 0.31 0.16 0.42 0.48 0.33 0.42 0.31 0.33 0.42 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
@@ -137,14 +126,14 @@
</bldg:WallSurface>
</bldg:boundedBy>
<bldg:boundedBy>
- <bldg:RoofSurface gml:id="UUID_0d7ed975-a91a-4d07-bff9-765c38a12e77">
+ <bldg:RoofSurface gml:id="UUID_9e543dcd-f8d3-42d9-a2f4-efe749446f4f">
<bldg:lod2MultiSurface>
<gml:MultiSurface srsDimension="3">
<gml:surfaceMember>
- <gml:Polygon gml:id="UUID_fb0469b5-dfc3-4cdb-91bc-374bf6088131">
+ <gml:Polygon gml:id="UUID_e881e8e2-9384-4a6c-a1b5-63627ed5ca29">
<gml:exterior>
<gml:LinearRing>
- <gml:posList>0.32999999999999996 0.42000000000000004 0.31 0.16499999999999998 0.42000000000000004 0.48000000000000004 0.16499999999999998 0 0.48000000000000004 0.32999999999999996 0 0.31 0.32999999999999996 0.42000000000000004 0.31</gml:posList>
+ <gml:posList>0.33 0.42 0.31 0.16 0.42 0.48 0.16 0 0.48 0.33 0 0.31 0.33 0.42 0.31</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>