Skip to content

Commit 57d989c

Browse files
EU-Agency-for-RailwaysStefan Jugeltgithub-actions[bot]
authored
Fix DatedServiceJourney for TAP TSI examples (#645)
* Fix Datedservice journey for TAP/MERITS examples * remove UicOperationPeriod from TAP TSI examples * DatedServiceJourney replaced by ServiceJourney * Lint and update documentation tables --------- Co-authored-by: Stefan Jugelt <stefan.jugelt@era.europa.eu> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 70c9953 commit 57d989c

17 files changed

+1924
-2149
lines changed

‎examples/standards/era_uic/Netex_Eurostar mapping_era_1.xml‎

Lines changed: 785 additions & 677 deletions
Large diffs are not rendered by default.

‎examples/standards/era_uic/Netex_Eurostar mapping_era_2.xml‎

Lines changed: 694 additions & 561 deletions
Large diffs are not rendered by default.

‎examples/standards/era_uic/Netex_era_uic_calendar.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,11 @@ This example shows the usage of Operating calendars with reference to it from th
8080
<VehicleModes>rail</VehicleModes>
8181
<vehicleJourneys>
8282
<!-- ===== == -->
83-
<DatedServiceJourney id="tap:00199121_2011-02-07/2011-08-26" version="any">
83+
<ServiceJourney id="tap:00199121_2011-02-07/2011-08-26" version="any">
8484
<ShortName>EUROSTAR</ShortName>
85+
<dayTypes>
86+
<DayTypeRef ref="tap:UicOperatingPeriod:2011-02-07/2011-08-26_111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111"/>
87+
</dayTypes>
8588
<LineView>
8689
<PublicCode>9121</PublicCode>
8790
<TransportMode>rail</TransportMode>
@@ -125,8 +128,7 @@ This example shows the usage of Operating calendars with reference to it from th
125128
<ProvidedByRef ref="tap:operates@0019"/>
126129
</ServiceFacilitySet>
127130
</facilities>
128-
<OperatingDayRef ref="tap:UicOperatingPeriod:2011-02-07/2011-08-26_111110011111001111100111110011111001111100111110011111001111100111110011111000111100011110011111001111100111110001111001111100111110011111001111100111110011111001111100111110011111001111100111110011111"/>
129-
</DatedServiceJourney>
131+
</ServiceJourney>
130132
</vehicleJourneys>
131133
</TimetableFrame>
132134
</frames>

‎examples/standards/era_uic/Netex_era_uic_joiningsplitting.xml‎

Lines changed: 44 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,30 @@ This example shows the usage of coupled journeys, footnodes and two directions f
6060
</ResponsibilitySet>
6161
</responsibilitySets>
6262
</ResourceFrame>
63+
<ServiceCalendarFrame id="tap:ServiceCalendarFrame" version="any">
64+
<operatingPeriods>
65+
<UicOperatingPeriod id="X01" version="any">
66+
<FromDate>2009-03-21T00:00:00</FromDate>
67+
<ToDate>2009-03-22T00:00:00</ToDate>
68+
<ValidDayBits>11</ValidDayBits>
69+
</UicOperatingPeriod>
70+
<UicOperatingPeriod id="X02" version="any">
71+
<FromDate>2008-12-15T00:00:00</FromDate>
72+
<ToDate>2009-06-13T00:00:00</ToDate>
73+
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111</ValidDayBits>
74+
</UicOperatingPeriod>
75+
<UicOperatingPeriod id="X03" version="any">
76+
<FromDate>2008-12-14T00:00:00</FromDate>
77+
<ToDate>2009-12-12T00:00:00</ToDate>
78+
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
79+
</UicOperatingPeriod>
80+
<UicOperatingPeriod id="X04" version="any">
81+
<FromDate>2008-12-14T00:00:00</FromDate>
82+
<ToDate>2009-12-12T00:00:00</ToDate>
83+
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
84+
</UicOperatingPeriod>
85+
</operatingPeriods>
86+
</ServiceCalendarFrame>
6387
<ServiceFrame responsibilitySetRef="tap:collects@0003" id="Sv01" version="any">
6488
<validityConditions>
6589
<AvailabilityCondition id="tap:2008-12-14/2009-12-12_ServiceFrame" version="any">
@@ -147,7 +171,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f
147171
</AvailabilityCondition>
148172
</validityConditions>
149173
<vehicleJourneys>
150-
<DatedServiceJourney id="tap:0084457_2009-03-21/2009-03-22" version="any">
174+
<ServiceJourney id="tap:0084457_2009-03-21/2009-03-22" version="any">
151175
<ShortName>Phoenix</ShortName>
152176
<noticeAssignments>
153177
<NoticeAssignmentView>
@@ -157,6 +181,9 @@ This example shows the usage of coupled journeys, footnodes and two directions f
157181
<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>
158182
</NoticeAssignmentView>
159183
</noticeAssignments>
184+
<dayTypes>
185+
<DayTypeRef ref="X01"/>
186+
</dayTypes>
160187
<LineView>
161188
<PublicCode>457</PublicCode>
162189
<TransportMode>rail</TransportMode>
@@ -515,13 +542,11 @@ This example shows the usage of coupled journeys, footnodes and two directions f
515542
<LuggageCarriageFacilityList>cyclesAllowedWithReservation</LuggageCarriageFacilityList>
516543
</ServiceFacilitySet>
517544
</facilities>
518-
<UicOperatingPeriod id="X01" version="any">
519-
<FromDate>2009-03-21T00:00:00</FromDate>
520-
<ToDate>2009-03-22T00:00:00</ToDate>
521-
<ValidDayBits>11</ValidDayBits>
522-
</UicOperatingPeriod>
523-
</DatedServiceJourney>
524-
<DatedServiceJourney id="tap:008060457_2008-12-15/2009-06-13" version="any">
545+
</ServiceJourney>
546+
<ServiceJourney id="tap:008060457_2008-12-15/2009-06-13" version="any">
547+
<dayTypes>
548+
<DayTypeRef ref="X02"/>
549+
</dayTypes>
525550
<LineView>
526551
<PublicCode>60457</PublicCode>
527552
<TransportMode>rail</TransportMode>
@@ -640,14 +665,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f
640665
<AccommodationFacilityList>seating</AccommodationFacilityList>
641666
</ServiceFacilitySet>
642667
</facilities>
643-
<UicOperatingPeriod id="X02" version="any">
644-
<FromDate>2008-12-15T00:00:00</FromDate>
645-
<ToDate>2009-06-13T00:00:00</ToDate>
646-
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111011111111111111111111111111111111100111111111111111111111111111</ValidDayBits>
647-
</UicOperatingPeriod>
648-
</DatedServiceJourney>
649-
<DatedServiceJourney id="tap:0054456_2008-12-14/2009-12-12" version="any">
668+
</ServiceJourney>
669+
<ServiceJourney id="tap:0054456_2008-12-14/2009-12-12" version="any">
650670
<ShortName>Phoenix</ShortName>
671+
<dayTypes>
672+
<DayTypeRef ref="X03"/>
673+
</dayTypes>
651674
<LineView>
652675
<PublicCode>456</PublicCode>
653676
<TransportMode>rail</TransportMode>
@@ -1039,14 +1062,12 @@ This example shows the usage of coupled journeys, footnodes and two directions f
10391062
<AccommodationFacilityList>doubleSleeper</AccommodationFacilityList>
10401063
</ServiceFacilitySet>
10411064
</facilities>
1042-
<UicOperatingPeriod id="X03" version="any">
1043-
<FromDate>2008-12-14T00:00:00</FromDate>
1044-
<ToDate>2009-12-12T00:00:00</ToDate>
1045-
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111110011111001111111111100001111111111100111000010111111111100111111111111000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
1046-
</UicOperatingPeriod>
1047-
</DatedServiceJourney>
1048-
<DatedServiceJourney id="tap:005460456_2008-12-14/2009-12-12" version="any">
1065+
</ServiceJourney>
1066+
<ServiceJourney id="tap:005460456_2008-12-14/2009-12-12" version="any">
10491067
<ShortName>Kopernikus</ShortName>
1068+
<dayTypes>
1069+
<DayTypeRef ref="X04"/>
1070+
</dayTypes>
10501071
<LineView>
10511072
<PublicCode>60456</PublicCode>
10521073
<TransportMode>rail</TransportMode>
@@ -1167,12 +1188,7 @@ This example shows the usage of coupled journeys, footnodes and two directions f
11671188
<AccommodationFacilityList>seating</AccommodationFacilityList>
11681189
</ServiceFacilitySet>
11691190
</facilities>
1170-
<UicOperatingPeriod id="X04" version="any">
1171-
<FromDate>2008-12-14T00:00:00</FromDate>
1172-
<ToDate>2009-12-12T00:00:00</ToDate>
1173-
<ValidDayBits>1111111111111111111111111111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</ValidDayBits>
1174-
</UicOperatingPeriod>
1175-
</DatedServiceJourney>
1191+
</ServiceJourney>
11761192
</vehicleJourneys>
11771193
<notices>
11781194
<Notice id="tap:FootNode_0084457_2009-03-21/2009-03-22_1" version="any">

‎examples/standards/era_uic/Netex_era_uic_simpletimetable.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
2828
<DefaultCodespaceRef ref="tap"/>
2929
</FrameDefaults>
3030
<frames>
31+
<ServiceCalendarFrame id="tap:ServiceCalendarFrame" version="any">
32+
<operatingPeriods>
33+
<UicOperatingPeriod id="tap:UicOperatingPeriod2011-02-07+2011-08-29" version="any">
34+
<FromDate>2011-02-07T00:00:00</FromDate>
35+
<ToDate>2011-08-29T00:00:00</ToDate>
36+
<ValidDayBits>000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011</ValidDayBits>
37+
</UicOperatingPeriod>
38+
</operatingPeriods>
39+
</ServiceCalendarFrame>
3140
<ResourceFrame id="tap:RessourceFrame:Rf_01" version="any">
3241
<responsibilitySets>
3342
<ResponsibilitySet id="tap:distributes@0003" version="any">
@@ -86,8 +95,11 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
8695
</AvailabilityCondition>
8796
</validityConditions>
8897
<vehicleJourneys>
89-
<DatedServiceJourney id="tap:00199129_2011-02-07/2011-08-29" version="any">
98+
<ServiceJourney id="tap:00199129_2011-02-07/2011-08-29" version="any">
9099
<ShortName>EUROSTAR</ShortName>
100+
<dayTypes>
101+
<DayTypeRef ref="tap:UicOperatingPeriod2011-02-07+2011-08-29"/>
102+
</dayTypes>
91103
<LineView>
92104
<PublicCode>9129</PublicCode>
93105
<TransportMode>rail</TransportMode>
@@ -159,12 +171,7 @@ NeTEx - Example for a simple timetable, generated from TAP TSI timetable data
159171
<FareClasses>premiumClass businessClass secondClass</FareClasses>
160172
</ServiceFacilitySet>
161173
</facilities>
162-
<UicOperatingPeriod id="2011-02-07+2011-08-29" version="any">
163-
<FromDate>2011-02-07T00:00:00</FromDate>
164-
<ToDate>2011-08-29T00:00:00</ToDate>
165-
<ValidDayBits>000000100000010000001000000100000010000001000000100000010000001000000100000011000001100000100000010000001000000110000010000001000000100000010000001000000100000010000001000000100000010000001000000100000011</ValidDayBits>
166-
</UicOperatingPeriod>
167-
</DatedServiceJourney>
174+
</ServiceJourney>
168175
</vehicleJourneys>
169176
</TimetableFrame>
170177
</frames>

‎examples/standards/era_uic/Netex_era_uic_timetable_hack_01.xml‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,18 @@ Assumes there is not a common calendar but rather specific days
9090
</properties>
9191
</DayType>
9292
</dayTypes>
93+
<operatingPeriods>
94+
<UicOperatingPeriod id="X01" version="any">
95+
<FromDate>2006-11-04T12:00:00</FromDate>
96+
<ToDate>2006-07-30T12:00:00</ToDate>
97+
<ValidDayBits>11111001111101</ValidDayBits>
98+
</UicOperatingPeriod>
99+
<UicOperatingPeriod id="X02" version="any">
100+
<FromDate>2006-11-04T12:00:00</FromDate>
101+
<ToDate>2006-11-04T12:00:00</ToDate>
102+
<ValidDayBits>1</ValidDayBits>
103+
</UicOperatingPeriod>
104+
</operatingPeriods>
93105
</ServiceCalendarFrame>
94106
<TimetableFrame version="any" id="uic:TIM_001">
95107
<validityConditions>
@@ -105,8 +117,11 @@ Assumes there is not a common calendar but rather specific days
105117
<VehicleModes>rail</VehicleModes>
106118
<vehicleJourneys>
107119
<!-- ===== == -->
108-
<DatedServiceJourney version="any" id="uicvj:393">
120+
<ServiceJourney version="any" id="uicvj:393">
109121
<DepartureTime>11:45:00Z</DepartureTime>
122+
<dayTypes>
123+
<DayTypeRef ref="X02"/>
124+
</dayTypes>
110125
<OperatorView>
111126
<OperatorRef ref="uicop:1174"/>
112127
<Name>Swedish Railways</Name>
@@ -139,7 +154,7 @@ Assumes there is not a common calendar but rather specific days
139154
<noticeAssignments>
140155
<NoticeAssignmentView>
141156
<NoticeRef ref="ft001">
142-
</NoticeRef>
157+
</NoticeRef>
143158
<Text>text for stop </Text>
144159
</NoticeAssignmentView>
145160
</noticeAssignments>
@@ -159,18 +174,16 @@ Assumes there is not a common calendar but rather specific days
159174
<ServiceFacilitySet version="any" id="uicvj:393">
160175
<otherFacilities>
161176
<TypeOfEquipment version="any" id="uicvj:5">
162-
</TypeOfEquipment>
177+
</TypeOfEquipment>
163178
</otherFacilities>
164179
</ServiceFacilitySet>
165180
</facilities>
166-
<UicOperatingPeriod id="X02" version="any">
167-
<FromDate>2006-11-04T12:00:00</FromDate>
168-
<ToDate>2006-11-04T12:00:00</ToDate>
169-
<ValidDayBits>1</ValidDayBits>
170-
</UicOperatingPeriod>
171-
</DatedServiceJourney>
172-
<DatedServiceJourney version="any" id="uicvj:395">
181+
</ServiceJourney>
182+
<ServiceJourney version="any" id="uicvj:395">
173183
<DepartureTime>15:26:00Z</DepartureTime>
184+
<dayTypes>
185+
<DayTypeRef ref="X01"/>
186+
</dayTypes>
174187
<OperatorView>
175188
<OperatorRef ref="uicop:1174"/>
176189
</OperatorView>
@@ -208,18 +221,13 @@ Assumes there is not a common calendar but rather specific days
208221
<ServiceFacilitySet version="any" id="uicvj:395">
209222
<otherFacilities>
210223
<TypeOfEquipment version="any" id="uicvj:28">
211-
</TypeOfEquipment>
224+
</TypeOfEquipment>
212225
<TypeOfEquipment version="any" id="uicvj:50"> </TypeOfEquipment>
213226
<TypeOfEquipmentRef version="any" ref="uicvj:5"/>
214227
</otherFacilities>
215228
</ServiceFacilitySet>
216229
</facilities>
217-
<UicOperatingPeriod id="X01" version="any">
218-
<FromDate>2006-11-04T12:00:00</FromDate>
219-
<ToDate>2006-07-30T12:00:00</ToDate>
220-
<ValidDayBits>11111001111101</ValidDayBits>
221-
</UicOperatingPeriod>
222-
</DatedServiceJourney>
230+
</ServiceJourney>
223231
</vehicleJourneys>
224232
</TimetableFrame>
225233
</frames>

‎examples/standards/tap_tsi/TAP-SKDUPD-example1-basic.xml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,28 @@ MES+200:KMT' -->
6161
<DefaultCodespaceRef ref="op_cs"/>
6262
</FrameDefaults>
6363
<frames>
64+
<ServiceCalendarFrame id="ServiceCalendarFrame:1" version="any">
65+
<operatingPeriods>
66+
<UicOperatingPeriod id="3" version="any">
67+
<FromDate>2006-11-04T12:00:00</FromDate>
68+
<ToDate>2006-11-04T12:00:00</ToDate>
69+
<ValidDayBits>1</ValidDayBits>
70+
</UicOperatingPeriod>
71+
</operatingPeriods>
72+
</ServiceCalendarFrame>
6473
<TimetableFrame version="any" id="SKDUPD_basic_example">
6574
<Name>Uic Example of a very simple train timetable</Name>
6675
<VehicleModes>rail</VehicleModes>
6776
<vehicleJourneys>
68-
<DatedServiceJourney version="any" id="3">
77+
<ServiceJourney version="any" id="3">
6978
<!-- PRD+3:11:1:3:::ALPHA TANGO+0060**80' -->
7079
<Name>ALPHA TANGO</Name>
7180
<TypeOfProductCategoryRef versionRef="EXTERNAL" ref="84"/>
7281
<TypeOfServiceRef versionRef="EXTERNAL" ref="3"/>
7382
<DepartureTime>05:03:00</DepartureTime>
83+
<dayTypes>
84+
<DayTypeRef ref="3"/>
85+
</dayTypes>
7486
<!-- Narrative: Operator of service (ie TAPTSI RU.) This is an external reference -->
7587
<!-- POR+006070001+*0503+*1+5' -->
7688
<OperatorRef versionRef="EXTERNAL" ref="uic:0060"/>
@@ -272,12 +284,7 @@ PDT++:::58:::' (TAPTSI B.4.7009 58 TRN Intercités) -->
272284
</delays>
273285
</CheckConstraint>
274286
</checkConstraints>
275-
<UicOperatingPeriod id="3" version="any">
276-
<FromDate>2006-11-04T12:00:00</FromDate>
277-
<ToDate>2006-11-04T12:00:00</ToDate>
278-
<ValidDayBits>1</ValidDayBits>
279-
</UicOperatingPeriod>
280-
</DatedServiceJourney>
287+
</ServiceJourney>
281288
</vehicleJourneys>
282289
<trainNumbers>
283290
<TrainNumber version="any" id="3">

‎examples/standards/tap_tsi/TAP-SKDUPD-example1.xml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,17 @@ Data is selected just for the stops for a single journey
443443
<DefaultCodespaceRef ref="op_cs"/>
444444
</FrameDefaults>
445445
<frames>
446+
<!-- Narrative: The SERVICE CALENDAR FRAME provides a container to organise the operational dates -->
447+
<ServiceCalendarFrame id="uic:SKDUPD_basic_example" version="any">
448+
<operatingPeriods>
449+
<!-- POP+273:2006-11-04/2006-11-04::1' -->
450+
<UicOperatingPeriod id="uic:SKDUPD_basic_example_operatingperiod" version="any">
451+
<FromDate>2006-11-04T12:00:00</FromDate>
452+
<ToDate>2006-11-04T12:00:00</ToDate>
453+
<ValidDayBits>1</ValidDayBits>
454+
</UicOperatingPeriod>
455+
</operatingPeriods>
456+
</ServiceCalendarFrame>
446457
<ServiceFrame version="any" id="uic:SKDUPD_basic_example">
447458
<!-- Narrative: The SERVICE FRAME provides a container to organise stop (TAPSI Location) and related data -->
448459
<!--- comment: A TAPTSI data stream doe snot normalloy incldue location (ie stop) definitions, just a refernce to their codes.
@@ -485,7 +496,7 @@ Data is selected just for the stops for a single journey
485496
<Name>Uic Example of a very simple train timetable</Name>
486497
<VehicleModes>rail</VehicleModes>
487498
<vehicleJourneys>
488-
<DatedServiceJourney version="any" id="3">
499+
<ServiceJourney version="any" id="3">
489500
<!-- PRD+3:11:1:3:::ALPHA TANGO+0060**80' -->
490501
<Name>ALPHA TANGO</Name>
491502
<TypeOfProductCategoryRef versionRef="EXTERNAL" ref="84"/>
@@ -499,6 +510,10 @@ Data is selected just for the stops for a single journey
499510
<!-- Narrative: Overall Departure times from firts stop-->
500511
<!-- PRD+3:11:1:3:::ALPHA TANGO+0060**80' -->
501512
<DepartureTime>05:03:00</DepartureTime>
513+
<!-- POP+273:2006-11-04/2006-11-04::1' -->
514+
<dayTypes>
515+
<DayTypeRef ref="uic:SKDUPD_basic_example_operatingperiod"/>
516+
</dayTypes>
502517
<!-- Narrative: Operator of service (ie TAPTSI RU.) This is an external reference -->
503518
<!-- POR+006070001+*0503+*1+5' -->
504519
<OperatorRef versionRef="EXTERNAL" ref="uic:0060"/>
@@ -700,12 +715,7 @@ PDT++:::58:::' (TAPTSI B.4.7009 58 TRN Intercités) -->
700715
</delays>
701716
</CheckConstraint>
702717
</checkConstraints>
703-
<UicOperatingPeriod id="3" version="any">
704-
<FromDate>2006-11-04T12:00:00</FromDate>
705-
<ToDate>2006-11-04T12:00:00</ToDate>
706-
<ValidDayBits>1</ValidDayBits>
707-
</UicOperatingPeriod>
708-
</DatedServiceJourney>
718+
</ServiceJourney>
709719
</vehicleJourneys>
710720
<trainNumbers>
711721
<TrainNumber version="any" id="3">

0 commit comments

Comments
 (0)