From 59b604bb90dd7aa5cf34c1876a1363677a58c3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 9 Apr 2025 18:15:17 +0200
Subject: [PATCH 01/12] fixes #749

---
 .../timetable/Netex_52_planned_delay.xml      | 208 ++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 examples/functions/timetable/Netex_52_planned_delay.xml

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
new file mode 100644
index 000000000..56ea2bb57
--- /dev/null
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ==== Planned delays. We assume that in July the trip has some minutes delay ====== 
+
+-->
+<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
+	<PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp>
+	<ParticipantRef>SYS001</ParticipantRef>
+	<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
+	<Description> An example that contains a service journey, that is delayed during some days.</Description>
+	<!--- =============== RESULTS =========== -->
+	<dataObjects>
+		<CompositeFrame version="1.0" id="ch:cf">
+			<!--- ======= CODESPACEs======== -->
+			<codespaces>
+				<Codespace id="mybus">
+					<Xmlns>mybus</Xmlns>
+					<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
+					<Description>My buses</Description>
+				</Codespace>
+			</codespaces>
+			<!--- =======FRAME DEFAULTS======== -->
+			<FrameDefaults>
+				<DefaultCodespaceRef ref="mybus"/>
+			</FrameDefaults>
+			<frames>
+				<ServiceFrame version="1.0" id="ch:serviceframe">
+					<Name>Stops for Winter timetable for route 24 </Name>
+					<!--- =========LINEs=========== -->
+					<lines>
+						<Line version="any" id="mybus:LN_24">
+							<Name>Line 24 Alpha to Charley</Name>
+							<ShortName>Line 24</ShortName>
+							<TransportMode>bus</TransportMode>
+							<PublicCode>24</PublicCode>
+							<OperatorRef version="1.0" ref="ch:1:Operator:1"/>
+						</Line>
+					</lines>
+					<!--- =========STOP POINTs============ -->
+					<scheduledStopPoints>
+						<ScheduledStopPoint version="any" id="mybus:SSP_001">
+							<Name>Alpha &amp; Castle</Name>
+							<Location>
+								<Longitude>53.0000</Longitude>
+								<Latitude>0.1000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+							<ShortName>Alpha</ShortName>
+							<PublicCode>ALPH</PublicCode>
+							<StopType>onstreetBus</StopType>
+							<VehicleModes>bus</VehicleModes>
+						</ScheduledStopPoint>
+						<ScheduledStopPoint version="any" id="mybus:SSP_077">
+							<Name>Charley Crescent</Name>
+							<Location>
+								<Longitude>53.3000</Longitude>
+								<Latitude>0.3000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+							<ShortName>Charley</ShortName>
+							<PublicCode>CHAS</PublicCode>
+							<StopType>onstreetBus</StopType>
+							<VehicleModes>bus</VehicleModes>
+						</ScheduledStopPoint>
+					</scheduledStopPoints>
+					<notices>
+						<Notice id="delay_notice" version="any">
+						<Text>During July the bus is delayed by 5 minutes due to construction work.</Text>
+						</Notice>
+					</notices>
+					</ServiceFrame>
+				<!-- ======TIMETABLE ======= -->
+				<TimetableFrame version="1.0" id="ch:tf">
+					<validityConditions>
+						<AvailabilityCondition version="any" id="all_year_no_longer_available">
+							<Description>regular run</Description>
+							<FromDate>2025-11-01T00:00:00Z</FromDate>
+							<ToDate>2025-12-31T00:00:00Z</ToDate>
+							<IsAvailable>false</IsAvailable>  <!--making clear that it is no longer available -->
+						</AvailabilityCondition>
+						<AvailabilityCondition version="any" id="only_july">
+							<Description>regular run</Description>
+							<FromDate>2025-07-01T00:00:00Z</FromDate>
+							<ToDate>2025-07-31T23:59:00Z</ToDate>
+						</AvailabilityCondition>	
+						<AvailabilityCondition version="any" id="all_except_july">
+							<Description>regular run</Description>
+							<FromDate>2025-07-01T00:00:00Z</FromDate>
+							<ToDate>2025-07-31T23:59:00Z</ToDate>
+						</AvailabilityCondition>						
+					</validityConditions>
+					<vehicleJourneys>
+						<ServiceJourney version="any" id="444">
+						<validityConditions>
+							<ValidityConditionRef ref="all_year_no_longer_available" version="any"/>
+						</validityConditions>
+						<Description>The original journey replaced by 444-1 and 444-2</Description>
+							<ServiceAlteration>replaced</ServiceAlteration>
+							<DepartureTime>14:20:00.0Z</DepartureTime>
+							<LineRef version="any" ref="mybus:LN_24"/>
+							<calls>
+								<Call version="any" id="hde:sj_24o_01_001" order="1">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<Arrival>
+										<ForAlighting>false</ForAlighting>
+									</Arrival>
+									<Departure>
+										<Time>14:20:00.0Z</Time>
+									</Departure>
+								</Call>
+								<Call version="any" id="hde:sj_24o_01_003" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>15:10:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>
+						</ServiceJourney>
+						<ServiceJourney version="any" id="444-1" derivedFromObjectRef="444" derivedFromVersionRef="any">
+						<validityConditions>
+							<ValidityConditionRef ref="all_except_july" version="any"/>
+						</validityConditions>
+						<Description>The replacement that is still the same</Description>
+							<ServiceAlteration>planned</ServiceAlteration>
+							<DepartureTime>14:20:00.0Z</DepartureTime>
+							<LineRef version="any" ref="mybus:LN_24"/>
+							<calls>
+								<Call version="any" id="hde:sj_24o_01_001-1" order="1">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<Arrival>
+										<ForAlighting>false</ForAlighting>
+									</Arrival>
+									<Departure>
+										<Time>14:20:00.0Z</Time>
+									</Departure>
+								</Call>
+								<Call version="any" id="hde:sj_24o_01_003-1" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>15:10:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>
+						</ServiceJourney>
+						<ServiceJourney version="any" id="444-2" derivedFromObjectRef="444" derivedFromVersionRef="any">
+						<validityConditions>
+							<ValidityConditionRef ref="only_july" version="any"/>
+						</validityConditions>
+
+						<Description>The delayed part in July</Description>
+												<noticeAssignments>
+							<NoticeAssignment id="na:1" version="any" order="1">
+								<NoticeRef ref="delay_notice" version="any"/>
+							</NoticeAssignment>
+						</noticeAssignments>
+							<ServiceAlteration>planned</ServiceAlteration>
+							<DepartureTime>14:25:00.0Z</DepartureTime>
+							<LineRef version="any" ref="mybus:LN_24"/>
+							<calls>
+								<Call version="any" id="hde:sj_24o_01_001-2" order="1">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<Arrival>
+										<ForAlighting>false</ForAlighting>
+									</Arrival>
+									<Departure>
+										<Time>14:25:00.0Z</Time> <!-- 5 minutes later -->
+									</Departure>
+								</Call>
+								<Call version="any" id="hde:sj_24o_01_003-2" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>15:15:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>
+							
+						</ServiceJourney>												
+					</vehicleJourneys>
+				</TimetableFrame>
+				<ServiceCalendarFrame version="1.0" id="ch:scf">
+					<ServiceCalendar version="any" id="hde:Calendar@2010">
+						<FromDate>2025-01-01</FromDate>
+						<ToDate>2025-12-31</ToDate>
+					</ServiceCalendar>
+				</ServiceCalendarFrame>
+				<ResourceFrame version="1.0" id="ch:rf">
+					<organisations>
+						<Operator version="1.0" id="ch:1:Operator:1">
+							<Name>The operator</Name>
+							<Locale>
+								<DefaultLanguage>fr</DefaultLanguage>
+							</Locale>
+							<OrganisationType>operator</OrganisationType>
+						</Operator>
+					</organisations>
+				</ResourceFrame>
+			</frames>
+		</CompositeFrame>
+	</dataObjects>
+</PublicationDelivery>

From 15335596dc6ddab56505df83c216daddeac93462 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:17:45 +0000
Subject: [PATCH 02/12] Lint and update documentation tables

---
 .../timetable/Netex_52_planned_delay.xml      | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 56ea2bb57..5a78aabda 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -64,10 +64,10 @@
 					</scheduledStopPoints>
 					<notices>
 						<Notice id="delay_notice" version="any">
-						<Text>During July the bus is delayed by 5 minutes due to construction work.</Text>
+							<Text>During July the bus is delayed by 5 minutes due to construction work.</Text>
 						</Notice>
 					</notices>
-					</ServiceFrame>
+				</ServiceFrame>
 				<!-- ======TIMETABLE ======= -->
 				<TimetableFrame version="1.0" id="ch:tf">
 					<validityConditions>
@@ -75,25 +75,26 @@
 							<Description>regular run</Description>
 							<FromDate>2025-11-01T00:00:00Z</FromDate>
 							<ToDate>2025-12-31T00:00:00Z</ToDate>
-							<IsAvailable>false</IsAvailable>  <!--making clear that it is no longer available -->
+							<IsAvailable>false</IsAvailable>
+							<!--making clear that it is no longer available -->
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="only_july">
 							<Description>regular run</Description>
 							<FromDate>2025-07-01T00:00:00Z</FromDate>
 							<ToDate>2025-07-31T23:59:00Z</ToDate>
-						</AvailabilityCondition>	
+						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="all_except_july">
 							<Description>regular run</Description>
 							<FromDate>2025-07-01T00:00:00Z</FromDate>
 							<ToDate>2025-07-31T23:59:00Z</ToDate>
-						</AvailabilityCondition>						
+						</AvailabilityCondition>
 					</validityConditions>
 					<vehicleJourneys>
 						<ServiceJourney version="any" id="444">
-						<validityConditions>
-							<ValidityConditionRef ref="all_year_no_longer_available" version="any"/>
-						</validityConditions>
-						<Description>The original journey replaced by 444-1 and 444-2</Description>
+							<validityConditions>
+								<ValidityConditionRef ref="all_year_no_longer_available" version="any"/>
+							</validityConditions>
+							<Description>The original journey replaced by 444-1 and 444-2</Description>
 							<ServiceAlteration>replaced</ServiceAlteration>
 							<DepartureTime>14:20:00.0Z</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
@@ -119,10 +120,10 @@
 							</calls>
 						</ServiceJourney>
 						<ServiceJourney version="any" id="444-1" derivedFromObjectRef="444" derivedFromVersionRef="any">
-						<validityConditions>
-							<ValidityConditionRef ref="all_except_july" version="any"/>
-						</validityConditions>
-						<Description>The replacement that is still the same</Description>
+							<validityConditions>
+								<ValidityConditionRef ref="all_except_july" version="any"/>
+							</validityConditions>
+							<Description>The replacement that is still the same</Description>
 							<ServiceAlteration>planned</ServiceAlteration>
 							<DepartureTime>14:20:00.0Z</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
@@ -148,16 +149,15 @@
 							</calls>
 						</ServiceJourney>
 						<ServiceJourney version="any" id="444-2" derivedFromObjectRef="444" derivedFromVersionRef="any">
-						<validityConditions>
-							<ValidityConditionRef ref="only_july" version="any"/>
-						</validityConditions>
-
-						<Description>The delayed part in July</Description>
-												<noticeAssignments>
-							<NoticeAssignment id="na:1" version="any" order="1">
-								<NoticeRef ref="delay_notice" version="any"/>
-							</NoticeAssignment>
-						</noticeAssignments>
+							<validityConditions>
+								<ValidityConditionRef ref="only_july" version="any"/>
+							</validityConditions>
+							<Description>The delayed part in July</Description>
+							<noticeAssignments>
+								<NoticeAssignment id="na:1" version="any" order="1">
+									<NoticeRef ref="delay_notice" version="any"/>
+								</NoticeAssignment>
+							</noticeAssignments>
 							<ServiceAlteration>planned</ServiceAlteration>
 							<DepartureTime>14:25:00.0Z</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
@@ -168,7 +168,8 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:25:00.0Z</Time> <!-- 5 minutes later -->
+										<Time>14:25:00.0Z</Time>
+										<!-- 5 minutes later -->
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003-2" order="2">
@@ -181,8 +182,7 @@
 									</Departure>
 								</Call>
 							</calls>
-							
-						</ServiceJourney>												
+						</ServiceJourney>
 					</vehicleJourneys>
 				</TimetableFrame>
 				<ServiceCalendarFrame version="1.0" id="ch:scf">

From 87a6828ad3abc4750b392aed8406d5b4400b7115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 9 Apr 2025 20:16:59 +0200
Subject: [PATCH 03/12] more precise about AvailabilityConditionRef

---
 examples/functions/timetable/Netex_52_planned_delay.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 5a78aabda..002d02228 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -92,7 +92,7 @@
 					<vehicleJourneys>
 						<ServiceJourney version="any" id="444">
 							<validityConditions>
-								<ValidityConditionRef ref="all_year_no_longer_available" version="any"/>
+								<AvailabilityConditionRef ref="all_year_no_longer_available" version="any"/>
 							</validityConditions>
 							<Description>The original journey replaced by 444-1 and 444-2</Description>
 							<ServiceAlteration>replaced</ServiceAlteration>
@@ -121,7 +121,7 @@
 						</ServiceJourney>
 						<ServiceJourney version="any" id="444-1" derivedFromObjectRef="444" derivedFromVersionRef="any">
 							<validityConditions>
-								<ValidityConditionRef ref="all_except_july" version="any"/>
+								<AvailabilityConditionRef ref="all_except_july" version="any"/>
 							</validityConditions>
 							<Description>The replacement that is still the same</Description>
 							<ServiceAlteration>planned</ServiceAlteration>
@@ -150,7 +150,7 @@
 						</ServiceJourney>
 						<ServiceJourney version="any" id="444-2" derivedFromObjectRef="444" derivedFromVersionRef="any">
 							<validityConditions>
-								<ValidityConditionRef ref="only_july" version="any"/>
+								<AvailabilityConditionRef ref="only_july" version="any"/>
 							</validityConditions>
 							<Description>The delayed part in July</Description>
 							<noticeAssignments>

From a2f383266e0425314ed233a6d654cccdfc88949f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 10 Apr 2025 10:09:49 +0200
Subject: [PATCH 04/12] Update
 examples/functions/timetable/Netex_52_planned_delay.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 002d02228..049212153 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -73,7 +73,7 @@
 					<validityConditions>
 						<AvailabilityCondition version="any" id="all_year_no_longer_available">
 							<Description>regular run</Description>
-							<FromDate>2025-11-01T00:00:00Z</FromDate>
+							<FromDate>2025-01-01T00:00:00Z</FromDate>
 							<ToDate>2025-12-31T00:00:00Z</ToDate>
 							<IsAvailable>false</IsAvailable>
 							<!--making clear that it is no longer available -->

From 016526c95fc150b1929a3dd4e712807b53cb180d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 10 Apr 2025 10:14:48 +0200
Subject: [PATCH 05/12] correct AvailabilityConditions

---
 .../functions/timetable/Netex_52_planned_delay.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 049212153..c80f310bf 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -83,10 +83,15 @@
 							<FromDate>2025-07-01T00:00:00Z</FromDate>
 							<ToDate>2025-07-31T23:59:00Z</ToDate>
 						</AvailabilityCondition>
-						<AvailabilityCondition version="any" id="all_except_july">
+						<AvailabilityCondition version="any" id="after_july">
 							<Description>regular run</Description>
-							<FromDate>2025-07-01T00:00:00Z</FromDate>
-							<ToDate>2025-07-31T23:59:00Z</ToDate>
+							<FromDate>2025-08-01T00:00:00Z</FromDate>
+							<ToDate>2025-12-31T23:59:00Z</ToDate>
+						</AvailabilityCondition>						
+						<AvailabilityCondition version="any" id="before_july">
+							<Description>regular run</Description>
+							<FromDate>2025-01-01T00:00:00Z</FromDate>
+							<ToDate>2025-06-30T23:59:00Z</ToDate>
 						</AvailabilityCondition>
 					</validityConditions>
 					<vehicleJourneys>
@@ -121,7 +126,8 @@
 						</ServiceJourney>
 						<ServiceJourney version="any" id="444-1" derivedFromObjectRef="444" derivedFromVersionRef="any">
 							<validityConditions>
-								<AvailabilityConditionRef ref="all_except_july" version="any"/>
+								<AvailabilityConditionRef ref="before_july" version="any"/>
+								<AvailabilityConditionRef ref="after_july" version="any"/>
 							</validityConditions>
 							<Description>The replacement that is still the same</Description>
 							<ServiceAlteration>planned</ServiceAlteration>

From 154e44c6bb13148ed4e4a8f4057ef6dc552c5413 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 10 Apr 2025 08:18:08 +0000
Subject: [PATCH 06/12] Lint and update documentation tables

---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index c80f310bf..5bacc9c0e 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -87,7 +87,7 @@
 							<Description>regular run</Description>
 							<FromDate>2025-08-01T00:00:00Z</FromDate>
 							<ToDate>2025-12-31T23:59:00Z</ToDate>
-						</AvailabilityCondition>						
+						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="before_july">
 							<Description>regular run</Description>
 							<FromDate>2025-01-01T00:00:00Z</FromDate>

From 7ddd587f9bea4c2cacf6cd76e2f2d03ad0ac6b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 10 Apr 2025 17:41:47 +0200
Subject: [PATCH 07/12] remove Z

as time is over daylight saving time
---
 .../timetable/Netex_52_planned_delay.xml      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 5bacc9c0e..ca2439dd6 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -3,7 +3,7 @@
 
 -->
 <PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
-	<PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp>
+	<PublicationTimestamp>2010-12-17T09:30:47.0</PublicationTimestamp>
 	<ParticipantRef>SYS001</ParticipantRef>
 	<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
 	<Description> An example that contains a service journey, that is delayed during some days.</Description>
@@ -73,25 +73,25 @@
 					<validityConditions>
 						<AvailabilityCondition version="any" id="all_year_no_longer_available">
 							<Description>regular run</Description>
-							<FromDate>2025-01-01T00:00:00Z</FromDate>
-							<ToDate>2025-12-31T00:00:00Z</ToDate>
+							<FromDate>2025-01-01T00:00:00</FromDate>
+							<ToDate>2025-12-31T00:00:00</ToDate>
 							<IsAvailable>false</IsAvailable>
 							<!--making clear that it is no longer available -->
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="only_july">
 							<Description>regular run</Description>
-							<FromDate>2025-07-01T00:00:00Z</FromDate>
-							<ToDate>2025-07-31T23:59:00Z</ToDate>
+							<FromDate>2025-07-01T00:00:00</FromDate>
+							<ToDate>2025-07-31T23:59:00</ToDate>
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="after_july">
 							<Description>regular run</Description>
-							<FromDate>2025-08-01T00:00:00Z</FromDate>
-							<ToDate>2025-12-31T23:59:00Z</ToDate>
+							<FromDate>2025-08-01T00:00:00</FromDate>
+							<ToDate>2025-12-31T23:59:00</ToDate>
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="before_july">
 							<Description>regular run</Description>
-							<FromDate>2025-01-01T00:00:00Z</FromDate>
-							<ToDate>2025-06-30T23:59:00Z</ToDate>
+							<FromDate>2025-01-01T00:00:00</FromDate>
+							<ToDate>2025-06-30T23:59:00</ToDate>
 						</AvailabilityCondition>
 					</validityConditions>
 					<vehicleJourneys>
@@ -101,7 +101,7 @@
 							</validityConditions>
 							<Description>The original journey replaced by 444-1 and 444-2</Description>
 							<ServiceAlteration>replaced</ServiceAlteration>
-							<DepartureTime>14:20:00.0Z</DepartureTime>
+							<DepartureTime>14:20:00.0</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001" order="1">
@@ -110,13 +110,13 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:20:00.0Z</Time>
+										<Time>14:20:00.0</Time>
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:10:00.0Z</Time>
+										<Time>15:10:00.0</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>
@@ -131,7 +131,7 @@
 							</validityConditions>
 							<Description>The replacement that is still the same</Description>
 							<ServiceAlteration>planned</ServiceAlteration>
-							<DepartureTime>14:20:00.0Z</DepartureTime>
+							<DepartureTime>14:20:00.0</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001-1" order="1">
@@ -140,13 +140,13 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:20:00.0Z</Time>
+										<Time>14:20:00.0</Time>
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003-1" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:10:00.0Z</Time>
+										<Time>15:10:00.0</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>
@@ -165,7 +165,7 @@
 								</NoticeAssignment>
 							</noticeAssignments>
 							<ServiceAlteration>planned</ServiceAlteration>
-							<DepartureTime>14:25:00.0Z</DepartureTime>
+							<DepartureTime>14:25:00.0</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001-2" order="1">
@@ -174,14 +174,14 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:25:00.0Z</Time>
+										<Time>14:25:00.0</Time>
 										<!-- 5 minutes later -->
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003-2" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:15:00.0Z</Time>
+										<Time>15:15:00.0</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>

From afabaa1d650d9a58c8fd39125f57c871443ec495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 16 Apr 2025 15:00:44 +0200
Subject: [PATCH 08/12] Update
 examples/functions/timetable/Netex_52_planned_delay.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index ca2439dd6..a905ed279 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -74,7 +74,7 @@
 						<AvailabilityCondition version="any" id="all_year_no_longer_available">
 							<Description>regular run</Description>
 							<FromDate>2025-01-01T00:00:00</FromDate>
-							<ToDate>2025-12-31T00:00:00</ToDate>
+							<ToDate>2025-12-31T23:59:59</ToDate>
 							<IsAvailable>false</IsAvailable>
 							<!--making clear that it is no longer available -->
 						</AvailabilityCondition>

From ee1c6ab227bb53eea32296c110ad3325dda2fbeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 16 Apr 2025 15:00:52 +0200
Subject: [PATCH 09/12] Update
 examples/functions/timetable/Netex_52_planned_delay.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index a905ed279..f40464fc2 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -81,7 +81,7 @@
 						<AvailabilityCondition version="any" id="only_july">
 							<Description>regular run</Description>
 							<FromDate>2025-07-01T00:00:00</FromDate>
-							<ToDate>2025-07-31T23:59:00</ToDate>
+							<ToDate>2025-07-31T23:59:59</ToDate>
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="after_july">
 							<Description>regular run</Description>

From e95cf3cd6dab2590eff55566d48cb7d5ee624092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 16 Apr 2025 15:00:59 +0200
Subject: [PATCH 10/12] Update
 examples/functions/timetable/Netex_52_planned_delay.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index f40464fc2..5aca4c93b 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -86,7 +86,7 @@
 						<AvailabilityCondition version="any" id="after_july">
 							<Description>regular run</Description>
 							<FromDate>2025-08-01T00:00:00</FromDate>
-							<ToDate>2025-12-31T23:59:00</ToDate>
+							<ToDate>2025-12-31T23:59:59</ToDate>
 						</AvailabilityCondition>
 						<AvailabilityCondition version="any" id="before_july">
 							<Description>regular run</Description>

From 2a248ed196d119fa3d18707d0e263eeb26b7776f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 16 Apr 2025 15:01:06 +0200
Subject: [PATCH 11/12] Update
 examples/functions/timetable/Netex_52_planned_delay.xml

Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com>
---
 examples/functions/timetable/Netex_52_planned_delay.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 5aca4c93b..721274fd7 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -91,7 +91,7 @@
 						<AvailabilityCondition version="any" id="before_july">
 							<Description>regular run</Description>
 							<FromDate>2025-01-01T00:00:00</FromDate>
-							<ToDate>2025-06-30T23:59:00</ToDate>
+							<ToDate>2025-06-30T23:59:59</ToDate>
 						</AvailabilityCondition>
 					</validityConditions>
 					<vehicleJourneys>

From 3e092ed682799edb53506135e7ad6c24decfd116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Sat, 19 Apr 2025 13:16:00 +0200
Subject: [PATCH 12/12] removing milliseconds

---
 NeTEx.spp                                      |  3 +++
 .../timetable/Netex_52_planned_delay.xml       | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/NeTEx.spp b/NeTEx.spp
index 4140471e2..e44f23557 100644
--- a/NeTEx.spp
+++ b/NeTEx.spp
@@ -734,6 +734,9 @@
 					<File FilePath="examples\functions\timetable\Netex_11_Rail_CompoundTrain.xml" HomeFolder="Yes"/>
 					<File FilePath="examples\functions\timetable\Netex_21_Rail_NetworkTimetable_eurostar.xml" HomeFolder="Yes"/>
 					<File FilePath="examples\functions\timetable\Netex_32_Multimodal_PassengerInformationEquipment.xml" HomeFolder="Yes"/>
+					<File FilePath="examples\functions\timetable\NeTEx_50_JourneyFrequencyGroup.xml" HomeFolder="Yes"/>
+					<File FilePath="examples\functions\timetable\Netex_51.1_Occupancy.xml" HomeFolder="Yes"/>
+					<File FilePath="examples\functions\timetable\Netex_52_planned_delay.xml" HomeFolder="Yes"/>
 				</Folder>
 				<Folder FolderName="calendar">
 					<File FilePath="examples\functions\calendar\NeTEx_Calendar_se_PA1.xml" HomeFolder="Yes"/>
diff --git a/examples/functions/timetable/Netex_52_planned_delay.xml b/examples/functions/timetable/Netex_52_planned_delay.xml
index 721274fd7..98639d54a 100644
--- a/examples/functions/timetable/Netex_52_planned_delay.xml
+++ b/examples/functions/timetable/Netex_52_planned_delay.xml
@@ -101,7 +101,7 @@
 							</validityConditions>
 							<Description>The original journey replaced by 444-1 and 444-2</Description>
 							<ServiceAlteration>replaced</ServiceAlteration>
-							<DepartureTime>14:20:00.0</DepartureTime>
+							<DepartureTime>14:20:00</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001" order="1">
@@ -110,13 +110,13 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:20:00.0</Time>
+										<Time>14:20:00</Time>
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:10:00.0</Time>
+										<Time>15:10:00</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>
@@ -131,7 +131,7 @@
 							</validityConditions>
 							<Description>The replacement that is still the same</Description>
 							<ServiceAlteration>planned</ServiceAlteration>
-							<DepartureTime>14:20:00.0</DepartureTime>
+							<DepartureTime>14:20:00</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001-1" order="1">
@@ -140,13 +140,13 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:20:00.0</Time>
+										<Time>14:20:00</Time>
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003-1" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:10:00.0</Time>
+										<Time>15:10:00</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>
@@ -165,7 +165,7 @@
 								</NoticeAssignment>
 							</noticeAssignments>
 							<ServiceAlteration>planned</ServiceAlteration>
-							<DepartureTime>14:25:00.0</DepartureTime>
+							<DepartureTime>14:25:00</DepartureTime>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<calls>
 								<Call version="any" id="hde:sj_24o_01_001-2" order="1">
@@ -174,14 +174,14 @@
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:25:00.0</Time>
+										<Time>14:25:00</Time>
 										<!-- 5 minutes later -->
 									</Departure>
 								</Call>
 								<Call version="any" id="hde:sj_24o_01_003-2" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
-										<Time>15:15:00.0</Time>
+										<Time>15:15:00</Time>
 									</Arrival>
 									<Departure>
 										<ForBoarding>false</ForBoarding>