Refactor: Rework selection of render color

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

@@ -7,6 +7,7 @@ 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.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
@@ -94,7 +95,7 @@ public abstract class AbstractFurniture extends CityObject {
 
     @Override
     public CityObject getTopLevelCityObject(){
-        return parent;
+        return parent.getTopLevelCityObject();
     }
 
     public void addBoundarySurface(BoundarySurface boundarySurface) {
@@ -134,6 +135,11 @@ public abstract class AbstractFurniture extends CityObject {
 		return parent;
 	}
 
+    @Override
+    public Color getRenderColor() {
+        return parent.getRenderColor();
+    }
+
     @Override
     public void unsetGmlGeometries() {
         af.setLod0MultiSurface(null);

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

@@ -7,6 +7,7 @@ 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.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
@@ -54,6 +55,11 @@ public abstract class AbstractTunnel extends CityObject {
         return FeatureType.TUNNEL;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.SLATEGRAY;
+    }
+
     @Override
     public void unsetGmlGeometries() {
         at.setLod1Solid(null);

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

@@ -25,6 +25,7 @@ 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.AbstractThematicSurface;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
@@ -86,6 +87,20 @@ public class BoundarySurface extends CityObject {
         return openings;
     }
 
+    @Override
+    public String getDisplayText() {
+        return String.format("[%s] %s", this.type.name(), this.getGmlId().toString());
+    }
+
+    @Override
+    public Color getRenderColor() {
+        return switch (type) {
+            case ROOF -> Color.RED;
+            case GROUND -> Color.KHAKI;
+            default -> Color.WHITE;
+        };
+    }
+
     @Override
     public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
         if (gmlObject.getId() == null) {

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

@@ -25,6 +25,7 @@ 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.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
@@ -66,6 +67,10 @@ public class BridgeConstructiveElement extends CityObject {
         return parent;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return parent.getRenderColor().brighter();
+    }
 
     @Override
     public Copyable createCopyInstance() {

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

@@ -25,6 +25,7 @@ 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.bridge.AbstractBridge;
 import org.citygml4j.core.model.bridge.BridgeInstallation;
 import org.citygml4j.core.model.bridge.BridgeInstallationProperty;
@@ -97,6 +98,11 @@ public class BridgeObject extends CityObject {
         return bridgeFurniture;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.LIGHTSTEELBLUE;
+    }
+
     @Override
     public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
         for (Geometry geom : getGeometries()) {

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

@@ -2,6 +2,7 @@ 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 java.io.Serial;
 
@@ -39,7 +40,12 @@ public class BridgeRoom extends AbstractRoom {
 
     @Override
     public CityObject getTopLevelCityObject() {
-        return getParent();
+        return parent.getTopLevelCityObject();
+    }
+
+    @Override
+    public Color getRenderColor() {
+        return parent.getRenderColor();
     }
 
     @Override

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

@@ -2,6 +2,7 @@ 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.building.BuildingFurnitureProperty;
 
 import java.io.Serial;
@@ -55,6 +56,11 @@ public class BuildingRoom extends AbstractRoom {
         return getParent().getTopLevelCityObject();
     }
 
+    @Override
+    public Color getRenderColor() {
+        return parent.getRenderColor();
+    }
+
     @Override
     public void collectInstances(CopyHandler handler) {
         super.collectInstances(handler);

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

@@ -5,6 +5,7 @@ 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.util.geometry.GeometryFactory;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
@@ -35,6 +36,11 @@ public class CityFurniture extends CityObject {
         return cgmlCityFurniture;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.THISTLE;
+    }
+
     public void setGmlObject(org.citygml4j.core.model.cityfurniture.CityFurniture gmlCityFurniture) {
         cgmlCityFurniture = gmlCityFurniture;
     }

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

@@ -24,6 +24,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 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.util.geometry.GeometryFactory;
 
@@ -44,6 +45,7 @@ public abstract class CityObject extends GmlElement {
     @Serial
     private static final long serialVersionUID = 651712070755024188L;
 
+
     private final List<Geometry> geometryList = new ArrayList<>();
     private final List<GenericAttribute> genericAttributeList = new ArrayList<>();
     /**
@@ -107,6 +109,17 @@ public abstract class CityObject extends GmlElement {
      */
     public abstract CityObject getTopLevelCityObject();
 
+    /**
+     * Returns the display text for this object
+     */
+    public String getDisplayText() {
+        return String.format("[%s] %s", this.getClass().getSimpleName(), this.getGmlId().toString());
+    }
+
+    public Color getRenderColor() {
+        return Color.WHITE;
+    }
+
     public void addGenericAttribute(GenericAttribute genericAttribute) {
         genericAttributeList.add(genericAttribute);
     }

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

@@ -7,6 +7,7 @@ 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.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractCityObject;
@@ -210,6 +211,11 @@ public class GenericCityObject extends CityObject {
         return boundarySurfaceList;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.DARKGOLDENROD;
+    }
+
     @Override
     public void unsetGmlGeometries() {
         cgmlGos.setLod1Solid(null);

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

@@ -25,6 +25,7 @@ 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.bridge.BridgeInstallation;
 import org.citygml4j.core.model.construction.AbstractInstallation;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
@@ -177,6 +178,11 @@ public class Installation extends CityObject {
         return parent;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return parent.getRenderColor().darker();
+    }
+
     public void addBoundarySurface(BoundarySurface bs) {
         boundarySurfaces.add(bs);
         bs.setParent(this);

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

@@ -22,6 +22,7 @@ import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
+import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.model.landuse.LandUse;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -63,6 +64,11 @@ public class LandObject extends CityObject {
         return FeatureType.LAND;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.TAN;
+    }
+
     private void setMultiSurfaceAccordingToLod(Geometry geom, MultiSurface ms) {
         switch (geom.getLod()) {
             case LOD0:

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

@@ -24,6 +24,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
+import javafx.scene.paint.Color;
 import org.citygml4j.core.model.relief.ReliefFeature;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 
@@ -156,6 +157,11 @@ public class ReliefObject extends CityObject {
         return FeatureType.LAND;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.TAN;
+    }
+
     public void addComponent(TinObject component) {
         components.add(component);
     }

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

@@ -21,6 +21,7 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
+import javafx.scene.paint.Color;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.relief.TINRelief;
@@ -101,4 +102,9 @@ public class TinObject extends CityObject {
         return FeatureType.LAND;
     }
 
+    @Override
+    public Color getRenderColor() {
+        return Color.TAN;
+    }
+
 }

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

@@ -65,10 +65,12 @@ public class TopLevelTransportFeature extends TransportationSpace {
 
     public void addSection(TransportSection section) {
         sections.add(section);
+        section.setParent(this);
     }
 
     public void addIntersection(TransportSection section) {
         intersections.add(section);
+        section.setParent(this);
     }
 
     public List<TransportSection> getSections() {

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

@@ -11,6 +11,9 @@ import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
 
 public class TrafficAreaObject extends TransportationObject {
 
+    private TrafficSpaceObject parent;
+
+
     public enum TrafficAreaType {
         TRAFFIC_AREA, AUXILIARY_TRAFFIC_AREA
     }
@@ -116,7 +119,15 @@ public class TrafficAreaObject extends TransportationObject {
 
     @Override
     public CityObject getTopLevelCityObject() {
-        return this;
+        return parent.getTopLevelCityObject();
+    }
+
+    public void setParent(TrafficSpaceObject parent) {
+        this.parent = parent;
+    }
+
+    public TrafficSpaceObject getParent() {
+        return parent;
     }
 
     @Override

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

@@ -19,6 +19,8 @@ public class TrafficSpaceObject extends TransportationObject {
 
     private final List<TrafficAreaObject> trafficAreas = new ArrayList<>();
 
+    private TransportationSpace parent;
+
     public enum TrafficSpaceType {
         TRAFFIC_SPACE, AUXILIARY_TRAFFIC_SPACE
     }
@@ -37,6 +39,7 @@ public class TrafficSpaceObject extends TransportationObject {
 
     public void addTrafficArea(TrafficAreaObject trafficAreaObject) {
         trafficAreas.add(trafficAreaObject);
+        trafficAreaObject.setParent(this);
     }
 
     @Override
@@ -138,10 +141,18 @@ public class TrafficSpaceObject extends TransportationObject {
 
     @Override
     public CityObject getTopLevelCityObject() {
-        return this;
+        return parent.getTopLevelCityObject();
     }
 
 
+    public void setParent(TransportationSpace parent) {
+        this.parent = parent;
+    }
+
+    public TransportationSpace getParent() {
+        return parent;
+    }
+
     @Override
     public String toString() {
         return "TransportationSpaceObject [id=" + getGmlId() + "]";

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

@@ -2,6 +2,8 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 public class TransportSection extends TransportationSpace {
 
+    private TopLevelTransportFeature parent;
+
     public enum SectionType {
         SECTION, INTERSECTION
     }
@@ -13,5 +15,17 @@ public class TransportSection extends TransportationSpace {
         }
     }
 
+    public void setParent(TopLevelTransportFeature parent) {
+        this.parent = parent;
+    }
+
+    public TopLevelTransportFeature getParent() {
+        return parent;
+    }
+
+    @Override
+    public CityObject getTopLevelCityObject() {
+        return parent.getTopLevelCityObject();
+    }
 
 }

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

@@ -25,6 +25,7 @@ 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;
@@ -77,6 +78,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,6 +104,11 @@ public abstract class TransportationObject extends CityObject {
         return "TransportationObject [id=" + getGmlId() + "]";
     }
 
+    @Override
+    public String getDisplayText() {
+        return String.format("[%s] %s", this.type.name(), this.getGmlId().toString());
+    }
+
 
     @Override
     public void fillValues(Copyable original, CopyHandler handler) {

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

@@ -35,10 +35,12 @@ 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