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

rebuild usage of realtime information #259

Merged
merged 19 commits into from
Jan 20, 2023
Merged

rebuild usage of realtime information #259

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
48e4a81
rebuild usage of realtime information
ue71603 Oct 26, 2022
7399623
Travis CI update [skip ci]
Oct 26, 2022
3cd587f
Update OJP_JourneySupport.xsd
ue71603 Nov 19, 2022
090cef0
Travis CI update [skip ci]
Nov 19, 2022
85c0616
Update OJP_Trips.xsd
ue71603 Nov 19, 2022
bdbf81e
Travis CI update [skip ci]
Nov 20, 2022
9577834
Update OJP/OJP_TripInfo.xsd
ue71603 Nov 24, 2022
3bacd4b
Update OJP/OJP_Trips.xsd
ue71603 Nov 24, 2022
b5bf867
Travis CI update [skip ci]
Nov 24, 2022
f1212d0
change default to full
ue71603 Nov 26, 2022
1ce72bc
Travis CI update [skip ci]
Nov 26, 2022
c8d6053
Update OJP_JourneySupport.xsd
Aurige Dec 16, 2022
1814a50
Lint and update documentation tables
github-actions[bot] Dec 17, 2022
3ace06d
add another error code
ue71603 Jan 16, 2023
a62c91c
Lint and update documentation tables
github-actions[bot] Jan 16, 2023
edfe5ee
Apply suggestions from code review
skinkie Jan 16, 2023
17f0282
Lint and update documentation tables
github-actions[bot] Jan 16, 2023
5e06d74
Merge branch 'changes_for_v1.1' into explanatoryrealtimedata
skinkie Jan 20, 2023
36c759d
Lint and update documentation tables
github-actions[bot] Jan 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
23 changes: 21 additions & 2 deletions OJP/OJP_JourneySupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,25 @@
</xs:element>
</xs:sequence>
</xs:group>
<xs:simpleType name="UseRealtimeDataEnumeration">
<xs:restriction base="xs:string">
<xs:enumeration value="full">
<xs:annotation>
<xs:documentation>Full use of real-time information, including removal of SERVICE JOURNEYS.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="explanatory">
<xs:annotation>
<xs:documentation>Cancelled and delayed SERVICE JOURNEYs are still returned, but an additional explanatory textual information is provide to decribe their current real-time status.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="none">
<xs:annotation>
<xs:documentation>Only based on timetable data</xs:documentation>
</xs:annotation>
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
<xs:group name="BaseTripPolicyGroup">
<xs:annotation>
<xs:documentation>Policies that control the trip search behaviour for both public and individual transport.</xs:documentation>
Expand All @@ -544,9 +563,9 @@
</xs:element>
<xs:group ref="NumberOfResultsGroup" minOccurs="0"/>
</xs:choice>
<xs:element name="IgnoreRealtimeData" type="xs:boolean" default="false" minOccurs="0">
<xs:element name="UseRealtimeData" type="UseRealtimeDataEnumeration" default="full" minOccurs="0">
<xs:annotation>
<xs:documentation>The trip calculation should not use any realtime or incident data.</xs:documentation>
<xs:documentation>The way real-time data should be used in the calculation of the trip.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ImmediateTripStart" type="xs:boolean" default="false" minOccurs="0">
Expand Down
4 changes: 2 additions & 2 deletions OJP/OJP_StopEvents.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<xs:documentation>Whether operating day information of this stop event should be included in the response.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IncludeRealtimeData" type="xs:boolean" default="false" minOccurs="0">
<xs:element name="UseRealtimeData" type="UseRealtimeDataEnumeration" default="full" minOccurs="0">
<xs:annotation>
<xs:documentation>Whether realtime information of this stop event should be included in the response.</xs:documentation>
<xs:documentation>Whether real-time information of this stop event should be used in the response. Default is "full"</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IncludePlacesContext" type="xs:boolean" default="true" minOccurs="0">
Expand Down
9 changes: 7 additions & 2 deletions OJP/OJP_TripInfo.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<xs:documentation>Parameters that control the response behaviour.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="UseTimetabledDataOnly" type="xs:boolean" default="false" minOccurs="0">
<xs:element name="UseRealTimeData" type="UseRealtimeDataEnumeration" default="full" minOccurs="0">
<xs:annotation>
<xs:documentation>Do not show any realtime or incident data. Default is false.</xs:documentation>
<xs:documentation>Use real-time data. Default is "full"</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -175,6 +175,11 @@
<xs:documentation>No geographic information available for this vehicle journey.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="TRIPINFO_NOREALTIME">
<xs:annotation>
<xs:documentation>No real-time information available.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="TRIPINFO_OTHER">
<xs:annotation>
<xs:documentation>A problem has occurred that does not have a specific problem type.</xs:documentation>
Expand Down
5 changes: 5 additions & 0 deletions OJP/OJP_Trips.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@
<xs:documentation>Refers to a leg to be refined by the server.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="UseRealtimeData" type="UseRealtimeDataEnumeration" default="full" minOccurs="0">
<xs:annotation>
<xs:documentation>Usage of real-time data in refinement. Default is "full".</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="TripContentFilterGroup"/>
<xs:element name="FareParam" type="FareParamStructure" minOccurs="0">
<xs:annotation>
Expand Down
Loading