Add getTopLevelCityObject method to CityObjects

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.java

@@ -34,6 +34,11 @@ public class Tunnel extends AbstractTunnel {
         }
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return this;
+    }
+
     @Override
     public void accept(Check c) {
         super.accept(c);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java

@@ -31,12 +31,20 @@ public class TunnelConstructiveElement extends CityObject {
 
     private final org.citygml4j.core.model.tunnel.TunnelConstructiveElement gmlTunnelElement;
     private final List<BoundarySurface> boundarySurfaceList = new ArrayList<>();
-
+    private AbstractTunnel parent;
 
     public TunnelConstructiveElement(org.citygml4j.core.model.tunnel.TunnelConstructiveElement gmlObject) {
         this.gmlTunnelElement = gmlObject;
     }
 
+    public void setParent(AbstractTunnel parent) {
+        this.parent = parent;
+    }
+
+    public AbstractTunnel getParent() {
+        return parent;
+    }
+
     @Override
     public Copyable createCopyInstance() {
         return new TunnelConstructiveElement(gmlTunnelElement);
@@ -186,6 +194,11 @@ public class TunnelConstructiveElement extends CityObject {
         }
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return getParent().getTopLevelCityObject();
+    }
+
     @Override
     public FeatureType getFeatureType() {
         return FeatureType.TUNNEL_CONSTRUCTION_ELEMENT;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelHollow.java

@@ -43,6 +43,11 @@ public class TunnelHollow extends AbstractRoom {
         parent = handler.getCopyInstance(oHollow.getParent());
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return getParent().getTopLevelCityObject();
+    }
+
     @Override
     public void collectInstances(CopyHandler handler) {
         super.collectInstances(handler);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelPart.java

@@ -22,6 +22,11 @@ public class TunnelPart extends AbstractTunnel {
         return parent;
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return getParent().getTopLevelCityObject();
+    }
+
     @Override
     public FeatureType getFeatureType() {
         return FeatureType.TUNNEL_PART;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Vegetation.java

@@ -198,6 +198,11 @@ public class Vegetation extends CityObject {
         }
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return this;
+    }
+
     public void setGmlObject(AbstractVegetationObject avo) {
         citygmlVegetation = avo;
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/WaterObject.java

@@ -106,6 +106,11 @@ public class WaterObject extends CityObject {
         gmlWater.getDeprecatedProperties().setLod1MultiSurface(null);
     }
 
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return this;
+    }
+
     public void setGmlObject(WaterBody waterBody) {
         gmlWater = waterBody;
     }

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

@@ -252,7 +252,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
 
     @Override
     public void visit(Bridge bridge) {
-        BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, bridge);
+        BridgeObject bo = new BridgeObject(bridge);
 
 
         // parse deprecated geometries
@@ -266,7 +266,7 @@ public class Citygml3FeatureMapper extends ObjectWalker {
                 continue;
             }
             BridgePart gmlBridgePart = bPartProperty.getObject();
-            BridgeObject bPart = new BridgeObject(BridgeType.BRIDGE_PART, gmlBridgePart);
+            BridgeObject bPart = new BridgeObject(gmlBridgePart, bo);
             mapAbstractBridge(gmlBridgePart, bPart);
             bo.addBridgePart(bPart);
         }

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java

@@ -348,6 +348,11 @@ public class AbstractBuildingTest {
 				return null;
 			}
 
+			@Override
+			public CityObject getTopLevelCityObject(){
+				return null;
+			}
+
 		};
 		return ab;
 	}

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java

@@ -47,7 +47,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testAccept() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		bo.addBoundarySurface(new BoundarySurface(null));
 		AtomicInteger boCounter = new AtomicInteger(0);
 		AtomicInteger bsCounter = new AtomicInteger(0);
@@ -75,7 +75,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testPrepareForChecking() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		bo.prepareForChecking();
@@ -84,7 +84,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testClearMetaInformation() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		bo.clearMetaInformation();
@@ -93,7 +93,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testContainsError() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		assertFalse(bo.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(bo.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -101,7 +101,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testContainsError2() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		assertFalse(bo.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
@@ -111,7 +111,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testClearAllContainedCheckResults() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		bo.clearAllContainedCheckResults();
@@ -120,7 +120,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testContainsAnyError() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		bo.containsAnyError();
@@ -129,14 +129,14 @@ public class BridgeObjectTest {
 		when(bsMock.containsAnyError()).thenReturn(true);
 		assertTrue(bo.containsAnyError());
 		
-		BridgeObject bo2 = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo2 = new BridgeObject(mock(AbstractBridge.class));
 		bo2.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		assertTrue(bo2.containsAnyError());
 	}
 
 	@Test
 	public void testCollectContainedErrors() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		ArrayList<CheckError> errors = new ArrayList<>();
@@ -146,7 +146,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testReCreateGeometries() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		GeometryFactory factoryMock = mock(GeometryFactory.class);
@@ -157,7 +157,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesMultiSurfaceLod1() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -172,7 +172,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesMultiSurfaceLod2() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -186,7 +186,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesMultiSurfaceLod3() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD3);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -200,7 +200,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesMultiSurfaceLod4() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD4);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -214,7 +214,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesSolidLod1() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD1);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -228,7 +228,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesSolidLod2() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD2);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -242,7 +242,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesSolidLod3() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD3);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -256,7 +256,7 @@ public class BridgeObjectTest {
 	
 	@Test
 	public void testReCreateGeometriesSolidLod4() {
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
 		Geometry geom = GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD4);
 		AbstractBridge ab = new Bridge();
 		bo.setGmlObject(ab);
@@ -273,7 +273,7 @@ public class BridgeObjectTest {
 		AbstractBridge abMock = mock(AbstractBridge.class);
 		DeprecatedPropertiesOfAbstractBridge propsMock = mock(DeprecatedPropertiesOfAbstractBridge.class);
 		when(abMock.getDeprecatedProperties()).thenReturn(propsMock);
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, abMock);
+		BridgeObject bo = new BridgeObject(abMock);
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		
@@ -293,14 +293,14 @@ public class BridgeObjectTest {
 	@Test
 	public void testGetFeatureType() {
 		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, abMock);
+		BridgeObject bo = new BridgeObject(abMock);
 		assertEquals(FeatureType.BRIDGE, bo.getFeatureType());
 	}
 
 	@Test
 	public void testGetType() {
 		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, abMock);
+		BridgeObject bo = new BridgeObject( abMock);
 		assertEquals(BridgeType.BRIDGE, bo.getType());
 		bo.setType(BridgeType.BRIDGE_PART);
 		assertEquals(BridgeType.BRIDGE_PART, bo.getType());
@@ -309,7 +309,7 @@ public class BridgeObjectTest {
 	@Test
 	public void testGetGmlObject() {
 		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject(BridgeType.BRIDGE, abMock);
+		BridgeObject bo = new BridgeObject(abMock);
 		assertEquals(abMock, bo.getGmlObject());
 		AbstractBridge abMock2 = mock(AbstractBridge.class);
 		bo.setGmlObject(abMock2);