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

Create Fare_example_with_park_and_ride.xml #414

Merged
merged 25 commits into from
Oct 20, 2023
Merged

Create Fare_example_with_park_and_ride.xml #414

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
118b7c5
Create Fare_example_with_park_and_ride.xml
ue71603 Oct 11, 2023
30641e7
Lint and update documentation tables
github-actions[bot] Oct 11, 2023
faea551
Added PlaceFareRequest and Response
ue71603 Oct 17, 2023
2d51d73
AccessMode added to TripFareRequest
ue71603 Oct 17, 2023
dad23b9
Lint and update documentation tables
github-actions[bot] Oct 17, 2023
e4b4e9b
Lint and update documentation tables
github-actions[bot] Oct 17, 2023
b4d3dda
fixing merged examples
ue71603 Oct 17, 2023
557a70f
Lint and update documentation tables
github-actions[bot] Oct 17, 2023
53bf3f6
Update OJP/OJP_Fare.xsd
ue71603 Oct 19, 2023
876c6cb
Lint and update documentation tables
github-actions[bot] Oct 19, 2023
664742a
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
02eac47
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
b00816c
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
2aa4643
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
7c85aa2
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
b1ac200
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
2f51fb0
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
1405542
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
f4c27be
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
7ba3013
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
df737f0
Update examples/functions/fare/Fare_example_with_park_and_ride.xml
ue71603 Oct 20, 2023
9c1c0a1
Update OJP/OJP_Fare.xsd
trurlurl Oct 20, 2023
f368cf0
Lint and update documentation tables
github-actions[bot] Oct 20, 2023
59ce596
Update OJP/OJP_Fare.xsd
skinkie Oct 20, 2023
8b05a03
Lint and update documentation tables
github-actions[bot] Oct 20, 2023
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
63 changes: 59 additions & 4 deletions OJP/OJP_Fare.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,27 @@
<xs:choice>
<xs:element name="StopFareRequest" type="StopFareRequestStructure">
<xs:annotation>
<xs:documentation>A request for stop-related Fare information.</xs:documentation>
<xs:documentation>A request for stop-related FARE information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PlaceFareRequest" type="PlaceFareRequestStructure">
<xs:annotation>
<xs:documentation>A request for place-related FARE information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="StaticFareRequest" type="StaticFareRequestStructure">
<xs:annotation>
<xs:documentation>A request for general/static Fare information.</xs:documentation>
<xs:documentation>A request for general/static FARE information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TripFareRequest" type="TripFareRequestStructure">
<xs:annotation>
<xs:documentation>A request to calculate the Fare information of a single trip</xs:documentation>
<xs:documentation>A request to calculate the FARE information of a single trip.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="MultiTripFareRequest" type="MultiTripFareRequestStructure">
<xs:annotation>
<xs:documentation>A request to calculate aggregated Fare information of multiple single trips</xs:documentation>
<xs:documentation>A request to calculate aggregated FARE information of multiple single trips.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
Expand Down Expand Up @@ -59,6 +64,28 @@
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PlaceFareRequestStructure">
<xs:annotation>
<xs:documentation>Sub-request: PLACE related fare information. This doesn't make a lot of sense for addresses, topographic place and coordinates. However, STOP PLACE, SCHEDULED STOP POINT and POINT OF INTERES&gt;T are different.</xs:documentation>
skinkie marked this conversation as resolved.
Show resolved Hide resolved
</xs:annotation>
<xs:sequence>
<xs:element name="Place" type="PlaceStructure">
<xs:annotation>
<xs:documentation>Place to get FAREs from (usually use only StopPoint, StopPlace and PointOfInterest).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Date" type="xs:date" minOccurs="0">
<xs:annotation>
<xs:documentation>Date for which to retrieve Fare information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="FareProductRef" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Reference to a FareProduct. If no FareProductRef is specified the responding system should reply with information about all available fare products.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="StaticFareRequestStructure">
<xs:annotation>
<xs:documentation>General Fare information. May depend on date.</xs:documentation>
Expand Down Expand Up @@ -159,6 +186,11 @@
<xs:documentation>Stop-related Fare information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PlaceFareResult" type="PlaceFareResultStructure">
<xs:annotation>
<xs:documentation>Place-related Fare information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="StaticFareResult" type="StaticFareResultStructure">
<xs:annotation>
<xs:documentation>Static Fare information.</xs:documentation>
Expand Down Expand Up @@ -190,6 +222,29 @@
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="PlaceFareResultStructure">
<xs:annotation>
<xs:documentation>PLACE-related Fare information.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Place" type="PlaceStructure">
<xs:annotation>
<xs:documentation>The involved PLACE. Usually a StopPoint, StopPlace or PointOfInterest.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FareProduct" type="FareProductStructure" minOccurs="0" maxOccurs="unbounded">
trurlurl marked this conversation as resolved.
Show resolved Hide resolved
<xs:annotation>
<xs:documentation>[related to FARE PRODUCT in TM and NeTEx] different FARE PRODUCTs that may be available with related information.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="StaticInfoUrl" type="WebLinkStructure" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>URL to information page on the web.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="StaticFareResultStructure">
<xs:annotation>
<xs:documentation>General Fare information.</xs:documentation>
Expand Down
5 changes: 5 additions & 0 deletions OJP/OJP_FareSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,11 @@
<xs:documentation>Number of travellers that will make the journey and for which Fare information needs to be gathered.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="AccessModeList" type="AccessModesListOfEnumerations" minOccurs="0">
<xs:annotation>
<xs:documentation>ACCESS MODEs to consider (usually only one). This is only used in very special cases. E.g. for carTransportRail. It indicates if one uses a car, truck, motorcycle or bike. The Access mode may result in no transportation being possible.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
Expand Down
Loading