changed to beta8 classes

src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZonePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/ZoneDoorPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -20,16 +20,16 @@ import org.w3._1999.xlink.TypeType;
 
 
 /**
- * <p>Java class for ThermalZonePropertyType complex type.
+ * <p>Java class for ZoneDoorPropertyType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="ThermalZonePropertyType"&gt;
+ * &lt;complexType name="ZoneDoorPropertyType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
  *       &lt;sequence minOccurs="0"&gt;
- *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ThermalZone"/&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneDoor"/&gt;
  *       &lt;/sequence&gt;
  *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
  *     &lt;/restriction&gt;
@@ -40,13 +40,13 @@ import org.w3._1999.xlink.TypeType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ThermalZonePropertyType", propOrder = {
-    "thermalZone"
+@XmlType(name = "ZoneDoorPropertyType", propOrder = {
+    "zoneDoor"
 })
-public class ThermalZonePropertyType {
+public class ZoneDoorPropertyType {
 
-    @XmlElement(name = "ThermalZone")
-    protected ThermalZoneType thermalZone;
+    @XmlElement(name = "ZoneDoor")
+    protected ZoneDoorType zoneDoor;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
     protected String remoteSchema;
@@ -66,31 +66,31 @@ public class ThermalZonePropertyType {
     protected ActuateType actuate;
 
     /**
-     * Gets the value of the thermalZone property.
+     * Gets the value of the zoneDoor property.
      * 
      * @return
      *     possible object is
-     *     {@link ThermalZoneType }
+     *     {@link ZoneDoorType }
      *     
      */
-    public ThermalZoneType getThermalZone() {
-        return thermalZone;
+    public ZoneDoorType getZoneDoor() {
+        return zoneDoor;
     }
 
     /**
-     * Sets the value of the thermalZone property.
+     * Sets the value of the zoneDoor property.
      * 
      * @param value
      *     allowed object is
-     *     {@link ThermalZoneType }
+     *     {@link ZoneDoorType }
      *     
      */
-    public void setThermalZone(ThermalZoneType value) {
-        this.thermalZone = value;
+    public void setZoneDoor(ZoneDoorType value) {
+        this.zoneDoor = value;
     }
 
-    public boolean isSetThermalZone() {
-        return (this.thermalZone!= null);
+    public boolean isSetZoneDoor() {
+        return (this.zoneDoor!= null);
     }
 
     /**

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneDoorType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneDoorType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneDoorType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneOpeningType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneDoorType")
+public class ZoneDoorType
+    extends AbstractZoneOpeningType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfacePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/ZoneExteriorWallSurfacePropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -20,16 +20,16 @@ import org.w3._1999.xlink.TypeType;
 
 
 /**
- * <p>Java class for BasementCeilingSurfacePropertyType complex type.
+ * <p>Java class for ZoneExteriorWallSurfacePropertyType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="BasementCeilingSurfacePropertyType"&gt;
+ * &lt;complexType name="ZoneExteriorWallSurfacePropertyType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
  *       &lt;sequence minOccurs="0"&gt;
- *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}BasementCeilingSurface"/&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneExteriorWallSurface"/&gt;
  *       &lt;/sequence&gt;
  *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
  *     &lt;/restriction&gt;
@@ -40,13 +40,13 @@ import org.w3._1999.xlink.TypeType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasementCeilingSurfacePropertyType", propOrder = {
-    "basementCeilingSurface"
+@XmlType(name = "ZoneExteriorWallSurfacePropertyType", propOrder = {
+    "zoneExteriorWallSurface"
 })
-public class BasementCeilingSurfacePropertyType {
+public class ZoneExteriorWallSurfacePropertyType {
 
-    @XmlElement(name = "BasementCeilingSurface")
-    protected BasementCeilingSurfaceType basementCeilingSurface;
+    @XmlElement(name = "ZoneExteriorWallSurface")
+    protected ZoneExteriorWallSurfaceType zoneExteriorWallSurface;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
     protected String remoteSchema;
@@ -66,31 +66,31 @@ public class BasementCeilingSurfacePropertyType {
     protected ActuateType actuate;
 
     /**
-     * Gets the value of the basementCeilingSurface property.
+     * Gets the value of the zoneExteriorWallSurface property.
      * 
      * @return
      *     possible object is
-     *     {@link BasementCeilingSurfaceType }
+     *     {@link ZoneExteriorWallSurfaceType }
      *     
      */
-    public BasementCeilingSurfaceType getBasementCeilingSurface() {
-        return basementCeilingSurface;
+    public ZoneExteriorWallSurfaceType getZoneExteriorWallSurface() {
+        return zoneExteriorWallSurface;
     }
 
     /**
-     * Sets the value of the basementCeilingSurface property.
+     * Sets the value of the zoneExteriorWallSurface property.
      * 
      * @param value
      *     allowed object is
-     *     {@link BasementCeilingSurfaceType }
+     *     {@link ZoneExteriorWallSurfaceType }
      *     
      */
-    public void setBasementCeilingSurface(BasementCeilingSurfaceType value) {
-        this.basementCeilingSurface = value;
+    public void setZoneExteriorWallSurface(ZoneExteriorWallSurfaceType value) {
+        this.zoneExteriorWallSurface = value;
     }
 
-    public boolean isSetBasementCeilingSurface() {
-        return (this.basementCeilingSurface!= null);
+    public boolean isSetZoneExteriorWallSurface() {
+        return (this.zoneExteriorWallSurface!= null);
     }
 
     /**

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneExteriorWallSurfaceType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneExteriorWallSurfaceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneExteriorWallSurfaceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneBoundarySurfaceType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneExteriorWallSurfaceType")
+public class ZoneExteriorWallSurfaceType
+    extends AbstractZoneBoundarySurfaceType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneGroundSurfacePropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZoneGroundSurfacePropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneGroundSurfacePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneGroundSurface"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneGroundSurfacePropertyType", propOrder = {
+    "zoneGroundSurface"
+})
+public class ZoneGroundSurfacePropertyType {
+
+    @XmlElement(name = "ZoneGroundSurface")
+    protected ZoneGroundSurfaceType zoneGroundSurface;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zoneGroundSurface property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneGroundSurfaceType }
+     *     
+     */
+    public ZoneGroundSurfaceType getZoneGroundSurface() {
+        return zoneGroundSurface;
+    }
+
+    /**
+     * Sets the value of the zoneGroundSurface property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneGroundSurfaceType }
+     *     
+     */
+    public void setZoneGroundSurface(ZoneGroundSurfaceType value) {
+        this.zoneGroundSurface = value;
+    }
+
+    public boolean isSetZoneGroundSurface() {
+        return (this.zoneGroundSurface!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneGroundSurfaceType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneGroundSurfaceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneGroundSurfaceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneBoundarySurfaceType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneGroundSurfaceType")
+public class ZoneGroundSurfaceType
+    extends AbstractZoneBoundarySurfaceType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneIntermediateFloorSurfacePropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZoneIntermediateFloorSurfacePropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneIntermediateFloorSurfacePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneIntermediateFloorSurface"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneIntermediateFloorSurfacePropertyType", propOrder = {
+    "zoneIntermediateFloorSurface"
+})
+public class ZoneIntermediateFloorSurfacePropertyType {
+
+    @XmlElement(name = "ZoneIntermediateFloorSurface")
+    protected ZoneIntermediateFloorSurfaceType zoneIntermediateFloorSurface;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zoneIntermediateFloorSurface property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneIntermediateFloorSurfaceType }
+     *     
+     */
+    public ZoneIntermediateFloorSurfaceType getZoneIntermediateFloorSurface() {
+        return zoneIntermediateFloorSurface;
+    }
+
+    /**
+     * Sets the value of the zoneIntermediateFloorSurface property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneIntermediateFloorSurfaceType }
+     *     
+     */
+    public void setZoneIntermediateFloorSurface(ZoneIntermediateFloorSurfaceType value) {
+        this.zoneIntermediateFloorSurface = value;
+    }
+
+    public boolean isSetZoneIntermediateFloorSurface() {
+        return (this.zoneIntermediateFloorSurface!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneIntermediateFloorSurfaceType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneIntermediateFloorSurfaceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneIntermediateFloorSurfaceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneBoundarySurfaceType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneIntermediateFloorSurfaceType")
+public class ZoneIntermediateFloorSurfaceType
+    extends AbstractZoneBoundarySurfaceType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfacePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/ZonePartPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -20,16 +20,16 @@ import org.w3._1999.xlink.TypeType;
 
 
 /**
- * <p>Java class for PartyWallSurfacePropertyType complex type.
+ * <p>Java class for ZonePartPropertyType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="PartyWallSurfacePropertyType"&gt;
+ * &lt;complexType name="ZonePartPropertyType"&gt;
  *   &lt;complexContent&gt;
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
  *       &lt;sequence minOccurs="0"&gt;
- *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}PartyWallSurface"/&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZonePart"/&gt;
  *       &lt;/sequence&gt;
  *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
  *     &lt;/restriction&gt;
@@ -40,13 +40,13 @@ import org.w3._1999.xlink.TypeType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PartyWallSurfacePropertyType", propOrder = {
-    "partyWallSurface"
+@XmlType(name = "ZonePartPropertyType", propOrder = {
+    "zonePart"
 })
-public class PartyWallSurfacePropertyType {
+public class ZonePartPropertyType {
 
-    @XmlElement(name = "PartyWallSurface")
-    protected PartyWallSurfaceType partyWallSurface;
+    @XmlElement(name = "ZonePart")
+    protected ZonePartType zonePart;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
     protected String remoteSchema;
@@ -66,31 +66,31 @@ public class PartyWallSurfacePropertyType {
     protected ActuateType actuate;
 
     /**
-     * Gets the value of the partyWallSurface property.
+     * Gets the value of the zonePart property.
      * 
      * @return
      *     possible object is
-     *     {@link PartyWallSurfaceType }
+     *     {@link ZonePartType }
      *     
      */
-    public PartyWallSurfaceType getPartyWallSurface() {
-        return partyWallSurface;
+    public ZonePartType getZonePart() {
+        return zonePart;
     }
 
     /**
-     * Sets the value of the partyWallSurface property.
+     * Sets the value of the zonePart property.
      * 
      * @param value
      *     allowed object is
-     *     {@link PartyWallSurfaceType }
+     *     {@link ZonePartType }
      *     
      */
-    public void setPartyWallSurface(PartyWallSurfaceType value) {
-        this.partyWallSurface = value;
+    public void setZonePart(ZonePartType value) {
+        this.zonePart = value;
     }
 
-    public boolean isSetPartyWallSurface() {
-        return (this.partyWallSurface!= null);
+    public boolean isSetZonePart() {
+        return (this.zonePart!= null);
     }
 
     /**

src-gen/org/sig3d/citygml/energyADE3beta8/ZonePartType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZonePartType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZonePartType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZonePartType")
+public class ZonePartType
+    extends AbstractZoneType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZonePropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZonePropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZonePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}Zone"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZonePropertyType", propOrder = {
+    "zone"
+})
+public class ZonePropertyType {
+
+    @XmlElement(name = "Zone")
+    protected ZoneType zone;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zone property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneType }
+     *     
+     */
+    public ZoneType getZone() {
+        return zone;
+    }
+
+    /**
+     * Sets the value of the zone property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneType }
+     *     
+     */
+    public void setZone(ZoneType value) {
+        this.zone = value;
+    }
+
+    public boolean isSetZone() {
+        return (this.zone!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneRoofSurfacePropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZoneRoofSurfacePropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneRoofSurfacePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneRoofSurface"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneRoofSurfacePropertyType", propOrder = {
+    "zoneRoofSurface"
+})
+public class ZoneRoofSurfacePropertyType {
+
+    @XmlElement(name = "ZoneRoofSurface")
+    protected ZoneRoofSurfaceType zoneRoofSurface;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zoneRoofSurface property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneRoofSurfaceType }
+     *     
+     */
+    public ZoneRoofSurfaceType getZoneRoofSurface() {
+        return zoneRoofSurface;
+    }
+
+    /**
+     * Sets the value of the zoneRoofSurface property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneRoofSurfaceType }
+     *     
+     */
+    public void setZoneRoofSurface(ZoneRoofSurfaceType value) {
+        this.zoneRoofSurface = value;
+    }
+
+    public boolean isSetZoneRoofSurface() {
+        return (this.zoneRoofSurface!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneRoofSurfaceType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneRoofSurfaceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneRoofSurfaceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneBoundarySurfaceType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneRoofSurfaceType")
+public class ZoneRoofSurfaceType
+    extends AbstractZoneBoundarySurfaceType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZoneType.java → src-gen/org/sig3d/citygml/energyADE3beta8/ZoneType.java

@@ -2,31 +2,30 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AbstractUsageZoneType complex type.
+ * <p>Java class for ZoneType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="AbstractUsageZoneType"&gt;
+ * &lt;complexType name="ZoneType"&gt;
  *   &lt;complexContent&gt;
- *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartitionType"&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneType"&gt;
  *       &lt;sequence&gt;
- *         &lt;element name="buildingUnit" type="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnitPropertyType" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="zonePart" type="{http://www.citygml.org/ade/energy/3.0}ZonePartPropertyType" maxOccurs="unbounded" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -36,53 +35,50 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AbstractUsageZoneType", propOrder = {
-    "buildingUnit"
+@XmlType(name = "ZoneType", propOrder = {
+    "zonePart"
 })
-@XmlSeeAlso({
-    UsageZoneType.class
-})
-public abstract class AbstractUsageZoneType
-    extends AbstractBuildingPartitionType
+public class ZoneType
+    extends AbstractZoneType
 {
 
-    protected List<AbstractBuildingUnitPropertyType> buildingUnit;
+    protected List<ZonePartPropertyType> zonePart;
 
     /**
-     * Gets the value of the buildingUnit property.
+     * Gets the value of the zonePart property.
      * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the buildingUnit property.
+     * This is why there is not a <CODE>set</CODE> method for the zonePart property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getBuildingUnit().add(newItem);
+     *    getZonePart().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link AbstractBuildingUnitPropertyType }
+     * {@link ZonePartPropertyType }
      * 
      * 
      */
-    public List<AbstractBuildingUnitPropertyType> getBuildingUnit() {
-        if (buildingUnit == null) {
-            buildingUnit = new ArrayList<AbstractBuildingUnitPropertyType>();
+    public List<ZonePartPropertyType> getZonePart() {
+        if (zonePart == null) {
+            zonePart = new ArrayList<ZonePartPropertyType>();
         }
-        return this.buildingUnit;
+        return this.zonePart;
     }
 
-    public boolean isSetBuildingUnit() {
-        return ((this.buildingUnit!= null)&&(!this.buildingUnit.isEmpty()));
+    public boolean isSetZonePart() {
+        return ((this.zonePart!= null)&&(!this.zonePart.isEmpty()));
     }
 
-    public void unsetBuildingUnit() {
-        this.buildingUnit = null;
+    public void unsetZonePart() {
+        this.zonePart = null;
     }
 
 }

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneUndergroundWallSurfacePropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZoneUndergroundWallSurfacePropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneUndergroundWallSurfacePropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneUndergroundWallSurface"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneUndergroundWallSurfacePropertyType", propOrder = {
+    "zoneUndergroundWallSurface"
+})
+public class ZoneUndergroundWallSurfacePropertyType {
+
+    @XmlElement(name = "ZoneUndergroundWallSurface")
+    protected ZoneUndergroundWallSurfaceType zoneUndergroundWallSurface;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zoneUndergroundWallSurface property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneUndergroundWallSurfaceType }
+     *     
+     */
+    public ZoneUndergroundWallSurfaceType getZoneUndergroundWallSurface() {
+        return zoneUndergroundWallSurface;
+    }
+
+    /**
+     * Sets the value of the zoneUndergroundWallSurface property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneUndergroundWallSurfaceType }
+     *     
+     */
+    public void setZoneUndergroundWallSurface(ZoneUndergroundWallSurfaceType value) {
+        this.zoneUndergroundWallSurface = value;
+    }
+
+    public boolean isSetZoneUndergroundWallSurface() {
+        return (this.zoneUndergroundWallSurface!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneUndergroundWallSurfaceType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneUndergroundWallSurfaceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneUndergroundWallSurfaceType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneBoundarySurfaceType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneUndergroundWallSurfaceType")
+public class ZoneUndergroundWallSurfaceType
+    extends AbstractZoneBoundarySurfaceType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneWindowPropertyType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.w3._1999.xlink.ActuateType;
+import org.w3._1999.xlink.ShowType;
+import org.w3._1999.xlink.TypeType;
+
+
+/**
+ * <p>Java class for ZoneWindowPropertyType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneWindowPropertyType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *       &lt;sequence minOccurs="0"&gt;
+ *         &lt;element ref="{http://www.citygml.org/ade/energy/3.0}ZoneWindow"/&gt;
+ *       &lt;/sequence&gt;
+ *       &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
+ *     &lt;/restriction&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneWindowPropertyType", propOrder = {
+    "zoneWindow"
+})
+public class ZoneWindowPropertyType {
+
+    @XmlElement(name = "ZoneWindow")
+    protected ZoneWindowType zoneWindow;
+    @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
+    @XmlSchemaType(name = "anyURI")
+    protected String remoteSchema;
+    @XmlAttribute(name = "type", namespace = "http://www.w3.org/1999/xlink")
+    protected TypeType type;
+    @XmlAttribute(name = "href", namespace = "http://www.w3.org/1999/xlink")
+    protected String href;
+    @XmlAttribute(name = "role", namespace = "http://www.w3.org/1999/xlink")
+    protected String role;
+    @XmlAttribute(name = "arcrole", namespace = "http://www.w3.org/1999/xlink")
+    protected String arcrole;
+    @XmlAttribute(name = "title", namespace = "http://www.w3.org/1999/xlink")
+    protected String title;
+    @XmlAttribute(name = "show", namespace = "http://www.w3.org/1999/xlink")
+    protected ShowType show;
+    @XmlAttribute(name = "actuate", namespace = "http://www.w3.org/1999/xlink")
+    protected ActuateType actuate;
+
+    /**
+     * Gets the value of the zoneWindow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ZoneWindowType }
+     *     
+     */
+    public ZoneWindowType getZoneWindow() {
+        return zoneWindow;
+    }
+
+    /**
+     * Sets the value of the zoneWindow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ZoneWindowType }
+     *     
+     */
+    public void setZoneWindow(ZoneWindowType value) {
+        this.zoneWindow = value;
+    }
+
+    public boolean isSetZoneWindow() {
+        return (this.zoneWindow!= null);
+    }
+
+    /**
+     * Gets the value of the remoteSchema property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRemoteSchema() {
+        return remoteSchema;
+    }
+
+    /**
+     * Sets the value of the remoteSchema property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoteSchema(String value) {
+        this.remoteSchema = value;
+    }
+
+    public boolean isSetRemoteSchema() {
+        return (this.remoteSchema!= null);
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TypeType }
+     *     
+     */
+    public TypeType getType() {
+        if (type == null) {
+            return TypeType.SIMPLE;
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TypeType }
+     *     
+     */
+    public void setType(TypeType value) {
+        this.type = value;
+    }
+
+    public boolean isSetType() {
+        return (this.type!= null);
+    }
+
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
+    public boolean isSetHref() {
+        return (this.href!= null);
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    public boolean isSetRole() {
+        return (this.role!= null);
+    }
+
+    /**
+     * Gets the value of the arcrole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getArcrole() {
+        return arcrole;
+    }
+
+    /**
+     * Sets the value of the arcrole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setArcrole(String value) {
+        this.arcrole = value;
+    }
+
+    public boolean isSetArcrole() {
+        return (this.arcrole!= null);
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    public boolean isSetTitle() {
+        return (this.title!= null);
+    }
+
+    /**
+     * Gets the value of the show property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ShowType }
+     *     
+     */
+    public ShowType getShow() {
+        return show;
+    }
+
+    /**
+     * Sets the value of the show property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ShowType }
+     *     
+     */
+    public void setShow(ShowType value) {
+        this.show = value;
+    }
+
+    public boolean isSetShow() {
+        return (this.show!= null);
+    }
+
+    /**
+     * Gets the value of the actuate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ActuateType }
+     *     
+     */
+    public ActuateType getActuate() {
+        return actuate;
+    }
+
+    /**
+     * Sets the value of the actuate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ActuateType }
+     *     
+     */
+    public void setActuate(ActuateType value) {
+        this.actuate = value;
+    }
+
+    public boolean isSetActuate() {
+        return (this.actuate!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta8/ZoneWindowType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ZoneWindowType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ZoneWindowType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractZoneOpeningType"&gt;
+ *       &lt;sequence&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ZoneWindowType")
+public class ZoneWindowType
+    extends AbstractZoneOpeningType
+{
+
+
+}

src-gen/org/sig3d/citygml/energyADE3beta7/package-info.java → src-gen/org/sig3d/citygml/energyADE3beta8/package-info.java

@@ -2,10 +2,10 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.citygml.org/ade/energy/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
     @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.citygml.org/ade/energy/3.0", prefix = "nrg3")
 })
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;

src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java

@@ -8,8 +8,8 @@ import org.citygml4j.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEMarshaller;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.util.mapper.TypeMapper;
-import org.sig3d.citygml.energyADE3beta7.*;
-import org.sig3d.citygml.energyADE3beta7.ObjectFactory;
+import org.sig3d.citygml.energyADE3beta8.*;
+import org.sig3d.citygml.energyADE3beta8.ObjectFactory;
 import org.w3._1999.xlink.ActuateType;
 import org.w3._1999.xlink.ShowType;
 import org.w3._1999.xlink.TypeType;
@@ -53,7 +53,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(BuildingBasementThermalStatusProperty.class, this::createBuildingBasementThermalStatusProperty)
                             .with(BuildingIsProtectedProperty.class, this::createBuildingIsProtectedProperty)
                             .with(AbstractQualifiedAttributeProperty.class, this::createAbstractQualifiedAttributeProperty)
-                            .with(RefurbishmentMeasure.class, this::createRefurbishmentMeasure)
+                           // .with(RefurbishmentMeasure.class, this::createRefurbishmentMeasure)
                             .with(RefurbishmentMeasureProperty.class, this::createRefurbishmentMeasureProperty)
                             .with(UrbanFunctionArea.class, this::createUrbanFunctionArea)
                             .with(Water.class, this::createWater)
@@ -72,7 +72,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(TypicalValuesTimeSeriesFile.class, this::createTypicalValuesTimeSeriesFile)
                             .with(SensorConnection.class, this::createSensorConnection)
                             .with(WeatherData.class, this::createWeatherData)
-                            .with(WeatherDataProperty.class, this::createWeatherDataProperty)
+                          //  .with(WeatherDataProperty.class, this::createWeatherDataProperty)
                             .with(WeatherStation.class, this::createWeatherStation);
                 }
             } finally {
@@ -98,7 +98,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(AbstractLibraryProperty.class, this::marshalAbstractLibraryProperty)
                             .with(DeviceOperation.class, this::marshalDeviceOperation)
                             .with(DeviceOperationProperty.class, this::marshalDeviceOperationProperty)
-                            .with(AbstractBuildingPartitionProperty.class, this::marshalAbstractBuildingPartitionProperty)
+                           // .with(AbstractBuildingPartitionProperty.class, this::marshalAbstractBuildingPartitionProperty)
                             .with(RegularTimeSeriesProperty.class, this::marshalRegularTimeSeriesProperty)
                             .with(TypicalValuesTimeSeriesFileProperty.class, this::marshalTypicalValuesTimeSeriesFileProperty)
                             .with(TypicalValuesTimeSeriesProperty.class, this::marshalTypicalValuesTimeSeriesProperty)
@@ -125,7 +125,7 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(UrbanSpace.class, this::marshalUrbanSpace)
                             .with(UrbanSpaceProperty.class, this::marshalUrbanSpaceProperty)
                             .with(WeatherStation.class, this::marshalWeatherStation)
-                            .with(RefurbishmentMeasure.class, this::marshalRefurbishmentMeasure)
+                           // .with(RefurbishmentMeasure.class, this::marshalRefurbishmentMeasure)
                             .with(RefurbishmentMeasureProperty.class, this::marshalRefurbishmentMeasureProperty)
                             .with(EnergyPerformanceCertificate.class, this::marshalEnergyPerformanceCertificate)
                             .with(UtilityNetworkConnection.class, this::marshalUtilityNetworkConnection)
@@ -169,8 +169,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         WeatherDataType dest = new WeatherDataType();
             if (src.isSetType())
                 dest.setType(helper.getGMLMarshaller().marshalCode(src.getType()));
-            if (src.isSetLibraryCode())
-                dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
+            //if (src.isSetLibraryCode())
+            //    dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
             if (src.isSetValueType())
                 dest.setValueType(helper.getGMLMarshaller().marshalCode(src.getValueType()));
             if (src.isSetYearlyValue())
@@ -376,60 +376,60 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return dest;
     }
 
-    private AbstractBuildingPartitionType marshalAbstractBuildingPartition(AbstractBuildingPartition src, AbstractBuildingPartitionType dest) {
-
-        helper.getGMLMarshaller().marshalAbstractGML(src, dest);
-
-        if (src.isSetFloorArea()) {
-//            dest.se(helper.getGMLMarshaller().marshalCode(src.getDeviceOperationTypeValue()));
-        }
-        if (src.isSetFloorVolume())
-//            dest.
-        if(src.isSetLod1Solid())
-            dest.setLod1Solid(src.getLod1Solid());
-        if (src.isSetLod2Solid())
-            dest.setLod2Solid(src.getLod2Solid());
-        if (src.isSetLod3Solid())
-            dest.setLod3Solid(src.getLod3Solid());
-
-        return dest;
-    }
-
-    private AbstractBuildingPartitionPropertyType marshalAbstractBuildingPartitionProperty(AbstractBuildingPartitionProperty src) {
-
-        AbstractBuildingPartitionPropertyType dest = new AbstractBuildingPartitionPropertyType();
-
-        if (src.isSetAbstractBuildingPartition()) {
-            JAXBElement<?> elem = helper.getJAXBMarshaller().marshalJAXBElement(src.getAbstractBuildingPartition());
-            if (elem != null && elem.getValue() instanceof AbstractBuildingPartition){}
-//                dest.setAbstractBuildingPartition(elem);
-        }
-        if (src.isSetRemoteSchema())
-            dest.setRemoteSchema(src.getRemoteSchema());
-
-        if (src.isSetType())
-            dest.setType(TypeType.fromValue(src.getType().getValue()));
-
-        if (src.isSetHref())
-            dest.setHref(src.getHref());
-
-        if (src.isSetRole())
-            dest.setRole(src.getRole());
-
-        if (src.isSetArcrole())
-            dest.setArcrole(src.getArcrole());
-
-        if (src.isSetTitle())
-            dest.setTitle(src.getTitle());
-
-        if (src.isSetShow())
-            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
-
-        if (src.isSetActuate())
-            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+//    private AbstractBuildingPartitionType marshalAbstractBuildingPartition(AbstractBuildingPartition src, AbstractBuildingPartitionType dest) {
+//
+//        helper.getGMLMarshaller().marshalAbstractGML(src, dest);
+//
+//        if (src.isSetFloorArea()) {
+////            dest.se(helper.getGMLMarshaller().marshalCode(src.getDeviceOperationTypeValue()));
+//        }
+//        if (src.isSetFloorVolume())
+////            dest.
+//        if(src.isSetLod1Solid())
+//            dest.setLod1Solid(src.getLod1Solid());
+//        if (src.isSetLod2Solid())
+//            dest.setLod2Solid(src.getLod2Solid());
+//        if (src.isSetLod3Solid())
+//            dest.setLod3Solid(src.getLod3Solid());
+//
+//        return dest;
+//    }
 
-        return dest;
-    }
+//    private AbstractBuildingPartitionPropertyType marshalAbstractBuildingPartitionProperty(AbstractBuildingPartitionProperty src) {
+//
+//        AbstractBuildingPartitionPropertyType dest = new AbstractBuildingPartitionPropertyType();
+//
+//        if (src.isSetAbstractBuildingPartition()) {
+//            JAXBElement<?> elem = helper.getJAXBMarshaller().marshalJAXBElement(src.getAbstractBuildingPartition());
+//            if (elem != null && elem.getValue() instanceof AbstractBuildingPartition){}
+////                dest.setAbstractBuildingPartition(elem);
+//        }
+//        if (src.isSetRemoteSchema())
+//            dest.setRemoteSchema(src.getRemoteSchema());
+//
+//        if (src.isSetType())
+//            dest.setType(TypeType.fromValue(src.getType().getValue()));
+//
+//        if (src.isSetHref())
+//            dest.setHref(src.getHref());
+//
+//        if (src.isSetRole())
+//            dest.setRole(src.getRole());
+//
+//        if (src.isSetArcrole())
+//            dest.setArcrole(src.getArcrole());
+//
+//        if (src.isSetTitle())
+//            dest.setTitle(src.getTitle());
+//
+//        if (src.isSetShow())
+//            dest.setShow(ShowType.fromValue(src.getShow().getValue()));
+//
+//        if (src.isSetActuate())
+//            dest.setActuate(ActuateType.fromValue(src.getActuate().getValue()));
+//
+//        return dest;
+//    }
 
 //
 //    private AbstractBuildingType marshalAbstractBuilding(AbstractBuilding src, AbstractBuildingType dest) {
@@ -503,9 +503,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
 
         helper.getGMLMarshaller().marshalAbstractGML(src, dest);
         try {
-            if (src.isSetId()) {
-                dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
-            }
+           // if (src.isSetId()) {
+           //     dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
+           // }
             if (src.isSetScheduleTypeValue()) {
                 dest.setType(helper.getGMLMarshaller().marshalCode(src.getScheduleTypeValue()));
             }
@@ -619,26 +619,26 @@ public class EnergyADEMarshaller implements ADEMarshaller {
     /*
      * Convert RefurbishmentMeasure to RefurbishmentMeasureType.
      */
-    private RefurbishmentMeasureType marshalRefurbishmentMeasure(RefurbishmentMeasure src) {
-        RefurbishmentMeasureType dest = new RefurbishmentMeasureType();
-        helper.getGMLMarshaller().marshalAbstractFeature(src, dest);
-
-        if (src.isSetType()) {
-            dest.setType(helper.getGMLMarshaller().marshalCode(src.getType()));
-        }
-        if (src.isSetEndDate()) {
-            XMLGregorianCalendar endDate = src.getEndDate();
-            endDate.setTimezone(DatatypeConstants.FIELD_UNDEFINED);
-            dest.setEndDate(endDate);
-        }
-        if (src.isSetStartDate()) {
-            dest.setStartDate(src.getStartDate());
-        }
-        if (src.isSetLibraryCode()) {
-            dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
-        }
-        return dest;
-    }
+//    private RefurbishmentMeasureType marshalRefurbishmentMeasure(RefurbishmentMeasure src) {
+//        RefurbishmentMeasureType dest = new RefurbishmentMeasureType();
+//        helper.getGMLMarshaller().marshalAbstractFeature(src, dest);
+//
+//        if (src.isSetType()) {
+//            dest.setType(helper.getGMLMarshaller().marshalCode(src.getType()));
+//        }
+//        if (src.isSetEndDate()) {
+//            XMLGregorianCalendar endDate = src.getEndDate();
+//            endDate.setTimezone(DatatypeConstants.FIELD_UNDEFINED);
+//            dest.setEndDate(endDate);
+//        }
+//        if (src.isSetStartDate()) {
+//            dest.setStartDate(src.getStartDate());
+//        }
+//        if (src.isSetLibraryCode()) {
+//            dest.setLibraryCode(helper.getGMLMarshaller().marshalCode(src.getLibraryCode()));
+//        }
+//        return dest;
+//    }
 
     /*
      * Convert RefurbishmentMeasureProperty to RefurbishmentMeasurePropertyType.
@@ -647,9 +647,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
 
         RefurbishmentMeasurePropertyType dest = factory.createRefurbishmentMeasurePropertyType();
 
-        if (src.isSetRefurbishmentMeasure()) {
-            dest.setRefurbishmentMeasure(marshalRefurbishmentMeasure(src.getRefurbishmentMeasure()));
-        }
+//        if (src.isSetRefurbishmentMeasure()) {
+//            dest.setRefurbishmentMeasure(marshalRefurbishmentMeasure(src.getRefurbishmentMeasure()));
+//        }
         if (src.isSetRemoteSchema())
             dest.setRemoteSchema(src.getRemoteSchema());
 
@@ -690,18 +690,18 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         if (src.isSetCertificationMethod()) {
             dest.setCertificationMethod(src.getCertificationMethod());
         }
-        if (src.isSetCertificationURI()) {
-            dest.setCertificationURI(src.getCertificationURI().toString());
-        }
-        if (src.isSetLabel()) {
-            dest.setLabel(src.getLabel());
-        }
-        if (src.isSetIssueDate()) {
-            dest.setIssueDate(src.getIssueDate());
-        }
-        if (src.isSetExpirationDate()) {
-            dest.setExpirationDate(src.getExpirationDate());
-        }
+//        if (src.isSetCertificationURI()) {
+//            dest.setCertificationURI(src.getCertificationURI().toString());
+//        }
+//        if (src.isSetLabel()) {
+//            dest.setLabel(src.getLabel());
+//        }
+//        if (src.isSetIssueDate()) {
+//            dest.setIssueDate(src.getIssueDate());
+//        }
+//        if (src.isSetExpirationDate()) {
+//            dest.setExpirationDate(src.getExpirationDate());
+//        }
         if (src.isSetValue())
             dest.setValue(helper.getGMLMarshaller().marshalMeasure(src.getValue()));
 
@@ -2160,9 +2160,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return factory.createWeatherData(marshalWeatherData(src));
     }
 
-    private JAXBElement<?> createWeatherDataProperty(WeatherDataProperty src) {
-        return factory.createWeatherDataProperty(marshalWeatherDataProperty(src));
-    }
+//    private JAXBElement<?> createWeatherDataProperty(WeatherDataProperty src) {
+//        return factory.createWeatherDataProperty(marshalWeatherDataProperty(src));
+//    }
     private JAXBElement<?> createWeatherStation(WeatherStation src) {
         return factory.createWeatherStation(marshalWeatherStation(src));
     }
@@ -2237,9 +2237,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return factory.createBdgBasementThermalStatus(src.getValue());
     }
 
-    private JAXBElement<?> createRefurbishmentMeasure(RefurbishmentMeasure src) {
-        return factory.createRefurbishmentMeasure(marshalRefurbishmentMeasure(src));
-    }
+//    private JAXBElement<?> createRefurbishmentMeasure(RefurbishmentMeasure src) {
+//        return factory.createRefurbishmentMeasure(marshalRefurbishmentMeasure(src));
+//    }
 
     private JAXBElement<?> createRefurbishmentMeasureProperty(RefurbishmentMeasureProperty src) {
         return factory.createRefurbishmentMeasureProperty(marshalRefurbishmentMeasureProperty(src));