Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend definition of entitlement products #229

Merged
merged 5 commits into from
Oct 19, 2022
Merged

Extend definition of entitlement products #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f84e041
Improving Entitlement Product to match others
ue71603 Aug 11, 2022
caf5e4e
RefStructure to Structure and REf now based on CodeType
ue71603 Aug 25, 2022
0ec7571
corrected EntitlementProduct and List structure
ue71603 Sep 1, 2022
4a7bd67
Improved documentation, removed superfluous EntitlementProductRef ele…
sgrossberndt Sep 28, 2022
b4623ec
Travis CI update [skip ci]
Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 43 additions & 16 deletions OJP/OJP_FareSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:schema xmlns="http://www.vdv.de/ojp" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.vdv.de/ojp" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>OJP/OJP_FareSupport.xsd - Supporting definitions for fare information on passenger trips</xs:documentation>
</xs:annotation>
<xs:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_model/siri_all-v2.0.xsd"/>
<xs:include schemaLocation="OJP_All.xsd"/>
<xs:simpleType name="TypeOfFareClassEnumeration">
<xs:annotation>
Expand Down Expand Up @@ -207,25 +208,51 @@
<xs:documentation>Reference to a FareProduct.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="EntitlementProductListStructure">
<xs:annotation>
<xs:documentation>A list of ENTITLEMENT PRODUCTs</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="EntitlementProduct" type="EntitlementProductStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>[a specific form of TRAVEL DOCUMENT in TM and NeTEx] Precondition to access a service or to purchase a FARE PRODUCT issued by an organisation that may not be a PT operator (e.g. military card, concessionary card, ...). In most cases, ENTITLEMENT PRODUCTs offer discounts, e.g. the "BahnCard50" of "Deutsche Bahn".</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="EntitlementProductCodeType">
<xs:annotation>
<xs:documentation>Identifier of a traveller card (f.e. BahnCard50, BahnCard50First etc.).</xs:documentation>
<xs:documentation>Identifier of an ENTITLEMENT PRODUCT (e.g. BahnCard50, BahnCard50First, military card, concessionary card, ...). It is defined by the fare authority.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:NMTOKEN"/>
</xs:simpleType>
<xs:complexType name="EntitlementProductRefStructure">
<xs:complexType name="EntitlementProductStructure">
<xs:annotation>
<xs:documentation>Reference to a a precondition to access a service or to purchase a FARE PRODUCT issued by an organisation that may not be a PT operator (eg: military card, concessionary card, etc).</xs:documentation>
<xs:documentation>[a specific form of TRAVEL DOCUMENT in TM and NeTEx] Precondition to access a service or to purchase a FARE PRODUCT issued by an organisation that may not be a PT operator (e.g. military card, concessionary card, ...). In most cases, ENTITLEMENT PRODUCTs offer discounts, e.g. the "BahnCard50" of "Deutsche Bahn".</xs:documentation>
</xs:annotation>
<xs:simpleContent>
<xs:extension base="EntitlementProductCodeType"/>
</xs:simpleContent>
<xs:sequence>
ue71603 marked this conversation as resolved.
Show resolved Hide resolved
<xs:element ref="FareAuthorityRef">
<xs:annotation>
<xs:documentation>Reference to the fare authority that issued the ENTITLEMENT PRODUCT</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EntitlementProductRef" type="EntitlementProductCodeType">
<xs:annotation>
<xs:documentation>Identifier of the ENTITLEMENT PRODUCT (e.g. BahnCard50, BahnCard50First, ...)</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ValidityPeriod" type="siri:HalfOpenTimestampOutputRangeStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Validity period of the ENTITLEMENT PRODUCT</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="EntitlementProductName" type="xs:string">
<xs:annotation>
<xs:documentation>Name of the ENTITLEMENT PRODUCT</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:element name="EntitlementProductRef" type="EntitlementProductRefStructure">
<xs:annotation>
<xs:documentation>Reference to a a precondition to access a service or to purchase a FARE PRODUCT issued by an organisation that may not be a PT operator (eg: military card, concessionary card, etc).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="FareProductStructure">
<xs:annotation>
<xs:documentation>[related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information</xs:documentation>
Expand Down Expand Up @@ -290,9 +317,9 @@
<xs:documentation>Travel class for which the FareProduct is valid.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RequiredCard" type="EntitlementProductRefStructure" minOccurs="0" maxOccurs="unbounded">
<xs:element name="RequiredCard" type="EntitlementProductStructure" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>One or more traveller cards that are needed for purchase of this FareProduct. In most cases traveller cards offer discounts, f.e. BahnCard50 of Deutsche Bahn.</xs:documentation>
<xs:documentation>One or more ENTITLEMENT PRODUCTs required for the purchase of this FareProduct. In most cases, ENTITLEMENT PRODUCTs offer discounts, e.g. the "BahnCard50" of "Deutsche Bahn".</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ValidFor" type="PassengerCategoryEnumeration" minOccurs="0" maxOccurs="unbounded">
Expand Down Expand Up @@ -408,9 +435,9 @@
</xs:annotation>
</xs:element>
</xs:choice>
<xs:element name="EntitlementProduct" type="EntitlementProductRefStructure" minOccurs="0" maxOccurs="unbounded">
sgrossberndt marked this conversation as resolved.
Show resolved Hide resolved
<xs:element name="EntitlementProducts" type="EntitlementProductListStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>[a specific form of TRAVEL DOCUMENT in TM and NeTEx] a precondition to access a service or to purchase a FARE PRODUCT issued by an organisation that may not be a PT operator (eg: military card, concessionary card, etc) </xs:documentation>
<xs:documentation>A list of ENTITLEMENT PRODUCTs.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:choice minOccurs="0">
Expand Down
Loading