Skip to content

Commit

Permalink
Rename TripLeg to Leg (#230)
Browse files Browse the repository at this point in the history
Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: Stephan Großberndt <[email protected]>
Co-authored-by: Stefan de Konink <[email protected]>
Co-authored-by: Malte Herlitze <[email protected]>
  • Loading branch information
4 people authored Jan 20, 2023
1 parent 3b6080a commit a8a58ab
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 48 deletions.
8 changes: 4 additions & 4 deletions OJP/OJP_Fare.xsd
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
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
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
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

0 comments on commit a8a58ab

Please sign in to comment.