Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/audit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="attic2ins"/>
<Layer>
Expand Down Expand Up @@ -373,7 +373,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1p" sameas="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="attic2insp" sameas="attic2ins"/>
<Layer>
Expand Down
6 changes: 3 additions & 3 deletions examples/bpi2101.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<RadiantBarrier>false</RadiantBarrier>
<Insulation>
<SystemIdentifier id="attic1roofins"/>
Expand Down Expand Up @@ -250,7 +250,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1proposed" sameas="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<RadiantBarrier>false</RadiantBarrier>
<Insulation>
<SystemIdentifier id="attic1roofinsproposed" sameas="attic1roofins"/>
Expand Down Expand Up @@ -449,7 +449,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1completion" sameas="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<RadiantBarrier>false</RadiantBarrier>
<Insulation>
<SystemIdentifier id="attic1roofinscompletion" sameas="attic1roofins"/>
Expand Down
4 changes: 2 additions & 2 deletions examples/invalid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="attic2ins"/>
<Layer>
Expand Down Expand Up @@ -373,7 +373,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1p" sameas="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="attic2insp" sameas="attic2ins"/>
<Layer>
Expand Down
4 changes: 2 additions & 2 deletions examples/upgrade.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="insul2"/>
<Layer>
Expand Down Expand Up @@ -352,7 +352,7 @@
<Roofs>
<Roof>
<SystemIdentifier id="roof1c"/>
<RoofType>shingles</RoofType>
<RoofMaterial>shingles</RoofMaterial>
<Insulation>
<SystemIdentifier id="insul2c" sameas="insul2"/>
<MisalignedInsulation>false</MisalignedInsulation>
Expand Down
15 changes: 8 additions & 7 deletions merged_schema/HPXMLMerged.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,8 @@
<xs:documentation>[deg]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="RoofType" type="RoofType"/>
<xs:element minOccurs="0" name="RoofType" type="FloorOrRoofType"/>
<xs:element minOccurs="0" name="RoofMaterial" type="RoofMaterial"/>
<xs:element minOccurs="0" name="CoolRoof" type="HPXMLBoolean">
<xs:annotation>
<xs:documentation>A cool roof has a material or coating that lowers the roof surface temperature, by having a low solar absorptance and/or high thermal emittance. Products may be designated by an efficiency program or similar.</xs:documentation>
Expand Down Expand Up @@ -1253,7 +1254,7 @@
<xs:documentation>From the perspective of the living/conditioned space.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="FloorType" type="FloorType"/>
<xs:element minOccurs="0" name="FloorType" type="FloorOrRoofType"/>
<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
<xs:element minOccurs="0" name="FloorTrusses" type="StudProperties"/>
<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering">
Expand Down Expand Up @@ -6329,7 +6330,7 @@
</xs:choice>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
<xs:complexType name="FloorType">
<xs:complexType name="FloorOrRoofType">
<xs:choice>
<xs:element name="WoodFrame">
<xs:complexType>
Expand Down Expand Up @@ -10760,7 +10761,7 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="RoofType_simple">
<xs:simpleType name="RoofMaterial_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="shingles"/>
<xs:enumeration value="slate or tile shingles"/>
Expand All @@ -10769,15 +10770,15 @@
<xs:enumeration value="metal surfacing"/>
<xs:enumeration value="expanded polystyrene sheathing"/>
<xs:enumeration value="plastic/rubber/synthetic sheeting"/>
<xs:enumeration value="concrete"/>
<xs:enumeration value="concrete tiles"/>
<xs:enumeration value="green roof"/>
<xs:enumeration value="no one major type"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="RoofType">
<xs:complexType name="RoofMaterial">
<xs:simpleContent>
<xs:extension base="RoofType_simple">
<xs:extension base="RoofMaterial_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
Expand Down
7 changes: 4 additions & 3 deletions schemas/HPXMLBaseElements.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,8 @@
<xs:documentation>[deg]</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="RoofType" type="RoofType"/>
<xs:element minOccurs="0" name="RoofType" type="FloorOrRoofType"/>
<xs:element minOccurs="0" name="RoofMaterial" type="RoofMaterial"/>
<xs:element minOccurs="0" name="CoolRoof" type="HPXMLBoolean">
<xs:annotation>
<xs:documentation>A cool roof has a material or coating that lowers the roof surface temperature, by having a low solar absorptance and/or high thermal emittance. Products may be designated by an efficiency program or similar.</xs:documentation>
Expand Down Expand Up @@ -1239,7 +1240,7 @@
<xs:documentation>From the perspective of the living/conditioned space.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="FloorType" type="FloorType"/>
<xs:element minOccurs="0" name="FloorType" type="FloorOrRoofType"/>
<xs:element minOccurs="0" name="FloorJoists" type="StudProperties"/>
<xs:element minOccurs="0" name="FloorTrusses" type="StudProperties"/>
<xs:element minOccurs="0" name="FloorCovering" type="FloorCovering">
Expand Down Expand Up @@ -6315,7 +6316,7 @@
</xs:choice>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
<xs:complexType name="FloorType">
<xs:complexType name="FloorOrRoofType">
<xs:choice>
<xs:element name="WoodFrame">
<xs:complexType>
Expand Down
8 changes: 4 additions & 4 deletions schemas/HPXMLDataTypes.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -3649,7 +3649,7 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="RoofType_simple">
<xs:simpleType name="RoofMaterial_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="shingles"/>
<xs:enumeration value="slate or tile shingles"/>
Expand All @@ -3658,15 +3658,15 @@
<xs:enumeration value="metal surfacing"/>
<xs:enumeration value="expanded polystyrene sheathing"/>
<xs:enumeration value="plastic/rubber/synthetic sheeting"/>
<xs:enumeration value="concrete"/>
<xs:enumeration value="concrete tiles"/>
<xs:enumeration value="green roof"/>
<xs:enumeration value="no one major type"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="RoofType">
<xs:complexType name="RoofMaterial">
<xs:simpleContent>
<xs:extension base="RoofType_simple">
<xs:extension base="RoofMaterial_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
Expand Down