Skip to content

Validityparameters transportmode cen 2 #618

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

Merged
ue71603 merged 4 commits into from
Dec 29, 2023
Merged

Validityparameters transportmode cen 2 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc77bc7
typos and check
ue71603 Dec 19, 2023
07c411b
example
ue71603 Dec 19, 2023
c024805
Lint and update documentation tables
github-actions[bot] Dec 19, 2023
8b5ca02
Apply suggestions from code review
skinkie Dec 19, 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
12 changes: 11 additions & 1 deletion examples/functions/fares/rail/Netex_era_crossborder_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ Use separate Composite frames to group
<GenericParameterAssignment id="tlx:Trilex@Tariff@Tagesticket@sections" version="01" order="1">
<ValidityParameterGroupingType>AND</ValidityParameterGroupingType>
<validityParameters>
<VehicleModes>rail</VehicleModes>
<!-- check PR #145 -->
<TransportSubmode>
<RailSubmode>longDistance</RailSubmode>
</TransportSubmode>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Goerlitz" version="01"/>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Liberec" version="01"/>
<FareSectionRef ref="tlx:Trilex@Seifhennersdorf-to-Liberec" version="01"/>
Expand Down Expand Up @@ -455,6 +460,11 @@ Saturdays / Sundays / public holidays: 00:00 to 03:00 the following day</Descrip
<Name>Dresden to Wroclaw section</Name>
<GenericParameterAssignment id="tlx:Trilex@Tariff@Dresden-Wroclaw-Spezial@de_pl" version="01" order="1">
<validityParameters>
<TransportModes>rail</TransportModes>
<!-- check PR #145 -->
<TransportSubmode>
<RailSubmode>highSpeedRail</RailSubmode>
</TransportSubmode>
<FareSectionRef ref="tlx:Trilex@Dresden-to-Wroclaw" version="01"/>
</validityParameters>
</GenericParameterAssignment>
Expand Down Expand Up @@ -1479,7 +1489,7 @@ issued to DB ticket vending machines.</Description>
<dayTypes>
<FareDayType version="any" id="tlx::everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<DayLength>P1DT3H</DayLength>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/rail/Netex_era_toc_uk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9130,7 +9130,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass+others_20170101.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5675,7 +5675,7 @@ Metrobus (including Fastway services), Southdown PSV, Compass Travel
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla
<dayTypes>
<FareDayType version="any" id="jsp:everyday">
<Name>Every day</Name>
<Description>ANy time</Description>
<Description>Any time</Description>
<EarliestTime>00:00:00</EarliestTime>
<properties>
<PropertyOfDay>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ Rail transport, Roads and Road transport
</xsd:element>
<xsd:element name="TransportModes" type="AllModesListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>ANy mode to which Mode validitry parameters apply + v1.2.2</xsd:documentation>
<xsd:documentation>Any mode to which Mode validity parameters apply +v1.2.2</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ Rail transport, Roads and Road transport
<!-- ======================================================================= -->
<xsd:element name="RoundingStep">
<xsd:annotation>
<xsd:documentation>A rounding step to use to round a range of values. ANy value larger than the step key and smaller tha the next step key should be rounded to this value.</xsd:documentation>
<xsd:documentation>A rounding step to use to round a range of values. Any value larger than the step key and smaller tha the next step key should be rounded to this value.</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
Expand Down