New Vehicle fields for hours driven/week and fraction charged at home

hpxmlwg · Jun 28, 2024 · 7af57e5 · 7af57e5
1 parent 4b8392e
commit 7af57e5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/merged_schema/HPXMLMerged.xsd b/merged_schema/HPXMLMerged.xsd
@@ -10174,7 +10174,8 @@
 			<xs:enumeration value="mpg"/>
 			<xs:enumeration value="mpge"/>
 			<xs:enumeration value="km/L"/>
-			<xs:enumeration value="mi/kWh"/>
+			<xs:enumeration value="mile/kWh"/>
+			<xs:enumeration value="kWh/mile"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="FuelEconomyUnits">

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
@@ -2221,6 +2221,7 @@
 									</xs:element>
 									<xs:element minOccurs="0" name="PrimaryLocation" type="VehicleLocation"/>
 									<xs:element minOccurs="0" name="MilesDrivenPerYear" type="HPXMLDoubleGreaterThanZero"/>
+									<xs:element minOccurs="0" name="HoursDrivenPerWeek" type="HPXMLDoubleGreaterThanOrEqualToZero"/>
 									<xs:element minOccurs="0" name="FuelEconomy">
 										<xs:complexType>
 											<xs:sequence>
@@ -6268,6 +6269,11 @@
 												in to the energy retrieved from storage.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
+			<xs:element minOccurs="0" name="FractionChargedAtHome" type="Fraction">
+				<xs:annotation>
+					<xs:documentation>The fraction of charging energy provided by an at-home charger.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="dataSource" type="DataSource"/>
 	</xs:complexType>

diff --git a/schemas/HPXMLDataTypes.xsd b/schemas/HPXMLDataTypes.xsd
@@ -53,6 +53,18 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
+	<xs:simpleType name="HPXMLDoubleGreaterThanOrEqualToZero_simple">
+		<xs:restriction base="xs:double">
+			<xs:minInclusive value="0"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="HPXMLDoubleGreaterThanOrEqualToZero">
+		<xs:simpleContent>
+			<xs:extension base="HPXMLDoubleGreaterThanOrEqualToZero_simple">
+				<xs:attribute name="dataSource" type="DataSource"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
 	<xs:complexType name="HPXMLDecimal">
 		<xs:simpleContent>
 			<xs:extension base="xs:decimal">
@@ -3765,7 +3777,8 @@
 			<xs:enumeration value="mpg"/>
 			<xs:enumeration value="mpge"/>
 			<xs:enumeration value="km/L"/>
-			<xs:enumeration value="mi/kWh"/>
+			<xs:enumeration value="mile/kWh"/>
+			<xs:enumeration value="kWh/mile"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="FuelEconomyUnits">