From 39a10f6d4ce6a3ac5757901381126ced2e02bcb0 Mon Sep 17 00:00:00 2001
From: Bertware <bert.marcelis@samtrafiken.se>
Date: Mon, 10 Aug 2020 12:06:51 +0200
Subject: [PATCH 1/2] Change TypeOfFuelEnumeration to match official NeTEx
 specification

This commit changes the values of TypeOfFuelEnumeration in order to match the allowed FuelType values, described in table 215 of CEN/TS 16614-1:2014
---
 .../netex_vehicleType_support.xsd                 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
index ae7cbff1c..3307441a7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -316,11 +316,18 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Allowed values for type of fuel.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:normalizedString">
-			<xsd:enumeration value="petrol"/>
-			<xsd:enumeration value="diesel"/>
-			<xsd:enumeration value="naturalGas"/>
+			<xsd:enumeration value="battery"/>
 			<xsd:enumeration value="biodiesel"/>
-			<xsd:enumeration value="electricity"/>
+			<xsd:enumeration value="diesel"/>
+			<xsd:enumeration value="dieselBatteryHybrid"/>
+			<xsd:enumeration value="electricContact"/>
+			<xsd:enumeration value="ethanol"/>
+			<xsd:enumeration value="hydrogen"/>
+			<xsd:enumeration value="liquidGas"/>
+			<xsd:enumeration value="tpg"/>
+			<xsd:enumeration value="methane"/>
+			<xsd:enumeration value="petrol"/>
+			<xsd:enumeration value="petrolBatteryHybrid"/>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>

From 6a562c6eb39f5dcd59262a2d20fa690b113c09cb Mon Sep 17 00:00:00 2001
From: Stefan de Konink <stefan@konink.de>
Date: Wed, 13 Apr 2022 22:58:37 +0200
Subject: [PATCH 2/2] Update with the new values too, retain naturalGas and
 electricity

---
 .../netex_reusableComponents/netex_vehicleType_support.xsd   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
index 3307441a7..2e7fa9d52 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -321,13 +321,18 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="diesel"/>
 			<xsd:enumeration value="dieselBatteryHybrid"/>
 			<xsd:enumeration value="electricContact"/>
+			<xsd:enumeration value="electricity"/>
 			<xsd:enumeration value="ethanol"/>
 			<xsd:enumeration value="hydrogen"/>
 			<xsd:enumeration value="liquidGas"/>
 			<xsd:enumeration value="tpg"/>
 			<xsd:enumeration value="methane"/>
+			<xsd:enumeration value="naturalGas"/>
 			<xsd:enumeration value="petrol"/>
 			<xsd:enumeration value="petrolBatteryHybrid"/>
+			<xsd:enumeration value="petrolLeaded"/>
+			<xsd:enumeration value="petrolUnleaded"/>
+                        <xsd:enumeration value="none"/>
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>