switched to ListOfEnumerations

NeTEx-CEN · Dec 12, 2023 · 0665b2c · 0665b2c
1 parent 0e47309
commit 0665b2c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -218,10 +218,8 @@
 							<Name>Strech limo</Name>
 							<ReversingDirection>true</ReversingDirection>
 							<SelfPropelled>true</SelfPropelled>
-							<PropulsionType>combustion</PropulsionType>
-							<PropulsionType>electric</PropulsionType>
-							<FuelType>petrol</FuelType>
-							<FuelType>battery</FuelType>
+							<PropulsionType>combustion electric</PropulsionType>
+							<FuelType>petrol battery</FuelType>
 							<TransportMode>selfDrive</TransportMode>
 							<PassengerCapacity version="any" id="stretch_limo">
 								<SeatingCapacity>7</SeatingCapacity>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -14,28 +14,37 @@
 				<Date>
 					<Created>2010-09-04</Created>
 				</Date>
-				<Date><Modified>2011-02-05</Modified>Name Space changes  
+				<Date>
+					<Modified>2011-02-05</Modified>Name Space changes  
 				</Date>
-				<Date><Modified>2012-04-15</Modified>Revise Passenger Capacity 
+				<Date>
+					<Modified>2012-04-15</Modified>Revise Passenger Capacity 
 				</Date>
-				<Date><Modified>2019-04-09</Modified>Add list of vehicle type refs for PARKING and general use
+				<Date>
+					<Modified>2019-04-09</Modified>Add list of vehicle type refs for PARKING and general use
 				</Date>
-				<Date><Modified>2020-08-11</Modified>Issue #110 Add missing fuel types			
+				<Date>
+					<Modified>2020-08-11</Modified>Issue #110 Add missing fuel types			
 				electricContact, battery, dieselBatteryHybrid, petrolBatteryHybrid, biodiesel, hydrogen, liquidGas, methane, ethanol
 				</Date>
-				<Date><Modified>2020-10-04</Modified>NewModes: Add list of VEHICLEs.
+				<Date>
+					<Modified>2020-10-04</Modified>NewModes: Add list of VEHICLEs.
 						Add TransportType, SimpleVehicleType
 						Add fuel types none, other, 
 						ADd Power Tpe enumeration
 						Add Vehicle PRofile
 				</Date>
-				<Date><Modified>2021-04-19</Modified>NewModes: GBFS compatibility Add car to vehicle Types
+				<Date>
+					<Modified>2021-04-19</Modified>NewModes: GBFS compatibility Add car to vehicle Types
 				</Date>
-				<Date><Modified>2021-07-07</Modified>NewModes: Add extra fuel types from APDS
+				<Date>
+					<Modified>2021-07-07</Modified>NewModes: Add extra fuel types from APDS
 				</Date>
-				<Date><Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
+				<Date>
+					<Modified>2021-07-08</Modified>NewModes: Correction Add missing VehicleEquipmentProfile relationship to VehicleModel
 				</Date>
-				<Date><Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
+				<Date>
+					<Modified>2023-01-30</Modified>TM CR: Enhancement Add Accepted Driver Permit
 				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -424,6 +433,12 @@ Rail transport, Roads and Road transport
 		</xsd:simpleContent>
 	</xsd:complexType>
 	<!-- ======================================================================= -->
+	<xsd:simpleType name="FuelTypeListOfEnumerations">
+		<xsd:annotation>
+			<xsd:documentation>List of allowed values for file type.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:list itemType="FuelTypeEnumeration"/>
+	</xsd:simpleType>
 	<xsd:simpleType name="FuelTypeEnumeration">
 		<xsd:annotation>
 			<xsd:documentation>Allowed values for type of fuel.</xsd:documentation>
@@ -449,6 +464,12 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="other"/>
 		</xsd:restriction>
 	</xsd:simpleType>
+	<xsd:simpleType name="PropulsionTypeListOfEnumerations">
+		<xsd:annotation>
+			<xsd:documentation>List of allowed values for propulsion type.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:list itemType="PropulsionTypeEnumeration"/>
+	</xsd:simpleType>
 	<xsd:simpleType name="PropulsionTypeEnumeration">
 		<xsd:annotation>
 			<xsd:documentation>Allowed values for type of power +v1/2/2</xsd:documentation>
@@ -612,4 +633,4 @@ Rail transport, Roads and Road transport
 		</xsd:simpleContent>
 	</xsd:complexType>
 	<!-- ======================================================================= -->
-</xsd:schema>
+</xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -194,15 +194,15 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Whether vehicles of the type are self-propelled.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="PropulsionType" type="PropulsionTypeEnumeration" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="PropulsionType" type="PropulsionTypeListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Type of power used +v1.2.2</xsd:documentation>
+					<xsd:documentation>List of types of power used +v1.2.2</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:choice>
-				<xsd:element name="FuelType" type="FuelTypeEnumeration" minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="FuelType" type="FuelTypeListOfEnumerations" minOccurs="0">
 					<xsd:annotation>
-						<xsd:documentation>The type of fuel used by a vehicle of the type. +1.2.2</xsd:documentation>
+						<xsd:documentation>The list of types of fuel used by a vehicle of the type. +1.2.2</xsd:documentation>
 					</xsd:annotation>
 				</xsd:element>
 				<xsd:element name="TypeOfFuel" type="FuelTypeEnumeration" minOccurs="0">