Use siri:FareClass instead of own TravelClass enumeration (#354)

VDVde · Apr 17, 2023 · 43c2d7b · 43c2d7b
1 parent 18a10a2
commit 43c2d7b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 26 deletions.
diff --git a/OJP/OJP_FareSupport.xsd b/OJP/OJP_FareSupport.xsd
@@ -5,19 +5,6 @@
 	</xs:annotation>
 	<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/xsd/siri_model/siri_all.xsd"/>
 	<xs:include schemaLocation="OJP_All.xsd"/>
-	<xs:simpleType name="TypeOfFareClassEnumeration">
-		<xs:annotation>
-			<xs:documentation>classes of travel available on a particular service which will affect the price to be paid</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:NMTOKEN">
-			<xs:enumeration value="all"/>
-			<xs:enumeration value="first"/>
-			<xs:enumeration value="second"/>
-			<xs:enumeration value="third"/>
-			<xs:enumeration value="business"/>
-			<xs:enumeration value="economy"/>
-		</xs:restriction>
-	</xs:simpleType>
 	<xs:annotation>
 		<xs:documentation>========================================== Fare Authority ==========================================</xs:documentation>
 	</xs:annotation>
@@ -606,9 +593,9 @@
 			<xs:documentation>conditions of use for a particular FARE PRODUCT.</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
-			<xs:element name="TravelClass" type="TypeOfFareClassEnumeration" minOccurs="0">
+			<xs:element name="FareClass" type="siri:FareClassEnumeration" minOccurs="0">
 				<xs:annotation>
-					<xs:documentation>Travel class for which the FareProduct is valid.</xs:documentation>
+					<xs:documentation>Fare class for which the FareProduct is valid (Transmodel: CLASS OF USE).</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="RequiredCard" type="EntitlementProductStructure" minOccurs="0" maxOccurs="unbounded">
@@ -767,9 +754,9 @@
 					<xs:documentation>sequence of all passenger categories, for which this FareProduct is valid</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="TravelClass" type="TypeOfFareClassEnumeration" minOccurs="0">
+			<xs:element name="FareClass" type="siri:FareClassEnumeration" minOccurs="0">
 				<xs:annotation>
-					<xs:documentation>Travel class for which to retrieve FareProducts. Refers to TYPE OF FARE CLASS (e.g. first class).</xs:documentation>
+					<xs:documentation>Fare class for which to retrieve FareProducts. Refers to TYPE OF FARE CLASS (e.g. first class). Transmodel: CLASS OF USE.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>