From aa74a90852a2bc127da7989f2a72b1614dae2b80 Mon Sep 17 00:00:00 2001
From: Xiong <jie.xiong@nrel.gov>
Date: Thu, 9 Sep 2021 12:32:52 -0600
Subject: [PATCH 1/4] Create proposal and implement

---
 BuildingSync.xsd                            | 79 +++++++++++----------
 proposals/2021/Deprecate eGRIDRegionCode.md | 15 ++++
 2 files changed, 58 insertions(+), 36 deletions(-)
 create mode 100644 proposals/2021/Deprecate eGRIDRegionCode.md

diff --git a/BuildingSync.xsd b/BuildingSync.xsd
index a9cb843b..7cfc28e5 100644
--- a/BuildingSync.xsd
+++ b/BuildingSync.xsd
@@ -466,7 +466,7 @@
         </xs:annotation>
       </xs:element>
       <xs:element ref="auc:ClimateZoneType" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="auc:eGRIDRegionCode" minOccurs="0"/>
+      <xs:element ref="auc:eGRIDSubregionCodes" minOccurs="0"/>
       <xs:choice>
         <xs:sequence>
           <xs:element ref="auc:WeatherDataStationID" minOccurs="0"/>
@@ -515,7 +515,7 @@
         </xs:annotation>
       </xs:element>
       <xs:element ref="auc:ClimateZoneType" minOccurs="0" maxOccurs="1"/>
-      <xs:element ref="auc:eGRIDRegionCode" minOccurs="0"/>
+      <xs:element ref="auc:eGRIDSubregionCodes" minOccurs="0"/>
       <xs:choice>
         <xs:sequence>
           <xs:element ref="auc:WeatherDataStationID" minOccurs="0"/>
@@ -14577,42 +14577,49 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="eGRIDRegionCode">
+  <xs:element name="eGRIDSubregionCodes">
     <xs:annotation>
-      <xs:documentation>The eGRID (Emissions and Generation Resource Database) region code associated with the data being described. WARNING: Element MORE was a typo and will be removed, use MROE.</xs:documentation>
+      <xs:documentation>The eGRID (Emissions and Generation Resource Database) subregion codes associated with the data being described.</xs:documentation>
     </xs:annotation>
-    <xs:simpleType>
-      <xs:restriction base="xs:string">
-        <xs:enumeration value="AKGD"/>
-        <xs:enumeration value="AKMS"/>
-        <xs:enumeration value="AZNM"/>
-        <xs:enumeration value="CAMX"/>
-        <xs:enumeration value="ERCT"/>
-        <xs:enumeration value="FRCC"/>
-        <xs:enumeration value="HIMS"/>
-        <xs:enumeration value="HIOA"/>
-        <xs:enumeration value="MROE"/>
-        <xs:enumeration value="MROW"/>
-        <xs:enumeration value="NEWE"/>
-        <xs:enumeration value="NWPP"/>
-        <xs:enumeration value="NYCW"/>
-        <xs:enumeration value="NYLI"/>
-        <xs:enumeration value="NYUP"/>
-        <xs:enumeration value="PRMS"/>
-        <xs:enumeration value="RFCE"/>
-        <xs:enumeration value="RFCM"/>
-        <xs:enumeration value="RFCW"/>
-        <xs:enumeration value="RMPA"/>
-        <xs:enumeration value="SPNO"/>
-        <xs:enumeration value="SPSO"/>
-        <xs:enumeration value="SRMV"/>
-        <xs:enumeration value="SRMW"/>
-        <xs:enumeration value="SRSO"/>
-        <xs:enumeration value="SRTV"/>
-        <xs:enumeration value="SRVC"/>
-        <xs:enumeration value="Other"/>
-      </xs:restriction>
-    </xs:simpleType>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="eGRIDSubregionCode">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="AKGD"/>
+              <xs:enumeration value="AKMS"/>
+              <xs:enumeration value="AZNM"/>
+              <xs:enumeration value="CAMX"/>
+              <xs:enumeration value="ERCT"/>
+              <xs:enumeration value="FRCC"/>
+              <xs:enumeration value="HIMS"/>
+              <xs:enumeration value="HIOA"/>
+              <xs:enumeration value="MORE"/>
+              <xs:enumeration value="MROE"/>
+              <xs:enumeration value="MROW"/>
+              <xs:enumeration value="NEWE"/>
+              <xs:enumeration value="NWPP"/>
+              <xs:enumeration value="NYCW"/>
+              <xs:enumeration value="NYLI"/>
+              <xs:enumeration value="NYUP"/>
+              <xs:enumeration value="PRMS"/>
+              <xs:enumeration value="RFCE"/>
+              <xs:enumeration value="RFCM"/>
+              <xs:enumeration value="RFCW"/>
+              <xs:enumeration value="RMPA"/>
+              <xs:enumeration value="SPNO"/>
+              <xs:enumeration value="SPSO"/>
+              <xs:enumeration value="SRMV"/>
+              <xs:enumeration value="SRMW"/>
+              <xs:enumeration value="SRSO"/>
+              <xs:enumeration value="SRTV"/>
+              <xs:enumeration value="SRVC"/>
+              <xs:enumeration value="Other"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
   </xs:element>
   <xs:element name="WeatherDataStationID">
     <xs:annotation>
diff --git a/proposals/2021/Deprecate eGRIDRegionCode.md b/proposals/2021/Deprecate eGRIDRegionCode.md
new file mode 100644
index 00000000..cddb024d
--- /dev/null
+++ b/proposals/2021/Deprecate eGRIDRegionCode.md	
@@ -0,0 +1,15 @@
+# Deprecate eGRIDRegionCode
+
+## Overview
+
+This proposal is to remove the element `auc:eGRIDRegionCode` and deprecate the choice of `auc:eGRIDRegionCode` reference under `auc:Site` and `auc:Building`.
+
+## Justification
+
+The element `auc:eGRIDSubregionCodes` was added in [#387](https://github.com/BuildingSync/schema/pull/387) to replace the function of `auc:eGRIDRegionCode` and allow multiple eGRID Subregion Codes with the `auc:Site` and/or `auc:Building`. `auc:eGRIDSubregionCodes` and `auc:eGRIDRegionCode` are currently options of the `auc:choice` element under both `auc:Site` and `auc:Building`. In version 3.0, we will deprecate `auc:eGRIDRegionCode`.
+
+## Implementation
+
+ We will remove the element and choice of `auc:eGRIDRegionCode`, and make `auc:eGRIDSubregionCodes` direct child under `auc:Site` and `auc:Building`.
+
+## References

From 2b2b89faf7afee801bb3e280d2822977c224acef Mon Sep 17 00:00:00 2001
From: Xiong <jie.xiong@nrel.gov>
Date: Tue, 28 Sep 2021 14:49:32 -0600
Subject: [PATCH 2/4] Update v2_to_v3.xsl

---
 translation/v2_to_v3.xsl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/translation/v2_to_v3.xsl b/translation/v2_to_v3.xsl
index 4489ece7..72bf5281 100644
--- a/translation/v2_to_v3.xsl
+++ b/translation/v2_to_v3.xsl
@@ -99,7 +99,7 @@ Version: 0.1.0
     </xsl:element>
   </xsl:template>
 
-  <!-- Systems and other components -->
+  <!-- Systems and general components -->
 
   <!-- 1. Deprecate auc:Capacity and auc:CapacityUnits under auc:Delivery -->
   <xsl:template match="auc:Delivery/auc:Capacity">
@@ -148,17 +148,25 @@ Version: 0.1.0
       <xsl:copy-of select="."/>
     </xsl:element>
   </xsl:template>
-  
   <!-- Transform auc:WindowID element under auc:Side to auc:WindowIDs/auc:WindowID element -->
   <xsl:template match="auc:WindowID">
     <xsl:element name="auc:WindowIDs">
       <xsl:copy-of select="."/>
     </xsl:element>
   </xsl:template>
+  <!-- Transform auc:WindowID element under auc:Side to auc:WindowIDs/auc:WindowID element -->
   <xsl:template match="auc:DoorID">
     <xsl:element name="auc:DoorIDs">
       <xsl:copy-of select="."/>
     </xsl:element>
   </xsl:template>
+  <!-- 6. Transform auc:eGRIDRegionCode element to auc:eGRIDSubregionCodes/auc:eGRIDSubregionCode element -->
+  <xsl:template match="auc:eGRIDRegionCode">
+    <xsl:element name="auc:eGRIDSubregionCodes">
+      <xsl:element name="auc:eGRIDSubregionCode">
+        <xsl:apply-templates/>
+      </xsl:element>
+    </xsl:element>
+  </xsl:template>
 
 </xsl:stylesheet>

From 006b9e1b2336b4d1cef709beceae287c43eb444c Mon Sep 17 00:00:00 2001
From: Xiong <jie.xiong@nrel.gov>
Date: Tue, 28 Sep 2021 15:04:19 -0600
Subject: [PATCH 3/4] Update v2_to_v3.xsl

---
 translation/v2_to_v3.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/translation/v2_to_v3.xsl b/translation/v2_to_v3.xsl
index 72bf5281..c8838dca 100644
--- a/translation/v2_to_v3.xsl
+++ b/translation/v2_to_v3.xsl
@@ -50,8 +50,10 @@ Version: 0.1.0
     <xsl:copy>Insulate attic hatch</xsl:copy>
   </xsl:template>
   <!-- 3. Map enumeration "MORE" to "MROE" under auc:eGRIDRegionCode -->
-  <xsl:template match="auc:eGRIDRegionCode/auc:MeasureName[. = 'MORE']">
-    <xsl:copy>MROE</xsl:copy>
+  <xsl:template match="auc:eGRIDRegionCode[. = 'MORE']">
+    <xsl:element name="auc:eGRIDSubregionCodes">
+      <auc:eGRIDSubregionCode>MROE</auc:eGRIDSubregionCode>
+    </xsl:element>
   </xsl:template>
   <!-- 4. Map enumeration "Convert to Cleaner Fuels" to "Convert to cleaner fuels" under auc:BoilerPlantImprovements -->
   <xsl:template match="auc:BoilerPlantImprovements/auc:MeasureName[. = 'Convert to Cleaner Fuels']">

From c4957612752dcc83fe202b88faffd292713ba381 Mon Sep 17 00:00:00 2001
From: Xiong <jie.xiong@nrel.gov>
Date: Wed, 29 Sep 2021 10:11:07 -0600
Subject: [PATCH 4/4] Correct comment in v2_to_v3.xsl

---
 translation/v2_to_v3.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translation/v2_to_v3.xsl b/translation/v2_to_v3.xsl
index c8838dca..98c1d2cd 100644
--- a/translation/v2_to_v3.xsl
+++ b/translation/v2_to_v3.xsl
@@ -156,7 +156,7 @@ Version: 0.1.0
       <xsl:copy-of select="."/>
     </xsl:element>
   </xsl:template>
-  <!-- Transform auc:WindowID element under auc:Side to auc:WindowIDs/auc:WindowID element -->
+  <!-- Transform auc:DoorID element under auc:Side to auc:DoorIDs/auc:DoorID element -->
   <xsl:template match="auc:DoorID">
     <xsl:element name="auc:DoorIDs">
       <xsl:copy-of select="."/>