Skip to content

Commit

Permalink
Merge pull request NeTEx-CEN#658 from NeTEx-CEN/master
Browse files Browse the repository at this point in the history 
Master to EPIAP
  • Loading branch information
@skinkie
skinkie authored Feb 7, 2024
2 parents 3ef0635 + 57d989c commit 1946bcb
Show file tree
Hide file tree
Showing 57 changed files with 2,147 additions and 2,862 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/validate-and-lint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ while IFS= read -r -d $'\0' filename; do
fi
# Remove temp file
rm "${filename}.pretty"
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)
done < <(/usr/bin/find examples xsd -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)

if [ ${PARSING_ERROR} -ne 0 ]; then
exit ${PARSING_ERROR}
fi
echo -e '\033[0;32mFinished validating XML file structure and linting XSD and XML files\033[0m'
echo -e '\033[0;32mFinished linting XSD and XML files\033[0m'
12 changes: 11 additions & 1 deletion examples/functions/fares/rail/Netex_era_crossborder_de.xml
View file
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
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/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ The Calendar is shown coded as
</Call>
</calls>
<PassengerCarryingRequirementsView>
<PassengerCapacity>
<PassengerCapacity version="any" id="PC1">
<SeatingCapacity>22</SeatingCapacity>
<StandingCapacity>44</StandingCapacity>
<SpecialPlaceCapacity>2</SpecialPlaceCapacity>
Expand Down
1,462 changes: 785 additions & 677 deletions examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml
View file

Large diffs are not rendered by default.

1,255 changes: 694 additions & 561 deletions examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml
View file

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions examples/standards/era_uic/Netex_era_uic_calendar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,11 @@ This example shows the usage of Operating calendars with reference to it from th
<VehicleModes>rail</VehicleModes>
<vehicleJourneys>
<!-- ===== == -->
<DatedServiceJourney id="tap:00199121_2011-02-07/2011-08-26" version="any">
<ServiceJourney id="tap:00199121_2011-02-07/2011-08-26" version="any">
<ShortName>EUROSTAR</ShortName>
<dayTypes>
<DayTypeRef ref="tap:UicOperatingPeriod:2011-02-07/2011-08-26_111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111"/>
</dayTypes>
<LineView>
<PublicCode>9121</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -125,8 +128,7 @@ This example shows the usage of Operating calendars with reference to it from th
<ProvidedByRef ref="tap:operates@0019"/>
</ServiceFacilitySet>
</facilities>
<OperatingDayRef ref="tap:UicOperatingPeriod:2011-02-07/2011-08-26_111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111"/>
</DatedServiceJourney>
</ServiceJourney>
</vehicleJourneys>
</TimetableFrame>
</frames>
Expand Down
72 changes: 44 additions & 28 deletions examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,30 @@ This example shows the usage of coupled journeys, footnodes and two directions f
</ResponsibilitySet>
</responsibilitySets>
</ResourceFrame>
<ServiceCalendarFrame id="tap:ServiceCalendarFrame" version="any">
<operatingPeriods>
<UicOperatingPeriod id="X01" version="any">
<FromDate>2009-03-21T00:00:00</FromDate>
<ToDate>2009-03-22T00:00:00</ToDate>
<ValidDayBits>11</ValidDayBits>
</UicOperatingPeriod>
<UicOperatingPeriod id="X02" version="any">
<FromDate>2008-12-15T00:00:00</FromDate>
<ToDate>2009-06-13T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
<UicOperatingPeriod id="X03" version="any">
<FromDate>2008-12-14T00:00:00</FromDate>
<ToDate>2009-12-12T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
<UicOperatingPeriod id="X04" version="any">
<FromDate>2008-12-14T00:00:00</FromDate>
<ToDate>2009-12-12T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
</operatingPeriods>
</ServiceCalendarFrame>
<ServiceFrame responsibilitySetRef="tap:collects@0003" id="Sv01" version="any">
<validityConditions>
<AvailabilityCondition id="tap:2008-12-14/2009-12-12_ServiceFrame" version="any">
Expand Down Expand Up @@ -147,7 +171,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f
</AvailabilityCondition>
</validityConditions>
<vehicleJourneys>
<DatedServiceJourney id="tap:0084457_2009-03-21/2009-03-22" version="any">
<ServiceJourney id="tap:0084457_2009-03-21/2009-03-22" version="any">
<ShortName>Phoenix</ShortName>
<noticeAssignments>
<NoticeAssignmentView>
Expand All @@ -157,6 +181,9 @@ This example shows the usage of coupled journeys, footnodes and two directions f
<NoticeRef version="any" ref="tap:FootNode_0084457_2009-03-21/2009-03-22_2">tap:FootNode_0084457_2009-03-21/2009-03-22_2</NoticeRef>
</NoticeAssignmentView>
</noticeAssignments>
<dayTypes>
<DayTypeRef ref="X01"/>
</dayTypes>
<LineView>
<PublicCode>457</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -515,13 +542,11 @@ This example shows the usage of coupled journeys, footnodes and two directions f
<LuggageCarriageFacilityList>cyclesAllowedWithReservation</LuggageCarriageFacilityList>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X01" version="any">
<FromDate>2009-03-21T00:00:00</FromDate>
<ToDate>2009-03-22T00:00:00</ToDate>
<ValidDayBits>11</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
<DatedServiceJourney id="tap:008060457_2008-12-15/2009-06-13" version="any">
</ServiceJourney>
<ServiceJourney id="tap:008060457_2008-12-15/2009-06-13" version="any">
<dayTypes>
<DayTypeRef ref="X02"/>
</dayTypes>
<LineView>
<PublicCode>60457</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -640,14 +665,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f
<AccommodationFacilityList>seating</AccommodationFacilityList>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X02" version="any">
<FromDate>2008-12-15T00:00:00</FromDate>
<ToDate>2009-06-13T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
<DatedServiceJourney id="tap:0054456_2008-12-14/2009-12-12" version="any">
</ServiceJourney>
<ServiceJourney id="tap:0054456_2008-12-14/2009-12-12" version="any">
<ShortName>Phoenix</ShortName>
<dayTypes>
<DayTypeRef ref="X03"/>
</dayTypes>
<LineView>
<PublicCode>456</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -1039,14 +1062,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f
<AccommodationFacilityList>doubleSleeper</AccommodationFacilityList>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X03" version="any">
<FromDate>2008-12-14T00:00:00</FromDate>
<ToDate>2009-12-12T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
<DatedServiceJourney id="tap:005460456_2008-12-14/2009-12-12" version="any">
</ServiceJourney>
<ServiceJourney id="tap:005460456_2008-12-14/2009-12-12" version="any">
<ShortName>Kopernikus</ShortName>
<dayTypes>
<DayTypeRef ref="X04"/>
</dayTypes>
<LineView>
<PublicCode>60456</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -1167,12 +1188,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f
<AccommodationFacilityList>seating</AccommodationFacilityList>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X04" version="any">
<FromDate>2008-12-14T00:00:00</FromDate>
<ToDate>2009-12-12T00:00:00</ToDate>
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
</ServiceJourney>
</vehicleJourneys>
<notices>
<Notice id="tap:FootNode_0084457_2009-03-21/2009-03-22_1" version="any">
Expand Down
21 changes: 14 additions & 7 deletions examples/standards/era_uic/Netex_era_uic_simpletimetable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
<DefaultCodespaceRef ref="tap"/>
</FrameDefaults>
<frames>
<ServiceCalendarFrame id="tap:ServiceCalendarFrame" version="any">
<operatingPeriods>
<UicOperatingPeriod id="tap:UicOperatingPeriod2011-02-07+2011-08-29" version="any">
<FromDate>2011-02-07T00:00:00</FromDate>
<ToDate>2011-08-29T00:00:00</ToDate>
<ValidDayBits>000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011</ValidDayBits>
</UicOperatingPeriod>
</operatingPeriods>
</ServiceCalendarFrame>
<ResourceFrame id="tap:RessourceFrame:Rf_01" version="any">
<responsibilitySets>
<ResponsibilitySet id="tap:distributes@0003" version="any">
Expand Down Expand Up @@ -86,8 +95,11 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
</AvailabilityCondition>
</validityConditions>
<vehicleJourneys>
<DatedServiceJourney id="tap:00199129_2011-02-07/2011-08-29" version="any">
<ServiceJourney id="tap:00199129_2011-02-07/2011-08-29" version="any">
<ShortName>EUROSTAR</ShortName>
<dayTypes>
<DayTypeRef ref="tap:UicOperatingPeriod2011-02-07+2011-08-29"/>
</dayTypes>
<LineView>
<PublicCode>9129</PublicCode>
<TransportMode>rail</TransportMode>
Expand Down Expand Up @@ -159,12 +171,7 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
<FareClasses>premiumClass businessClass secondClass</FareClasses>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="2011-02-07+2011-08-29" version="any">
<FromDate>2011-02-07T00:00:00</FromDate>
<ToDate>2011-08-29T00:00:00</ToDate>
<ValidDayBits>000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
</ServiceJourney>
</vehicleJourneys>
</TimetableFrame>
</frames>
Expand Down
42 changes: 25 additions & 17 deletions examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ Assumes there is not a common calendar but rather specific days
</properties>
</DayType>
</dayTypes>
<operatingPeriods>
<UicOperatingPeriod id="X01" version="any">
<FromDate>2006-11-04T12:00:00</FromDate>
<ToDate>2006-07-30T12:00:00</ToDate>
<ValidDayBits>11111001111101</ValidDayBits>
</UicOperatingPeriod>
<UicOperatingPeriod id="X02" version="any">
<FromDate>2006-11-04T12:00:00</FromDate>
<ToDate>2006-11-04T12:00:00</ToDate>
<ValidDayBits>1</ValidDayBits>
</UicOperatingPeriod>
</operatingPeriods>
</ServiceCalendarFrame>
<TimetableFrame version="any" id="uic:TIM_001">
<validityConditions>
Expand All @@ -105,8 +117,11 @@ Assumes there is not a common calendar but rather specific days
<VehicleModes>rail</VehicleModes>
<vehicleJourneys>
<!-- ===== == -->
<DatedServiceJourney version="any" id="uicvj:393">
<ServiceJourney version="any" id="uicvj:393">
<DepartureTime>11:45:00Z</DepartureTime>
<dayTypes>
<DayTypeRef ref="X02"/>
</dayTypes>
<OperatorView>
<OperatorRef ref="uicop:1174"/>
<Name>Swedish Railways</Name>
Expand Down Expand Up @@ -139,7 +154,7 @@ Assumes there is not a common calendar but rather specific days
<noticeAssignments>
<NoticeAssignmentView>
<NoticeRef ref="ft001">
</NoticeRef>
</NoticeRef>
<Text>text for stop </Text>
</NoticeAssignmentView>
</noticeAssignments>
Expand All @@ -159,18 +174,16 @@ Assumes there is not a common calendar but rather specific days
<ServiceFacilitySet version="any" id="uicvj:393">
<otherFacilities>
<TypeOfEquipment version="any" id="uicvj:5">
</TypeOfEquipment>
</TypeOfEquipment>
</otherFacilities>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X02" version="any">
<FromDate>2006-11-04T12:00:00</FromDate>
<ToDate>2006-11-04T12:00:00</ToDate>
<ValidDayBits>1</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
<DatedServiceJourney version="any" id="uicvj:395">
</ServiceJourney>
<ServiceJourney version="any" id="uicvj:395">
<DepartureTime>15:26:00Z</DepartureTime>
<dayTypes>
<DayTypeRef ref="X01"/>
</dayTypes>
<OperatorView>
<OperatorRef ref="uicop:1174"/>
</OperatorView>
Expand Down Expand Up @@ -208,18 +221,13 @@ Assumes there is not a common calendar but rather specific days
<ServiceFacilitySet version="any" id="uicvj:395">
<otherFacilities>
<TypeOfEquipment version="any" id="uicvj:28">
</TypeOfEquipment>
</TypeOfEquipment>
<TypeOfEquipment version="any" id="uicvj:50"> </TypeOfEquipment>
<TypeOfEquipmentRef version="any" ref="uicvj:5"/>
</otherFacilities>
</ServiceFacilitySet>
</facilities>
<UicOperatingPeriod id="X01" version="any">
<FromDate>2006-11-04T12:00:00</FromDate>
<ToDate>2006-07-30T12:00:00</ToDate>
<ValidDayBits>11111001111101</ValidDayBits>
</UicOperatingPeriod>
</DatedServiceJourney>
</ServiceJourney>
</vehicleJourneys>
</TimetableFrame>
</frames>
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
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
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 examples/standards/gtfs/Netex_gtfs_exm1_CalendarDates_1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The data comes from the sample-feed.zip available at http://code.google.com/tr
2. MAPPING
A CALENDAR DATE maps to a VALIDITY CONDITION
The condition can be included as part of a SERVICE CALENDAR FRAME alonfg with the calendar.txts
The condition can be included as part of a SERVICE CALENDAR FRAME along with the calendar.txts
GTFS NeTEx
service_id, <ServiceCalendarFrame #service_id>@id
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ is relevant for supplying an Integrator with partial data from multiple sources.
</Call>
</calls>
<PassengerCarryingRequirementsView>
<PassengerCapacity>
<PassengerCapacity version="any" id="PC1">
<TotalCapacity>90</TotalCapacity>
<SeatingCapacity>50</SeatingCapacity>
<PushchairCapacity>1</PushchairCapacity>
Expand Down
Loading

0 comments on commit 1946bcb

Please sign in to comment.