From 64e833371bffb1d6c6f430417d7269b3e74c4d2e Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Thu, 7 Feb 2019 15:49:39 -0700
Subject: [PATCH 1/4] Revamping LightingFractions for flexibility. Multiple
 lighting fractions can now be defined, each with a lighting type, location,
 and fraction value.

---
 schemas/BaseElements.xsd   | 23 +++++------------------
 schemas/HPXMLDataTypes.xsd |  1 +
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 6f26d2d5..67477ac9 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1774,27 +1774,14 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element minOccurs="0" name="LightingFractions">
+			<xs:element minOccurs="0" name="LightingFractions" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element minOccurs="0" name="FractionIncandescent" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of lights that are incandescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionCFL" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of the lights that are compact fluorescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionLFL" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of the lights that are linear fluorescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionLED" type="Fraction">
+						<xs:element minOccurs="0" name="LightingType" type="LightingType"/>
+						<xs:element minOccurs="0" name="Location" type="LightingLocation"/>
+						<xs:element minOccurs="0" name="Fraction" type="Fraction">
 							<xs:annotation>
-								<xs:documentation>Fraction of lights that are LED.</xs:documentation>
+								<xs:documentation>Fraction of lights with the specified lighting type and/or location.</xs:documentation>
 							</xs:annotation>
 						</xs:element>
 						<xs:element ref="extension" minOccurs="0"/>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index 68f429e2..4fa1af79 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -707,6 +707,7 @@
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="interior"/>
 			<xs:enumeration value="exterior"/>
+			<xs:enumeration value="garage"/>
 			<xs:enumeration value="common area"/>
 		</xs:restriction>
 	</xs:simpleType>

From 31d16c64a8158e142c960a1f2c9fb0d2e7e88f26 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 8 Feb 2019 09:58:50 -0700
Subject: [PATCH 2/4] New approach: Adds FractionofUnitsInLocation field to
 LightingGroup. Marks LightingFractions as deprecated. Adds ERI Tier I and ERI
 Tier II as certification enumerations. Replaces use of
 LightingThirdPartyCertification with LightingFixtureThirdPartyCertification,
 which has all the former enumeration choices plus more.

---
 schemas/BaseElements.xsd   | 34 ++++++++++++++++++++++++++++------
 schemas/HPXMLDataTypes.xsd | 11 ++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 67477ac9..4f83f746 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1715,6 +1715,11 @@
 						<xs:element minOccurs="0" ref="AttachedToSpace"/>
 						<xs:element minOccurs="0" name="Location" type="LightingLocation"/>
 						<xs:element name="NumberofUnits" type="xs:integer" minOccurs="0"/>
+						<xs:element minOccurs="0" name="FractionofUnitsInLocation" type="Fraction">
+							<xs:annotation>
+								<xs:documentation>The fraction of lighting units in the specified Location, where all the fractions for the Location sum to 1. If a Location is not specified, fractions apply to the entire building.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
 						<xs:element minOccurs="0" name="LightingType" type="LightingType"/>
 						<xs:element minOccurs="0" name="AverageLumens" type="xs:double">
 							<xs:annotation>
@@ -1727,7 +1732,8 @@
 							</xs:annotation>
 						</xs:element>
 						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="ThirdPartyCertification" type="LightingThirdPartyCertification"/>
+							name="ThirdPartyCertification"
+							type="LightingFixtureThirdPartyCertification"/>
 						<xs:element name="AverageHoursPerDay" type="HoursPerDay" minOccurs="0">
 							<xs:annotation>
 								<xs:documentation>[h]</xs:documentation>
@@ -1774,14 +1780,30 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element minOccurs="0" name="LightingFractions" maxOccurs="unbounded">
+			<xs:element minOccurs="0" name="LightingFractions">
+				<xs:annotation>
+					<xs:documentation>DEPRECATED - Please use LightingGroup/FractionofUnitInLocation</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element minOccurs="0" name="LightingType" type="LightingType"/>
-						<xs:element minOccurs="0" name="Location" type="LightingLocation"/>
-						<xs:element minOccurs="0" name="Fraction" type="Fraction">
+						<xs:element minOccurs="0" name="FractionIncandescent" type="Fraction">
+							<xs:annotation>
+								<xs:documentation>Fraction of lights that are incandescent.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element minOccurs="0" name="FractionCFL" type="Fraction">
+							<xs:annotation>
+								<xs:documentation>Fraction of the lights that are compact fluorescent.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element minOccurs="0" name="FractionLFL" type="Fraction">
+							<xs:annotation>
+								<xs:documentation>Fraction of the lights that are linear fluorescent.</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element minOccurs="0" name="FractionLED" type="Fraction">
 							<xs:annotation>
-								<xs:documentation>Fraction of lights with the specified lighting type and/or location.</xs:documentation>
+								<xs:documentation>Fraction of lights that are LED.</xs:documentation>
 							</xs:annotation>
 						</xs:element>
 						<xs:element ref="extension" minOccurs="0"/>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index 4fa1af79..d527ae3e 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -733,12 +733,6 @@
 			<xs:enumeration value="programmed start"/>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="LightingThirdPartyCertification">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Energy Star"/>
-			<xs:enumeration value="other"/>
-		</xs:restriction>
-	</xs:simpleType>
 	<xs:simpleType name="LightingDailyHours">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="1 to 4 hours per day"/>
@@ -1337,7 +1331,8 @@
 	<xs:simpleType name="WaterType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="indoor and outdoor water"/>
-			<xs:enumeration value="indoor water "/><!-- deprecated -->
+			<xs:enumeration value="indoor water "/>
+			<!-- deprecated -->
 			<xs:enumeration value="indoor water"/>
 			<xs:enumeration value="outdoor water"/>
 			<xs:enumeration value="wastewater/sewer"/>
@@ -2060,6 +2055,8 @@
 			<xs:enumeration value="CEE Tier 1"/>
 			<xs:enumeration value="CEE Tier 2"/>
 			<xs:enumeration value="CEE Tier 3"/>
+			<xs:enumeration value="ERI Tier I"/>
+			<xs:enumeration value="ERI Tier II"/>
 			<xs:enumeration value="other"/>
 			<xs:enumeration value="unknown"/>
 		</xs:restriction>

From 39673be224a6782664a58327d9cfb47c735561fd Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Fri, 8 Feb 2019 10:08:44 -0700
Subject: [PATCH 3/4] Updates so that PR does not introduce breaking changes.

---
 schemas/BaseElements.xsd   |  3 +--
 schemas/HPXMLDataTypes.xsd | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 4f83f746..561e0a6a 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1732,8 +1732,7 @@
 							</xs:annotation>
 						</xs:element>
 						<xs:element maxOccurs="unbounded" minOccurs="0"
-							name="ThirdPartyCertification"
-							type="LightingFixtureThirdPartyCertification"/>
+							name="ThirdPartyCertification" type="LightingThirdPartyCertification"/>
 						<xs:element name="AverageHoursPerDay" type="HoursPerDay" minOccurs="0">
 							<xs:annotation>
 								<xs:documentation>[h]</xs:documentation>
diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
index d527ae3e..a8157f8e 100644
--- a/schemas/HPXMLDataTypes.xsd
+++ b/schemas/HPXMLDataTypes.xsd
@@ -733,6 +733,19 @@
 			<xs:enumeration value="programmed start"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="LightingThirdPartyCertification">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Energy Star"/>
+			<xs:enumeration value="Energy Star Most Efficient"/>
+			<xs:enumeration value="CEE Tier 1"/>
+			<xs:enumeration value="CEE Tier 2"/>
+			<xs:enumeration value="CEE Tier 3"/>
+			<xs:enumeration value="ERI Tier I"/>
+			<xs:enumeration value="ERI Tier II"/>
+			<xs:enumeration value="other"/>
+			<xs:enumeration value="unknown"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<xs:simpleType name="LightingDailyHours">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="1 to 4 hours per day"/>
@@ -1331,8 +1344,7 @@
 	<xs:simpleType name="WaterType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="indoor and outdoor water"/>
-			<xs:enumeration value="indoor water "/>
-			<!-- deprecated -->
+			<xs:enumeration value="indoor water "/><!-- deprecated -->
 			<xs:enumeration value="indoor water"/>
 			<xs:enumeration value="outdoor water"/>
 			<xs:enumeration value="wastewater/sewer"/>

From 04666f88bb2e9d7a0aeccd25f0a71039685925d6 Mon Sep 17 00:00:00 2001
From: Scott Horowitz <scott.horowitz@nrel.gov>
Date: Tue, 2 Jul 2019 14:19:14 -0600
Subject: [PATCH 4/4] Removes LightingFraction.

---
 schemas/BaseElements.xsd | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/schemas/BaseElements.xsd b/schemas/BaseElements.xsd
index 561e0a6a..5b8c2cf1 100644
--- a/schemas/BaseElements.xsd
+++ b/schemas/BaseElements.xsd
@@ -1779,36 +1779,6 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element minOccurs="0" name="LightingFractions">
-				<xs:annotation>
-					<xs:documentation>DEPRECATED - Please use LightingGroup/FractionofUnitInLocation</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="FractionIncandescent" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of lights that are incandescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionCFL" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of the lights that are compact fluorescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionLFL" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of the lights that are linear fluorescent.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element minOccurs="0" name="FractionLED" type="Fraction">
-							<xs:annotation>
-								<xs:documentation>Fraction of lights that are LED.</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element ref="extension" minOccurs="0"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
 			<xs:element maxOccurs="unbounded" minOccurs="0" name="CeilingFan">
 				<xs:complexType>
 					<xs:sequence>