Skip to content
GitLab
Commit afa32aa3 authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

Updated to Energy ADE 3 beta 7 - version 0.2

parent 25f5a94c
Hide whitespace changes
Inline Side-by-side
src-gen/org/sig3d/citygml/energyADE2beta7/package-info.java → src-gen/org/sig3d/citygml/energyADE3beta7/package-info.java
View file @ afa32aa3
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
// 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
// //
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.citygml.org/ade/energy/2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { @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/2.0", prefix = "nrg2") @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.citygml.org/ade/energy/3.0", prefix = "nrg3")
}) })
package org.sig3d.citygml.energyADE2beta7; package org.sig3d.citygml.energyADE3beta7;
src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
View file @ afa32aa3
...@@ -8,8 +8,8 @@ import org.citygml4j.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper; ...@@ -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.ADEMarshaller;
import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
import org.citygml4j.util.mapper.TypeMapper; import org.citygml4j.util.mapper.TypeMapper;
import org.sig3d.citygml.energyADE2beta7.*; import org.sig3d.citygml.energyADE3beta7.*;
import org.sig3d.citygml.energyADE2beta7.ObjectFactory; import org.sig3d.citygml.energyADE3beta7.ObjectFactory;
import org.w3._1999.xlink.ActuateType; import org.w3._1999.xlink.ActuateType;
import org.w3._1999.xlink.ShowType; import org.w3._1999.xlink.ShowType;
import org.w3._1999.xlink.TypeType; import org.w3._1999.xlink.TypeType;
......
src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java
View file @ afa32aa3
...@@ -13,7 +13,8 @@ import org.citygml4j.model.gml.xlink.XLinkShow; ...@@ -13,7 +13,8 @@ import org.citygml4j.model.gml.xlink.XLinkShow;
import org.citygml4j.model.gml.xlink.XLinkType; import org.citygml4j.model.gml.xlink.XLinkType;
import org.citygml4j.util.mapper.CheckedTypeMapper; import org.citygml4j.util.mapper.CheckedTypeMapper;
import org.citygml4j.xml.io.reader.MissingADESchemaException; import org.citygml4j.xml.io.reader.MissingADESchemaException;
import org.sig3d.citygml.energyADE2beta7.*; import org.sig3d.citygml.energyADE3beta7.*;
import org.sig3d.citygml.energyADE3beta7.*;
import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBElement;
import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeConstants;
......
src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java
View file @ afa32aa3
...@@ -10,7 +10,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor; ...@@ -10,7 +10,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor;
import org.citygml4j.model.gml.basicTypes.Code; import org.citygml4j.model.gml.basicTypes.Code;
import org.citygml4j.model.gml.basicTypes.Measure; import org.citygml4j.model.gml.basicTypes.Measure;
import org.citygml4j.model.gml.feature.AbstractFeature; import org.citygml4j.model.gml.feature.AbstractFeature;
import org.sig3d.citygml.energyADE2beta7.ResourceStatusValueType; import org.sig3d.citygml.energyADE3beta7.ResourceStatusValueType;
public abstract class AbstractResource extends AbstractFeature implements ADEModelObject { public abstract class AbstractResource extends AbstractFeature implements ADEModelObject {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType; import org.sig3d.citygml.energyADE3beta7.ThermalStatusValueType;
public class BuildingAtticThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> { public class BuildingAtticThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType; import org.sig3d.citygml.energyADE3beta7.ThermalStatusValueType;
public class BuildingBasementThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> { public class BuildingBasementThermalStatusProperty extends ADEGenericApplicationProperty<ThermalStatusValueType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedAreaPropertyType;
public class BuildingFloorAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> { public class BuildingFloorAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
public class BuildingHeightAboveGroundProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> { public class BuildingHeightAboveGroundProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
public class BuildingHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> { public class BuildingHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedVolumePropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedVolumePropertyType;
public class BuildingVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> { public class BuildingVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedAreaPropertyType;
public class QualifiedAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> { public class QualifiedAreaProperty extends ADEGenericApplicationProperty<QualifiedAreaPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
public class QualifiedHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> { public class QualifiedHeightProperty extends ADEGenericApplicationProperty<QualifiedHeightPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.QualifiedVolumePropertyType; import org.sig3d.citygml.energyADE3beta7.QualifiedVolumePropertyType;
public class QualifiedVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> { public class QualifiedVolumeProperty extends ADEGenericApplicationProperty<QualifiedVolumePropertyType> {
public QualifiedVolumeProperty() {} public QualifiedVolumeProperty() {}
......
src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java
View file @ afa32aa3
...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core; ...@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
import org.citygml4j.builder.copy.CopyBuilder; import org.citygml4j.builder.copy.CopyBuilder;
import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty; import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
import org.sig3d.citygml.energyADE2beta7.SuitabilityPropertyType; import org.sig3d.citygml.energyADE3beta7.SuitabilityPropertyType;
public class SuitabilityProperty extends ADEGenericApplicationProperty<SuitabilityPropertyType> { public class SuitabilityProperty extends ADEGenericApplicationProperty<SuitabilityPropertyType> {
......
src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java
View file @ afa32aa3
...@@ -18,8 +18,8 @@ public class EnergyADEModule extends ADEModule { ...@@ -18,8 +18,8 @@ public class EnergyADEModule extends ADEModule {
private HashSet<String> featureProperties; private HashSet<String> featureProperties;
public EnergyADEModule() { public EnergyADEModule() {
super("http://www.citygml.org/ade/energy/2.0", super("http://www.citygml.org/ade/energy/3.0",
"nrg2", "nrg3",
CityGMLVersion.v2_0_0); CityGMLVersion.v2_0_0);
features = new HashMap<>(); features = new HashMap<>();
...@@ -49,12 +49,12 @@ public class EnergyADEModule extends ADEModule { ...@@ -49,12 +49,12 @@ public class EnergyADEModule extends ADEModule {
@Override @Override
public URL getSchemaResource() { public URL getSchemaResource() {
return EnergyADEContext.class.getResource("/Energy_ADE_2.0_beta7.xsd"); return EnergyADEContext.class.getResource("/Energy_ADE_3.0_beta7.xsd");
} }
@Override @Override
public List<String> getJAXBPackageNames() { public List<String> getJAXBPackageNames() {
return Collections.singletonList("org.sig3d.citygml.energyADE2beta7"); return Collections.singletonList("org.sig3d.citygml.energyADE3beta7");
} }
@Override @Override
......
src/main/resources/Energy_ADE_2.0_beta7.xsd → src/main/resources/Energy_ADE_3.0_beta7.xsd
View file @ afa32aa3
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
XML Schema Definition (XSD) file for the XML Schema Definition (XSD) file for the
CityGML Energy ADE 2.0 (beta 7) CityGML Energy ADE 3.0 (beta 7)
Last update: 2025-06-25 Last update: 2025-09-23
This schema file was first automatically generated using Shapechange 3.10 and This schema file was first automatically generated using Shapechange 3.10 and
successively manually edited, annotated by means of additional tags, and restructured. successively manually edited, annotated by means of additional tags, and restructured.
...@@ -84,13 +84,13 @@ xmlns:tran="http://www.opengis.net/citygml/transportation/2.0" ...@@ -84,13 +84,13 @@ xmlns:tran="http://www.opengis.net/citygml/transportation/2.0"
xmlns:tun="http://www.opengis.net/citygml/tunnel/2.0" xmlns:tun="http://www.opengis.net/citygml/tunnel/2.0"
xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0" xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0"
xmlns:wtr="http://www.opengis.net/citygml/waterbody/2.0" xmlns:wtr="http://www.opengis.net/citygml/waterbody/2.0"
xmlns:nrg2="http://www.citygml.org/ade/energy/2.0" xmlns:nrg3="http://www.citygml.org/ade/energy/3.0"
elementFormDefault="qualified" elementFormDefault="qualified"
targetNamespace="http://www.citygml.org/ade/energy/2.0" targetNamespace="http://www.citygml.org/ade/energy/3.0"
version="2.0" version="3.0"
> >
<annotation> <annotation>
<documentation>Energy ADE 2.0 beta 7 (2025-06-25) for CityGML 2.0</documentation> <documentation>Energy ADE 3.0 beta 7 (2025-09-23) for CityGML 2.0</documentation>
</annotation> </annotation>
<!-- All CityGML modules added manually, in case they are not written automatically by ShapeChange --> <!-- All CityGML modules added manually, in case they are not written automatically by ShapeChange -->
...@@ -187,7 +187,7 @@ version="2.0" ...@@ -187,7 +187,7 @@ version="2.0"
<!-- ********************* --> <!-- ********************* -->
<element abstract="true" name="AbstractOpticalProperty" substitutionGroup="gml:_Object" type="nrg2:AbstractOpticalProperty_Type"></element> <element abstract="true" name="AbstractOpticalProperty" substitutionGroup="gml:_Object" type="nrg3:AbstractOpticalProperty_Type"></element>
<complexType abstract="true" name="AbstractOpticalProperty_Type"> <complexType abstract="true" name="AbstractOpticalProperty_Type">
<sequence> <sequence>
<element name="fraction" type="gml:ScaleType"></element> <element name="fraction" type="gml:ScaleType"></element>
...@@ -195,35 +195,35 @@ version="2.0" ...@@ -195,35 +195,35 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractOpticalProperty_PropertyType"> <complexType name="AbstractOpticalProperty_PropertyType">
<sequence> <sequence>
<element ref="nrg2:AbstractOpticalProperty"/> <element ref="nrg3:AbstractOpticalProperty"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="Emissivity" substitutionGroup="nrg2:AbstractOpticalProperty" type="nrg2:EmissivityType"></element> <element name="Emissivity" substitutionGroup="nrg3:AbstractOpticalProperty" type="nrg3:EmissivityType"></element>
<complexType name="EmissivityType"> <complexType name="EmissivityType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractOpticalProperty_Type"> <extension base="nrg3:AbstractOpticalProperty_Type">
<sequence> <sequence>
<element name="surface" type="nrg2:SurfaceSideType"></element> <element name="surface" type="nrg3:SurfaceSideType"></element>
</sequence> </sequence>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="EmissivityPropertyType"> <complexType name="EmissivityPropertyType">
<sequence> <sequence>
<element ref="nrg2:Emissivity"/> <element ref="nrg3:Emissivity"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="Reflectance" substitutionGroup="nrg2:AbstractOpticalProperty" type="nrg2:ReflectanceType"></element> <element name="Reflectance" substitutionGroup="nrg3:AbstractOpticalProperty" type="nrg3:ReflectanceType"></element>
<complexType name="ReflectanceType"> <complexType name="ReflectanceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractOpticalProperty_Type"> <extension base="nrg3:AbstractOpticalProperty_Type">
<sequence> <sequence>
<element name="surface" type="nrg2:SurfaceSideType"/> <element name="surface" type="nrg3:SurfaceSideType"/>
<element name="wavelengthRange" type="nrg2:WavelengthRangeType"> <element name="wavelengthRange" type="nrg3:WavelengthRangeType">
</element> </element>
</sequence> </sequence>
</extension> </extension>
...@@ -231,29 +231,29 @@ version="2.0" ...@@ -231,29 +231,29 @@ version="2.0"
</complexType> </complexType>
<complexType name="ReflectancePropertyType"> <complexType name="ReflectancePropertyType">
<sequence> <sequence>
<element ref="nrg2:Reflectance"/> <element ref="nrg3:Reflectance"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="Transmittance" substitutionGroup="nrg2:AbstractOpticalProperty" type="nrg2:TransmittanceType"></element> <element name="Transmittance" substitutionGroup="nrg3:AbstractOpticalProperty" type="nrg3:TransmittanceType"></element>
<complexType name="TransmittanceType"> <complexType name="TransmittanceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractOpticalProperty_Type"> <extension base="nrg3:AbstractOpticalProperty_Type">
<sequence> <sequence>
<element name="wavelengthRange" type="nrg2:WavelengthRangeType"></element> <element name="wavelengthRange" type="nrg3:WavelengthRangeType"></element>
</sequence> </sequence>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="TransmittancePropertyType"> <complexType name="TransmittancePropertyType">
<sequence> <sequence>
<element ref="nrg2:Transmittance"/> <element ref="nrg3:Transmittance"/>
</sequence> </sequence>
</complexType> </complexType>
<element abstract="true" name="AbstractQualifiedAttribute" substitutionGroup="gml:_Object" type="nrg2:AbstractQualifiedAttributeType"></element> <element abstract="true" name="AbstractQualifiedAttribute" substitutionGroup="gml:_Object" type="nrg3:AbstractQualifiedAttributeType"></element>
<complexType abstract="true" name="AbstractQualifiedAttributeType"> <complexType abstract="true" name="AbstractQualifiedAttributeType">
<sequence> <sequence>
<element minOccurs="0" name="description" type="string"/> <element minOccurs="0" name="description" type="string"/>
...@@ -263,15 +263,15 @@ version="2.0" ...@@ -263,15 +263,15 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractQualifiedAttributePropertyType"> <complexType name="AbstractQualifiedAttributePropertyType">
<sequence> <sequence>
<element ref="nrg2:AbstractQualifiedAttribute"/> <element ref="nrg3:AbstractQualifiedAttribute"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="QualifiedArea" substitutionGroup="nrg2:AbstractQualifiedAttribute" type="nrg2:QualifiedAreaType"></element> <element name="QualifiedArea" substitutionGroup="nrg3:AbstractQualifiedAttribute" type="nrg3:QualifiedAreaType"></element>
<complexType name="QualifiedAreaType"> <complexType name="QualifiedAreaType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractQualifiedAttributeType"> <extension base="nrg3:AbstractQualifiedAttributeType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
</sequence> </sequence>
...@@ -280,15 +280,15 @@ version="2.0" ...@@ -280,15 +280,15 @@ version="2.0"
</complexType> </complexType>
<complexType name="QualifiedAreaPropertyType"> <complexType name="QualifiedAreaPropertyType">
<sequence> <sequence>
<element ref="nrg2:QualifiedArea"/> <element ref="nrg3:QualifiedArea"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="QualifiedHeight" substitutionGroup="nrg2:AbstractQualifiedAttribute" type="nrg2:QualifiedHeightType"></element> <element name="QualifiedHeight" substitutionGroup="nrg3:AbstractQualifiedAttribute" type="nrg3:QualifiedHeightType"></element>
<complexType name="QualifiedHeightType"> <complexType name="QualifiedHeightType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractQualifiedAttributeType"> <extension base="nrg3:AbstractQualifiedAttributeType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
</sequence> </sequence>
...@@ -297,15 +297,15 @@ version="2.0" ...@@ -297,15 +297,15 @@ version="2.0"
</complexType> </complexType>
<complexType name="QualifiedHeightPropertyType"> <complexType name="QualifiedHeightPropertyType">
<sequence> <sequence>
<element ref="nrg2:QualifiedHeight"/> <element ref="nrg3:QualifiedHeight"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="QualifiedVolume" substitutionGroup="nrg2:AbstractQualifiedAttribute" type="nrg2:QualifiedVolumeType"></element> <element name="QualifiedVolume" substitutionGroup="nrg3:AbstractQualifiedAttribute" type="nrg3:QualifiedVolumeType"></element>
<complexType name="QualifiedVolumeType"> <complexType name="QualifiedVolumeType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractQualifiedAttributeType"> <extension base="nrg3:AbstractQualifiedAttributeType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
</sequence> </sequence>
...@@ -314,18 +314,18 @@ version="2.0" ...@@ -314,18 +314,18 @@ version="2.0"
</complexType> </complexType>
<complexType name="QualifiedVolumePropertyType"> <complexType name="QualifiedVolumePropertyType">
<sequence> <sequence>
<element ref="nrg2:QualifiedVolume"/> <element ref="nrg3:QualifiedVolume"/>
</sequence> </sequence>
</complexType> </complexType>
<element name="Suitability" substitutionGroup="gml:_Object" type="nrg2:SuitabilityType"/> <element name="Suitability" substitutionGroup="gml:_Object" type="nrg3:SuitabilityType"/>
<complexType name="SuitabilityType"> <complexType name="SuitabilityType">
<sequence> <sequence>
<element name="reason" type="gml:CodeType"/> <element name="reason" type="gml:CodeType"/>
<element minOccurs="0" name="description" type="string"/> <element minOccurs="0" name="description" type="string"/>
<element name="value" type="gml:ScaleType"/> <element name="value" type="gml:ScaleType"/>
<element minOccurs="0" name="schedule" type="nrg2:AbstractSchedulePropertyType"> <element minOccurs="0" name="schedule" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -336,7 +336,7 @@ version="2.0" ...@@ -336,7 +336,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="SuitabilityPropertyType"> <complexType name="SuitabilityPropertyType">
<sequence> <sequence>
<element ref="nrg2:Suitability"/> <element ref="nrg3:Suitability"/>
</sequence> </sequence>
</complexType> </complexType>
...@@ -346,13 +346,13 @@ version="2.0" ...@@ -346,13 +346,13 @@ version="2.0"
<!-- ****************************************** --> <!-- ****************************************** -->
<element abstract="true" name="AbstractTimeSeries" substitutionGroup="gml:_Feature" type="nrg2:AbstractTimeSeriesType"></element> <element abstract="true" name="AbstractTimeSeries" substitutionGroup="gml:_Feature" type="nrg3:AbstractTimeSeriesType"></element>
<complexType abstract="true" name="AbstractTimeSeriesType"> <complexType abstract="true" name="AbstractTimeSeriesType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
<sequence> <sequence>
<element name="acquisitionMethod" type="gml:CodeType"></element> <element name="acquisitionMethod" type="gml:CodeType"></element>
<element name="interpolationType" type="nrg2:InterpolationTypeValueType"></element> <element name="interpolationType" type="nrg3:InterpolationTypeValueType"></element>
<element minOccurs="0" name="source" type="string"></element> <element minOccurs="0" name="source" type="string"></element>
</sequence> </sequence>
</extension> </extension>
...@@ -360,16 +360,16 @@ version="2.0" ...@@ -360,16 +360,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractTimeSeriesPropertyType"> <complexType name="AbstractTimeSeriesPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractTimeSeries"/> <element ref="nrg3:AbstractTimeSeries"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="RegularTimeSeries" substitutionGroup="nrg2:AbstractTimeSeries" type="nrg2:RegularTimeSeriesType"></element> <element name="RegularTimeSeries" substitutionGroup="nrg3:AbstractTimeSeries" type="nrg3:RegularTimeSeriesType"></element>
<complexType name="RegularTimeSeriesType"> <complexType name="RegularTimeSeriesType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractTimeSeriesType"> <extension base="nrg3:AbstractTimeSeriesType">
<sequence> <sequence>
<element name="temporalExtent" type="gml:TimePeriodPropertyType"></element> <element name="temporalExtent" type="gml:TimePeriodPropertyType"></element>
<element name="timeInterval" type="gml:TimeIntervalLengthType"></element> <element name="timeInterval" type="gml:TimeIntervalLengthType"></element>
...@@ -380,16 +380,16 @@ version="2.0" ...@@ -380,16 +380,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="RegularTimeSeriesPropertyType"> <complexType name="RegularTimeSeriesPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:RegularTimeSeries"/> <element ref="nrg3:RegularTimeSeries"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="RegularTimeSeriesFile" substitutionGroup="nrg2:AbstractTimeSeries" type="nrg2:RegularTimeSeriesFileType"></element> <element name="RegularTimeSeriesFile" substitutionGroup="nrg3:AbstractTimeSeries" type="nrg3:RegularTimeSeriesFileType"></element>
<complexType name="RegularTimeSeriesFileType"> <complexType name="RegularTimeSeriesFileType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractTimeSeriesType"> <extension base="nrg3:AbstractTimeSeriesType">
<sequence> <sequence>
<element name="uom" type="gml:UnitOfMeasureType"></element> <element name="uom" type="gml:UnitOfMeasureType"></element>
<element name="fileURI" type="anyURI"></element> <element name="fileURI" type="anyURI"></element>
...@@ -406,16 +406,16 @@ version="2.0" ...@@ -406,16 +406,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="RegularTimeSeriesFilePropertyType"> <complexType name="RegularTimeSeriesFilePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:RegularTimeSeriesFile"/> <element ref="nrg3:RegularTimeSeriesFile"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="TypicalValuesTimeSeries" substitutionGroup="nrg2:AbstractTimeSeries" type="nrg2:TypicalValuesTimeSeriesType"></element> <element name="TypicalValuesTimeSeries" substitutionGroup="nrg3:AbstractTimeSeries" type="nrg3:TypicalValuesTimeSeriesType"></element>
<complexType name="TypicalValuesTimeSeriesType"> <complexType name="TypicalValuesTimeSeriesType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractTimeSeriesType"> <extension base="nrg3:AbstractTimeSeriesType">
<sequence> <sequence>
<element minOccurs="0" name="startTime" type="time"/> <element minOccurs="0" name="startTime" type="time"/>
<element minOccurs="0" name="startDay" type="integer"/> <element minOccurs="0" name="startDay" type="integer"/>
...@@ -429,16 +429,16 @@ version="2.0" ...@@ -429,16 +429,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="TypicalValuesTimeSeriesPropertyType"> <complexType name="TypicalValuesTimeSeriesPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:TypicalValuesTimeSeries"/> <element ref="nrg3:TypicalValuesTimeSeries"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="TypicalValuesTimeSeriesFile" substitutionGroup="nrg2:AbstractTimeSeries" type="nrg2:TypicalValuesTimeSeriesFileType"></element> <element name="TypicalValuesTimeSeriesFile" substitutionGroup="nrg3:AbstractTimeSeries" type="nrg3:TypicalValuesTimeSeriesFileType"></element>
<complexType name="TypicalValuesTimeSeriesFileType"> <complexType name="TypicalValuesTimeSeriesFileType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractTimeSeriesType"> <extension base="nrg3:AbstractTimeSeriesType">
<sequence> <sequence>
<element minOccurs="0" name="startTime" type="time"/> <element minOccurs="0" name="startTime" type="time"/>
<element minOccurs="0" name="startDay" type="integer"/> <element minOccurs="0" name="startDay" type="integer"/>
...@@ -458,16 +458,16 @@ version="2.0" ...@@ -458,16 +458,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="TypicalValuesTimeSeriesFilePropertyType"> <complexType name="TypicalValuesTimeSeriesFilePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:TypicalValuesTimeSeriesFile"/> <element ref="nrg3:TypicalValuesTimeSeriesFile"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="SensorConnection" substitutionGroup="nrg2:AbstractTimeSeries" type="nrg2:SensorConnectionType"></element> <element name="SensorConnection" substitutionGroup="nrg3:AbstractTimeSeries" type="nrg3:SensorConnectionType"></element>
<complexType name="SensorConnectionType"> <complexType name="SensorConnectionType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractTimeSeriesType"> <extension base="nrg3:AbstractTimeSeriesType">
<sequence> <sequence>
<element name="temporalExtent" type="gml:TimeIntervalLengthType"></element> <element name="temporalExtent" type="gml:TimeIntervalLengthType"></element>
<element name="connectionType" type="gml:CodeType"></element> <element name="connectionType" type="gml:CodeType"></element>
...@@ -489,7 +489,7 @@ version="2.0" ...@@ -489,7 +489,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="SensorConnectionPropertyType"> <complexType name="SensorConnectionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:SensorConnection"/> <element ref="nrg3:SensorConnection"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -500,7 +500,7 @@ version="2.0" ...@@ -500,7 +500,7 @@ version="2.0"
<!-- ****************************************** --> <!-- ****************************************** -->
<element abstract="true" name="AbstractSchedule" substitutionGroup="gml:_Feature" type="nrg2:AbstractScheduleType"></element> <element abstract="true" name="AbstractSchedule" substitutionGroup="gml:_Feature" type="nrg3:AbstractScheduleType"></element>
<complexType abstract="true" name="AbstractScheduleType"> <complexType abstract="true" name="AbstractScheduleType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -518,16 +518,16 @@ version="2.0" ...@@ -518,16 +518,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractSchedulePropertyType"> <complexType name="AbstractSchedulePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractSchedule"/> <element ref="nrg3:AbstractSchedule"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="DualValueSchedule" substitutionGroup="nrg2:AbstractSchedule" type="nrg2:DualValueScheduleType"/> <element name="DualValueSchedule" substitutionGroup="nrg3:AbstractSchedule" type="nrg3:DualValueScheduleType"/>
<complexType name="DualValueScheduleType"> <complexType name="DualValueScheduleType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractScheduleType"> <extension base="nrg3:AbstractScheduleType">
<sequence> <sequence>
<element name="idleValue" type="gml:MeasureType"/> <element name="idleValue" type="gml:MeasureType"/>
<element name="usageValue" type="gml:MeasureType"/> <element name="usageValue" type="gml:MeasureType"/>
...@@ -539,19 +539,19 @@ version="2.0" ...@@ -539,19 +539,19 @@ version="2.0"
</complexType> </complexType>
<complexType name="DualValueSchedulePropertyType"> <complexType name="DualValueSchedulePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:DualValueSchedule"/> <element ref="nrg3:DualValueSchedule"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="AtomicSchedule" substitutionGroup="nrg2:AbstractSchedule" type="nrg2:AtomicScheduleType"></element> <element name="AtomicSchedule" substitutionGroup="nrg3:AbstractSchedule" type="nrg3:AtomicScheduleType"></element>
<complexType name="AtomicScheduleType"> <complexType name="AtomicScheduleType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractScheduleType"> <extension base="nrg3:AbstractScheduleType">
<sequence> <sequence>
<element minOccurs="0" name="constantValue" type="gml:MeasureType"/> <element minOccurs="0" name="constantValue" type="gml:MeasureType"/>
<element minOccurs="0" name="timeSeries" type="nrg2:AbstractTimeSeriesPropertyType"> <element minOccurs="0" name="timeSeries" type="nrg3:AbstractTimeSeriesPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -564,18 +564,18 @@ version="2.0" ...@@ -564,18 +564,18 @@ version="2.0"
</complexType> </complexType>
<complexType name="AtomicSchedulePropertyType"> <complexType name="AtomicSchedulePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AtomicSchedule"/> <element ref="nrg3:AtomicSchedule"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="CompositeSchedule" substitutionGroup="nrg2:AbstractSchedule" type="nrg2:CompositeScheduleType"></element> <element name="CompositeSchedule" substitutionGroup="nrg3:AbstractSchedule" type="nrg3:CompositeScheduleType"></element>
<complexType name="CompositeScheduleType"> <complexType name="CompositeScheduleType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractScheduleType"> <extension base="nrg3:AbstractScheduleType">
<sequence> <sequence>
<element maxOccurs="unbounded" name="scheduleComponent" type="nrg2:ScheduleComponentPropertyType"> <element maxOccurs="unbounded" name="scheduleComponent" type="nrg3:ScheduleComponentPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -588,13 +588,13 @@ version="2.0" ...@@ -588,13 +588,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="CompositeSchedulePropertyType"> <complexType name="CompositeSchedulePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:CompositeSchedule"/> <element ref="nrg3:CompositeSchedule"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ScheduleComponent" substitutionGroup="gml:_Feature" type="nrg2:ScheduleComponentType"></element> <element name="ScheduleComponent" substitutionGroup="gml:_Feature" type="nrg3:ScheduleComponentType"></element>
<complexType name="ScheduleComponentType"> <complexType name="ScheduleComponentType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -602,7 +602,7 @@ version="2.0" ...@@ -602,7 +602,7 @@ version="2.0"
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element default="1" name="repetitions" type="integer"/> <element default="1" name="repetitions" type="integer"/>
<element minOccurs="0" name="additionalGap" type="gml:TimeIntervalLengthType"/> <element minOccurs="0" name="additionalGap" type="gml:TimeIntervalLengthType"/>
<element name="scheduleComponentMember" type="nrg2:AbstractSchedulePropertyType"> <element name="scheduleComponentMember" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -615,13 +615,13 @@ version="2.0" ...@@ -615,13 +615,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="ScheduleComponentPropertyType"> <complexType name="ScheduleComponentPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ScheduleComponent"/> <element ref="nrg3:ScheduleComponent"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ScheduleLibrary" substitutionGroup="nrg2:AbstractLibrary" type="nrg2:ScheduleLibraryType"> <element name="ScheduleLibrary" substitutionGroup="nrg3:AbstractLibrary" type="nrg3:ScheduleLibraryType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="topLevel">true</taggedValue> <taggedValue tag="topLevel">true</taggedValue>
...@@ -630,9 +630,9 @@ version="2.0" ...@@ -630,9 +630,9 @@ version="2.0"
</element> </element>
<complexType name="ScheduleLibraryType"> <complexType name="ScheduleLibraryType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractLibraryType"> <extension base="nrg3:AbstractLibraryType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg2:AbstractSchedulePropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -645,7 +645,7 @@ version="2.0" ...@@ -645,7 +645,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="ScheduleLibraryPropertyType"> <complexType name="ScheduleLibraryPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ScheduleLibrary"/> <element ref="nrg3:ScheduleLibrary"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -656,13 +656,13 @@ version="2.0" ...@@ -656,13 +656,13 @@ version="2.0"
<!-- ************************ --> <!-- ************************ -->
<element abstract="true" name="AbstractBuildingPartition" substitutionGroup="core:_CityObject" type="nrg2:AbstractBuildingPartitionType"/> <element abstract="true" name="AbstractBuildingPartition" substitutionGroup="core:_CityObject" type="nrg3:AbstractBuildingPartitionType"/>
<complexType abstract="true" name="AbstractBuildingPartitionType"> <complexType abstract="true" name="AbstractBuildingPartitionType">
<complexContent> <complexContent>
<extension base="core:AbstractCityObjectType"> <extension base="core:AbstractCityObjectType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="area" type="nrg2:QualifiedAreaPropertyType"/> <element maxOccurs="unbounded" minOccurs="0" name="area" type="nrg3:QualifiedAreaPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="volume" type="nrg2:QualifiedVolumePropertyType"/> <element maxOccurs="unbounded" minOccurs="0" name="volume" type="nrg3:QualifiedVolumePropertyType"/>
<element minOccurs="0" name="lod1Solid" type="gml:SolidPropertyType"> <element minOccurs="0" name="lod1Solid" type="gml:SolidPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
...@@ -690,29 +690,29 @@ version="2.0" ...@@ -690,29 +690,29 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractBuildingPartitionPropertyType"> <complexType name="AbstractBuildingPartitionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractBuildingPartition"/> <element ref="nrg3:AbstractBuildingPartition"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractBuildingUnit" substitutionGroup="nrg2:AbstractBuildingPartition" type="nrg2:AbstractBuildingUnitType"/> <element abstract="true" name="AbstractBuildingUnit" substitutionGroup="nrg3:AbstractBuildingPartition" type="nrg3:AbstractBuildingUnitType"/>
<complexType abstract="true" name="AbstractBuildingUnitType"> <complexType abstract="true" name="AbstractBuildingUnitType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractBuildingPartitionType"> <extension base="nrg3:AbstractBuildingPartitionType">
<sequence/> <sequence/>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="AbstractBuildingUnitPropertyType"> <complexType name="AbstractBuildingUnitPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractBuildingUnit"/> <element ref="nrg3:AbstractBuildingUnit"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractDevice" substitutionGroup="core:_CityObject" type="nrg2:AbstractDeviceType"/> <element abstract="true" name="AbstractDevice" substitutionGroup="core:_CityObject" type="nrg3:AbstractDeviceType"/>
<complexType abstract="true" name="AbstractDeviceType"> <complexType abstract="true" name="AbstractDeviceType">
<complexContent> <complexContent>
<extension base="core:AbstractCityObjectType"> <extension base="core:AbstractCityObjectType">
...@@ -727,7 +727,7 @@ version="2.0" ...@@ -727,7 +727,7 @@ version="2.0"
<element minOccurs="0" name="heatDissipationConvectiveFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationConvectiveFraction" type="gml:ScaleType"/>
<element minOccurs="0" name="heatDissipationLatentFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationLatentFraction" type="gml:ScaleType"/>
<element minOccurs="0" name="heatDissipationRadiantFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationRadiantFraction" type="gml:ScaleType"/>
<element maxOccurs="unbounded" minOccurs="0" name="deviceOperation" type="nrg2:DeviceOperationPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="deviceOperation" type="nrg3:DeviceOperationPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -740,13 +740,13 @@ version="2.0" ...@@ -740,13 +740,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractDevicePropertyType"> <complexType name="AbstractDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractDevice"/> <element ref="nrg3:AbstractDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractLibrary" substitutionGroup="core:_CityObject" type="nrg2:AbstractLibraryType"/> <element abstract="true" name="AbstractLibrary" substitutionGroup="core:_CityObject" type="nrg3:AbstractLibraryType"/>
<complexType abstract="true" name="AbstractLibraryType"> <complexType abstract="true" name="AbstractLibraryType">
<complexContent> <complexContent>
<extension base="core:AbstractCityObjectType"> <extension base="core:AbstractCityObjectType">
...@@ -760,13 +760,13 @@ version="2.0" ...@@ -760,13 +760,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractLibraryPropertyType"> <complexType name="AbstractLibraryPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractLibrary"/> <element ref="nrg3:AbstractLibrary"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractLayeredConstruction" substitutionGroup="gml:_Feature" type="nrg2:AbstractLayeredConstructionType"></element> <element abstract="true" name="AbstractLayeredConstruction" substitutionGroup="gml:_Feature" type="nrg3:AbstractLayeredConstructionType"></element>
<complexType abstract="true" name="AbstractLayeredConstructionType"> <complexType abstract="true" name="AbstractLayeredConstructionType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -776,23 +776,23 @@ version="2.0" ...@@ -776,23 +776,23 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractLayeredConstructionPropertyType"> <complexType name="AbstractLayeredConstructionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractLayeredConstruction"/> <element ref="nrg3:AbstractLayeredConstruction"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractResource" substitutionGroup="gml:_Feature" type="nrg2:AbstractResourceType"/> <element abstract="true" name="AbstractResource" substitutionGroup="gml:_Feature" type="nrg3:AbstractResourceType"/>
<complexType abstract="true" name="AbstractResourceType"> <complexType abstract="true" name="AbstractResourceType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
<sequence> <sequence>
<element name="status" type="nrg2:ResourceStatusValueType"/> <element name="status" type="nrg3:ResourceStatusValueType"/>
<element name="operationType" type="gml:CodeType"/> <element name="operationType" type="gml:CodeType"/>
<element name="amountType" type="gml:CodeType"/> <element name="amountType" type="gml:CodeType"/>
<element minOccurs="0" name="year" type="integer"/> <element minOccurs="0" name="year" type="integer"/>
<element minOccurs="0" name="amount" type="gml:MeasureType"/> <element minOccurs="0" name="amount" type="gml:MeasureType"/>
<element minOccurs="0" name="timeDependentAmount" type="nrg2:AbstractTimeSeriesPropertyType"> <element minOccurs="0" name="timeDependentAmount" type="nrg3:AbstractTimeSeriesPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -811,18 +811,18 @@ version="2.0" ...@@ -811,18 +811,18 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractResourcePropertyType"> <complexType name="AbstractResourcePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractResource"/> <element ref="nrg3:AbstractResource"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractThermalZone" substitutionGroup="nrg2:AbstractBuildingPartition" type="nrg2:AbstractThermalZoneType"/> <element abstract="true" name="AbstractThermalZone" substitutionGroup="nrg3:AbstractBuildingPartition" type="nrg3:AbstractThermalZoneType"/>
<complexType abstract="true" name="AbstractThermalZoneType"> <complexType abstract="true" name="AbstractThermalZoneType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractBuildingPartitionType"> <extension base="nrg3:AbstractBuildingPartitionType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="usageZone" type="nrg2:AbstractUsageZonePropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="usageZone" type="nrg3:AbstractUsageZonePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -835,18 +835,18 @@ version="2.0" ...@@ -835,18 +835,18 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractThermalZonePropertyType"> <complexType name="AbstractThermalZonePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractThermalZone"/> <element ref="nrg3:AbstractThermalZone"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element abstract="true" name="AbstractUsageZone" substitutionGroup="nrg2:AbstractBuildingPartition" type="nrg2:AbstractUsageZoneType"/> <element abstract="true" name="AbstractUsageZone" substitutionGroup="nrg3:AbstractBuildingPartition" type="nrg3:AbstractUsageZoneType"/>
<complexType abstract="true" name="AbstractUsageZoneType"> <complexType abstract="true" name="AbstractUsageZoneType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractBuildingPartitionType"> <extension base="nrg3:AbstractBuildingPartitionType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="buildingUnit" type="nrg2:AbstractBuildingUnitPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="buildingUnit" type="nrg3:AbstractBuildingUnitPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -859,13 +859,13 @@ version="2.0" ...@@ -859,13 +859,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractUsageZonePropertyType"> <complexType name="AbstractUsageZonePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractUsageZone"/> <element ref="nrg3:AbstractUsageZone"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="EnergyPerformanceCertificate" substitutionGroup="gml:_Feature" type="nrg2:EnergyPerformanceCertificateType"></element> <element name="EnergyPerformanceCertificate" substitutionGroup="gml:_Feature" type="nrg3:EnergyPerformanceCertificateType"></element>
<complexType name="EnergyPerformanceCertificateType"> <complexType name="EnergyPerformanceCertificateType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -884,13 +884,13 @@ version="2.0" ...@@ -884,13 +884,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="EnergyPerformanceCertificatePropertyType"> <complexType name="EnergyPerformanceCertificatePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:EnergyPerformanceCertificate"/> <element ref="nrg3:EnergyPerformanceCertificate"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="RefurbishmentMeasure" substitutionGroup="gml:_Feature" type="nrg2:RefurbishmentMeasureType"></element> <element name="RefurbishmentMeasure" substitutionGroup="gml:_Feature" type="nrg3:RefurbishmentMeasureType"></element>
<complexType name="RefurbishmentMeasureType"> <complexType name="RefurbishmentMeasureType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -905,19 +905,19 @@ version="2.0" ...@@ -905,19 +905,19 @@ version="2.0"
</complexType> </complexType>
<complexType name="RefurbishmentMeasurePropertyType"> <complexType name="RefurbishmentMeasurePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:RefurbishmentMeasure"/> <element ref="nrg3:RefurbishmentMeasure"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="UtilityNetworkConnection" substitutionGroup="gml:_Feature" type="nrg2:UtilityNetworkConnectionType"></element> <element name="UtilityNetworkConnection" substitutionGroup="gml:_Feature" type="nrg3:UtilityNetworkConnectionType"></element>
<complexType name="UtilityNetworkConnectionType"> <complexType name="UtilityNetworkConnectionType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
<sequence> <sequence>
<element name="networkType" type="gml:CodeType"></element> <element name="networkType" type="gml:CodeType"></element>
<element name="connectionStatus" type="nrg2:NetworkConnectionStatusValueType"></element> <element name="connectionStatus" type="nrg3:NetworkConnectionStatusValueType"></element>
<element minOccurs="0" name="functionInNetwork" type="gml:CodeType"></element> <element minOccurs="0" name="functionInNetwork" type="gml:CodeType"></element>
<element minOccurs="0" name="usageInNetwork" type="gml:CodeType"></element> <element minOccurs="0" name="usageInNetwork" type="gml:CodeType"></element>
<element minOccurs="0" name="networkID" type="string"></element> <element minOccurs="0" name="networkID" type="string"></element>
...@@ -928,13 +928,13 @@ version="2.0" ...@@ -928,13 +928,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="UtilityNetworkConnectionPropertyType"> <complexType name="UtilityNetworkConnectionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:UtilityNetworkConnection"/> <element ref="nrg3:UtilityNetworkConnection"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="WeatherData" substitutionGroup="gml:_Feature" type="nrg2:WeatherDataType"></element> <element name="WeatherData" substitutionGroup="gml:_Feature" type="nrg3:WeatherDataType"></element>
<complexType name="WeatherDataType"> <complexType name="WeatherDataType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -943,7 +943,7 @@ version="2.0" ...@@ -943,7 +943,7 @@ version="2.0"
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element minOccurs="0" name="valueType" type="gml:CodeType"/> <element minOccurs="0" name="valueType" type="gml:CodeType"/>
<element minOccurs="0" name="yearlyValue" type="gml:MeasureType"/> <element minOccurs="0" name="yearlyValue" type="gml:MeasureType"/>
<element minOccurs="0" name="timeDependentValues" type="nrg2:AbstractTimeSeriesPropertyType"> <element minOccurs="0" name="timeDependentValues" type="nrg3:AbstractTimeSeriesPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -957,21 +957,21 @@ version="2.0" ...@@ -957,21 +957,21 @@ version="2.0"
</complexType> </complexType>
<complexType name="WeatherDataPropertyType"> <complexType name="WeatherDataPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:WeatherData"/> <element ref="nrg3:WeatherData"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<!-- ADE Extension of bldg:_AbstractBuilding --> <!-- ADE Extension of bldg:_AbstractBuilding -->
<element name="bdgAtticThermalStatus" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:ThermalStatusValueType"> <element name="bdgAtticThermalStatus" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:ThermalStatusValueType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="maxOccurs">1</taggedValue> <taggedValue tag="maxOccurs">1</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="bdgBasementThermalStatus" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:ThermalStatusValueType"> <element name="bdgBasementThermalStatus" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:ThermalStatusValueType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="maxOccurs">1</taggedValue> <taggedValue tag="maxOccurs">1</taggedValue>
...@@ -985,9 +985,9 @@ version="2.0" ...@@ -985,9 +985,9 @@ version="2.0"
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="bdgArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:QualifiedAreaPropertyType"></element> <element name="bdgArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:QualifiedAreaPropertyType"></element>
<element name="bdgHeight" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:QualifiedHeightPropertyType"></element> <element name="bdgHeight" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:QualifiedHeightPropertyType"></element>
<element name="bdgVolume" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:QualifiedVolumePropertyType"></element> <element name="bdgVolume" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:QualifiedVolumePropertyType"></element>
<element name="bdgIsProtected" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="boolean"> <element name="bdgIsProtected" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="boolean">
<annotation> <annotation>
<appinfo> <appinfo>
...@@ -1002,35 +1002,35 @@ version="2.0" ...@@ -1002,35 +1002,35 @@ version="2.0"
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="buildingUnit" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:AbstractBuildingUnitPropertyType"> <element name="buildingUnit" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:AbstractBuildingUnitPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="energyPerformanceCertificate" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:EnergyPerformanceCertificatePropertyType"> <element name="energyPerformanceCertificate" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:EnergyPerformanceCertificatePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="refurbishmentMeasure" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:RefurbishmentMeasurePropertyType"> <element name="refurbishmentMeasure" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:RefurbishmentMeasurePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="thermalZone" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:AbstractThermalZonePropertyType"> <element name="thermalZone" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:AbstractThermalZonePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="usageZone" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg2:AbstractUsageZonePropertyType"> <element name="usageZone" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="nrg3:AbstractUsageZonePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1040,11 +1040,11 @@ version="2.0" ...@@ -1040,11 +1040,11 @@ version="2.0"
<!-- BEGIN: Manually converted Association class "CityObjectRelation" --> <!-- BEGIN: Manually converted Association class "CityObjectRelation" -->
<element name="CityObjectRelation" substitutionGroup="gml:_Object" type="nrg2:CityObjectRelationType"></element> <element name="CityObjectRelation" substitutionGroup="gml:_Object" type="nrg3:CityObjectRelationType"></element>
<complexType name="CityObjectRelationType"> <complexType name="CityObjectRelationType">
<sequence> <sequence>
<element name="relationType" type="gml:CodeType"/> <element name="relationType" type="gml:CodeType"/>
<element name="relatedTo" type="nrg2:RelatedToPropertyType"> <element name="relatedTo" type="nrg3:RelatedToPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -1055,7 +1055,7 @@ version="2.0" ...@@ -1055,7 +1055,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="CityObjectRelationPropertyType"> <complexType name="CityObjectRelationPropertyType">
<sequence> <sequence>
<element minOccurs="0" ref="nrg2:CityObjectRelation"/> <element minOccurs="0" ref="nrg3:CityObjectRelation"/>
</sequence> </sequence>
</complexType> </complexType>
...@@ -1069,7 +1069,7 @@ version="2.0" ...@@ -1069,7 +1069,7 @@ version="2.0"
<!-- ADE Extension of core:_CityObject --> <!-- ADE Extension of core:_CityObject -->
<!-- BEGIN: Manually edited type of relatedTo property --> <!-- BEGIN: Manually edited type of relatedTo property -->
<element name="relatedTo" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:CityObjectRelationPropertyType"> <element name="relatedTo" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:CityObjectRelationPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1077,14 +1077,14 @@ version="2.0" ...@@ -1077,14 +1077,14 @@ version="2.0"
</annotation> </annotation>
</element> </element>
<!-- END: Manually edited type of relatedTo property --> <!-- END: Manually edited type of relatedTo property -->
<element name="device" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:AbstractDevicePropertyType"> <element name="device" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:AbstractDevicePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="layeredConstruction" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:AbstractLayeredConstructionPropertyType"> <element name="layeredConstruction" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:AbstractLayeredConstructionPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -1094,28 +1094,28 @@ version="2.0" ...@@ -1094,28 +1094,28 @@ version="2.0"
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="resource" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:AbstractResourcePropertyType"> <element name="resource" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:AbstractResourcePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="suitability" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:SuitabilityPropertyType"> <element name="suitability" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:SuitabilityPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="utilityNetworkConnection" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:UtilityNetworkConnectionPropertyType"> <element name="utilityNetworkConnection" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:UtilityNetworkConnectionPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element name="weatherData" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg2:WeatherDataPropertyType"> <element name="weatherData" substitutionGroup="core:_GenericApplicationPropertyOfCityObject" type="nrg3:WeatherDataPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1136,10 +1136,10 @@ version="2.0" ...@@ -1136,10 +1136,10 @@ version="2.0"
<!-- *************************** --> <!-- *************************** -->
<element name="ConstructionMaterial" substitutionGroup="nrg2:AbstractResource" type="nrg2:ConstructionMaterialType"></element> <element name="ConstructionMaterial" substitutionGroup="nrg3:AbstractResource" type="nrg3:ConstructionMaterialType"></element>
<complexType name="ConstructionMaterialType"> <complexType name="ConstructionMaterialType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1149,16 +1149,16 @@ version="2.0" ...@@ -1149,16 +1149,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="ConstructionMaterialPropertyType"> <complexType name="ConstructionMaterialPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ConstructionMaterial"/> <element ref="nrg3:ConstructionMaterial"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Energy" substitutionGroup="nrg2:AbstractResource" type="nrg2:EnergyType"></element> <element name="Energy" substitutionGroup="nrg3:AbstractResource" type="nrg3:EnergyType"></element>
<complexType name="EnergyType"> <complexType name="EnergyType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1171,16 +1171,16 @@ version="2.0" ...@@ -1171,16 +1171,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="EnergyPropertyType"> <complexType name="EnergyPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Energy"/> <element ref="nrg3:Energy"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Food" substitutionGroup="nrg2:AbstractResource" type="nrg2:FoodType"></element> <element name="Food" substitutionGroup="nrg3:AbstractResource" type="nrg3:FoodType"></element>
<complexType name="FoodType"> <complexType name="FoodType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1190,16 +1190,16 @@ version="2.0" ...@@ -1190,16 +1190,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="FoodPropertyType"> <complexType name="FoodPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Food"/> <element ref="nrg3:Food"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="OtherResource" substitutionGroup="nrg2:AbstractResource" type="nrg2:OtherResourceType"></element> <element name="OtherResource" substitutionGroup="nrg3:AbstractResource" type="nrg3:OtherResourceType"></element>
<complexType name="OtherResourceType"> <complexType name="OtherResourceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1209,16 +1209,16 @@ version="2.0" ...@@ -1209,16 +1209,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="OtherResourcePropertyType"> <complexType name="OtherResourcePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:OtherResource"/> <element ref="nrg3:OtherResource"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="UrbanSpace" substitutionGroup="nrg2:AbstractResource" type="nrg2:UrbanSpaceType"></element> <element name="UrbanSpace" substitutionGroup="nrg3:AbstractResource" type="nrg3:UrbanSpaceType"></element>
<complexType name="UrbanSpaceType"> <complexType name="UrbanSpaceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1228,16 +1228,16 @@ version="2.0" ...@@ -1228,16 +1228,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="UrbanSpacePropertyType"> <complexType name="UrbanSpacePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:UrbanSpace"/> <element ref="nrg3:UrbanSpace"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Waste" substitutionGroup="nrg2:AbstractResource" type="nrg2:WasteType"></element> <element name="Waste" substitutionGroup="nrg3:AbstractResource" type="nrg3:WasteType"></element>
<complexType name="WasteType"> <complexType name="WasteType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1249,16 +1249,16 @@ version="2.0" ...@@ -1249,16 +1249,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="WastePropertyType"> <complexType name="WastePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Waste"/> <element ref="nrg3:Waste"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Water" substitutionGroup="nrg2:AbstractResource" type="nrg2:WaterType"></element> <element name="Water" substitutionGroup="nrg3:AbstractResource" type="nrg3:WaterType"></element>
<complexType name="WaterType"> <complexType name="WaterType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractResourceType"> <extension base="nrg3:AbstractResourceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element name="endUse" type="gml:CodeType"></element> <element name="endUse" type="gml:CodeType"></element>
...@@ -1268,7 +1268,7 @@ version="2.0" ...@@ -1268,7 +1268,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="WaterPropertyType"> <complexType name="WaterPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Water"/> <element ref="nrg3:Water"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -1279,7 +1279,7 @@ version="2.0" ...@@ -1279,7 +1279,7 @@ version="2.0"
<!-- ********************************************* --> <!-- ********************************************* -->
<element abstract="true" name="AbstractMaterial" substitutionGroup="gml:_Feature" type="nrg2:AbstractMaterialType"></element> <element abstract="true" name="AbstractMaterial" substitutionGroup="gml:_Feature" type="nrg3:AbstractMaterialType"></element>
<complexType abstract="true" name="AbstractMaterialType"> <complexType abstract="true" name="AbstractMaterialType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -1291,16 +1291,16 @@ version="2.0" ...@@ -1291,16 +1291,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractMaterialPropertyType"> <complexType name="AbstractMaterialPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractMaterial"/> <element ref="nrg3:AbstractMaterial"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Gas" substitutionGroup="nrg2:AbstractMaterial" type="nrg2:GasType"></element> <element name="Gas" substitutionGroup="nrg3:AbstractMaterial" type="nrg3:GasType"></element>
<complexType name="GasType"> <complexType name="GasType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractMaterialType"> <extension base="nrg3:AbstractMaterialType">
<sequence> <sequence>
<element default="false" minOccurs="0" name="isVentilated" type="boolean"></element> <element default="false" minOccurs="0" name="isVentilated" type="boolean"></element>
<element minOccurs="0" name="rValue" type="gml:MeasureType"></element> <element minOccurs="0" name="rValue" type="gml:MeasureType"></element>
...@@ -1310,13 +1310,13 @@ version="2.0" ...@@ -1310,13 +1310,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="GasPropertyType"> <complexType name="GasPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Gas"/> <element ref="nrg3:Gas"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="LayeredConstructionLibrary" substitutionGroup="nrg2:AbstractLibrary" type="nrg2:LayeredConstructionLibraryType"> <element name="LayeredConstructionLibrary" substitutionGroup="nrg3:AbstractLibrary" type="nrg3:LayeredConstructionLibraryType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="topLevel">true</taggedValue> <taggedValue tag="topLevel">true</taggedValue>
...@@ -1325,9 +1325,9 @@ version="2.0" ...@@ -1325,9 +1325,9 @@ version="2.0"
</element> </element>
<complexType name="LayeredConstructionLibraryType"> <complexType name="LayeredConstructionLibraryType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractLibraryType"> <extension base="nrg3:AbstractLibraryType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg2:AbstractLayeredConstructionPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg3:AbstractLayeredConstructionPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1340,19 +1340,19 @@ version="2.0" ...@@ -1340,19 +1340,19 @@ version="2.0"
</complexType> </complexType>
<complexType name="LayeredConstructionLibraryPropertyType"> <complexType name="LayeredConstructionLibraryPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:LayeredConstructionLibrary"/> <element ref="nrg3:LayeredConstructionLibrary"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Layer" substitutionGroup="gml:_Feature" type="nrg2:LayerType"></element> <element name="Layer" substitutionGroup="gml:_Feature" type="nrg3:LayerType"></element>
<complexType name="LayerType"> <complexType name="LayerType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
<sequence> <sequence>
<element name="thickness" type="gml:MeasureType"/> <element name="thickness" type="gml:MeasureType"/>
<element name="material" type="nrg2:AbstractMaterialPropertyType"> <element name="material" type="nrg3:AbstractMaterialPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -1365,25 +1365,25 @@ version="2.0" ...@@ -1365,25 +1365,25 @@ version="2.0"
</complexType> </complexType>
<complexType name="LayerPropertyType"> <complexType name="LayerPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Layer"/> <element ref="nrg3:Layer"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="LayeredConstruction" substitutionGroup="nrg2:AbstractLayeredConstruction" type="nrg2:LayeredConstructionType"></element> <element name="LayeredConstruction" substitutionGroup="nrg3:AbstractLayeredConstruction" type="nrg3:LayeredConstructionType"></element>
<complexType name="LayeredConstructionType"> <complexType name="LayeredConstructionType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractLayeredConstructionType"> <extension base="nrg3:AbstractLayeredConstructionType">
<sequence> <sequence>
<element minOccurs="0" name="libraryCode" type="gml:CodeType"></element> <element minOccurs="0" name="libraryCode" type="gml:CodeType"></element>
<element minOccurs="0" name="uValue" type="gml:MeasureType"></element> <element minOccurs="0" name="uValue" type="gml:MeasureType"></element>
<element minOccurs="0" name="gValue" type="gml:ScaleType"></element> <element minOccurs="0" name="gValue" type="gml:ScaleType"></element>
<element minOccurs="0" name="glazingRatio" type="gml:ScaleType"></element> <element minOccurs="0" name="glazingRatio" type="gml:ScaleType"></element>
<element maxOccurs="unbounded" minOccurs="0" name="emissivity" type="nrg2:EmissivityPropertyType"/> <element maxOccurs="unbounded" minOccurs="0" name="emissivity" type="nrg3:EmissivityPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="reflectance" type="nrg2:ReflectancePropertyType"/> <element maxOccurs="unbounded" minOccurs="0" name="reflectance" type="nrg3:ReflectancePropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="transmittance" type="nrg2:TransmittancePropertyType"/> <element maxOccurs="unbounded" minOccurs="0" name="transmittance" type="nrg3:TransmittancePropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="layer" type="nrg2:LayerPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="layer" type="nrg3:LayerPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1396,13 +1396,13 @@ version="2.0" ...@@ -1396,13 +1396,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="LayeredConstructionPropertyType"> <complexType name="LayeredConstructionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:LayeredConstruction"/> <element ref="nrg3:LayeredConstruction"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="MaterialLibrary" substitutionGroup="nrg2:AbstractLibrary" type="nrg2:MaterialLibraryType"> <element name="MaterialLibrary" substitutionGroup="nrg3:AbstractLibrary" type="nrg3:MaterialLibraryType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="topLevel">true</taggedValue> <taggedValue tag="topLevel">true</taggedValue>
...@@ -1411,9 +1411,9 @@ version="2.0" ...@@ -1411,9 +1411,9 @@ version="2.0"
</element> </element>
<complexType name="MaterialLibraryType"> <complexType name="MaterialLibraryType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractLibraryType"> <extension base="nrg3:AbstractLibraryType">
<sequence> <sequence>
<element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg2:AbstractMaterialPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="libraryMember" type="nrg3:AbstractMaterialPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
...@@ -1426,18 +1426,18 @@ version="2.0" ...@@ -1426,18 +1426,18 @@ version="2.0"
</complexType> </complexType>
<complexType name="MaterialLibraryPropertyType"> <complexType name="MaterialLibraryPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:MaterialLibrary"/> <element ref="nrg3:MaterialLibrary"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ReverseLayeredConstruction" substitutionGroup="nrg2:AbstractLayeredConstruction" type="nrg2:ReverseLayeredConstructionType"/> <element name="ReverseLayeredConstruction" substitutionGroup="nrg3:AbstractLayeredConstruction" type="nrg3:ReverseLayeredConstructionType"/>
<complexType name="ReverseLayeredConstructionType"> <complexType name="ReverseLayeredConstructionType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractLayeredConstructionType"> <extension base="nrg3:AbstractLayeredConstructionType">
<sequence> <sequence>
<element name="baseLayeredConstruction" type="nrg2:LayeredConstructionPropertyType"> <element name="baseLayeredConstruction" type="nrg3:LayeredConstructionPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">association</taggedValue> <taggedValue tag="relationType">association</taggedValue>
...@@ -1450,16 +1450,16 @@ version="2.0" ...@@ -1450,16 +1450,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="ReverseLayeredConstructionPropertyType"> <complexType name="ReverseLayeredConstructionPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ReverseLayeredConstruction"/> <element ref="nrg3:ReverseLayeredConstruction"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="SolidMaterial" substitutionGroup="nrg2:AbstractMaterial" type="nrg2:SolidMaterialType"></element> <element name="SolidMaterial" substitutionGroup="nrg3:AbstractMaterial" type="nrg3:SolidMaterialType"></element>
<complexType name="SolidMaterialType"> <complexType name="SolidMaterialType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractMaterialType"> <extension base="nrg3:AbstractMaterialType">
<sequence> <sequence>
<element minOccurs="0" name="thermalConductivity" type="gml:MeasureType"></element> <element minOccurs="0" name="thermalConductivity" type="gml:MeasureType"></element>
<element minOccurs="0" name="density" type="gml:MeasureType"></element> <element minOccurs="0" name="density" type="gml:MeasureType"></element>
...@@ -1474,7 +1474,7 @@ version="2.0" ...@@ -1474,7 +1474,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="SolidMaterialPropertyType"> <complexType name="SolidMaterialPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:SolidMaterial"/> <element ref="nrg3:SolidMaterial"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -1485,7 +1485,7 @@ version="2.0" ...@@ -1485,7 +1485,7 @@ version="2.0"
<!-- ************************************ --> <!-- ************************************ -->
<element name="AtticFloorSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg2:AtticFloorSurfaceType"/> <element name="AtticFloorSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg3:AtticFloorSurfaceType"/>
<complexType name="AtticFloorSurfaceType"> <complexType name="AtticFloorSurfaceType">
<complexContent> <complexContent>
<extension base="bldg:AbstractBoundarySurfaceType"> <extension base="bldg:AbstractBoundarySurfaceType">
...@@ -1495,13 +1495,13 @@ version="2.0" ...@@ -1495,13 +1495,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="AtticFloorSurfacePropertyType"> <complexType name="AtticFloorSurfacePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AtticFloorSurface"/> <element ref="nrg3:AtticFloorSurface"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="BasementCeilingSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg2:BasementCeilingSurfaceType"/> <element name="BasementCeilingSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg3:BasementCeilingSurfaceType"/>
<complexType name="BasementCeilingSurfaceType"> <complexType name="BasementCeilingSurfaceType">
<complexContent> <complexContent>
<extension base="bldg:AbstractBoundarySurfaceType"> <extension base="bldg:AbstractBoundarySurfaceType">
...@@ -1511,13 +1511,13 @@ version="2.0" ...@@ -1511,13 +1511,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="BasementCeilingSurfacePropertyType"> <complexType name="BasementCeilingSurfacePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:BasementCeilingSurface"/> <element ref="nrg3:BasementCeilingSurface"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="IntermediateFloorSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg2:IntermediateFloorSurfaceType"/> <element name="IntermediateFloorSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg3:IntermediateFloorSurfaceType"/>
<complexType name="IntermediateFloorSurfaceType"> <complexType name="IntermediateFloorSurfaceType">
<complexContent> <complexContent>
<extension base="bldg:AbstractBoundarySurfaceType"> <extension base="bldg:AbstractBoundarySurfaceType">
...@@ -1527,13 +1527,13 @@ version="2.0" ...@@ -1527,13 +1527,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="IntermediateFloorSurfacePropertyType"> <complexType name="IntermediateFloorSurfacePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:IntermediateFloorSurface"/> <element ref="nrg3:IntermediateFloorSurface"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="PartyWallSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg2:PartyWallSurfaceType"/> <element name="PartyWallSurface" substitutionGroup="bldg:_BoundarySurface" type="nrg3:PartyWallSurfaceType"/>
<complexType name="PartyWallSurfaceType"> <complexType name="PartyWallSurfaceType">
<complexContent> <complexContent>
<extension base="bldg:AbstractBoundarySurfaceType"> <extension base="bldg:AbstractBoundarySurfaceType">
...@@ -1543,16 +1543,16 @@ version="2.0" ...@@ -1543,16 +1543,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="PartyWallSurfacePropertyType"> <complexType name="PartyWallSurfacePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:PartyWallSurface"/> <element ref="nrg3:PartyWallSurface"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ThermalZone" substitutionGroup="nrg2:AbstractThermalZone" type="nrg2:ThermalZoneType"></element> <element name="ThermalZone" substitutionGroup="nrg3:AbstractThermalZone" type="nrg3:ThermalZoneType"></element>
<complexType name="ThermalZoneType"> <complexType name="ThermalZoneType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractThermalZoneType"> <extension base="nrg3:AbstractThermalZoneType">
<sequence> <sequence>
<element minOccurs="0" name="heatCapacity" type="gml:MeasureType"/> <element minOccurs="0" name="heatCapacity" type="gml:MeasureType"/>
<element minOccurs="0" name="infiltrationRate" type="gml:MeasureType"></element> <element minOccurs="0" name="infiltrationRate" type="gml:MeasureType"></element>
...@@ -1573,7 +1573,7 @@ version="2.0" ...@@ -1573,7 +1573,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="ThermalZonePropertyType"> <complexType name="ThermalZonePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ThermalZone"/> <element ref="nrg3:ThermalZone"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -1695,10 +1695,10 @@ version="2.0" ...@@ -1695,10 +1695,10 @@ version="2.0"
<!-- *************************** --> <!-- *************************** -->
<element name="BuildingUnit" substitutionGroup="nrg2:AbstractBuildingUnit" type="nrg2:BuildingUnitType"></element> <element name="BuildingUnit" substitutionGroup="nrg3:AbstractBuildingUnit" type="nrg3:BuildingUnitType"></element>
<complexType name="BuildingUnitType"> <complexType name="BuildingUnitType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractBuildingUnitType"> <extension base="nrg3:AbstractBuildingUnitType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element minOccurs="0" name="numberOfRooms" type="integer"></element> <element minOccurs="0" name="numberOfRooms" type="integer"></element>
...@@ -1711,21 +1711,21 @@ version="2.0" ...@@ -1711,21 +1711,21 @@ version="2.0"
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element maxOccurs="unbounded" minOccurs="0" name="energyPerformanceCertificate" type="nrg2:EnergyPerformanceCertificatePropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="energyPerformanceCertificate" type="nrg3:EnergyPerformanceCertificatePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element maxOccurs="unbounded" minOccurs="0" name="refurbishmentMeasure" type="nrg2:RefurbishmentMeasurePropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="refurbishmentMeasure" type="nrg3:RefurbishmentMeasurePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">composition</taggedValue> <taggedValue tag="relationType">composition</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element maxOccurs="unbounded" minOccurs="0" name="occupiedBy" type="nrg2:OccupantsPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="occupiedBy" type="nrg3:OccupantsPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -1738,13 +1738,13 @@ version="2.0" ...@@ -1738,13 +1738,13 @@ version="2.0"
</complexType> </complexType>
<complexType name="BuildingUnitPropertyType"> <complexType name="BuildingUnitPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:BuildingUnit"/> <element ref="nrg3:BuildingUnit"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Occupants" substitutionGroup="gml:_Feature" type="nrg2:OccupantsType"></element> <element name="Occupants" substitutionGroup="gml:_Feature" type="nrg3:OccupantsType"></element>
<complexType name="OccupantsType"> <complexType name="OccupantsType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
...@@ -1755,7 +1755,7 @@ version="2.0" ...@@ -1755,7 +1755,7 @@ version="2.0"
<element minOccurs="0" name="heatDissipationConvectiveFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationConvectiveFraction" type="gml:ScaleType"/>
<element minOccurs="0" name="heatDissipationLatentFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationLatentFraction" type="gml:ScaleType"/>
<element minOccurs="0" name="heatDissipationRadiantFraction" type="gml:ScaleType"/> <element minOccurs="0" name="heatDissipationRadiantFraction" type="gml:ScaleType"/>
<element minOccurs="0" name="occupancyRate" type="nrg2:AbstractSchedulePropertyType"> <element minOccurs="0" name="occupancyRate" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -1771,16 +1771,16 @@ version="2.0" ...@@ -1771,16 +1771,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="OccupantsPropertyType"> <complexType name="OccupantsPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Occupants"/> <element ref="nrg3:Occupants"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="UsageZone" substitutionGroup="nrg2:AbstractUsageZone" type="nrg2:UsageZoneType"></element> <element name="UsageZone" substitutionGroup="nrg3:AbstractUsageZone" type="nrg3:UsageZoneType"></element>
<complexType name="UsageZoneType"> <complexType name="UsageZoneType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractUsageZoneType"> <extension base="nrg3:AbstractUsageZoneType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element minOccurs="0" name="isPrimary" type="boolean"></element> <element minOccurs="0" name="isPrimary" type="boolean"></element>
...@@ -1789,28 +1789,28 @@ version="2.0" ...@@ -1789,28 +1789,28 @@ version="2.0"
<element minOccurs="0" name="internalHeatGainsConvectiveFraction" type="gml:ScaleType"></element> <element minOccurs="0" name="internalHeatGainsConvectiveFraction" type="gml:ScaleType"></element>
<element minOccurs="0" name="internalHeatGainsLatentFraction" type="gml:ScaleType"></element> <element minOccurs="0" name="internalHeatGainsLatentFraction" type="gml:ScaleType"></element>
<element minOccurs="0" name="internalHeatGainsRadiantFraction" type="gml:ScaleType"></element> <element minOccurs="0" name="internalHeatGainsRadiantFraction" type="gml:ScaleType"></element>
<element minOccurs="0" name="coolingSchedule" type="nrg2:AbstractSchedulePropertyType"> <element minOccurs="0" name="coolingSchedule" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element minOccurs="0" name="heatingSchedule" type="nrg2:AbstractSchedulePropertyType"> <element minOccurs="0" name="heatingSchedule" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element minOccurs="0" name="ventilationSchedule" type="nrg2:AbstractSchedulePropertyType"> <element minOccurs="0" name="ventilationSchedule" type="nrg3:AbstractSchedulePropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
</appinfo> </appinfo>
</annotation> </annotation>
</element> </element>
<element maxOccurs="unbounded" minOccurs="0" name="occupiedBy" type="nrg2:OccupantsPropertyType"> <element maxOccurs="unbounded" minOccurs="0" name="occupiedBy" type="nrg3:OccupantsPropertyType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="relationType">aggregation</taggedValue> <taggedValue tag="relationType">aggregation</taggedValue>
...@@ -1823,7 +1823,7 @@ version="2.0" ...@@ -1823,7 +1823,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="UsageZonePropertyType"> <complexType name="UsageZonePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:UsageZone"/> <element ref="nrg3:UsageZone"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -1834,10 +1834,10 @@ version="2.0" ...@@ -1834,10 +1834,10 @@ version="2.0"
<!-- ******************************** --> <!-- ******************************** -->
<element abstract="true" name="AbstractSolarCollector" substitutionGroup="nrg2:AbstractDevice" type="nrg2:AbstractSolarCollectorType"></element> <element abstract="true" name="AbstractSolarCollector" substitutionGroup="nrg3:AbstractDevice" type="nrg3:AbstractSolarCollectorType"></element>
<complexType abstract="true" name="AbstractSolarCollectorType"> <complexType abstract="true" name="AbstractSolarCollectorType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element minOccurs="0" name="moduleArea" type="gml:AreaType"/> <element minOccurs="0" name="moduleArea" type="gml:AreaType"/>
<element minOccurs="0" name="apertureArea" type="gml:AreaType"/> <element minOccurs="0" name="apertureArea" type="gml:AreaType"/>
...@@ -1863,16 +1863,16 @@ version="2.0" ...@@ -1863,16 +1863,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="AbstractSolarCollectorPropertyType"> <complexType name="AbstractSolarCollectorPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:AbstractSolarCollector"/> <element ref="nrg3:AbstractSolarCollector"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="Boiler" substitutionGroup="nrg2:AbstractDevice" type="nrg2:BoilerType"></element> <element name="Boiler" substitutionGroup="nrg3:AbstractDevice" type="nrg3:BoilerType"></element>
<complexType name="BoilerType"> <complexType name="BoilerType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element name="hasCondensation" type="boolean"></element> <element name="hasCondensation" type="boolean"></element>
</sequence> </sequence>
...@@ -1881,36 +1881,36 @@ version="2.0" ...@@ -1881,36 +1881,36 @@ version="2.0"
</complexType> </complexType>
<complexType name="BoilerPropertyType"> <complexType name="BoilerPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:Boiler"/> <element ref="nrg3:Boiler"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="DeviceOperation" substitutionGroup="gml:_Feature" type="nrg2:DeviceOperationType"></element> <element name="DeviceOperation" substitutionGroup="gml:_Feature" type="nrg3:DeviceOperationType"></element>
<complexType name="DeviceOperationType"> <complexType name="DeviceOperationType">
<complexContent> <complexContent>
<extension base="gml:AbstractFeatureType"> <extension base="gml:AbstractFeatureType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"></element> <element name="type" type="gml:CodeType"></element>
<element minOccurs="0" name="yearlyGlobalEfficiency" type="double"/> <element minOccurs="0" name="yearlyGlobalEfficiency" type="double"/>
<element minOccurs="0" name="schedule" type="nrg2:AbstractSchedulePropertyType"></element> <element minOccurs="0" name="schedule" type="nrg3:AbstractSchedulePropertyType"></element>
</sequence> </sequence>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="DeviceOperationPropertyType"> <complexType name="DeviceOperationPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:DeviceOperation"/> <element ref="nrg3:DeviceOperation"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ElectricalStorageDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:ElectricalStorageDeviceType"/> <element name="ElectricalStorageDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:ElectricalStorageDeviceType"/>
<complexType name="ElectricalStorageDeviceType"> <complexType name="ElectricalStorageDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element minOccurs="0" name="batteryTechnology" type="gml:CodeType"/> <element minOccurs="0" name="batteryTechnology" type="gml:CodeType"/>
<element minOccurs="0" name="powerCapacity" type="gml:MeasureType"/> <element minOccurs="0" name="powerCapacity" type="gml:MeasureType"/>
...@@ -1920,64 +1920,64 @@ version="2.0" ...@@ -1920,64 +1920,64 @@ version="2.0"
</complexType> </complexType>
<complexType name="ElectricalStorageDevicePropertyType"> <complexType name="ElectricalStorageDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ElectricalStorageDevice"/> <element ref="nrg3:ElectricalStorageDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="GenericDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:GenericDeviceType"/> <element name="GenericDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:GenericDeviceType"/>
<complexType name="GenericDeviceType"> <complexType name="GenericDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence/> <sequence/>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="GenericDevicePropertyType"> <complexType name="GenericDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:GenericDevice"/> <element ref="nrg3:GenericDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="GenericElectricalDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:GenericElectricalDeviceType"/> <element name="GenericElectricalDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:GenericElectricalDeviceType"/>
<complexType name="GenericElectricalDeviceType"> <complexType name="GenericElectricalDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence/> <sequence/>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="GenericElectricalDevicePropertyType"> <complexType name="GenericElectricalDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:GenericElectricalDevice"/> <element ref="nrg3:GenericElectricalDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="GenericSolarCollector" substitutionGroup="nrg2:AbstractSolarCollector" type="nrg2:GenericSolarCollectorType"/> <element name="GenericSolarCollector" substitutionGroup="nrg3:AbstractSolarCollector" type="nrg3:GenericSolarCollectorType"/>
<complexType name="GenericSolarCollectorType"> <complexType name="GenericSolarCollectorType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractSolarCollectorType"> <extension base="nrg3:AbstractSolarCollectorType">
<sequence/> <sequence/>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="GenericSolarCollectorPropertyType"> <complexType name="GenericSolarCollectorPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:GenericSolarCollector"/> <element ref="nrg3:GenericSolarCollector"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="HeatPump" substitutionGroup="nrg2:AbstractDevice" type="nrg2:HeatPumpType"/> <element name="HeatPump" substitutionGroup="nrg3:AbstractDevice" type="nrg3:HeatPumpType"/>
<complexType name="HeatPumpType"> <complexType name="HeatPumpType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element name="heatSource" type="gml:CodeType"/> <element name="heatSource" type="gml:CodeType"/>
<element minOccurs="0" name="copSourceTemperature" type="gml:MeasureType"></element> <element minOccurs="0" name="copSourceTemperature" type="gml:MeasureType"></element>
...@@ -1988,53 +1988,53 @@ version="2.0" ...@@ -1988,53 +1988,53 @@ version="2.0"
</complexType> </complexType>
<complexType name="HeatPumpPropertyType"> <complexType name="HeatPumpPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:HeatPump"/> <element ref="nrg3:HeatPump"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="LightingDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:LightingDeviceType"/> <element name="LightingDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:LightingDeviceType"/>
<complexType name="LightingDeviceType"> <complexType name="LightingDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence/> <sequence/>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="LightingDevicePropertyType"> <complexType name="LightingDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:LightingDevice"/> <element ref="nrg3:LightingDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="MovableShadingDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:MovableShadingDeviceType"/> <element name="MovableShadingDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:MovableShadingDeviceType"/>
<complexType name="MovableShadingDeviceType"> <complexType name="MovableShadingDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element name="installationSide" type="nrg2:SurfaceSideType"/> <element name="installationSide" type="nrg3:SurfaceSideType"/>
<element minOccurs="0" name="maximumCoverRatio" type="gml:ScaleType"/> <element minOccurs="0" name="maximumCoverRatio" type="gml:ScaleType"/>
<element minOccurs="0" name="transmittance" type="nrg2:TransmittancePropertyType"/> <element minOccurs="0" name="transmittance" type="nrg3:TransmittancePropertyType"/>
</sequence> </sequence>
</extension> </extension>
</complexContent> </complexContent>
</complexType> </complexType>
<complexType name="MovableShadingDevicePropertyType"> <complexType name="MovableShadingDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:MovableShadingDevice"/> <element ref="nrg3:MovableShadingDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="PhotovoltaicCollector" substitutionGroup="nrg2:AbstractSolarCollector" type="nrg2:PhotovoltaicCollectorType"/> <element name="PhotovoltaicCollector" substitutionGroup="nrg3:AbstractSolarCollector" type="nrg3:PhotovoltaicCollectorType"/>
<complexType name="PhotovoltaicCollectorType"> <complexType name="PhotovoltaicCollectorType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractSolarCollectorType"> <extension base="nrg3:AbstractSolarCollectorType">
<sequence> <sequence>
<element name="cellType" type="gml:CodeType"/> <element name="cellType" type="gml:CodeType"/>
</sequence> </sequence>
...@@ -2043,16 +2043,16 @@ version="2.0" ...@@ -2043,16 +2043,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="PhotovoltaicCollectorPropertyType"> <complexType name="PhotovoltaicCollectorPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:PhotovoltaicCollector"/> <element ref="nrg3:PhotovoltaicCollector"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="PhotovoltaicThermalCollector" substitutionGroup="nrg2:AbstractSolarCollector" type="nrg2:PhotovoltaicThermalCollectorType"></element> <element name="PhotovoltaicThermalCollector" substitutionGroup="nrg3:AbstractSolarCollector" type="nrg3:PhotovoltaicThermalCollectorType"></element>
<complexType name="PhotovoltaicThermalCollectorType"> <complexType name="PhotovoltaicThermalCollectorType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractSolarCollectorType"> <extension base="nrg3:AbstractSolarCollectorType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element name="cellType" type="gml:CodeType"/> <element name="cellType" type="gml:CodeType"/>
...@@ -2065,16 +2065,16 @@ version="2.0" ...@@ -2065,16 +2065,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="PhotovoltaicThermalCollectorPropertyType"> <complexType name="PhotovoltaicThermalCollectorPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:PhotovoltaicThermalCollector"/> <element ref="nrg3:PhotovoltaicThermalCollector"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="SolarThermalCollector" substitutionGroup="nrg2:AbstractSolarCollector" type="nrg2:SolarThermalCollectorType"></element> <element name="SolarThermalCollector" substitutionGroup="nrg3:AbstractSolarCollector" type="nrg3:SolarThermalCollectorType"></element>
<complexType name="SolarThermalCollectorType"> <complexType name="SolarThermalCollectorType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractSolarCollectorType"> <extension base="nrg3:AbstractSolarCollectorType">
<sequence> <sequence>
<element name="type" type="gml:CodeType"/> <element name="type" type="gml:CodeType"/>
<element minOccurs="0" name="opticalEfficiency" type="gml:ScaleType"/> <element minOccurs="0" name="opticalEfficiency" type="gml:ScaleType"/>
...@@ -2086,16 +2086,16 @@ version="2.0" ...@@ -2086,16 +2086,16 @@ version="2.0"
</complexType> </complexType>
<complexType name="SolarThermalCollectorPropertyType"> <complexType name="SolarThermalCollectorPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:SolarThermalCollector"/> <element ref="nrg3:SolarThermalCollector"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
<element name="ThermalStorageDevice" substitutionGroup="nrg2:AbstractDevice" type="nrg2:ThermalStorageDeviceType"/> <element name="ThermalStorageDevice" substitutionGroup="nrg3:AbstractDevice" type="nrg3:ThermalStorageDeviceType"/>
<complexType name="ThermalStorageDeviceType"> <complexType name="ThermalStorageDeviceType">
<complexContent> <complexContent>
<extension base="nrg2:AbstractDeviceType"> <extension base="nrg3:AbstractDeviceType">
<sequence> <sequence>
<element minOccurs="0" name="preparationTemperature" type="gml:MeasureType"/> <element minOccurs="0" name="preparationTemperature" type="gml:MeasureType"/>
<element minOccurs="0" name="medium" type="gml:CodeType"/> <element minOccurs="0" name="medium" type="gml:CodeType"/>
...@@ -2107,7 +2107,7 @@ version="2.0" ...@@ -2107,7 +2107,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="ThermalStorageDevicePropertyType"> <complexType name="ThermalStorageDevicePropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:ThermalStorageDevice"/> <element ref="nrg3:ThermalStorageDevice"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -2118,7 +2118,7 @@ version="2.0" ...@@ -2118,7 +2118,7 @@ version="2.0"
<!-- *************************************** --> <!-- *************************************** -->
<element name="UrbanFunctionArea" substitutionGroup="grp:CityObjectGroup" type="nrg2:UrbanFunctionAreaType"> <element name="UrbanFunctionArea" substitutionGroup="grp:CityObjectGroup" type="nrg3:UrbanFunctionAreaType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="topLevel">true</taggedValue> <taggedValue tag="topLevel">true</taggedValue>
...@@ -2137,7 +2137,7 @@ version="2.0" ...@@ -2137,7 +2137,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="UrbanFunctionAreaPropertyType"> <complexType name="UrbanFunctionAreaPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:UrbanFunctionArea"/> <element ref="nrg3:UrbanFunctionArea"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
...@@ -2148,7 +2148,7 @@ version="2.0" ...@@ -2148,7 +2148,7 @@ version="2.0"
<!-- ********************************* --> <!-- ********************************* -->
<element name="WeatherStation" substitutionGroup="core:_CityObject" type="nrg2:WeatherStationType"> <element name="WeatherStation" substitutionGroup="core:_CityObject" type="nrg3:WeatherStationType">
<annotation> <annotation>
<appinfo> <appinfo>
<taggedValue tag="topLevel">true</taggedValue> <taggedValue tag="topLevel">true</taggedValue>
...@@ -2164,7 +2164,7 @@ version="2.0" ...@@ -2164,7 +2164,7 @@ version="2.0"
</complexType> </complexType>
<complexType name="WeatherStationPropertyType"> <complexType name="WeatherStationPropertyType">
<sequence minOccurs="0"> <sequence minOccurs="0">
<element ref="nrg2:WeatherStation"/> <element ref="nrg3:WeatherStation"/>
</sequence> </sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/> <attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType> </complexType>
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal