Fix: BoundingBoxCalculator not including BoundarySurfaces

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/BoundingBoxCalculator.java

@@ -26,12 +26,9 @@ import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
-import de.hft.stuttgart.citydoctor2.datastructure.TopLevelTransportFeature;
-import de.hft.stuttgart.citydoctor2.datastructure.TrafficSpaceObject;
-import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
-import de.hft.stuttgart.citydoctor2.datastructure.TransportationSpace;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
+import de.hft.stuttgart.citydoctor2.utils.visitors.CityObjectCollector;
 
 /**
  * Utility class for calculating axis aligned bounding boxes for different
@@ -99,14 +96,13 @@ public class BoundingBoxCalculator {
 	 * @return the bounding box of the model
 	 */
 	public static BoundingBox calculateBoundingBox(CityDoctorModel model) {
-		Vector3d low = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE);
+		Vector3d low = new Vector3d(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
 		Vector3d high = new Vector3d(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
 
-		//TODO: Rework this using visitors
 		findMinMax(low, high, model.getBuildings());
 		findMinMax(low, high, model.getBridges());
 		findMinMax(low, high, model.getLand());
-		findMinMaxTransport(low, high, model.getTransportation());
+		findMinMax(low, high, model.getTransportation());
 		findMinMax(low, high, model.getWater());
 		findMinMax(low, high, model.getVegetation());
 		findMinMax(low, high, model.getTunnels());
@@ -159,47 +155,39 @@ public class BoundingBoxCalculator {
 		}
 	}
 
-	//TODO: Implement this properly with visitor. Quick and dirty fix for the renderer
-	private static void findMinMaxTransport(Vector3d low, Vector3d high, List<? extends TransportationObject> features) {
-		for (TransportationObject to : features) {
-			findMinMax(low, high, to);
-			if (to instanceof TransportationSpace ts) {
-				findMinMaxTransport(low, high, ts.getTrafficSpaces());
-				findMinMaxTransport(low, high, ts.getAuxTrafficSpaces());
-				if (to instanceof TopLevelTransportFeature top) {
-					findMinMaxTransport(low, high, top.getSections());
-					findMinMaxTransport(low, high, top.getIntersections());
+
+	private static void findMinMax(Vector3d low, Vector3d high, CityObject co) {
+		CityObjectCollector collector = new CityObjectCollector();
+		co.accept(collector);
+		for (CityObject object : collector.getCityObjects()) {
+			for (Geometry geom : object.getGeometries()) {
+				if (geom.getVertices() == null) {
+					geom.updateVertices();
 				}
-			} else if (to instanceof TrafficSpaceObject tso) {
-				findMinMaxTransport(low, high, tso.getTrafficAreas());
+				findMinMax(low, high, geom);
 			}
 		}
 	}
 
-	private static void findMinMax(Vector3d low, Vector3d high, CityObject co) {
-		for (Geometry geom : co.getGeometries()) {
-			if (geom.getVertices() == null) {
-				geom.updateVertices();
+	private static void findMinMax(Vector3d low, Vector3d high, Geometry geom) {
+		for (Vertex v : geom.getVertices()) {
+			if (v.getX() < low.getX()) {
+				low.setX(v.getX());
 			}
-			for (Vertex v : geom.getVertices()) {
-				if (v.getX() < low.getX()) {
-					low.setX(v.getX());
-				}
-				if (v.getX() > high.getX()) {
-					high.setX(v.getX());
-				}
-				if (v.getY() < low.getY()) {
-					low.setY(v.getY());
-				}
-				if (v.getY() > high.getY()) {
-					high.setY(v.getY());
-				}
-				if (v.getZ() < low.getZ()) {
-					low.setZ(v.getZ());
-				}
-				if (v.getZ() > high.getZ()) {
-					high.setZ(v.getZ());
-				}
+			if (v.getX() > high.getX()) {
+				high.setX(v.getX());
+			}
+			if (v.getY() < low.getY()) {
+				low.setY(v.getY());
+			}
+			if (v.getY() > high.getY()) {
+				high.setY(v.getY());
+			}
+			if (v.getZ() < low.getZ()) {
+				low.setZ(v.getZ());
+			}
+			if (v.getZ() > high.getZ()) {
+				high.setZ(v.getZ());
 			}
 		}
 	}