Implements PASSENGER AT STOP TIME and TimetabledTime constraints (#678)

* Implements #672 Includes fixes for broken examples * Lint and update documentation tables * Typo squating. * More typo's and optical changes * Remove extra spaces * Remove double spaces * Update Netex_simpleVehicleSchedule_01.xml --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthias Günter <[email protected]>
NeTEx-CEN · Apr 17, 2024 · babaef8 · babaef8
1 parent 40be9eb
commit babaef8
Show file tree

Hide file tree

Showing 15 changed files with 562 additions and 68 deletions.
diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml
@@ -1005,11 +1005,11 @@ This Shows  sample Purchases
 							<DepartureTime>07:00:00</DepartureTime>
 							<OperatingDayRef version="any" ref="2020-08-10"/>
 							<datedPassingTimes>
-								<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234">
+								<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234@070000">
 									<PointInSingleJourneyPathRef version="any" ref="rydt:Cust777@trans001@ride1234" order="1"/>
 									<AimedDepartureTime>07:00:00</AimedDepartureTime>
 								</TargetPassingTime>
-								<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234">
+								<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234@091500">
 									<PointInSingleJourneyPathRef version="any" ref="rydt:Cust777@trans001@ride1234" order="2"/>
 									<AimedArrivalTime>09:15:00</AimedArrivalTime>
 								</TargetPassingTime>

diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -1138,11 +1138,11 @@ This Shows  sample Purchases
 							<DepartureTime>10:15:00</DepartureTime>
 							<OperatingDayRef versionRef="EXTERNAL" ref="opday_7656"/>
 							<datedPassingTimes>
-								<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163">
+								<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163@101500">
 									<PointInSingleJourneyPathRef version="any" ref="hmjt:anon@trans005@ride5163" order="1"/>
 									<AimedDepartureTime>10:15:00</AimedDepartureTime>
 								</TargetPassingTime>
-								<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163">
+								<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163@111000">
 									<PointInSingleJourneyPathRef version="any" ref="hmjt:anon@trans005@ride5163" order="2"/>
 									<AimedArrivalTime>11:10:00</AimedArrivalTime>
 								</TargetPassingTime>

diff --git a/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml b/examples/functions/timetable/Netex_02.1_Bus_CircularRoute_Timetable.xml
@@ -788,27 +788,27 @@ Two GROUP of SERVICEs  groups two sets of      journeys.
 	C		1	 |   15:15 		 |  16:30 			|	C to B: 15mn
 	B		1	 |  15:30  		 |  16:45 			|	B to A	15mn
     A	 	2	 |   15:45 		 |  17:00 			| 	   -->
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Alpha1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@01-Alpha1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@01"/>
 									<DepartureTime>14:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Bravo1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@02-Bravo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@02"/>
 									<DepartureTime>14:40:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Charley1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@03-Charley1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@03"/>
 									<DepartureTime>15:00:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Delta1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@04-Delta1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@04"/>
 									<DepartureTime>15:15:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Echo1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@05-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@05"/>
 									<DepartureTime>15:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Alpha2">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@06-Alpha2">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@06"/>
 									<ArrivalTime>15:45:00.0Z</ArrivalTime>
 								</TimetabledPassingTime>
@@ -923,27 +923,27 @@ Two GROUP of SERVICEs  groups two sets of      journeys.
 	C		1	 |   15:15 		 |  16:30 			|	C to B: 15mn
 	B		1	 |  15:30  		 |  16:45 			|	B to A	15mn
     A	 	2	 |   15:45 		 |  17:00 			| 	   -->
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Alpha1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@01-Alpha1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@01"/>
 									<DepartureTime>15:45:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Bravo1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@02-Bravo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@02"/>
 									<DepartureTime>16:00:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Charley1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@03-Charley1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@03"/>
 									<DepartureTime>16:15:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Delta1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@04-Delta1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@04"/>
 									<DepartureTime>16:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Echo1">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@05-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@05"/>
 									<DepartureTime>16:45:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Alpha2">
+								<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@06-Alpha2">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@06"/>
 									<ArrivalTime>17:00:00.0Z</ArrivalTime>
 								</TimetabledPassingTime>
@@ -1058,27 +1058,27 @@ Two GROUP of SERVICEs  groups two sets of      journeys.
 	B		1	 |  15:30  		 |  16:45 			|	A to E	15mn
     E	 	2	 |   15:45 		 |  17:00 			| 	 
    -->
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Echo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@01-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@01"/>
 									<DepartureTime>14:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Delta1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@02-Delta1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@02"/>
 									<DepartureTime>14:45:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Charley1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@03-Charley1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@03"/>
 									<DepartureTime>15:00:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Bravo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@04-Bravo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@04"/>
 									<DepartureTime>15:15:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Alpha2">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@05-Alpha2">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@05"/>
 									<DepartureTime>15:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Echo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@06-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@06"/>
 									<ArrivalTime>15:45:00.0Z</ArrivalTime>
 								</TimetabledPassingTime>
@@ -1194,27 +1194,27 @@ Two GROUP of SERVICEs  groups two sets of      journeys.
 	B		1	 |  15:30  		 |  16:45 			|	A to E	15mn
     E	 	2	 |   15:45 		 |  17:00 			| 	 
    -->
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Echo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_01-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@01"/>
 									<DepartureTime>15:45:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Delta1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_02=Delta1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@02"/>
 									<DepartureTime>16:00:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Charley1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_03-Charley1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@03"/>
 									<DepartureTime>16:15:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Bravo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_04-Bravo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@04"/>
 									<DepartureTime>16:30:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Alpha2">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_05-Alpha2">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@05"/>
 									<DepartureTime>16:45:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Echo1">
+								<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_06-Echo1">
 									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@06"/>
 									<ArrivalTime>17:00:00.0Z</ArrivalTime>
 								</TimetabledPassingTime>

diff --git a/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml b/examples/functions/vehicleSchedule/Netex_simpleVehicleSchedule_01.xml
@@ -1683,11 +1683,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
 							<TimeDemandTypeRef version="any" ref="kx:tdt_46_Night"/>
 							<BlockRef version="any" ref="ops:blk_L24N_04"/>
 							<passingTimes>
-								<TimetabledPassingTime version="any" id="kx:tpt_dr_L24_10i_001">
+								<TimetabledPassingTime version="any" id="kx:tpt_dr_L24_10i_001a">
 									<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_001"/>
 									<DepartureTime>21:15:00.0Z</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any" id="kx:tpt_dr_L24_10i_002">
+								<TimetabledPassingTime version="any" id="kx:tpt_dr_L24_10i_002a">
 									<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_002"/>
 									<ArrivalTime>21:25:00.0Z</ArrivalTime>
 								</TimetabledPassingTime>

diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml
@@ -2389,16 +2389,16 @@
 								<TrainNumberRef ref="ch:1:TrainNumber:10:" version="any"/>
 							</trainNumbers>
 							<passingTimes>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020101">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020101:" version="any"/>
 									<DepartureTime>08:00:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020102">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020102:" version="any"/>
 									<ArrivalTime>08:15:00</ArrivalTime>
 									<DepartureTime>08:15:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020103">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020103:" version="any"/>
 									<ArrivalTime>08:30:00</ArrivalTime>
 								</TimetabledPassingTime>
@@ -2419,16 +2419,16 @@
 								<TrainNumberRef ref="ch:1:TrainNumber:20:" version="any"/>
 							</trainNumbers>
 							<passingTimes>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030101">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030101:" version="any"/>
 									<DepartureTime>08:00:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030102">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030102:" version="any"/>
 									<ArrivalTime>08:15:00</ArrivalTime>
 									<DepartureTime>08:15:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime version="any">
+								<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030103">
 									<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030103:" version="any"/>
 									<ArrivalTime>08:30:00</ArrivalTime>
 								</TimetabledPassingTime>

diff --git a/examples/standards/norway/network/Line61A.xml b/examples/standards/norway/network/Line61A.xml
@@ -363,37 +363,37 @@
 							<!-- Hvilken linje det gjelder (optional) -->
 							<LineRef version="any" ref="RUT:Line:0061"/>
 							<passingTimes>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101001">
 									<!-- Tveita T -->
 									<StopPointInJourneyPatternRef version="any" ref="RUT:StopPointInJourneyPattern:0061101001"/>
 									<DepartureTime>00:15:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101002">
 									<!-- Tveita bedriftsområde -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101002"/>
 									<DepartureTime>00:17:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101003">
 									<!-- Solfjellet -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101003"/>
 									<DepartureTime>00:21:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101004">
 									<!-- Larsbråten -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101004"/>
 									<DepartureTime>00:24:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101005">
 									<!-- Tveita bedriftsområde -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101005"/>
 									<DepartureTime>00:27:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101006">
 									<!-- Tveita -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101006"/>
 									<DepartureTime>00:28:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:TemplateServiceJourney:0061_0061101007">
 									<!-- Tveita -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:0061101007"/>
 									<ArrivalTime>00:31:00</ArrivalTime>

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -7726,6 +7726,27 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====TimetabledPassingTime============================== -->
+		<!-- =====TimetabledPassingTime unique========================== -->
+		<xsd:unique name="TimetabledPassingTime_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [TimetabledPassingTime Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:TimetabledPassingTime | .//netex:PassengerAtStopTime | .//netex:DatedPassingTime | .//netex:TargetPassingTime | .//netex:EstimatedPassingTime | .//netex:ObservedPassingTime"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====TimetabledPassingTime Key ========================== -->
+		<xsd:keyref name="TimetabledPassingTime_KeyRef" refer="netex:TimetabledPassingTime_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TimetabledPassingTimeRef | .//netex:PassengerAtStopTimeRef | .//netex:DatedPassingTimeRef | .//netex:TargetPassingTimeRef | .//netex:EstimatedPassingTimeRef | .//netex:ObservedPassingTimeRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="TimetabledPassingTime_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:TimetabledPassingTime | .//netex:PassengerAtStopTime | .//netex:DatedPassingTime| .//netex:TargetPassingTime | .//netex:EstimatedPassingTime | .//netex:ObservedPassingTime"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====TimeDemandType============================== -->
 		<!-- =====TimeDemandType unique========================== -->
 		<xsd:unique name="TimeDemandType_UniqueBy_Id_Version">

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
@@ -16,8 +16,10 @@
 	<xsd:include schemaLocation="netex_interchange_support.xsd"/>
 	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
 	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerAtStopTime_support.xsd"/>
+	<xsd:include schemaLocation="netex_passengerAtStopTime_version.xsd"/>
 	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
 	<xsd:include schemaLocation="netex_datedVehicleJourney_version.xsd"/>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -3,6 +3,7 @@
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerAtStopTime_version.xsd"/>
 	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_call_support.xsd"/>
@@ -284,6 +285,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>NOTICEs of a CALL that apply only to the Arrival  or departure.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="passengerAtStopTimes" type="passengerAtStopTimes_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Times by which passenger should be at stop for specific processes such as baggage checking, passport control and security - may be earlier than the departure time for departures, or later than arrival time for arrivals. +v2.0</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ==== CALL =========================================-->