Commit c23ab655 authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

Merge branch 'beta7' into 'master'

Updated to Energy ADE 3 beta 7 - version 0.2

See merge request !11
parents f74d48a3 afa32aa3
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; ...@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
* <complexContent> * <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence> * <sequence>
* <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractQualifiedAttribute"/> * <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractQualifiedAttribute"/>
* </sequence> * </sequence>
* </restriction> * </restriction>
* </complexContent> * </complexContent>
...@@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType; ...@@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType;
}) })
public class AbstractQualifiedAttributePropertyType { public class AbstractQualifiedAttributePropertyType {
@XmlElementRef(name = "AbstractQualifiedAttribute", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class) @XmlElementRef(name = "AbstractQualifiedAttribute", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class)
protected JAXBElement<? extends AbstractQualifiedAttributeType> abstractQualifiedAttribute; protected JAXBElement<? extends AbstractQualifiedAttributeType> abstractQualifiedAttribute;
/** /**
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractResource"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractResource"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractResourcePropertyType { public class AbstractResourcePropertyType {
@XmlElementRef(name = "AbstractResource", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractResource", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractResourceType> abstractResource; protected JAXBElement<? extends AbstractResourceType> abstractResource;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,12 +30,12 @@ import net.opengis.gml.MeasureType; ...@@ -30,12 +30,12 @@ import net.opengis.gml.MeasureType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt; * &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt;
* &lt;sequence&gt; * &lt;sequence&gt;
* &lt;element name="status" type="{http://www.citygml.org/ade/energy/2.0}ResourceStatusValueType"/&gt; * &lt;element name="status" type="{http://www.citygml.org/ade/energy/3.0}ResourceStatusValueType"/&gt;
* &lt;element name="operationType" type="{http://www.opengis.net/gml}CodeType"/&gt; * &lt;element name="operationType" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="amountType" type="{http://www.opengis.net/gml}CodeType"/&gt; * &lt;element name="amountType" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="year" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt; * &lt;element name="year" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
* &lt;element name="amount" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt; * &lt;element name="amount" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
* &lt;element name="timeDependentAmount" type="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesPropertyType" minOccurs="0"/&gt; * &lt;element name="timeDependentAmount" type="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesPropertyType" minOccurs="0"/&gt;
* &lt;element name="isAmountNormalized" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt; * &lt;element name="isAmountNormalized" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
* &lt;element name="normalizationValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt; * &lt;element name="normalizationValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
* &lt;element name="normalizationParameter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt; * &lt;element name="normalizationParameter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractSchedule"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractSchedule"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractSchedulePropertyType { public class AbstractSchedulePropertyType {
@XmlElementRef(name = "AbstractSchedule", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractSchedule", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractScheduleType> abstractSchedule; protected JAXBElement<? extends AbstractScheduleType> abstractSchedule;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollector"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollector"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractSolarCollectorPropertyType { public class AbstractSolarCollectorPropertyType {
@XmlElementRef(name = "AbstractSolarCollector", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractSolarCollector", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractSolarCollectorType> abstractSolarCollector; protected JAXBElement<? extends AbstractSolarCollectorType> abstractSolarCollector;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -25,7 +25,7 @@ import net.opengis.gml.MultiSurfacePropertyType; ...@@ -25,7 +25,7 @@ import net.opengis.gml.MultiSurfacePropertyType;
* <pre> * <pre>
* &lt;complexType name="AbstractSolarCollectorType"&gt; * &lt;complexType name="AbstractSolarCollectorType"&gt;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType"&gt; * &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType"&gt;
* &lt;sequence&gt; * &lt;sequence&gt;
* &lt;element name="moduleArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/&gt; * &lt;element name="moduleArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/&gt;
* &lt;element name="apertureArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/&gt; * &lt;element name="apertureArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractThermalZone"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractThermalZone"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractThermalZonePropertyType { public class AbstractThermalZonePropertyType {
@XmlElementRef(name = "AbstractThermalZone", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractThermalZone", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractThermalZoneType> abstractThermalZone; protected JAXBElement<? extends AbstractThermalZoneType> abstractThermalZone;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.ArrayList;
import java.util.List; import java.util.List;
...@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType; ...@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
* <pre> * <pre>
* &lt;complexType name="AbstractThermalZoneType"&gt; * &lt;complexType name="AbstractThermalZoneType"&gt;
* &lt;complexContent&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;element name="usageZone" type="{http://www.citygml.org/ade/energy/2.0}AbstractUsageZonePropertyType" maxOccurs="unbounded" minOccurs="0"/&gt; * &lt;element name="usageZone" type="{http://www.citygml.org/ade/energy/3.0}AbstractUsageZonePropertyType" maxOccurs="unbounded" minOccurs="0"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;/extension&gt; * &lt;/extension&gt;
* &lt;/complexContent&gt; * &lt;/complexContent&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeries"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeries"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractTimeSeriesPropertyType { public class AbstractTimeSeriesPropertyType {
@XmlElementRef(name = "AbstractTimeSeries", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractTimeSeries", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractTimeSeriesType> abstractTimeSeries; protected JAXBElement<? extends AbstractTimeSeriesType> abstractTimeSeries;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -29,7 +29,7 @@ import net.opengis.gml.CodeType; ...@@ -29,7 +29,7 @@ import net.opengis.gml.CodeType;
* &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt; * &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt;
* &lt;sequence&gt; * &lt;sequence&gt;
* &lt;element name="acquisitionMethod" type="{http://www.opengis.net/gml}CodeType"/&gt; * &lt;element name="acquisitionMethod" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="interpolationType" type="{http://www.citygml.org/ade/energy/2.0}InterpolationTypeValueType"/&gt; * &lt;element name="interpolationType" type="{http://www.citygml.org/ade/energy/3.0}InterpolationTypeValueType"/&gt;
* &lt;element name="source" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt; * &lt;element name="source" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;/extension&gt; * &lt;/extension&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AbstractUsageZone"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AbstractUsageZone"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
}) })
public class AbstractUsageZonePropertyType { public class AbstractUsageZonePropertyType {
@XmlElementRef(name = "AbstractUsageZone", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) @XmlElementRef(name = "AbstractUsageZone", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
protected JAXBElement<? extends AbstractUsageZoneType> abstractUsageZone; protected JAXBElement<? extends AbstractUsageZoneType> abstractUsageZone;
@XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
@XmlSchemaType(name = "anyURI") @XmlSchemaType(name = "anyURI")
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.ArrayList;
import java.util.List; import java.util.List;
...@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType; ...@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
* <pre> * <pre>
* &lt;complexType name="AbstractUsageZoneType"&gt; * &lt;complexType name="AbstractUsageZoneType"&gt;
* &lt;complexContent&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;element name="buildingUnit" type="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingUnitPropertyType" maxOccurs="unbounded" minOccurs="0"/&gt; * &lt;element name="buildingUnit" type="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnitPropertyType" maxOccurs="unbounded" minOccurs="0"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;/extension&gt; * &lt;/extension&gt;
* &lt;/complexContent&gt; * &lt;/complexContent&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AtomicSchedule"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AtomicSchedule"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -22,10 +22,10 @@ import net.opengis.gml.MeasureType; ...@@ -22,10 +22,10 @@ import net.opengis.gml.MeasureType;
* <pre> * <pre>
* &lt;complexType name="AtomicScheduleType"&gt; * &lt;complexType name="AtomicScheduleType"&gt;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractScheduleType"&gt; * &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractScheduleType"&gt;
* &lt;sequence&gt; * &lt;sequence&gt;
* &lt;element name="constantValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt; * &lt;element name="constantValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
* &lt;element name="timeSeries" type="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesPropertyType" minOccurs="0"/&gt; * &lt;element name="timeSeries" type="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesPropertyType" minOccurs="0"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;/extension&gt; * &lt;/extension&gt;
* &lt;/complexContent&gt; * &lt;/complexContent&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}AtticFloorSurface"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}AtticFloorSurface"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType; ...@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &lt;complexContent&gt; * &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt; * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;sequence minOccurs="0"&gt; * &lt;sequence minOccurs="0"&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/2.0}BasementCeilingSurface"/&gt; * &lt;element ref="{http://www.citygml.org/ade/energy/3.0}BasementCeilingSurface"/&gt;
* &lt;/sequence&gt; * &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt; * &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt; * &lt;/restriction&gt;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0 // 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 // 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 // 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.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment