Merge branch 'beta7' into 'master'

Updated to Energy ADE 3 beta 7 - version 0.2

See merge request !11

README.md

@@ -11,12 +11,12 @@ Currently, there are _no plans to migrate_ the Energy ADE 3 citygml4j module to
 
 The following modules are supported at the moment:
 
--  Core (AbstractBuilding, Refurbishment Measures)
+-  Core (AbstractBuilding, RefurbishmentMeasures, WeatherData)
 -  Resource
 -  UrbanFunctionArea
 -  WeatherStation
 -  Timeseries
--  DataTypes
+-  DataTypes (AbstractQualifiedAttribute)
 
 The following modules are currently in development:
 
@@ -26,6 +26,7 @@ The following modules are currently in development:
 -  LayeredConstruction
 -  Schedule
 -  Devices
+-  DataTypes (AbstractOpticalProperties)
 
 The Energy ADE 3 module for citygml4j uses [Gradle](https://gradle.org/) as build system.
 

build.gradle

@@ -18,8 +18,8 @@ java {
 
 allprojects {
     group 'org.citygml4j.ade'
-    version 'beta7-0.1'
-    description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.1'
+    version 'beta7-0.2'
+    description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.2'
 
     ext {
         citygml4jVersion = '2.13.1'

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartition"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartition"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractBuildingPartitionPropertyType {
 
-    @XmlElementRef(name = "AbstractBuildingPartition", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractBuildingPartition", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractBuildingPartitionType> abstractBuildingPartition;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,8 +28,8 @@ import net.opengis.gml.SolidPropertyType;
  *   <complexContent>
  *     <extension base="{http://www.opengis.net/citygml/2.0}AbstractCityObjectType">
  *       <sequence>
- *         <element name="area" type="{http://www.citygml.org/ade/energy/2.0}QualifiedAreaPropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="volume" type="{http://www.citygml.org/ade/energy/2.0}QualifiedVolumePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="area" type="{http://www.citygml.org/ade/energy/3.0}QualifiedAreaPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="volume" type="{http://www.citygml.org/ade/energy/3.0}QualifiedVolumePropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="lod1Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/>
  *         <element name="lod2Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/>
  *         <element name="lod3Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/>

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingUnit"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnit"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractBuildingUnitPropertyType {
 
-    @XmlElementRef(name = "AbstractBuildingUnit", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractBuildingUnit", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractBuildingUnitType> abstractBuildingUnit;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;complexType name="AbstractBuildingUnitType"&gt;
  *   &lt;complexContent&gt;
- *     &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartitionType"&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartitionType"&gt;
  *       &lt;sequence&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDevicePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractDevicePropertyType {
 
-    @XmlElementRef(name = "AbstractDevice", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractDevice", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractDeviceType> abstractDevice;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDeviceType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import net.opengis.gml.ScaleType;
  *         <element name="heatDissipationConvectiveFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationLatentFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationRadiantFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="deviceOperation" type="{http://www.citygml.org/ade/energy/2.0}DeviceOperationPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="deviceOperation" type="{http://www.citygml.org/ade/energy/3.0}DeviceOperationPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractLayeredConstruction"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractLayeredConstruction"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractLayeredConstructionPropertyType {
 
-    @XmlElementRef(name = "AbstractLayeredConstruction", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractLayeredConstruction", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractLayeredConstructionType> abstractLayeredConstruction;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractLibrary"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractLibrary"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractLibraryPropertyType {
 
-    @XmlElementRef(name = "AbstractLibrary", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractLibrary", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractLibraryType> abstractLibrary;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractMaterial"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractMaterial"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractMaterialPropertyType {
 
-    @XmlElementRef(name = "AbstractMaterial", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractMaterial", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement<? extends AbstractMaterialType> abstractMaterial;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_PropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_PropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractOpticalProperty"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractOpticalProperty"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class AbstractOpticalProperty_PropertyType {
 
-    @XmlElementRef(name = "AbstractOpticalProperty", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class)
+    @XmlElementRef(name = "AbstractOpticalProperty", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class)
     protected JAXBElement<? extends AbstractOpticalProperty_Type> abstractOpticalProperty;
 
     /**

src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_Type.java → src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_Type.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;