Merge remote-tracking branch 'remotes/origin/dev' into 111-update-dependencies

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

@@ -18,21 +18,9 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
-import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
-import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
+import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
-import org.citygml4j.core.model.core.AbstractSpace;
-import org.citygml4j.core.model.transportation.AbstractTransportationSpace;
-import org.citygml4j.core.model.transportation.AuxiliaryTrafficArea;
-import org.citygml4j.core.model.transportation.TrafficArea;
-import org.citygml4j.core.util.geometry.GeometryFactory;
-import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
-import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
+
 
 import java.io.Serial;
 import java.util.ArrayList;
@@ -77,6 +65,17 @@ public abstract class TransportationObject extends CityObject {
         return ato;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return switch (type) {
+            case TRACK -> Color.BROWN;
+            case WATERWAY -> Color.NAVY;
+            case SQUARE -> Color.DARKSLATEGRAY;
+            case AUXILLIARY_TRAFFIC_AREA, AUXILLIARY_TRAFFIC_SPACE -> Color.LIGHTSLATEGREY;
+            default -> Color.DIMGRAY;
+        };
+    }
+
 
     public void setGmlObject(AbstractCityObject tc) {
         ato = tc;
@@ -92,17 +91,9 @@ public abstract class TransportationObject extends CityObject {
         return "TransportationObject [id=" + getGmlId() + "]";
     }
 
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TransportationObject originalTo = (TransportationObject) original;
-        ato = originalTo.ato;
-    }
-
     @Override
-    public Copyable createCopyInstance() {
-        return null;
+    public String getDisplayText() {
+        return String.format("[%s] %s", this.type.name(), this.getGmlId().toString());
     }
 
 }

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
-import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 import org.citygml4j.core.model.core.AbstractSpace;
 import org.citygml4j.core.model.transportation.AbstractTransportationSpace;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
+import org.xmlobjects.gml.model.geometry.primitives.Solid;
+import org.xmlobjects.gml.model.geometry.primitives.SolidProperty;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,37 +33,42 @@ public abstract class TransportationSpace extends TransportationObject {
 
     public void addTrafficSpace(TrafficSpaceObject t) {
         trafficSpaces.add(t);
+        t.setParent(this);
     }
 
     public void addAuxTrafficSpace(TrafficSpaceObject t) {
         auxTrafficSpaces.add(t);
+        t.setParent(this);
     }
 
     @Override
-    public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
+    public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
         for (Geometry geom : getGeometries()) {
             if (geom instanceof ImplicitGeometryHolder) {
                 continue;
             }
-            if (geom.getType() == GeometryType.MULTI_SURFACE) {
-                MultiSurface ms = CityGmlUtils.createMultiSurface(geom, factory, config);
-                if (super.getGmlObject() instanceof AbstractTransportationSpace ats) {
+            if (super.getGmlObject() instanceof AbstractTransportationSpace ats) {
+                if (geom.getType() == GeometryType.MULTI_SURFACE || geom.getType() == GeometryType.COMPOSITE_SURFACE) {
+                    MultiSurface ms = CityGmlUtils.createMultiSurface(geom, factory, config);
                     setMultiSurfaceAccordingToLod(ats, ms, geom.getLod());
+                } else if (geom.getType() == GeometryType.SOLID) {
+                    Solid solid = CityGmlUtils.createSolid(geom, factory, config);
+                    setSolidAccordingToLod(ats, solid, geom.getLod());
                 } else {
-                    AbstractSpace as = (AbstractSpace) super.getGmlObject();
+                    throw new IllegalArgumentException("Unsupported geometry type: " + geom.getType());
+                }
+            } else if (super.getGmlObject() instanceof AbstractSpace as) {
+                if (geom.getType() == GeometryType.MULTI_SURFACE || geom.getType() == GeometryType.COMPOSITE_SURFACE) {
+                    MultiSurface ms = CityGmlUtils.createMultiSurface(geom, factory, config);
                     setMultiSurfaceAccordingToLod(as, ms, geom.getLod());
+                } else if (geom.getType() == GeometryType.SOLID) {
+                    Solid solid = CityGmlUtils.createSolid(geom, factory, config);
+                    setSolidAccordingToLod(as, solid, geom.getLod());
+                } else {
+                    throw new IllegalArgumentException("Unsupported geometry type: " + geom.getType());
                 }
-            } else {
-                throw new IllegalStateException("Geometry in TransportationObject cannot be of type " + geom.getType()
-                        + ". Only MultiSurface allowed");
             }
         }
-        for (TrafficSpaceObject spaces : trafficSpaces) {
-            spaces.reCreateGeometries(factory, config);
-        }
-        for (TrafficSpaceObject spaces : auxTrafficSpaces) {
-            spaces.reCreateGeometries(factory, config);
-        }
     }
 
     private void setMultiSurfaceAccordingToLod(AbstractTransportationSpace ats, MultiSurface ms, Lod lod) {
@@ -75,8 +78,8 @@ public abstract class TransportationSpace extends TransportationObject {
             case LOD2 -> ats.setLod2MultiSurface(new MultiSurfaceProperty(ms));
             case LOD3 -> ats.setLod3MultiSurface(new MultiSurfaceProperty(ms));
             case LOD4 -> ats.getDeprecatedProperties().setLod4MultiSurface(new MultiSurfaceProperty(ms));
-            default ->
-                    throw new IllegalStateException("cannot set geometry with LOD for AuxiliaryTrafficSpace: " + lod);
+            default -> throw new IllegalStateException(String.format("Cannot set MultiSurface with LOD %s for " +
+                    "[GML]AbstractTransportationSpace in TransportationSpace ", lod));
         }
     }
 
@@ -92,69 +95,29 @@ public abstract class TransportationSpace extends TransportationObject {
                 as.setLod3MultiSurface(new MultiSurfaceProperty(ms));
                 break;
             default:
-                throw new IllegalStateException("cannot set geometry with LOD for AuxiliaryTrafficSpace: " + lod);
-        }
-    }
-
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
+                throw new IllegalStateException(String.format("Cannot set MultiSurface with LOD %s for [GML]AbstractSpace in TransportationSpace ", lod));
         }
-        for (TrafficSpaceObject to : trafficSpaces) {
-            if (to.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            if (to.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
     }
 
-    @Override
-    public void clearAllContainedCheckResults() {
-        super.clearAllContainedCheckResults();
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.clearAllContainedCheckResults();
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.clearAllContainedCheckResults();
-        }
-    }
-
-    @Override
-    public void collectContainedErrors(List<CheckError> errors) {
-        super.collectContainedErrors(errors);
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.collectContainedErrors(errors);
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.collectContainedErrors(errors);
+    private void setSolidAccordingToLod(AbstractTransportationSpace ats, Solid solid, Lod lod) {
+        switch (lod) {
+            case LOD1 -> ats.setLod1Solid(new SolidProperty(solid));
+            case LOD2 -> ats.setLod2Solid(new SolidProperty(solid));
+            case LOD3 -> ats.setLod3Solid(new SolidProperty(solid));
+            default -> throw new IllegalStateException(String.format("Cannot set Solid with LOD %s for " +
+                    "[GML]AbstractTransportationSpace in TransportationSpace ", lod));
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (TrafficSpaceObject to : trafficSpaces) {
-            if (to.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            if (to.containsAnyError()) {
-                return true;
-            }
+    private void setSolidAccordingToLod(AbstractSpace ats, Solid solid, Lod lod) {
+        switch (lod) {
+            case LOD1 -> ats.setLod1Solid(new SolidProperty(solid));
+            case LOD2 -> ats.setLod2Solid(new SolidProperty(solid));
+            case LOD3 -> ats.setLod3Solid(new SolidProperty(solid));
+            default ->
+                    throw new IllegalStateException(String.format("Cannot set Solid with LOD %s for [GML]AbstractSpace" +
+                            " in TransportationSpace ", lod));
         }
-        return false;
     }
 
     @Override
@@ -178,12 +141,9 @@ public abstract class TransportationSpace extends TransportationObject {
         ats.setLod0MultiSurface(null);
         ats.setLod2MultiSurface(null);
         ats.setLod3MultiSurface(null);
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.unsetGmlGeometries();
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.unsetGmlGeometries();
-        }
+        ats.setLod1Solid(null);
+        ats.setLod2Solid(null);
+        ats.setLod3Solid(null);
     }
 
     @Override
@@ -197,50 +157,4 @@ public abstract class TransportationSpace extends TransportationObject {
         return "TransportationSpace [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public void prepareForChecking() {
-        super.prepareForChecking();
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.prepareForChecking();
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.prepareForChecking();
-        }
-    }
-
-    @Override
-    public void clearMetaInformation() {
-        super.clearMetaInformation();
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.clearMetaInformation();
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.clearMetaInformation();
-        }
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.collectInstances(handler);
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.collectInstances(handler);
-        }
-    }
-
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TransportationObject originalTo = (TransportationObject) original;
-        for (TrafficSpaceObject to : trafficSpaces) {
-            to.fillValues(originalTo, handler);
-        }
-        for (TrafficSpaceObject to : auxTrafficSpaces) {
-            to.fillValues(originalTo, handler);
-        }
-    }
-
-
 }

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
 import java.io.Serial;
 
@@ -13,9 +12,4 @@ public class TunnelFurniture extends AbstractFurniture {
         super.setGmlObject(gmlObject);
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new BuildingRoomFurniture();
-    }
-
 }

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
+import javafx.scene.paint.Color;
 import org.citygml4j.core.model.tunnel.TunnelFurnitureProperty;
 
 import java.io.Serial;
@@ -36,26 +35,13 @@ public class TunnelHollow extends AbstractRoom {
     }
 
     @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-
-        TunnelHollow oHollow = (TunnelHollow) original;
-        parent = handler.getCopyInstance(oHollow.getParent());
+    public Color getRenderColor() {
+        return parent.getRenderColor();
     }
 
     @Override
     public CityObject getTopLevelCityObject() {
-        return getParent().getTopLevelCityObject();
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
+        return parent.getTopLevelCityObject();
     }
 
-    @Override
-    public Copyable createCopyInstance() {
-        return new TunnelHollow();
-    }
 }

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

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
-import de.hft.stuttgart.citydoctor2.utils.Copyable;
-
 import java.io.Serial;
 
 public class TunnelPart extends AbstractTunnel {
@@ -37,24 +34,6 @@ public class TunnelPart extends AbstractTunnel {
         return "TunnelPart [id=" + getGmlId() + "]";
     }
 
-    @Override
-    public void fillValues(Copyable original, CopyHandler handler) {
-        super.fillValues(original, handler);
-        TunnelPart originalPart = (TunnelPart) original;
-        parent = handler.getCopyInstance(originalPart.parent);
-    }
-
-    @Override
-    public void collectInstances(CopyHandler handler) {
-        super.collectInstances(handler);
-        handler.addInstance(parent);
-    }
-
-    @Override
-    public Copyable createCopyInstance() {
-        return new TunnelPart();
-    }
-
     private TunnelPart() {
     }
 }

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

@@ -35,6 +35,7 @@ import org.xmlobjects.gml.visitor.GeometryWalker;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -76,6 +77,11 @@ public class Citygml3GeometryMapper extends GeometryWalker {
             public void visit(PolygonPatch patch) {
                 parsePolygonPatch(patch, patchCollection);
             }
+
+            @Override
+            public void visit(Triangle tri) {
+                parsePolygon(null, tri.getExterior(), Collections.emptyList());
+            }
         };
         surface.getPatches().getObjects().forEach(abstractSurfacePatch -> abstractSurfacePatch.accept(patchCollector));
     }

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

+package de.hft.stuttgart.citydoctor2.utils;
+
+/**
+ * This Throwable signals that a requested CheckError was found.
+ */
+public class CheckErrorFound extends Throwable {
+
+
+    public CheckErrorFound() {
+        super("CheckError was found", null, true, false);
+    }
+}