Fix parsing of DeprecatedProperties

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java

@@ -119,6 +119,19 @@ public class Citygml3FeatureMapper extends ObjectWalker {
     public void visit(org.citygml4j.core.model.generics.GenericOccupiedSpace gos) {
         GenericCityObject gco = new GenericCityObject();
         gco.setGmlObject(gos);
+        GeometryProperty<?> agLod1 = gos.getDeprecatedProperties().getLod1Geometry();
+        GeometryProperty<?> agLod4 = gos.getDeprecatedProperties().getLod4Geometry();
+        if (agLod1 != null && agLod1.getObject() != null &&
+                agLod1.getObject() instanceof MultiSurface ms) {
+            gco.addGeometry(parseMultiSurface(ms, Lod.LOD1));
+        }
+        if (agLod4 != null && agLod4.getObject() != null) {
+            if (agLod4.getObject() instanceof MultiSurface ms) {
+                gco.addGeometry(parseMultiSurface(ms, Lod.LOD4));
+            } else if (agLod4.getObject() instanceof AbstractSolid solid) {
+                gco.addGeometry(parseSolid(solid, Lod.LOD4));
+            }
+        }
         mapAbstractOccupiedSpace(gos, gco);
         resolveAndClearReferences();
         gco.unsetGmlGeometries();
@@ -240,6 +253,14 @@ public class Citygml3FeatureMapper extends ObjectWalker {
     @Override
     public void visit(Bridge bridge) {
         BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, bridge);
+
+
+        // parse deprecated geometries
+        parseAndAddMultiSurface(bridge.getDeprecatedProperties().getLod1MultiSurface(), Lod.LOD1, bo);
+        parseAndAddMultiSurface(bridge.getDeprecatedProperties().getLod4MultiSurface(), Lod.LOD4, bo);
+        parseAndAddSolid(bridge.getDeprecatedProperties().getLod4Solid(), Lod.LOD4, bo);
+
+        mapAbstractBridge(bridge, bo);
         for (BridgePartProperty bPartProperty : bridge.getBridgeParts()) {
             if (!bPartProperty.isSetObject()) {
                 continue;
@@ -249,7 +270,6 @@ public class Citygml3FeatureMapper extends ObjectWalker {
             mapAbstractBridge(gmlBridgePart, bPart);
             bo.addBridgePart(bPart);
         }
-        mapAbstractBridge(bridge, bo);
         resolveAndClearReferences();
         updateEdgesAndVertices(bo);
         for (BridgeObject part : bo.getParts()) {