From 073b693ff612ae09f9cbd7b6d71afd7af9866d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Tue, 12 Dec 2023 16:36:40 +0100
Subject: [PATCH] Arrival instead Departure in JourneyFrequencyGroupGroup

---
 .../NeTEx_50_JourneyFrequencyGroup.xml        | 189 ++++++++++++++++++
 .../netex_vehicleJourneyFrequency_version.xsd |  27 +++
 2 files changed, 216 insertions(+)
 create mode 100644 examples/functions/timetable/NeTEx_50_JourneyFrequencyGroup.xml

diff --git a/examples/functions/timetable/NeTEx_50_JourneyFrequencyGroup.xml b/examples/functions/timetable/NeTEx_50_JourneyFrequencyGroup.xml
new file mode 100644
index 000000000..c7bb86706
--- /dev/null
+++ b/examples/functions/timetable/NeTEx_50_JourneyFrequencyGroup.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PublicationDelivery xmlns:xi="http://www.w3.org/2001/XInclude" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" 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>
+	<!--- ======WHAT WAS REQUESTED ========== -->
+	<PublicationRequest version="1.0">
+		<RequestTimestamp>2010-12-17T09:30:47.0Z</RequestTimestamp>
+		<ParticipantRef>SYS002</ParticipantRef>
+		<topics>
+			<NetworkFrameTopic>
+				<selectionValidityConditions>
+					<AvailabilityCondition version="any" id="hde:01">
+						<FromDate>2010-11-01T00:00:00Z</FromDate>
+					</AvailabilityCondition>
+				</selectionValidityConditions>
+				<TimetableFrameRef ref="hde:TIM_24o_FS_Outbound">REQUEST</TimetableFrameRef>
+			</NetworkFrameTopic>
+		</topics>
+	</PublicationRequest>
+	<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
+	<Description>Example  of simple Headwayal  template timetable   with three    journeys  </Description>
+	<!--- =============== RESULTS =========== -->
+	<dataObjects>
+		<CompositeFrame version="1" id="hde:CF_1">
+			<!--- ======= CODESPACEs======== -->
+			<codespaces>
+				<Codespace id="mybus">
+					<Xmlns>mybus</Xmlns>
+					<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
+					<Description>My buses</Description>
+				</Codespace>
+				<Codespace id="hde">
+					<Xmlns>hde</Xmlns>
+					<XmlnsUrl>http://www.halt.de/</XmlnsUrl>
+					<Description>Stop data  data</Description>
+				</Codespace>
+			</codespaces>
+			<!--- =======FRAME DEFAULTS======== -->
+			<FrameDefaults>
+				<DefaultCodespaceRef ref="mybus"/>
+			</FrameDefaults>
+			<frames>
+				<!-- ======Timetable ======= -->
+				<ServiceCalendarFrame version="any" id="hde:TIM_24o_FS_Outbound">
+					<Name/>
+					<ServiceCalendar version="any" id="hde:TIM_24o_FS_Outbound">
+						<dayTypes>
+							<DayType version="any" id="hde:DT_01MTWTFSS">
+								<Name>Everyday</Name>
+								<properties>
+									<PropertyOfDay>
+										<DaysOfWeek> Everyday</DaysOfWeek>
+									</PropertyOfDay>
+								</properties>
+							</DayType>
+							<DayType version="any" id="hde:DT_01MTWTF">
+								<Name>Weekdays</Name>
+								<properties>
+									<PropertyOfDay>
+										<DaysOfWeek>  Monday Tuesday Wednesday Thursday Friday</DaysOfWeek>
+									</PropertyOfDay>
+								</properties>
+							</DayType>
+						</dayTypes>
+					</ServiceCalendar>
+				</ServiceCalendarFrame>
+				<TimetableFrame version="001" id="hde:TIM_24o_FS_Outbound">
+					<validityConditions>
+						<AvailabilityCondition version="any" id="hde:TIM_24o_FS_Outbound">
+							<Description>Sept  to March</Description>
+							<FromDate>2010-11-01T00:00:00Z</FromDate>
+							<ToDate>2011-03-31T00:00:00Z</ToDate>
+						</AvailabilityCondition>
+					</validityConditions>
+					<Name>Winter timetable for route 234 outbound</Name>
+					<VehicleModes>bus</VehicleModes>
+					<vehicleJourneys>
+						<TemplateServiceJourney version="any" id="hde:tvjh_24o_01">
+							<DepartureTime>10:00:00.0Z</DepartureTime>
+							<dayTypes>
+								<DayTypeRef version="any" ref="hde:DT_01MTWTFSS"/>
+							</dayTypes>
+							<ServicePatternRef ref="hde:svp_24o">EXTERNAL</ServicePatternRef>
+							<LineRef version="any" ref="mybus:LN_234"/>
+							<calls>
+								<Call id="hde:tvjh_24o_02_001" version="any" order="1">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<Arrival>
+										<ForAlighting>false</ForAlighting>
+									</Arrival>
+									<Departure>
+										<Time>10:20:00.0Z</Time>
+									</Departure>
+								</Call>
+								<Call id="hde:tvjh_24o_02_002" version="any" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<Arrival>
+										<Time>11:20:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<Time>11:22:00.0Z</Time>
+										<WaitTime>PT2M</WaitTime>
+									</Departure>
+								</Call>
+								<Call id="hde:tvjh_24o_02_003" version="any" order="3">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>12:20:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>
+							<frequencyGroups>
+								<HeadwayJourneyGroup version="any" id="hde:hjg_24o_01">
+									<Name>Regular  Interval service between 10am and 12:00 pm</Name>
+									<Description>About every 12 minutes</Description>
+									<FirstArrivalTime>10:00:00</FirstArrivalTime>
+									<LastArrivalTime>12:00:00</LastArrivalTime>
+									<ScheduledHeadwayInterval>PT12M</ScheduledHeadwayInterval>
+									<HeadwayDisplay>DisplayInsteadOfPassingTimes</HeadwayDisplay>
+									
+								</HeadwayJourneyGroup>
+								<HeadwayJourneyGroup version="any" id="hde:hjg_24o_02">
+									<Name>Regular  Interval service between 12am and 18:00 pm</Name>
+									<Description>About every 20 minutes</Description>
+									<FirstDepartureTime>12:00:00</FirstDepartureTime>
+									<LastDepartureTime>18:00:00</LastDepartureTime>
+									<ScheduledHeadwayInterval>PT20M</ScheduledHeadwayInterval>
+									<HeadwayDisplay>DisplayInsteadOfPassingTimes</HeadwayDisplay>
+								</HeadwayJourneyGroup>
+							</frequencyGroups>
+						</TemplateServiceJourney>
+					</vehicleJourneys>
+				</TimetableFrame>
+				<ServiceFrame id="mybus:svf_12" version="any">
+					<Name>Stops for Winter timetable for route 234 </Name>
+					<lines>
+						<Line version="any" id="mybus:LN_234">
+							<Name>Line 234 Alpha to Charley Green</Name>
+							<ShortName>Line 234</ShortName>
+							<TransportMode>bus</TransportMode>
+							<PublicCode>234</PublicCode>
+						</Line>
+					</lines>
+					<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>EANDC</PublicCode>
+							<StopType>onstreetBus</StopType>
+							<VehicleModes>bus</VehicleModes>
+						</ScheduledStopPoint>
+						<ScheduledStopPoint version="any" id="mybus:SSP_002">
+							<Name>Bravo Arch</Name>
+							<Location>
+								<Longitude>53.2000</Longitude>
+								<Latitude>0.2000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+							<ShortName>Bravo Arch</ShortName>
+							<PublicCode>BRAV</PublicCode>
+							<StopType>onstreetBus</StopType>
+							<VehicleModes>bus</VehicleModes>
+						</ScheduledStopPoint>
+						<ScheduledStopPoint version="any" id="mybus:SSP_077">
+							<Name>Charley Green</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>
+				</ServiceFrame>
+			</frames>
+		</CompositeFrame>
+	</dataObjects>
+</PublicationDelivery>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
index d86f30cce..7066ba546 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
@@ -212,6 +212,8 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Elements for a JOURNEY FREQUENCY GROUP.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
+			<xsd:choice>
+				<xsd:sequence>
 			<xsd:element name="FirstDepartureTime" type="xsd:time">
 				<xsd:annotation>
 					<xsd:documentation>Time of first departure in JOURNEY FREQUENCY GROUP.</xsd:documentation>
@@ -232,6 +234,31 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Offset days for end time. Number of days after the starting departure time of the journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			</xsd:sequence>
+			<xsd:sequence>
+			<xsd:element name="FirstArrivalTime" type="xsd:time">
+				<xsd:annotation>
+					<xsd:documentation>Time of first arrival in JOURNEY FREQUENCY GROUP.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="FirstDayOffset" type="DayOffsetType" default="0" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Offset days for end time. Number of days after the starting operational day if journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="LastArrivalTime" type="xsd:time" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Time of last arrival in JOURNEY FREQUENCY GROUP.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="LastDayOffset" type="DayOffsetType" default="0" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Offset days for end time. Number of days after the starting departure time of the journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>			
+			</xsd:sequence>
+						</xsd:choice>
+
 			<xsd:element name="timeDemandTypes" type="timeDemandTypeRefs_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>TIME DEMAND TYPES associated with JOURNEY FREQUENCY GROUP.</xsd:documentation>