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

Rename TripLeg to Leg #230

Merged
merged 17 commits into from
Jan 20, 2023
+48 −48
Merged

Rename TripLeg to Leg #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b82b340
TripLeg -> Leg
ue71603 Aug 11, 2022
d3a521c
updated example
ue71603 Oct 18, 2022
2ad5b0f
Lint and update documentation tables
github-actions[bot] Dec 22, 2022
7f9312a
Merge branch 'changes_for_v1.1' into TripLeg-to-Leg
skinkie Jan 19, 2023
6c839c6
Lint and update documentation tables
github-actions[bot] Jan 19, 2023
079b6c7
added PlaceSortingGroup to PlaceParamStructure (#281)
herlitze Jan 19, 2023
cf663d0
Necessary low level elements for User Preferences (#271)
ue71603 Jan 19, 2023
00f0bb3
Merge branch 'changes_for_v1.1' into TripLeg-to-Leg
skinkie Jan 19, 2023
5e6a458
Removed TripLeg in a better way.
ue71603 Jan 20, 2023
8d52ae6
Merge branch 'changes_for_v1.1' into TripLeg-to-Leg
ue71603 Jan 20, 2023
93313c1
Lint and update documentation tables
github-actions[bot] Jan 20, 2023
d2fb1f4
Update OJP_Fare.xsd
ue71603 Jan 20, 2023
8fa1e39
Merge branch 'TripLeg-to-Leg' of https://github.com/VDVde/OJP into Tr…
ue71603 Jan 20, 2023
69d24b5
Lint and update documentation tables
github-actions[bot] Jan 20, 2023
47ae412
nore trip legs --> legs
ue71603 Jan 20, 2023
5ae6e77
Merge branch 'TripLeg-to-Leg' of https://github.com/VDVde/OJP into Tr…
ue71603 Jan 20, 2023
0be918c
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
8 changes: 4 additions & 4 deletions OJP/OJP_Fare.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,19 +190,19 @@
<xs:documentation>Identifies the "valid from" trip.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="FromTripLegIdRef" type="xs:NMTOKEN" minOccurs="0">
<xs:element name="FromLegIdRef" type="xs:NMTOKEN" minOccurs="0">
<xs:annotation>
<xs:documentation>Identifies the "valid from" tripLeg. If missing, then valid from the first leg.</xs:documentation>
<xs:documentation>Identifies the "valid from" LEG. If missing, then valid from the first LEG.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ToTripIdRef" type="xs:NMTOKEN">
<xs:annotation>
<xs:documentation>Identifies the "valid to" trip.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ToTripLegIdRef" type="xs:NMTOKEN" minOccurs="0">
<xs:element name="ToLegIdRef" type="xs:NMTOKEN" minOccurs="0">
<xs:annotation>
<xs:documentation>Identifies the "valid to" tripLeg. If missing, then valid to the last leg.</xs:documentation>
<xs:documentation>Identifies the "valid to" LEG. If missing, then valid to the last LEG.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand Down
18 changes: 9 additions & 9 deletions OJP/OJP_FareSupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,19 +657,19 @@
<xs:annotation>
<xs:documentation>========================================== Trip Fare ==========================================</xs:documentation>
</xs:annotation>
<xs:group name="TripLegRangeGroup">
<xs:group name="LegRangeGroup">
<xs:annotation>
<xs:documentation>Range of trip legs (from - to) for which a Fare result (ticket) is valid.</xs:documentation>
<xs:documentation>Range of LEGs (from - to) for which a Fare result (ticket) is valid.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="FromTripLegIdRef" type="xs:NMTOKEN">
<xs:element name="FromLegIdRef" type="xs:NMTOKEN">
<xs:annotation>
<xs:documentation>Identifies the "valid from" trip leg.</xs:documentation>
<xs:documentation>Identifies the "valid from" LEG.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ToTripLegIdRef" type="xs:NMTOKEN">
<xs:element name="ToLegIdRef" type="xs:NMTOKEN">
<xs:annotation>
<xs:documentation>Identifies the "valid to" trip leg.</xs:documentation>
<xs:documentation>Identifies the "valid to" LEG.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
Expand All @@ -684,7 +684,7 @@
<xs:documentation>Result-specific error messages.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:group ref="TripLegRangeGroup" minOccurs="0"/>
<xs:group ref="LegRangeGroup" minOccurs="0"/>
<xs:element name="PassedZones" type="TariffZoneListInAreaStructure" minOccurs="0">
<xs:annotation>
<xs:documentation>The sequence of passed fare zones.</xs:documentation>
Expand Down Expand Up @@ -806,12 +806,12 @@
</xs:enumeration>
<xs:enumeration value="FARE_ROUTENOTFEASIBLE">
<xs:annotation>
<xs:documentation>Fare calculation is not possible because the suggested trip is not in compliance with the fare regulations, e.g. because of round trips, TripLegs that go forth and return or exceed the maximal total trip duration.</xs:documentation>
<xs:documentation>Fare calculation is not possible because the suggested trip is not in compliance with the fare regulations, e.g. because of round trips, LEGs that go forth and return or exceed the maximal total trip duration.</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FARE_ALREADYCOVERED">
<xs:annotation>
<xs:documentation>The ticket that has been specified in the request is valid for the suggested trip (or parts of it as defined by TripLegRange).</xs:documentation>
<xs:documentation>The ticket that has been specified in the request is valid for the suggested trip (or parts of it as defined by LegRange).</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FARE_DATEOUTOFRANGE">
Expand Down
4 changes: 2 additions & 2 deletions OJP/OJP_JourneySupport.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,14 +721,14 @@
<xs:sequence>
<xs:element name="TrackSection" type="TrackSectionStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>LINK PROJECTION on the infrastructure network of the trip leg section together with time information.</xs:documentation>
<xs:documentation>LINK PROJECTION on the infrastructure network of the leg section together with time information.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TrackSectionStructure">
<xs:annotation>
<xs:documentation>LINK PROJECTION on the infrastructure network of the TRIP LEG together with time information</xs:documentation>
<xs:documentation>LINK PROJECTION on the infrastructure network of the LEG together with time information</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="TrackStart" type="PlaceRefStructure" minOccurs="0">
Expand Down
16 changes: 8 additions & 8 deletions OJP/OJP_Trips.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@
<xs:documentation>Arrival time at destination.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PTTripLegs" type="xs:nonNegativeInteger" minOccurs="0">
<xs:element name="PTLegs" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>Number of public transport trip legs.</xs:documentation>
<xs:documentation>Number of public transport legs.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="Distance" type="siri:DistanceType" minOccurs="0">
Expand All @@ -437,7 +437,7 @@
</xs:complexType>
<xs:complexType name="TripStructure">
<xs:annotation>
<xs:documentation>[an extended form of PT TRIP in TM and NeTEx as it also includes the initial and final access legs to and from public transport] whole journey from passenger origin to passenger destination in one or more trip LEGs </xs:documentation>
<xs:documentation>[an extended form of PT TRIP in TM and NeTEx as it also includes the initial and final access legs to and from public transport] whole journey from passenger origin to passenger destination in one or more LEGs </xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="TripId" type="xs:NMTOKEN">
Expand Down Expand Up @@ -470,7 +470,7 @@
<xs:documentation>Trip distance.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="TripLeg" type="TripLegStructure" maxOccurs="unbounded">
<xs:element name="Leg" type="LegStructure" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>Legs of the trip</xs:documentation>
</xs:annotation>
Expand All @@ -490,14 +490,14 @@
<xs:element name="Extension" type="xs:anyType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="TripLegStructure">
<xs:complexType name="LegStructure">
<xs:annotation>
<xs:documentation>a single stage of a TRIP that is made without change of MODE or service (ie: between each interchange)</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="LegId" type="xs:NMTOKEN">
<xs:annotation>
<xs:documentation>Id of this trip leg. Unique within trip result.</xs:documentation>
<xs:documentation>Id of this leg. Unique within trip result.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ParticipantRef" type="siri:ParticipantRefStructure" minOccurs="0">
Expand All @@ -515,7 +515,7 @@
</xs:complexType>
<xs:complexType name="TimedLegStructure">
<xs:annotation>
<xs:documentation>passenger TRIP LEG with timetabled schedule. Corresponds to a RIDE.</xs:documentation>
<xs:documentation>passenger LEG with timetabled schedule. Corresponds to a RIDE.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="LegBoard" type="LegBoardStructure">
Expand All @@ -535,7 +535,7 @@
</xs:element>
<xs:element name="Service" type="DatedJourneyStructure">
<xs:annotation>
<xs:documentation>Service that is used for this trip leg.</xs:documentation>
<xs:documentation>Service that is used for this leg.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="LegAttribute" type="LegAttributeStructure" minOccurs="0" maxOccurs="unbounded">
Expand Down
Loading