added point and curve style settings for furniture and vegetation

3dcitydb · Sep 25, 2024 · a5affac · a5affac
1 parent e0f26dc
commit a5affac
Show file tree

Hide file tree

Showing 7 changed files with 321 additions and 173 deletions.
diff --git a/.../src/main/java/org/citydb/gui/operation/visExporter/preferences/VisExportPreferences.java b/.../src/main/java/org/citydb/gui/operation/visExporter/preferences/VisExportPreferences.java
@@ -54,10 +54,18 @@ public VisExportPreferences(ViewController viewController, Config config) {
                 true, true, true, true,
                 config)));
         renderingNode.addChildEntry(new DefaultPreferencesEntry(new BuildingStylingPanel(config)));
-        renderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
-                "pref.tree.visExport.cityFurniture.styling",
+
+        DefaultPreferencesEntry cityFurnitureRenderingNode = new EmptyPanel(
+                () -> Language.I18N.getString("pref.tree.visExport.cityFurniture.styling"));
+        cityFurnitureRenderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
+                "pref.tree.visExport.surfaceAndSolid.styling",
                 () -> config.getVisExportConfig().getCityFurnitureStyles(),
                 config)));
+        cityFurnitureRenderingNode.addChildEntry(new DefaultPreferencesEntry(new PointAndCurveStylingPanel(
+                () -> config.getVisExportConfig().getCityFurniturePointAndCurve(),
+                config)));
+        renderingNode.addChildEntry(cityFurnitureRenderingNode);
+
         renderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
                 "pref.tree.visExport.cityObjectGroup.styling",
                 () -> config.getVisExportConfig().getReliefStyles(),
@@ -85,7 +93,7 @@ public VisExportPreferences(ViewController viewController, Config config) {
                 () -> Language.I18N.getString("pref.tree.visExport.transportation.styling"));
         transportationComplexRenderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
                 "pref.tree.visExport.surfaceAndSolid.styling",
-                () -> config.getVisExportConfig().getGenericCityObjectStyles(),
+                () -> config.getVisExportConfig().getTransportationStyles(),
                 config)));
         transportationComplexRenderingNode.addChildEntry(new DefaultPreferencesEntry(new PointAndCurveStylingPanel(
                 () -> config.getVisExportConfig().getTransportationPointAndCurve(),
@@ -97,10 +105,18 @@ public VisExportPreferences(ViewController viewController, Config config) {
                 () -> config.getVisExportConfig().getTunnelStyles(),
                 true, true, true, true,
                 config)));
-        renderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
-                "pref.tree.visExport.vegetation.styling",
+
+        DefaultPreferencesEntry vegetationRenderingNode = new EmptyPanel(
+                () -> Language.I18N.getString("pref.tree.visExport.vegetation.styling"));
+        vegetationRenderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
+                "pref.tree.visExport.surfaceAndSolid.styling",
                 () -> config.getVisExportConfig().getVegetationStyles(),
                 config)));
+        vegetationRenderingNode.addChildEntry(new DefaultPreferencesEntry(new PointAndCurveStylingPanel(
+                () -> config.getVisExportConfig().getSolitaryVegetationObjectPointAndCurve(),
+                config)));
+        renderingNode.addChildEntry(vegetationRenderingNode);
+
         renderingNode.addChildEntry(new DefaultPreferencesEntry(new SurfaceStylingPanel(
                 "pref.tree.visExport.waterBody.styling",
                 () -> config.getVisExportConfig().getWaterBodyStyles(),

diff --git a/impexp-config/src/main/java/org/citydb/config/project/visExporter/VisExportConfig.java b/impexp-config/src/main/java/org/citydb/config/project/visExporter/VisExportConfig.java
@@ -54,13 +54,15 @@
         "landUseBalloon",
         "vegetationStyles",
         "vegetationBalloon",
+        "solitaryVegetationObjectPointAndCurve",
         "transportationStyles",
         "transportationBalloon",
         "transportationPointAndCurve",
         "reliefStyles",
         "reliefBalloon",
         "cityFurnitureStyles",
         "cityFurnitureBalloon",
+        "cityFurniturePointAndCurve",
         "genericCityObjectStyles",
         "genericCityObject3DBalloon",
         "genericCityObjectPointAndCurve",
@@ -107,6 +109,7 @@ public class VisExportConfig {
     @XmlJavaTypeAdapter(StylesAdapter.class)
     private Styles vegetationStyles;
     private Balloon vegetationBalloon;
+    private PointAndCurve solitaryVegetationObjectPointAndCurve;
     @XmlJavaTypeAdapter(StylesAdapter.class)
     private Styles transportationStyles;
     private Balloon transportationBalloon;
@@ -117,6 +120,7 @@ public class VisExportConfig {
     @XmlJavaTypeAdapter(StylesAdapter.class)
     private Styles cityFurnitureStyles;
     private Balloon cityFurnitureBalloon;
+    private PointAndCurve cityFurniturePointAndCurve;
     @XmlJavaTypeAdapter(StylesAdapter.class)
     private Styles genericCityObjectStyles;
     private Balloon genericCityObject3DBalloon;
@@ -166,13 +170,15 @@ public VisExportConfig() {
         landUseBalloon = new Balloon();
         vegetationStyles = new Styles();
         vegetationBalloon = new Balloon();
+        solitaryVegetationObjectPointAndCurve = new PointAndCurve();
         transportationStyles = new Styles();
         transportationBalloon = new Balloon();
         transportationPointAndCurve = new PointAndCurve();
         reliefStyles = new Styles();
         reliefBalloon = new Balloon();
         cityFurnitureStyles = new Styles();
         cityFurnitureBalloon = new Balloon();
+        cityFurniturePointAndCurve = new PointAndCurve();
         genericCityObjectStyles = new Styles();
         genericCityObject3DBalloon = new Balloon();
         genericCityObjectPointAndCurve = new PointAndCurve();
@@ -450,6 +456,14 @@ public void setGenericCityObjectStyles(Styles genericCityObjectStyles) {
         }
     }
 
+    public void setSolitaryVegetationObjectPointAndCurve(PointAndCurve solitaryVegetationObjectPointAndCurve) {
+        this.solitaryVegetationObjectPointAndCurve = solitaryVegetationObjectPointAndCurve;
+    }
+
+    public PointAndCurve getSolitaryVegetationObjectPointAndCurve() {
+        return solitaryVegetationObjectPointAndCurve;
+    }
+
     public Styles getGenericCityObjectStyles() {
         return genericCityObjectStyles;
     }
@@ -488,6 +502,14 @@ public Balloon getCityFurnitureBalloon() {
         return cityFurnitureBalloon;
     }
 
+    public void setCityFurniturePointAndCurve(PointAndCurve cityFurniturePointAndCurve) {
+        this.cityFurniturePointAndCurve = cityFurniturePointAndCurve;
+    }
+
+    public PointAndCurve getCityFurniturePointAndCurve() {
+        return cityFurniturePointAndCurve;
+    }
+
     public void setTransportationStyles(Styles transportationStyles) {
         if (transportationStyles != null) {
             this.transportationStyles = transportationStyles;
@@ -506,8 +528,8 @@ public Balloon getTransportationBalloon() {
         return transportationBalloon;
     }
 
-    public void setTransportationPointAndCurve(PointAndCurve TransportationPointAndCurve) {
-        this.transportationPointAndCurve = TransportationPointAndCurve;
+    public void setTransportationPointAndCurve(PointAndCurve transportationPointAndCurve) {
+        this.transportationPointAndCurve = transportationPointAndCurve;
     }
 
     public PointAndCurve getTransportationPointAndCurve() {

diff --git a/impexp-core/src/main/java/org/citydb/core/ade/visExporter/ADEVisExportQueryHelper.java b/impexp-core/src/main/java/org/citydb/core/ade/visExporter/ADEVisExportQueryHelper.java
@@ -49,6 +49,8 @@ public interface ADEVisExportQueryHelper {
 
     String getSolitaryVegetationObjectQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);
 
+    String getSolitaryVegetationObjectPointAndCurveQuery(int lodToExportFrom, int objectClassId);
+
     String getPlantCoverQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);
 
     String getGenericCityObjectQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);
@@ -57,6 +59,8 @@ public interface ADEVisExportQueryHelper {
 
     String getCityFurnitureQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);
 
+    String getCityFurniturePointAndCurveQuery(int lodToExportFrom, int objectClassId);
+
     String getWaterBodyQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);
 
     String getLandUseQuery(int lodToExportFrom, DisplayForm displayForm, int objectClassId);

diff --git a/impexp-vis-plugin/src/main/java/org/citydb/vis/controller/VisExporter.java b/impexp-vis-plugin/src/main/java/org/citydb/vis/controller/VisExporter.java
@@ -897,6 +897,10 @@ private void addStyle(DisplayForm displayForm, int objectClassId, SAXWriter saxW
 
         switch (Util.getCityGMLClass(objectClassId)) {
             case SOLITARY_VEGETATION_OBJECT:
+                style = config.getVisExportConfig().getVegetationStyles().getOrDefault(type);
+                styleBasisName = SolitaryVegetationObject.STYLE_BASIS_NAME;
+                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getSolitaryVegetationObjectPointAndCurve(), styleBasisName);
+                break;
             case PLANT_COVER:
                 style = config.getVisExportConfig().getVegetationStyles().getOrDefault(type);
                 styleBasisName = SolitaryVegetationObject.STYLE_BASIS_NAME;
@@ -906,9 +910,9 @@ private void addStyle(DisplayForm displayForm, int objectClassId, SAXWriter saxW
             case RAILWAY:
             case ROAD:
             case SQUARE:
-                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getTransportationPointAndCurve(), Transportation.STYLE_BASIS_NAME);
                 style = config.getVisExportConfig().getTransportationStyles().getOrDefault(type);
                 styleBasisName = Transportation.STYLE_BASIS_NAME;
+                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getTransportationPointAndCurve(), styleBasisName);
                 break;
             case RELIEF_FEATURE:
                 style = config.getVisExportConfig().getReliefStyles().getOrDefault(type);
@@ -921,11 +925,12 @@ private void addStyle(DisplayForm displayForm, int objectClassId, SAXWriter saxW
             case CITY_FURNITURE:
                 style = config.getVisExportConfig().getCityFurnitureStyles().getOrDefault(type);
                 styleBasisName = CityFurniture.STYLE_BASIS_NAME;
+                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getCityFurniturePointAndCurve(), styleBasisName);
                 break;
             case GENERIC_CITY_OBJECT:
-                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getGenericCityObjectPointAndCurve(), GenericCityObject.STYLE_BASIS_NAME);
                 style = config.getVisExportConfig().getGenericCityObjectStyles().getOrDefault(type);
                 styleBasisName = GenericCityObject.STYLE_BASIS_NAME;
+                addPointAndCurveStyle(saxWriter, config.getVisExportConfig().getGenericCityObjectPointAndCurve(), styleBasisName);
                 break;
             case LAND_USE:
                 style = config.getVisExportConfig().getLandUseStyles().getOrDefault(type);