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

Add operators to PlaceResultStructure and ResponseContext, allow multiple per ServiceGroup #220

Merged
merged 39 commits into from
Jan 20, 2023
Merged

Add operators to PlaceResultStructure and ResponseContext, allow multiple per ServiceGroup #220

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
723f0fe
Including Operators in the Context and having additional Operators in…
ue71603 Jul 25, 2022
3d66b51
Travis CI update [skip ci]
Jul 25, 2022
726affe
Update OJP/OJP_Places.xsd
skinkie Aug 8, 2022
5450324
changed structure of addionalOperator
ue71603 Aug 25, 2022
7daaced
Travis CI update [skip ci]
Aug 25, 2022
fee5fb9
Update OJP/OJP_RequestSupport.xsd
skinkie Oct 18, 2022
8fb68c8
Update OJP/OJP_RequestSupport.xsd
skinkie Oct 18, 2022
9721b51
fixed Structureproblem
ue71603 Oct 18, 2022
99bf5f2
fixed for Place as well
ue71603 Oct 18, 2022
0a3cb58
Travis CI update [skip ci]
Oct 18, 2022
72b5052
Travis CI update [skip ci]
Oct 18, 2022
14069b5
No style changes.
skinkie Oct 18, 2022
5ff26c4
Including Operators in the Context and having additional Operators in…
ue71603 Jul 25, 2022
3ab088b
Update OJP/OJP_Places.xsd
skinkie Aug 8, 2022
856e92c
fixed for Place as well
ue71603 Oct 18, 2022
95e4520
No style changes.
skinkie Oct 18, 2022
ec028ec
Travis CI update [skip ci]
Oct 19, 2022
151c386
Optimising OperatorRef
ue71603 Oct 26, 2022
2a56cae
fixing comments from Stephan
ue71603 Oct 26, 2022
adc0f0a
Travis CI update [skip ci]
Oct 26, 2022
40f8cd3
Travis CI update [skip ci]
Oct 26, 2022
ad7f2c5
Travis CI update [skip ci]
Oct 26, 2022
ffa605c
Update .gitignore
ue71603 Nov 20, 2022
1ac1ac1
Update OJP_Common.xsd
ue71603 Nov 20, 2022
3c7c131
Update OJP_JourneySupport.xsd
ue71603 Nov 20, 2022
511d4f4
Update OJP_Places.xsd
ue71603 Nov 20, 2022
e8e6f7a
fixing validation errors
ue71603 Nov 20, 2022
5d54dcd
correcting example
ue71603 Nov 20, 2022
1167456
Travis CI update [skip ci]
Nov 20, 2022
e5b1170
Update OJP/OJP_Places.xsd
skinkie Nov 24, 2022
fd68db4
Lint and update documentation tables
github-actions[bot] Dec 22, 2022
4989f2d
reviews André
ue71603 Dec 28, 2022
cb3cc77
Lint and update documentation tables
github-actions[bot] Dec 28, 2022
0271d01
OperatorRefsStructure -> OperatorRelStructure
ue71603 Jan 17, 2023
913fc24
_RelStructure according to Stefan
ue71603 Jan 17, 2023
f177268
Merge branch 'changes_for_v1.1' into Operators_updated
skinkie Jan 19, 2023
6419c2e
Merge branch 'changes_for_v1.1' into Operators_updated
skinkie Jan 20, 2023
e7dab20
Changed example to extend it to OperatorRefs.
skinkie Jan 20, 2023
f25ee8b
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
5 changes: 5 additions & 0 deletions OJP/OJP_Common.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
<xs:documentation>Reference to an Operator ([TMv6] company providing public transport services.) </xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="OperatorRefs_RelStructure">
<xs:sequence>
<xs:element name="OperatorRef" type="siri:OperatorRefStructure" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="OperatorFilterStructure">
<xs:annotation>
<xs:documentation>Filter for in/exclusion of transport operators.</xs:documentation>
Expand Down
6 changes: 5 additions & 1 deletion OJP/OJP_JourneySupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@
<xs:documentation>Contains the Vehicle reference of the vehicle. In Transmodel this may be the VEHICLE Id.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="OperatorRef" minOccurs="0"/>
<xs:element name="OperatorRefs" type="OperatorRefs_RelStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>References to the OPERATORS. Multiple OPERATORS in case a ContinuousLeg can be operated by more than one operator, especially in the ALTERNATIVE MODE OF OPERATION where there can be dozens of taxi companies and many free floating sharing companies.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="RouteDescription" type="InternationalTextStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Descriptive text for a route, f.e. "Airport via City Centre"</xs:documentation>
Expand Down
10 changes: 10 additions & 0 deletions OJP/OJP_Places.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@
<xs:documentation>List of transport modes that call at this place object. This list should only be filled in case of stop points or stop places – and only when explicitly requested.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Operators" type="OperatorRefs_RelStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>List of operators operating at this place object. This list should only be filled if this is explicitly requested.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:group name="PlacePolicyGroup">
Expand All @@ -170,6 +175,11 @@
<xs:documentation>Tells the service to include the available public transport modes at returned stops.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IncludeOperators" type="xs:boolean" default="false" minOccurs="0">
<xs:annotation>
<xs:documentation>Tells the service to include the available operators at returned stops.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:group>
<xs:group name="PlaceDataFilterGroup">
Expand Down
17 changes: 17 additions & 0 deletions OJP/OJP_RequestSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,28 @@
<xs:element name="Place" type="PlaceStructure" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Operators_RelStructure">
<xs:annotation>
<xs:documentation>Structure providing a collection of operators.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Operator" type="siri:AffectedOperatorStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Operator of the service.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ResponseContextStructure">
<xs:annotation>
<xs:documentation>Structure providing response contexts related to journeys, containing collections of places and situations.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="Operators" type="Operators_RelStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for OPERATOR objects. Only operator objects that are referenced in the response should be put into the container.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Places" type="PlacesStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>Container for place objects. Only place objects that are referenced in the response should be put into the container.</xs:documentation>
Expand Down
Loading