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 @@
// 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;
......@@ -29,7 +29,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}Energy"/>
* <element ref="{http://www.citygml.org/ade/energy/3.0}Energy"/>
* </sequence>
* <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
* </restriction>
......
......@@ -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;
......@@ -24,7 +24,7 @@ import net.opengis.gml.MeasureType;
* <pre>
* &lt;complexType name="EnergyType"&gt;
* &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType"&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType"&gt;
* &lt;sequence&gt;
* &lt;element name="type" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="endUse" type="{http://www.opengis.net/gml}CodeType"/&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}Food"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}Food"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
* <pre>
* &lt;complexType name="FoodType"&gt;
* &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType"&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType"&gt;
* &lt;sequence&gt;
* &lt;element name="type" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="endUse" type="{http://www.opengis.net/gml}CodeType"/&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}Gas"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}Gas"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -23,7 +23,7 @@ import net.opengis.gml.MeasureType;
* <pre>
* &lt;complexType name="GasType"&gt;
* &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialType"&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialType"&gt;
* &lt;sequence&gt;
* &lt;element name="isVentilated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
* &lt;element name="rValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}GenericDevice"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}GenericDevice"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
* <pre>
* &lt;complexType name="GenericDeviceType"&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;/extension&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}GenericElectricalDevice"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}GenericElectricalDevice"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
* <pre>
* &lt;complexType name="GenericElectricalDeviceType"&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;/extension&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}GenericSolarCollector"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}GenericSolarCollector"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
* <pre>
* &lt;complexType name="GenericSolarCollectorType"&gt;
* &lt;complexContent&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollectorType"&gt;
* &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollectorType"&gt;
* &lt;sequence&gt;
* &lt;/sequence&gt;
* &lt;/extension&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}HeatPump"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}HeatPump"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -24,7 +24,7 @@ import net.opengis.gml.MeasureType;
* <pre>
* &lt;complexType name="HeatPumpType"&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;element name="heatSource" type="{http://www.opengis.net/gml}CodeType"/&gt;
* &lt;element name="copSourceTemperature" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}IntermediateFloorSurface"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}IntermediateFloorSurface"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......
......@@ -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.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}Layer"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}Layer"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
......@@ -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;
......@@ -27,7 +27,7 @@ import net.opengis.gml.MeasureType;
* &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt;
* &lt;sequence&gt;
* &lt;element name="thickness" type="{http://www.opengis.net/gml}MeasureType"/&gt;
* &lt;element name="material" type="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialPropertyType"/&gt;
* &lt;element name="material" type="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialPropertyType"/&gt;
* &lt;/sequence&gt;
* &lt;/extension&gt;
* &lt;/complexContent&gt;
......
......@@ -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;
......@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
* &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/2.0}LayeredConstructionLibrary"/&gt;
* &lt;element ref="{http://www.citygml.org/ade/energy/3.0}LayeredConstructionLibrary"/&gt;
* &lt;/sequence&gt;
* &lt;attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/&gt;
* &lt;/restriction&gt;
......
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