Commit 1e924320 authored by Elisa Rolland's avatar Elisa Rolland

Merge branch 'v0.8'

parents e99c7f51 2a535e82
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -11,17 +11,17 @@ p {
<body bgcolor="#FFFFCC">
<p><strong>Feature catalogue</strong></p>
<p><a href="energy__AbstractBuilding.html" target="mainFrame">energy:_AbstractBuilding</a></p>
<p><a href="energy__BoundarySurface.html" target="mainFrame">energy:_BoundarySurface</a></p>
<p><a href="energy__CityObject.html" target="mainFrame">energy:_CityObject</a></p>
<p><a href="energy__Opening.html" target="mainFrame">energy:_Opening</a></p>
<p><a href="energy__Schedule.html" target="mainFrame">energy:_Schedule</a></p>
<p><a href="energy__SolarEnergySystem.html" target="mainFrame">energy:_SolarEnergySystem</a></p>
<p><a href="energy__StorageSystem.html" target="mainFrame">energy:_StorageSystem</a></p>
<p><a href="energy__TimeSeries.html" target="mainFrame">energy:_TimeSeries</a></p>
<p><a href="energy_AbstractConstruction.html" target="mainFrame">energy:AbstractConstruction</a></p>
<p><a href="energy_AbstractMaterial.html" target="mainFrame">energy:AbstractMaterial</a></p>
<p><a href="energy_AirCompressor.html" target="mainFrame">energy:AirCompressor</a></p>
<p><a href="energy_Boiler.html" target="mainFrame">energy:Boiler</a></p>
<p><a href="energy_BuildingUnit.html" target="mainFrame">energy:BuildingUnit</a></p>
<p><a href="energy_Chiller.html" target="mainFrame">energy:Chiller</a></p>
<p><a href="energy_CombinedHeatPower.html" target="mainFrame">energy:CombinedHeatPower</a></p>
<p><a href="energy_ConstantValueSchedule.html" target="mainFrame">energy:ConstantValueSchedule</a></p>
<p><a href="energy_Construction.html" target="mainFrame">energy:Construction</a></p>
......@@ -29,11 +29,11 @@ p {
<p><a href="energy_DailySchedule.html" target="mainFrame">energy:DailySchedule</a></p>
<p><a href="energy_DateOfEvent.html" target="mainFrame">energy:DateOfEvent</a></p>
<p><a href="energy_DHWFacilities.html" target="mainFrame">energy:DHWFacilities</a></p>
<p><a href="energy_DistrictNetworkSubstation.html" target="mainFrame">energy:DistrictNetworkSubstation</a></p>
<p><a href="energy_DualValueSchedule.html" target="mainFrame">energy:DualValueSchedule</a></p>
<p><a href="energy_ElectricalAppliances.html" target="mainFrame">energy:ElectricalAppliances</a></p>
<p><a href="energy_ElectricalResistance.html" target="mainFrame">energy:ElectricalResistance</a></p>
<p><a href="energy_Emissivity.html" target="mainFrame">energy:Emissivity</a></p>
<p><a href="energy_Emitter.html" target="mainFrame">energy:Emitter</a></p>
<p><a href="energy_EnergyCarrier.html" target="mainFrame">energy:EnergyCarrier</a></p>
<p><a href="energy_EnergyConversionSystem.html" target="mainFrame">energy:EnergyConversionSystem</a></p>
<p><a href="energy_EnergyDemand.html" target="mainFrame">energy:EnergyDemand</a></p>
......@@ -43,6 +43,7 @@ p {
<p><a href="energy_FinalEnergy.html" target="mainFrame">energy:FinalEnergy</a></p>
<p><a href="energy_FloorArea.html" target="mainFrame">energy:FloorArea</a></p>
<p><a href="energy_Gas.html" target="mainFrame">energy:Gas</a></p>
<p><a href="energy_HeatExchanger.html" target="mainFrame">energy:HeatExchanger</a></p>
<p><a href="energy_HeatExchangeType.html" target="mainFrame">energy:HeatExchangeType</a></p>
<p><a href="energy_HeatPump.html" target="mainFrame">energy:HeatPump</a></p>
<p><a href="energy_HeightAboveGround.html" target="mainFrame">energy:HeightAboveGround</a></p>
......@@ -73,8 +74,8 @@ p {
<p><a href="energy_SolidMaterial.html" target="mainFrame">energy:SolidMaterial</a></p>
<p><a href="energy_SystemOperation.html" target="mainFrame">energy:SystemOperation</a></p>
<p><a href="energy_ThermalBoundary.html" target="mainFrame">energy:ThermalBoundary</a></p>
<p><a href="energy_ThermalComponent.html" target="mainFrame">energy:ThermalComponent</a></p>
<p><a href="energy_ThermalDistributionSystem.html" target="mainFrame">energy:ThermalDistributionSystem</a></p>
<p><a href="energy_ThermalOpening.html" target="mainFrame">energy:ThermalOpening</a></p>
<p><a href="energy_ThermalStorageSystem.html" target="mainFrame">energy:ThermalStorageSystem</a></p>
<p><a href="energy_ThermalZone.html" target="mainFrame">energy:ThermalZone</a></p>
<p><a href="energy_TimeSeriesSchedule.html" target="mainFrame">energy:TimeSeriesSchedule</a></p>
......
......@@ -45,28 +45,28 @@ h2 {
<h2>Definition</h2>
<p class="einzug10"></p>
<h2>Namespace</h2>
<p class="einzug10">http://www.sig3d.org/citygml/2.0/energy/0.7.0</p>
<p class="einzug10">http://www.sig3d.org/citygml/2.0/energy/0.8.0</p>
<h2>Namespace code</h2>
<p class="einzug10">energy</p>
<h2>Version</h2>
<p class="einzug10">0.7.0</p>
<p class="einzug10">0.8.0</p>
<h2>XML schema file</h2>
<p class="einzug10">EnergyADE_0_7_0.xsd</p>
<p class="einzug10">EnergyADE_0_8_0.xsd</p>
<h2>Belongs to module</h2>
<p class="einzug10"><a>CityGML_ADE</a></p>
<h2>Feature types</h2>
<p class="einzug10"><a href="energy__AbstractBuilding.html">energy:_AbstractBuilding</a></p>
<p class="einzug10"><a href="energy__BoundarySurface.html">energy:_BoundarySurface</a></p>
<p class="einzug10"><a href="energy__CityObject.html">energy:_CityObject</a></p>
<p class="einzug10"><a href="energy__Opening.html">energy:_Opening</a></p>
<p class="einzug10"><a href="energy__Schedule.html">energy:_Schedule</a></p>
<p class="einzug10"><a href="energy__SolarEnergySystem.html">energy:_SolarEnergySystem</a></p>
<p class="einzug10"><a href="energy__StorageSystem.html">energy:_StorageSystem</a></p>
<p class="einzug10"><a href="energy__TimeSeries.html">energy:_TimeSeries</a></p>
<p class="einzug10"><a href="energy_AbstractConstruction.html">energy:AbstractConstruction</a></p>
<p class="einzug10"><a href="energy_AbstractMaterial.html">energy:AbstractMaterial</a></p>
<p class="einzug10"><a href="energy_AirCompressor.html">energy:AirCompressor</a></p>
<p class="einzug10"><a href="energy_Boiler.html">energy:Boiler</a></p>
<p class="einzug10"><a href="energy_BuildingUnit.html">energy:BuildingUnit</a></p>
<p class="einzug10"><a href="energy_Chiller.html">energy:Chiller</a></p>
<p class="einzug10"><a href="energy_CombinedHeatPower.html">energy:CombinedHeatPower</a></p>
<p class="einzug10"><a href="energy_ConstantValueSchedule.html">energy:ConstantValueSchedule</a></p>
<p class="einzug10"><a href="energy_Construction.html">energy:Construction</a></p>
......@@ -74,11 +74,11 @@ h2 {
<p class="einzug10"><a href="energy_DailySchedule.html">energy:DailySchedule</a></p>
<p class="einzug10"><a href="energy_DateOfEvent.html">energy:DateOfEvent</a></p>
<p class="einzug10"><a href="energy_DHWFacilities.html">energy:DHWFacilities</a></p>
<p class="einzug10"><a href="energy_DistrictNetworkSubstation.html">energy:DistrictNetworkSubstation</a></p>
<p class="einzug10"><a href="energy_DualValueSchedule.html">energy:DualValueSchedule</a></p>
<p class="einzug10"><a href="energy_ElectricalAppliances.html">energy:ElectricalAppliances</a></p>
<p class="einzug10"><a href="energy_ElectricalResistance.html">energy:ElectricalResistance</a></p>
<p class="einzug10"><a href="energy_Emissivity.html">energy:Emissivity</a></p>
<p class="einzug10"><a href="energy_Emitter.html">energy:Emitter</a></p>
<p class="einzug10"><a href="energy_EnergyCarrier.html">energy:EnergyCarrier</a></p>
<p class="einzug10"><a href="energy_EnergyConversionSystem.html">energy:EnergyConversionSystem</a></p>
<p class="einzug10"><a href="energy_EnergyDemand.html">energy:EnergyDemand</a></p>
......@@ -88,6 +88,7 @@ h2 {
<p class="einzug10"><a href="energy_FinalEnergy.html">energy:FinalEnergy</a></p>
<p class="einzug10"><a href="energy_FloorArea.html">energy:FloorArea</a></p>
<p class="einzug10"><a href="energy_Gas.html">energy:Gas</a></p>
<p class="einzug10"><a href="energy_HeatExchanger.html">energy:HeatExchanger</a></p>
<p class="einzug10"><a href="energy_HeatExchangeType.html">energy:HeatExchangeType</a></p>
<p class="einzug10"><a href="energy_HeatPump.html">energy:HeatPump</a></p>
<p class="einzug10"><a href="energy_HeightAboveGround.html">energy:HeightAboveGround</a></p>
......@@ -118,8 +119,8 @@ h2 {
<p class="einzug10"><a href="energy_SolidMaterial.html">energy:SolidMaterial</a></p>
<p class="einzug10"><a href="energy_SystemOperation.html">energy:SystemOperation</a></p>
<p class="einzug10"><a href="energy_ThermalBoundary.html">energy:ThermalBoundary</a></p>
<p class="einzug10"><a href="energy_ThermalComponent.html">energy:ThermalComponent</a></p>
<p class="einzug10"><a href="energy_ThermalDistributionSystem.html">energy:ThermalDistributionSystem</a></p>
<p class="einzug10"><a href="energy_ThermalOpening.html">energy:ThermalOpening</a></p>
<p class="einzug10"><a href="energy_ThermalStorageSystem.html">energy:ThermalStorageSystem</a></p>
<p class="einzug10"><a href="energy_ThermalZone.html">energy:ThermalZone</a></p>
<p class="einzug10"><a href="energy_TimeSeriesSchedule.html">energy:TimeSeriesSchedule</a></p>
......
......@@ -73,7 +73,8 @@ h3 {
</td>
</tr>
<tr><a name="energy_AbstractMaterial_imageTexture_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_AbstractMaterial_imageTexture">energy:imageTexture</a></p>
<p><a href="#energy_AbstractMaterial_imageTexture">energy:imageTexture [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>ImageTexture</p>
......
This diff is collapsed.
......@@ -71,98 +71,112 @@ h3 {
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_efficiencyIndicator_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_efficiencyIndicator">energy:efficiencyIndicator</a></p>
<p><a href="#energy_EnergyConversionSystem_efficiencyIndicator">energy:efficiencyIndicator [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_installedNominalPower_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_installedNominalPower">energy:installedNominalPower</a></p>
<p><a href="#energy_EnergyConversionSystem_installedNominalPower">energy:installedNominalPower [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Measure</p>
<p>Decimal</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_model_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_model">energy:model</a></p>
<p><a href="#energy_EnergyConversionSystem_model">energy:model [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_nominalEfficiency_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_nominalEfficiency">energy:nominalEfficiency</a></p>
<p><a href="#energy_EnergyConversionSystem_nominalEfficiency">energy:nominalEfficiency [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Measure</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_number_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_number">energy:number</a></p>
<p><a href="#energy_EnergyConversionSystem_number">energy:number [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Integer</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_productAndInstallationDocument_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_productAndInstallationDocument">energy:productAndInstallationDocument</a></p>
<p><a href="#energy_EnergyConversionSystem_productAndInstallationDocument">energy:productAndInstallationDocument [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>ExternalReference</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_yearOfManufacture_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_yearOfManufacture">energy:yearOfManufacture</a></p>
<p><a href="#energy_EnergyConversionSystem_yearOfManufacture">energy:yearOfManufacture [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Year</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_serviceLife_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_serviceLife">energy:serviceLife</a></p>
<p><a href="#energy_EnergyConversionSystem_serviceLife">energy:serviceLife [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>ServiceLife</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_installedIn_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_installedIn">energy:installedIn</a></p>
<p><a href="#energy_EnergyConversionSystem_installedIn">energy:installedIn [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>_CityObject</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_has_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_has">energy:has</a></p>
<p><a href="#energy_EnergyConversionSystem_has">energy:has [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>SystemOperation</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_consumes_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_consumes">energy:consumes</a></p>
<p><a href="#energy_EnergyConversionSystem_consumes">energy:consumes [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>FinalEnergy</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_produces_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_produces">energy:produces</a></p>
<p><a href="#energy_EnergyConversionSystem_produces">energy:produces [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>FinalEnergy</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_provides_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_provides">energy:provides</a></p>
<p><a href="#energy_EnergyConversionSystem_provides">energy:provides [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>EnergyDemand</p>
</td>
</tr>
<tr><a name="energy_Boiler_condensation_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_Boiler_condensation">energy:condensation</a></p>
<p><a href="#energy_Boiler_condensation">energy:condensation [1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Boolean</p>
......@@ -198,7 +212,7 @@ h3 {
<h3>Cardinality</h3>
<p class="einzug10">0..1</p>
<h3>Data type</h3>
<p class="einzug10">Measure</p><br></br><a name="energy_EnergyConversionSystem_model"></a><table width="800" border="0" cellspacing="3">
<p class="einzug10">Decimal (Type)</p><br></br><a name="energy_EnergyConversionSystem_model"></a><table width="800" border="0" cellspacing="3">
<tr>
<td width="600" height="20" bgcolor="#EEEEEE">
<h2>Attribute type: energy:model</h2>
......
......@@ -71,105 +71,120 @@ h3 {
</td>
</tr>
<tr><a name="core__CityObject_creationDate_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_creationDate">core:creationDate</a></p>
<p><a href="#core__CityObject_creationDate">core:creationDate [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Date</p>
</td>
</tr>
<tr><a name="core__CityObject_terminationDate_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_terminationDate">core:terminationDate</a></p>
<p><a href="#core__CityObject_terminationDate">core:terminationDate [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Date</p>
</td>
</tr>
<tr><a name="core__CityObject_externalReference_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_externalReference">core:externalReference</a></p>
<p><a href="#core__CityObject_externalReference">core:externalReference [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>ExternalReference</p>
</td>
</tr>
<tr><a name="core__CityObject_relativeToTerrain_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_relativeToTerrain">core:relativeToTerrain</a></p>
<p><a href="#core__CityObject_relativeToTerrain">core:relativeToTerrain [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>RelativeToTerrain</p>
</td>
</tr>
<tr><a name="core__CityObject_relativeToWater_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_relativeToWater">core:relativeToWater</a></p>
<p><a href="#core__CityObject_relativeToWater">core:relativeToWater [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>RelativeToWater</p>
</td>
</tr>
<tr><a name="core__CityObject_appearance_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_appearance">core:appearance</a></p>
<p><a href="#core__CityObject_appearance">core:appearance [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>AbstractAppearance</p>
</td>
</tr>
<tr><a name="core__CityObject_genericAttribute_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#core__CityObject_genericAttribute">core:genericAttribute</a></p>
<p><a href="#core__CityObject_genericAttribute">core:genericAttribute [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>AbstractGenericAttribute</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_numberOfRooms_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_numberOfRooms">energy:numberOfRooms</a></p>
<p><a href="#energy_BuildingUnit_numberOfRooms">energy:numberOfRooms [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Integer</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_ownerName_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_ownerName">energy:ownerName</a></p>
<p><a href="#energy_BuildingUnit_ownerName">energy:ownerName [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_ownershipType_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_ownershipType">energy:ownershipType</a></p>
<p><a href="#energy_BuildingUnit_ownershipType">energy:ownershipType [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>OwnershipTypeValue</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_floorArea_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_floorArea">energy:floorArea</a></p>
<p><a href="#energy_BuildingUnit_floorArea">energy:floorArea [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>FloorArea</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_energyPerformanceCertification_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_energyPerformanceCertification">energy:energyPerformanceCertification</a></p>
<p><a href="#energy_BuildingUnit_energyPerformanceCertification">energy:energyPerformanceCertification [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>EnergyPerformanceCertification</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_occupiedBy_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_occupiedBy">energy:occupiedBy</a></p>
<p><a href="#energy_BuildingUnit_occupiedBy">energy:occupiedBy [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Occupants</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_address_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_address">energy:address</a></p>
<p><a href="#energy_BuildingUnit_address">energy:address [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Address</p>
</td>
</tr>
<tr><a name="energy_BuildingUnit_equippedWith_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_BuildingUnit_equippedWith">energy:equippedWith</a></p>
<p><a href="#energy_BuildingUnit_equippedWith">energy:equippedWith [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Facilities</p>
......
This diff is collapsed.
......@@ -71,112 +71,128 @@ h3 {
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_efficiencyIndicator_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_efficiencyIndicator">energy:efficiencyIndicator</a></p>
<p><a href="#energy_EnergyConversionSystem_efficiencyIndicator">energy:efficiencyIndicator [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_installedNominalPower_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_installedNominalPower">energy:installedNominalPower</a></p>
<p><a href="#energy_EnergyConversionSystem_installedNominalPower">energy:installedNominalPower [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Measure</p>
<p>Decimal</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_model_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_model">energy:model</a></p>
<p><a href="#energy_EnergyConversionSystem_model">energy:model [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_nominalEfficiency_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_nominalEfficiency">energy:nominalEfficiency</a></p>
<p><a href="#energy_EnergyConversionSystem_nominalEfficiency">energy:nominalEfficiency [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Measure</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_number_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_number">energy:number</a></p>
<p><a href="#energy_EnergyConversionSystem_number">energy:number [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Integer</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_productAndInstallationDocument_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_productAndInstallationDocument">energy:productAndInstallationDocument</a></p>
<p><a href="#energy_EnergyConversionSystem_productAndInstallationDocument">energy:productAndInstallationDocument [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>ExternalReference</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_yearOfManufacture_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_yearOfManufacture">energy:yearOfManufacture</a></p>
<p><a href="#energy_EnergyConversionSystem_yearOfManufacture">energy:yearOfManufacture [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>Year</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_serviceLife_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_serviceLife">energy:serviceLife</a></p>
<p><a href="#energy_EnergyConversionSystem_serviceLife">energy:serviceLife [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>ServiceLife</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_installedIn_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_installedIn">energy:installedIn</a></p>
<p><a href="#energy_EnergyConversionSystem_installedIn">energy:installedIn [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>_CityObject</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_has_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_has">energy:has</a></p>
<p><a href="#energy_EnergyConversionSystem_has">energy:has [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>SystemOperation</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_consumes_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_consumes">energy:consumes</a></p>
<p><a href="#energy_EnergyConversionSystem_consumes">energy:consumes [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>FinalEnergy</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_produces_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_produces">energy:produces</a></p>
<p><a href="#energy_EnergyConversionSystem_produces">energy:produces [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>FinalEnergy</p>
</td>
</tr>
<tr><a name="energy_EnergyConversionSystem_provides_A"></a><td width="600" height="20" bgcolor="#EEEEEE">
<p><a href="#energy_EnergyConversionSystem_provides">energy:provides</a></p>
<p><a href="#energy_EnergyConversionSystem_provides">energy:provides [0..*]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#EEEEEE">
<p>EnergyDemand</p>
</td>
</tr>
<tr><a name="energy_CombinedHeatPower_technologyType_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_CombinedHeatPower_technologyType">energy:technologyType</a></p>
<p><a href="#energy_CombinedHeatPower_technologyType">energy:technologyType [1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>CharacterString</p>
</td>
</tr>
<tr><a name="energy_CombinedHeatPower_thermalEfficiency_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_CombinedHeatPower_thermalEfficiency">energy:thermalEfficiency</a></p>
<p><a href="#energy_CombinedHeatPower_thermalEfficiency">energy:thermalEfficiency [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Scale</p>
</td>
</tr>
<tr><a name="energy_CombinedHeatPower_electricalEfficiency_A"></a><td width="600" height="20" bgcolor="#CCCCCC">
<p><a href="#energy_CombinedHeatPower_electricalEfficiency">energy:electricalEfficiency</a></p>
<p><a href="#energy_CombinedHeatPower_electricalEfficiency">energy:electricalEfficiency [0..1]&#xD;
</a></p>
</td>
<td width="600" height="20" bgcolor="#CCCCCC">
<p>Scale</p>
......@@ -212,7 +228,7 @@ h3 {
<h3>Cardinality</h3>
<p class="einzug10">0..1</p>
<h3>Data type</h3>
<p class="einzug10">Measure</p><br></br><a name="energy_EnergyConversionSystem_model"></a><table width="800" border="0" cellspacing="3">
<p class="einzug10">Decimal (Type)</p><br></br><a name="energy_EnergyConversionSystem_model"></a><table width="800" border="0" cellspacing="3">
<tr>
<td width="600" height="20" bgcolor="#EEEEEE">
<h2>Attribute type: energy:model</h2>
......