diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java index 3b73f01b290c48e2a4c1a9921f0b4eda11a31aa5..e8e83d59962f7a305aee67ecabe283af61271733 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java @@ -76,12 +76,18 @@ public class CityFurniture extends CityObject { case LOD0: cgmlCityFurniture.setLod0MultiSurface(new MultiSurfaceProperty(ms)); break; + case LOD1: + cgmlCityFurniture.getDeprecatedProperties().setLod1Geometry(new MultiSurfaceProperty(ms)); + break; case LOD2: cgmlCityFurniture.setLod2MultiSurface(new MultiSurfaceProperty(ms)); break; case LOD3: cgmlCityFurniture.setLod3MultiSurface(new MultiSurfaceProperty(ms)); break; + case LOD4: + cgmlCityFurniture.getDeprecatedProperties().setLod4Geometry(new MultiSurfaceProperty(ms)); + break; default: throw new IllegalStateException("Cannot add " + geom.getLod() + " multi surface to buildings"); } @@ -98,6 +104,8 @@ public class CityFurniture extends CityObject { case LOD3: cgmlCityFurniture.setLod3Solid(new SolidProperty(solid)); break; + case LOD4: + cgmlCityFurniture.getDeprecatedProperties().setLod4Geometry(new SolidProperty(solid)); default: throw new IllegalStateException("Cannot add " + geom.getLod() + " solid to buildings"); } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java index 3ddaa0f02ac5a69d352f86862335fa29354af33c..40a8c41668562af06c6b8497cf2b9a8dfc221e42 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java @@ -84,14 +84,20 @@ public class GenericCityObject extends CityObject { case LOD0: cgmlGos.setLod0MultiSurface(new MultiSurfaceProperty(ms)); break; + case LOD1: + cgmlGos.getDeprecatedProperties().setLod1Geometry(new MultiSurfaceProperty(ms)); + break; case LOD2: cgmlGos.setLod2MultiSurface(new MultiSurfaceProperty(ms)); break; case LOD3: cgmlGos.setLod3MultiSurface(new MultiSurfaceProperty(ms)); break; + case LOD4: + cgmlGos.getDeprecatedProperties().setLod4Geometry(new MultiSurfaceProperty(ms)); + break; default: - throw new IllegalStateException("Cannot add " + geom.getLod() + " multi surface to buildings"); + throw new IllegalStateException("Cannot add " + geom.getLod() + " multi surface to generic city object"); } } @@ -106,6 +112,9 @@ public class GenericCityObject extends CityObject { case LOD3: cgmlGos.setLod3Solid(new SolidProperty(solid)); break; + case LOD4: + cgmlGos.getDeprecatedProperties().setLod4Geometry(new SolidProperty(solid)); + break; default: throw new IllegalStateException("Cannot add " + geom.getLod() + " solid to buildings"); }