From 6b2e6a4390e442f6cf7066965deb610952b00c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 13 Dec 2023 20:48:26 +0100
Subject: [PATCH 01/21] Occupancy solved for Call

---
 ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml |   9 ++
 .../netex_trainElement_support.xsd            |   9 +-
 .../part2_journeyTimes/netex_call_version.xsd |   3 +
 .../part5_oc/netex_oc_occupancy_support.xsd   |  74 +++++++++++
 .../part5_oc/netex_oc_occupancy_version.xsd   | 122 ++++++++++++++++++
 5 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
 create mode 100644 xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd

diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
index 907939291..0aab0d797 100644
--- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
+++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
@@ -265,6 +265,15 @@ The Calendar is shown coded as
 									</Arrival>
 									<Departure>
 										<Time>14:20:00.0Z</Time>
+										<ExpectedDepartureOccupancy>
+											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
+											<OccupancyPercentage>40</OccupancyPercentage>
+											<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
+											<GroupReservation>
+												<NameOfGroup>a group</NameOfGroup>
+												<NumberOfReservedSeats>4</NumberOfReservedSeats>
+											</GroupReservation>
+										</ExpectedDepartureOccupancy>
 									</Departure>
 								</Call>
 								<Call version="any" id="acs:sj_24o_01_002" order="2">
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index 5835b127b..c3b5f5624 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -34,8 +34,7 @@
 					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
- <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
-				</Rights>
+ <Copyright>CEN, Crown Copyright 2009-2014</Copyright></Rights>
 				<Source>
 					<ul>
 						<li>Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.</li>
@@ -96,9 +95,9 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Reference to a COMPOUND TRAIN.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:complexContent>
+			<xsd:simpleContent>
 				<xsd:extension base="CompoundTrainRefStructure"/>
-			</xsd:complexContent>
+			</xsd:simpleContent>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:complexType name="CompoundTrainRefStructure">
@@ -220,4 +219,4 @@ Rail transport, Roads and Road transport
 		</xsd:restriction>
 	</xsd:simpleType>
 	<!-- ======================================================================= -->
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index 84fd7388b..a937b5f0c 100644
--- 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,8 @@
 	<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_part_5/part5_oc/netex_oc_occupancy_version.xsd"/>
+
 	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_call_support.xsd"/>
@@ -279,6 +281,7 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="CallPartGroup"/>
+			<xsd:element name="ExpectedDepartureOccupancy" type="VehicleOccupancyStructure" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:group name="CallPartGroup">
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
new file mode 100644
index 000000000..e7595eaf3
--- /dev/null
+++ b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2.2" id="netex_occupancy_support">
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<!-- ======================================================================= -->
+	<!-- ====  INDIVIDUAL TRAVELLER ============================================ -->
+ <xsd:simpleType name="OccupancyEnumeration">
+  <xsd:annotation>
+   <xsd:documentation>Passenger load status of a VEHICLE - GTFS-R / TPEG Pts045</xsd:documentation>
+  </xsd:annotation>
+  <xsd:restriction base="xsd:NMTOKEN">
+   <xsd:enumeration value="unknown">
+    <xsd:annotation>
+     <xsd:documentation>TPEG Pts45_0, unknown</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="empty">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "EMPTY"
+       The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="manySeatsAvailable">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available
+       The vehicle has a large percentage of seats available. What percentage of free seats out of the total seats available is to be considered large enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="fewSeatsAvailable">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available
+       The vehicle has a small percentage of seats available. What percentage of free seats out of the total seats available is to be considered small enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="standingRoomOnly">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4, standing room only (and TPEG Pts45_3, no seats available)
+       The vehicle can currently accommodate only standing passengers.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="crushedStandingRoomOnly">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "CRUSHED_STANDING_ROOM_ONLY"
+       The vehicle can currently accommodate only standing passengers and has limited space for them.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="full">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "FULL" / TPEG Pts45_5, full</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="notAcceptingPassengers">
+    <xsd:annotation>
+     <xsd:documentation>GTFS-R "NOT_ACCEPTING_PASSENGERS"
+       The vehicle cannot accept passengers.</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="undefined">
+    <xsd:annotation>
+     <xsd:documentation>TPEG Pts45_255, undefined occupancy</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="seatsAvailable">
+    <xsd:annotation>
+     <xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+   <xsd:enumeration value="standingAvailable">
+    <xsd:annotation>
+     <xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
+    </xsd:annotation>
+   </xsd:enumeration>
+  </xsd:restriction>
+ </xsd:simpleType>
+</xsd:schema>
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
new file mode 100644
index 000000000..01a235fd6
--- /dev/null
+++ b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_occupancy_version">
+	<xsd:include schemaLocation="netex_oc_occupancy_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../../siri/siri_base-v2.0.xsd"/>
+	<xsd:group name="OccupancyScopeFilterGroup">
+		<xsd:annotation>
+			<xsd:documentation>The intersection of supplied elements describes the extent that the Occupancy values applies to. (since SIRI 2.1)
+Only vehicle-centric filter (measurement in a part or at an entrance of a TRAIN) are available here, but a stop-centric filtering (measurement in a sector or at a position on a QUAY) can be achieved indirectly via Arrival-/DepartureFormationAssignment.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:group ref="TrainComponentGroup" minOccurs="0"/>
+			<xsd:element name="FareClass" type="FareClassEnumeration" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Fare class in VEHICLE for which occupancy or capacities are specified.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="PassengerCategory" type="siri:NaturalLanguageStringStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Adult, child, wheelchair etc.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:group>
+	<xsd:group name="OccupancyValuesGroup">
+		<xsd:annotation>
+			<xsd:documentation>Occupancy values applying to indicated scope. (since SIRI 2.1)</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="OccupancyLevel" type="OccupancyEnumeration" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>An approximate figure of how occupied or full a VEHICLE and its parts are, e.g. 'manySeatsAvailable' or 'standingRoomOnly'.  
+More accurate data can be provided by the individual occupancies or capacities below.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="OccupancyPercentage" type="PercentageType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Utilised percentage of maximum payload after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="AlightingCount" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of alighting passengers for this vehicle journey at this STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="BoardingCount" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of boarding passengers for this vehicle journey at this STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="OnboardCount" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of passengers on-board after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="SpecialPlacesOccupied" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of special places, e.g. seats for the disabled or lounge seats, that are occupied after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="PushchairsOnboardCount" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of pushchairs on-board after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="WheelchairsOnboardCount" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of wheelchairs on-board after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="PramsOnboardCount" type="xsd:nonNegativeInteger" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of prams on-board after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="BicycleOnboardCount" type="xsd:nonNegativeInteger" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of bicycles on-board, i.e., number of bicycle racks that are occupied after departing the STOP POINT.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:group>
+	<xsd:complexType name="GroupReservationStructure">
+		<xsd:annotation>
+			<xsd:documentation>Used to specify that a travel group has booked a section of the vehicle for a part of the journey, and if so under what name. (since SIRI 2.1)</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="NameOfGroup" type="siri:NaturalLanguageStringStructure">
+				<xsd:annotation>
+					<xsd:documentation>Name for which the travel group has made the reservation.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="NumberOfReservedSeats" type="NumberOfPassengers">
+				<xsd:annotation>
+					<xsd:documentation>Number of seats that the group has booked.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="VehicleOccupancyStructure">
+		<xsd:annotation>
+			<xsd:documentation>Real-time occupancies of a VEHICLE (by fare class). Could be feedback from an automatic passenger counting system (APC) or estimated values from statistics. (since SIRI 2.1)</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:group ref="OccupancyScopeFilterGroup"/>
+			<xsd:group ref="OccupancyValuesGroup"/>
+			<xsd:element name="TotalNumberOfReservedSeats" type="NumberOfPassengers" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Total number of booked seats from individual and group reservations.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="GroupReservation" type="GroupReservationStructure" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>Reservations of travel groups, i.e., name of group and number of seats booked.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+</xsd:schema>
\ No newline at end of file

From 6aecbb8dbd90fd3457cd7ccd200f5669fa85391c Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 19:49:52 +0000
Subject: [PATCH 02/21] Lint and update documentation tables

---
 .../netex_trainElement_support.xsd            |   2 +-
 .../part2_journeyTimes/netex_call_version.xsd |   1 -
 .../part5_oc/netex_oc_occupancy_support.xsd   | 124 +++++++++---------
 .../part5_oc/netex_oc_occupancy_version.xsd   |   2 +-
 4 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index c3b5f5624..4b6a9a249 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -219,4 +219,4 @@ Rail transport, Roads and Road transport
 		</xsd:restriction>
 	</xsd:simpleType>
 	<!-- ======================================================================= -->
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index a937b5f0c..41f930cf0 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -4,7 +4,6 @@
 	<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_part_5/part5_oc/netex_oc_occupancy_version.xsd"/>
-
 	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_call_support.xsd"/>
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
index e7595eaf3..6b5826c6d 100644
--- a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
+++ b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
@@ -3,72 +3,72 @@
 	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ====  INDIVIDUAL TRAVELLER ============================================ -->
- <xsd:simpleType name="OccupancyEnumeration">
-  <xsd:annotation>
-   <xsd:documentation>Passenger load status of a VEHICLE - GTFS-R / TPEG Pts045</xsd:documentation>
-  </xsd:annotation>
-  <xsd:restriction base="xsd:NMTOKEN">
-   <xsd:enumeration value="unknown">
-    <xsd:annotation>
-     <xsd:documentation>TPEG Pts45_0, unknown</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="empty">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "EMPTY"
+	<xsd:simpleType name="OccupancyEnumeration">
+		<xsd:annotation>
+			<xsd:documentation>Passenger load status of a VEHICLE - GTFS-R / TPEG Pts045</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="xsd:NMTOKEN">
+			<xsd:enumeration value="unknown">
+				<xsd:annotation>
+					<xsd:documentation>TPEG Pts45_0, unknown</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="empty">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "EMPTY"
        The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="manySeatsAvailable">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="manySeatsAvailable">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available
        The vehicle has a large percentage of seats available. What percentage of free seats out of the total seats available is to be considered large enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="fewSeatsAvailable">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="fewSeatsAvailable">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available
        The vehicle has a small percentage of seats available. What percentage of free seats out of the total seats available is to be considered small enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="standingRoomOnly">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4, standing room only (and TPEG Pts45_3, no seats available)
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="standingRoomOnly">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4, standing room only (and TPEG Pts45_3, no seats available)
        The vehicle can currently accommodate only standing passengers.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="crushedStandingRoomOnly">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "CRUSHED_STANDING_ROOM_ONLY"
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="crushedStandingRoomOnly">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "CRUSHED_STANDING_ROOM_ONLY"
        The vehicle can currently accommodate only standing passengers and has limited space for them.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="full">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "FULL" / TPEG Pts45_5, full</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="notAcceptingPassengers">
-    <xsd:annotation>
-     <xsd:documentation>GTFS-R "NOT_ACCEPTING_PASSENGERS"
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="full">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "FULL" / TPEG Pts45_5, full</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="notAcceptingPassengers">
+				<xsd:annotation>
+					<xsd:documentation>GTFS-R "NOT_ACCEPTING_PASSENGERS"
        The vehicle cannot accept passengers.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="undefined">
-    <xsd:annotation>
-     <xsd:documentation>TPEG Pts45_255, undefined occupancy</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="seatsAvailable">
-    <xsd:annotation>
-     <xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-   <xsd:enumeration value="standingAvailable">
-    <xsd:annotation>
-     <xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
-    </xsd:annotation>
-   </xsd:enumeration>
-  </xsd:restriction>
- </xsd:simpleType>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="undefined">
+				<xsd:annotation>
+					<xsd:documentation>TPEG Pts45_255, undefined occupancy</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="seatsAvailable">
+				<xsd:annotation>
+					<xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+			<xsd:enumeration value="standingAvailable">
+				<xsd:annotation>
+					<xsd:documentation>(SIRI 2.1) deprecated - use a more specific value</xsd:documentation>
+				</xsd:annotation>
+			</xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
 </xsd:schema>
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
index 01a235fd6..e5e8f3312 100644
--- a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
@@ -119,4 +119,4 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

From 9be7179960715f3053de3786e23b55e533875186 Mon Sep 17 00:00:00 2001
From: Christophe Duquesne <christophe.duquesne@aurigetech.com>
Date: Thu, 14 Dec 2023 11:20:31 +0100
Subject: [PATCH 03/21] XML Spy integration

Addition of the 2 files in the XMLSpy project
---
 NeTEx.spp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NeTEx.spp b/NeTEx.spp
index 1c4f8643d..4ceeb1091 100644
--- a/NeTEx.spp
+++ b/NeTEx.spp
@@ -549,6 +549,10 @@
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
+			<Folder FolderName="netec_part5_NM_OC">
+				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
+			</Folder>
 			<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="netex_service">

From 5682d1395b8465660ad8409bf6dd884b7aa89f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Dec 2023 13:36:36 +0100
Subject: [PATCH 04/21] Update
 xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd

---
 .../netex_reusableComponents/netex_trainElement_support.xsd     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index 4b6a9a249..d7a7f1ddf 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -97,7 +97,7 @@ Rail transport, Roads and Road transport
 		<xsd:complexType>
 			<xsd:simpleContent>
 				<xsd:extension base="CompoundTrainRefStructure"/>
-			</xsd:simpleContent>
+			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:complexType name="CompoundTrainRefStructure">

From 1e8865203bdb7506289260ebb8395afefa17c722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Dec 2023 13:36:43 +0100
Subject: [PATCH 05/21] Update
 xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd

---
 .../netex_reusableComponents/netex_trainElement_support.xsd     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index d7a7f1ddf..409129ebc 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -95,7 +95,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Reference to a COMPOUND TRAIN.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:simpleContent>
+			<xsd:complexContent>
 				<xsd:extension base="CompoundTrainRefStructure"/>
 			</xsd:complexContent>
 		</xsd:complexType>

From 6aa576bb3f0ea119cdeed1a762d4273a428355e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Mon, 18 Dec 2023 19:36:51 +0100
Subject: [PATCH 06/21] fixed everything discussed last week

switched to part 2
DayType added
occupancies now also as part of TimetableFrameGroup
occupancies added to JourneyGroup and JourneyPartGroup
made Occupancy a first class citizen
rebuild everything to occupancies
updates example
---
 ...etex_10_Rail_SplittingJoiningTimetable.xml |  13 +
 .../timetable/Netex_51.1_Occupancy.xml        | 449 ++++++++++++++++++
 .../netex_servicePattern_version.xsd          |   6 +
 .../netex_timetableFrame_version.xsd          |   1 +
 .../part2_journeyTimes/netex_call_version.xsd |   8 +-
 .../netex_coupledJourney_version.xsd          |   6 +
 .../netex_journey_version.xsd                 |   6 +
 .../netex_oc_occupancy_support.xsd            |   0
 .../netex_oc_occupancy_version.xsd            | 114 ++++-
 9 files changed, 599 insertions(+), 4 deletions(-)
 create mode 100644 examples/functions/timetable/Netex_51.1_Occupancy.xml
 rename xsd/{netex_part_5/part5_oc => netex_part_2/part2_occupancy}/netex_oc_occupancy_support.xsd (100%)
 rename xsd/{netex_part_5/part5_oc => netex_part_2/part2_occupancy}/netex_oc_occupancy_version.xsd (62%)

diff --git a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
index a0576cbcf..c95304e74 100644
--- a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
+++ b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
@@ -364,6 +364,14 @@ The TIMETABLE FRAME groups the servicee  elements
 					<vehicleJourneys>
 						<ServiceJourney version="any" id="bbd:sj_447">
 							<Description>447 Amsterdam to Warsaw</Description>
+							<occupancies>
+								<Occupancy>	
+									<TrainRef version="any" ref="bbd:trn_40447"/>
+									<TrainElementRef version="any" ref="bbd:trne_40447_01"/>
+									<FareClass>businessClass</FareClass>
+									<OccupancyPercentage>20</OccupancyPercentage>						
+								</Occupancy>
+							</occupancies>
 							<DepartureTime>09:00:00Z</DepartureTime>
 							<ServiceJourneyPatternRef version="any" ref="bbd:JP_447_amsterdam_warsaw"/>
 							<TrainRef version="any" ref="bbd:trn_447"/>
@@ -391,6 +399,11 @@ The TIMETABLE FRAME groups the servicee  elements
 									<StartTime>09:00:00Z</StartTime>
 									<EndTime>12:00:00Z</EndTime>
 									<PurposeOfJourneyPartitionRef ref="bbd:coupling">coupling</PurposeOfJourneyPartitionRef>
+									<occupancies>
+										<Occupancy version="any" id="bbd:occ:1">
+											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
+										</Occupancy>
+									</occupancies>
 								</JourneyPart>
 								<JourneyPart version="any" id="bbd:jpt_447_02">
 									<Description>Hannover to Berlin</Description>
diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
new file mode 100644
index 000000000..271f17924
--- /dev/null
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -0,0 +1,449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+	<!--- ======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="acs:CAL_02">
+						<FromDate>2010-11-01T00:00:00Z</FromDate>
+					</AvailabilityCondition>
+				</selectionValidityConditions>
+				<TimetableFrameRef ref="acs:TimetableFrameTIM_23_O">REQUEST</TimetableFrameRef>
+			</NetworkFrameTopic>
+		</topics>
+	</PublicationRequest>
+	<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
+	<Description>Example  of simple timetable frame with two journeys and service calendar</Description>
+	<!--- =============== RESULTS =========== -->
+	<dataObjects>
+		<CompositeFrame version="1.0" id="acs:ACS@Line_24">
+			<!--- ======= CODESPACEs======== -->
+			<!--- =======FRAME DEFAULTS======== -->
+			<FrameDefaults>
+				<DefaultCodespaceRef ref="mybus"/>
+			</FrameDefaults>
+			<frames>
+				<ServiceFrame version="1.0" id="mybus:ACS@Line_24@Network">
+					<Name>Stops for Winter timetable for route 24 </Name>
+					<codespaces>
+						<Codespace id="mybus">
+							<Xmlns>mybus</Xmlns>
+							<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
+							<Description>My buses</Description>
+						</Codespace>
+					</codespaces>
+					<prerequisites>
+						<ResourceFrameRef version="1.0" ref="acs:ACS@Common_Resources"/>
+					</prerequisites>
+					<!--- =========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="acs:ACS"/>
+						</Line>
+					</lines>
+					<!--- =========DESTINATION DISPLAYs============ -->
+					<destinationDisplays>
+						<DestinationDisplay version="any" id="mybus:Bravo">
+							<Name>Bravo Road</Name>
+							<ShortName>Bravo Rd</ShortName>
+							<PublicCode>BRAV</PublicCode>
+							<variants>
+								<DestinationDisplayVariant>
+									<DestinationDisplayVariantMediaType>textToSpeech</DestinationDisplayVariantMediaType>
+									<Name>Bravo</Name>
+									<vias>
+										<Via>
+											<Name>Eye Hospital</Name>
+										</Via>
+									</vias>
+								</DestinationDisplayVariant>
+							</variants>
+						</DestinationDisplay>
+						<DestinationDisplay version="any" id="mybus:Charley">
+							<Name>Charley Crescent</Name>
+							<ShortName>Charley C</ShortName>
+							<PublicCode>CHAS</PublicCode>
+						</DestinationDisplay>
+					</destinationDisplays>
+					<!--- =========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_002">
+							<Name>Bravo Street</Name>
+							<Location>
+								<Longitude>53.2000</Longitude>
+								<Latitude>0.2000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+							<ShortName>Bravo</ShortName>
+							<PublicCode>BRAV</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>
+						<ScheduledStopPoint version="any" id="mybus:SSP_015">
+							<Name>Park Lane</Name>
+							<Location>
+								<Longitude>53.34000</Longitude>
+								<Latitude>0.34000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+							<ShortName>Park Lane</ShortName>
+							<PublicCode>PARK</PublicCode>
+							<StopType>onstreetBus</StopType>
+							<VehicleModes>bus</VehicleModes>
+						</ScheduledStopPoint>
+					</scheduledStopPoints>
+				</ServiceFrame>
+				<!-- ======Timetable ======= -->
+				<TimetableFrame version="1.0" id="acs:ACS@Line_24@Timetable">
+					<validityConditions>
+						<AvailabilityCondition version="any" id="acs:Cnd001">
+							<Description>Sept  to March</Description>
+							<FromDate>2010-11-01T00:00:00Z</FromDate>
+							<ToDate>2011-03-31T00:00:00Z</ToDate>
+							<dayTypes>
+								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+								<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+							</dayTypes>
+						</AvailabilityCondition>
+					</validityConditions>
+					<Name>Winter timetable for route 24 outbound</Name>
+					<prerequisites>
+						<ServiceFrameRef version="1.0" ref="mybus:ACS@Line_24@Network"/>
+						<ServiceFrameRef versionRef="EXTERNAL" ref="mybus:ACS@Line_24@Routes_and_JourneyPatterns"/>
+						<ServiceCalendarFrameRef version="1.0" ref="acs:ACS@Winter_2010"/>
+						<VehicleScheduleFrameRef versionRef="EXTERNAL" ref="mybus:ACS@Line_24@Schedule"/>
+					</prerequisites>
+					<VehicleModes>bus</VehicleModes>
+					<vehicleJourneys>
+						<ServiceJourney version="any" id="acs:sj_24o_01">
+							<DepartureTime>14:20:00.0Z</DepartureTime>
+							<dayTypes>
+								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							</dayTypes>
+							<ServiceJourneyPatternRef versionRef="EXTERNAL" ref="acs:jp_24o">EXTERNAL</ServiceJourneyPatternRef>
+							<TimeDemandTypeRef versionRef="EXTERNAL" ref="mybus:td_01">EXTERNAL</TimeDemandTypeRef>
+							<BlockRef versionRef="EXTERNAL" ref="mybus:BLK_24o5">EXTERNAL</BlockRef>
+							<LineRef version="any" ref="mybus:LN_24"/>
+							<JourneyPatternView>
+								<RouteRef ref="mybus:RT_24o">EXTERNAL</RouteRef>
+								<DirectionType>outbound</DirectionType>
+								<DestinationDisplayRef version="any" ref="mybus:Charley"/>
+							</JourneyPatternView>
+							<calls>
+								<Call version="any" id="acs: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>
+										<occupancies>
+											<Occupancy id="occ2" version="any">
+												<validityConditions>
+													<ValidityConditionRef ref="acs:Cnd001"/>
+												</validityConditions>
+												<FareClass>businessClass</FareClass>
+												<OccupancyLevel>standingAvailable</OccupancyLevel>
+												<OccupancyPercentage>60</OccupancyPercentage>
+												<TotalNumberOfReservedSeats>21</TotalNumberOfReservedSeats>
+												<GroupReservation>
+													<NameOfGroup>group 1</NameOfGroup>
+													<NumberOfReservedSeats>3</NumberOfReservedSeats>
+												</GroupReservation>
+											</Occupancy>
+										</occupancies>
+									</Departure>
+								</Call>
+								<Call version="any" id="acs:sj_24o_01_002" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<Arrival>
+										<Time>14:30:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<Time>14:32:00.0Z</Time>
+										<WaitTime>PT2M</WaitTime>
+									</Departure>
+									<Note>Arrival at Terminus</Note>
+								</Call>
+								<Call version="any" id="acs:sj_24o_01_003" order="3">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>15:10:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>							
+							<facilities>
+								<ServiceFacilitySetRef version="any" ref="acs:sfs_24o_01"/>
+							</facilities>
+						</ServiceJourney>
+						<ServiceJourney version="any" id="acs:sj_24o_02">
+							<occupancies>
+								<OccupancyRef ref="occ1" version="any"/>
+							</occupancies>
+							<DepartureTime>15:20:00.0Z</DepartureTime>
+							<dayTypes>
+								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							</dayTypes>
+							<ServiceJourneyPatternRef ref="acs:jp_24o">EXTERNAL</ServiceJourneyPatternRef>
+							<TimeDemandTypeRef ref="mybus:td_01">EXTERNAL</TimeDemandTypeRef>
+							<BlockRef ref="mybus:BLK_24o5">EXTERNAL</BlockRef>
+							<LineRef version="any" ref="mybus:LN_24"/>
+							<JourneyPatternView>
+								<RouteRef ref="mybus:RT_24o">EXTERNAL</RouteRef>
+								<DirectionType>outbound</DirectionType>
+								<DestinationDisplayRef version="any" ref="mybus:Charley"/>
+							</JourneyPatternView>
+							<calls>
+								<Call version="any" id="acs:sj_24o_02_001" order="1">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<Arrival>
+										<ForAlighting>false</ForAlighting>
+									</Arrival>
+									<Departure>
+										<Time>15:20:00.0Z</Time>
+									</Departure>
+									<vias>
+										<Via>
+											<DestinationDisplayRef version="any" ref="mybus:Bravo"/>
+										</Via>
+									</vias>
+									<ChangeOfDestinationDisplay>true</ChangeOfDestinationDisplay>
+								</Call>
+								<Call version="any" id="acs:sj_24o_02_002" order="2">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<Arrival>
+										<Time>15:30:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<Time>15:32:00.0Z</Time>
+										<WaitTime>PT2M</WaitTime>
+									</Departure>
+									<vias>
+										<None/>
+									</vias>
+									<ChangeOfDestinationDisplay>true</ChangeOfDestinationDisplay>
+								</Call>
+								<Call version="any" id="acs:sj_24o_02_003" order="3">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<Arrival>
+										<Time>16:10:00.0Z</Time>
+									</Arrival>
+									<Departure>
+										<ForBoarding>false</ForBoarding>
+									</Departure>
+								</Call>
+							</calls>
+							<facilities>
+								<ServiceFacilitySetRef version="any" ref="acs:sfs_24o_01"/>
+							</facilities>
+						</ServiceJourney>
+					</vehicleJourneys>
+					<serviceFacilitySets>
+						<ServiceFacilitySet version="any" id="acs:sfs_24o_01">
+							<ProvidedByRef ref="xyz:4567">EXTERNAL</ProvidedByRef>
+							<AssistanceFacilityList>boardingAssistance conductor wheelchairAssistance</AssistanceFacilityList>
+							<FareClasses>standardClass</FareClasses>
+							<MobilityFacilityList> stepFreeAccess suitableForWheelchairs</MobilityFacilityList>
+							<NuisanceFacilityList>noSmoking</NuisanceFacilityList>
+							<PassengerInformationFacilityList>nextStopIndicator   realTimeConnections stopAnnouncements</PassengerInformationFacilityList>
+							<TicketingServiceFacilityList> purchase </TicketingServiceFacilityList>
+							<LuggageCarriageFacilityList>noBaggageStorage</LuggageCarriageFacilityList>
+						</ServiceFacilitySet>
+					</serviceFacilitySets>
+					<occupancies>
+						<OccupancyRef ref="occ2" version="any"/>
+						<Occupancy id="occ1" version="any">
+							<dayTypeRefs>
+								<DayTypeRef ref="acs:DT_01-MF-NH"/>
+							</dayTypeRefs>
+							<FareClass>businessClass</FareClass>
+							<OccupancyPercentage>50</OccupancyPercentage>
+							<AlightingCount>1</AlightingCount>
+						</Occupancy>
+					</occupancies>
+				</TimetableFrame>
+				<!--  Service Calendar Nov 2010     Coding  === -->
+				<ServiceCalendarFrame version="1.0" id="acs:ACS@Winter_2010">
+					<Name>Service Calendar Nov 2010 ALTERNATE MORE COMPACT Coding  </Name>
+					<ServiceCalendar version="any" id="acs:ACS@Winter_2010">
+						<FromDate>2010-11-01</FromDate>
+						<ToDate>2010-11-14</ToDate>
+					</ServiceCalendar>
+					<dayTypes>
+						<DayType version="any" id="acs:DT_01-MF-NH">
+							<Name>Weekdays unless a holiday</Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Monday Tuesday Wednesday Thursday Friday</DaysOfWeek>
+									<HolidayTypes>NotHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="acs:DT_02-AA-NH">
+							<Name>Everyday unless a holiday</Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Everyday</DaysOfWeek>
+									<HolidayTypes>NotHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="acs:DT_03-WE-NH">
+							<Name>Weekends unless a holiday</Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Saturday Sunday</DaysOfWeek>
+									<HolidayTypes>NotHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="acs:DT_04-AA-NH">
+							<Name>Holidays</Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Everyday</DaysOfWeek>
+									<HolidayTypes>AnyHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+					</dayTypes>
+					<dayTypeAssignments>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-01">
+							<Description>Monday 2010-11-01</Description>
+							<Date>2010-11-01</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-02">
+							<Description>Tuesday 2010-11-02</Description>
+							<Date>2010-11-02</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-03">
+							<Description>Wednesday 2010-11-03</Description>
+							<Date>2010-11-03</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-04">
+							<Description>Thusday 2010-11-04</Description>
+							<Date>2010-11-04</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-05">
+							<Description>MFriday 2010-11-05</Description>
+							<Date>2010-11-05</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-06">
+							<Description>Saturday 2010-11-06</Description>
+							<Date>2010-11-06</Date>
+							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-07">
+							<Description>Sunday 2010-11-07</Description>
+							<Date>2010-11-07</Date>
+							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+						</DayTypeAssignment>
+						<!-- Week 2 -->
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-08">
+							<Description>Monday 2010-11-08</Description>
+							<Date>2010-11-08</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-09">
+							<Description>Tuesday 2010-11-09</Description>
+							<Date>2010-11-09</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-10">
+							<Description>Wednesday 2010-11-10</Description>
+							<Date>2010-11-10</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-11">
+							<Description>Thusday 2010-11-11</Description>
+							<Date>2010-11-11</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-12">
+							<Description>MFriday 2010-11-12</Description>
+							<Date>2010-11-12</Date>
+							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-113">
+							<Description>Saturday 2010-11-13</Description>
+							<Date>2010-11-13</Date>
+							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="acs:2010-11-14">
+							<Description>Sunday 2010-11-14</Description>
+							<Date>2010-11-14</Date>
+							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+						</DayTypeAssignment>
+					</dayTypeAssignments>
+				</ServiceCalendarFrame>
+				<ResourceFrame version="1.0" id="acs:ACS@Common_Resources">
+					<!--- ======= CODESPACEs======== -->
+					<codespaces>
+						<Codespace id="acs">
+							<Xmlns>acs</Xmlns>
+							<XmlnsUrl>http://autocarssuperbe.fr</XmlnsUrl>
+							<Description>Service data </Description>
+						</Codespace>
+					</codespaces>
+					<!--- =======FRAME DEFAULTS======== -->
+					<FrameDefaults>
+						<DefaultCodespaceRef ref="acs"/>
+					</FrameDefaults>
+					<organisations>
+						<Operator version="1.0" id="acs:ACS">
+							<Name>Autocars superbe</Name>
+							<Locale>
+								<DefaultLanguage>fr</DefaultLanguage>
+							</Locale>
+							<ContactDetails>
+								<Phone>+33-1-675-9876</Phone>
+								<Url>http://autocarssuperbe.fr</Url>
+							</ContactDetails>
+						</Operator>
+					</organisations>
+				</ResourceFrame>
+			</frames>
+		</CompositeFrame>
+	</dataObjects>
+</PublicationDelivery>
\ No newline at end of file
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index f62077e6f..5336297c0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -7,6 +7,7 @@
 	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
 	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
 	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>		
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -1030,6 +1031,11 @@ Rail transport, Roads and Road transport
 							<xsd:documentation>RUN TIME for SERVICE LINK.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>					
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index 4aabad0c7..fa2d9d149 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -115,6 +115,7 @@ Rail transport, Roads and Road transport
 			<xsd:group ref="InterchangeInFrameGroup"/>
 			<xsd:group ref="VehicleTypeInFrameGroup"/>
 			<xsd:group ref="JourneyAccountingInFrameGroup"/>
+			<xsd:group ref="OccupancyInFrameGroup"/>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="TimetableDefaultsGroup">
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index 41f930cf0..2d9b34c7e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -3,7 +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_part_5/part5_oc/netex_oc_occupancy_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<xsd:include schemaLocation="netex_call_support.xsd"/>
@@ -280,7 +280,11 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="CallPartGroup"/>
-			<xsd:element name="ExpectedDepartureOccupancy" type="VehicleOccupancyStructure" minOccurs="0"/>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:group name="CallPartGroup">
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index ba35c8e4a..5b7cd2259 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -3,6 +3,7 @@
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
 	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>	
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -202,6 +203,11 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
 					<xsd:documentation>Positions in Train of JOURNEY PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>			
 			<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index 86f7bf72d..5d8a7467d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -7,6 +7,7 @@
 	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
@@ -132,6 +133,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>NOTICEs  relevant for the whole GROUP OF SERVICEs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
similarity index 100%
rename from xsd/netex_part_5/part5_oc/netex_oc_occupancy_support.xsd
rename to xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
diff --git a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
similarity index 62%
rename from xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
rename to xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index e5e8f3312..9db0f8598 100644
--- a/xsd/netex_part_5/part5_oc/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -5,6 +5,8 @@
 	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceRestrictions_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../../siri/siri_base-v2.0.xsd"/>
 	<xsd:group name="OccupancyScopeFilterGroup">
 		<xsd:annotation>
@@ -100,11 +102,74 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:complexType name="VehicleOccupancyStructure">
+	<xsd:element name="Occupancy_" type="Occupancy_VersionStructure" abstract="true" substitutionGroup="DataManagedObject">
+		<xsd:annotation>
+			<xsd:documentation>Dummy supertype for Occupancy.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Occupancy" abstract="true" substitutionGroup="Occupancy_">
+		<xsd:annotation>
+			<xsd:documentation>An OCCUPANCY.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="Occupancy_VersionStructure">
+					<xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="DataManagedObjectGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="OccupancyGroup">
+								<xsd:annotation>
+									<xsd:documentation>Details of an Occupancy.</xsd:documentation>
+								</xsd:annotation>
+							</xsd:group>
+						</xsd:sequence>
+					</xsd:sequence>
+					<xsd:attribute name="id" type="OccupancyIdType"/>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="Occupancy_VersionStructure" abstract="false">
+		<xsd:annotation>
+			<xsd:documentation>Type for an Occupancy.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="DataManagedObjectStructure">
+				<xsd:sequence>
+					<xsd:group ref="OccupancyGroup">
+						<xsd:annotation>
+							<xsd:documentation>Details for OCCUPANCY.</xsd:documentation>
+						</xsd:annotation>
+					</xsd:group>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:group name="OccupancyGroup">
 		<xsd:annotation>
 			<xsd:documentation>Real-time occupancies of a VEHICLE (by fare class). Could be feedback from an automatic passenger counting system (APC) or estimated values from statistics. (since SIRI 2.1)</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
+			<xsd:element name="dayTypeRefs" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>DAY TYPEs for BLOCK.</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:complexContent>
+						<xsd:extension base="dayTypeRefs_RelStructure"/>
+					</xsd:complexContent>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="dayTypes" type="dayTypesInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Reusable DAY TYPE  in SERVICE CALENDAR FRAME.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:group ref="OccupancyScopeFilterGroup"/>
 			<xsd:group ref="OccupancyValuesGroup"/>
 			<xsd:element name="TotalNumberOfReservedSeats" type="NumberOfPassengers" minOccurs="0">
@@ -118,5 +183,50 @@ More accurate data can be provided by the individual occupancies or capacities b
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
+	</xsd:group>
+	<xsd:group name="OccupancyInFrameGroup">
+		<xsd:annotation>
+			<xsd:documentation>Elements for a OCCUPANCY in frame.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs in frame.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:group>
+	<xsd:complexType name="OccupancyRefStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for a reference  to an OCCUPANCY.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:restriction base="VersionOfObjectRefStructure">
+				<xsd:attribute name="ref" type="OccupancyIdType" use="required">
+					<xsd:annotation>
+						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:simpleType name="OccupancyIdType">
+		<xsd:annotation>
+			<xsd:documentation>Type for identifier of a OCCUPANCY.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="ObjectIdType"/>
+	</xsd:simpleType>
+	<xsd:complexType name="OccupancyInFrame_RelStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for containment in frame of OCCUPANCYs.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="containmentAggregationStructure">
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
+					<xsd:element name="OccupancyRef" type="OccupancyRefStructure"/>
+				</xsd:choice>
+			</xsd:extension>
+		</xsd:complexContent>
 	</xsd:complexType>
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file

From 44205586d686a6780230104d2c0c86411b2b61e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Mon, 18 Dec 2023 19:41:08 +0100
Subject: [PATCH 07/21] fix example

---
 ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
index 0aab0d797..610a3534a 100644
--- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
+++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
@@ -265,15 +265,17 @@ The Calendar is shown coded as
 									</Arrival>
 									<Departure>
 										<Time>14:20:00.0Z</Time>
-										<ExpectedDepartureOccupancy>
-											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
-											<OccupancyPercentage>40</OccupancyPercentage>
-											<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
-											<GroupReservation>
-												<NameOfGroup>a group</NameOfGroup>
-												<NumberOfReservedSeats>4</NumberOfReservedSeats>
-											</GroupReservation>
-										</ExpectedDepartureOccupancy>
+										<occupancies>
+											<Occupancy version="any" id="occ1">
+												<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
+												<OccupancyPercentage>40</OccupancyPercentage>
+												<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
+												<GroupReservation>
+													<NameOfGroup>a group</NameOfGroup>
+													<NumberOfReservedSeats>4</NumberOfReservedSeats>
+												</GroupReservation>
+											</Occupancy>
+										</occupancies>
 									</Departure>
 								</Call>
 								<Call version="any" id="acs:sj_24o_01_002" order="2">
@@ -521,4 +523,4 @@ The Calendar is shown coded as
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
+</PublicationDelivery>
\ No newline at end of file

From 2a4248a8c895135136280409289dd93626431e47 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 18:42:44 +0000
Subject: [PATCH 08/21] Lint and update documentation tables

---
 .../Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml  |  2 +-
 .../Netex_10_Rail_SplittingJoiningTimetable.xml      |  4 ++--
 .../functions/timetable/Netex_51.1_Occupancy.xml     |  4 ++--
 .../netex_servicePattern_version.xsd                 | 12 ++++++------
 .../netex_coupledJourney_version.xsd                 |  4 ++--
 .../part2_occupancy/netex_oc_occupancy_version.xsd   |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
index 610a3534a..469f912de 100644
--- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
+++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
@@ -523,4 +523,4 @@ The Calendar is shown coded as
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
\ No newline at end of file
+</PublicationDelivery>
diff --git a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
index c95304e74..9edb514f5 100644
--- a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
+++ b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
@@ -365,11 +365,11 @@ The TIMETABLE FRAME groups the servicee  elements
 						<ServiceJourney version="any" id="bbd:sj_447">
 							<Description>447 Amsterdam to Warsaw</Description>
 							<occupancies>
-								<Occupancy>	
+								<Occupancy>
 									<TrainRef version="any" ref="bbd:trn_40447"/>
 									<TrainElementRef version="any" ref="bbd:trne_40447_01"/>
 									<FareClass>businessClass</FareClass>
-									<OccupancyPercentage>20</OccupancyPercentage>						
+									<OccupancyPercentage>20</OccupancyPercentage>
 								</Occupancy>
 							</occupancies>
 							<DepartureTime>09:00:00Z</DepartureTime>
diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
index 271f17924..db7251275 100644
--- a/examples/functions/timetable/Netex_51.1_Occupancy.xml
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -207,7 +207,7 @@
 										<ForBoarding>false</ForBoarding>
 									</Departure>
 								</Call>
-							</calls>							
+							</calls>
 							<facilities>
 								<ServiceFacilitySetRef version="any" ref="acs:sfs_24o_01"/>
 							</facilities>
@@ -446,4 +446,4 @@
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
\ No newline at end of file
+</PublicationDelivery>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index 5336297c0..5c120dc11 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -7,7 +7,7 @@
 	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
 	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
 	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>		
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -1031,11 +1031,11 @@ Rail transport, Roads and Road transport
 							<xsd:documentation>RUN TIME for SERVICE LINK.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>					
+					<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+						</xsd:annotation>
+					</xsd:element>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index 5b7cd2259..0e75604b7 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -3,7 +3,7 @@
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
 	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>	
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -207,7 +207,7 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>
-			</xsd:element>			
+			</xsd:element>
 			<xsd:element ref="TypeOfProductCategoryRef" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>
diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index 9db0f8598..58ec36eca 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -229,4 +229,4 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

From 56d3408cd10f4e7335e2d314d479bc13d12f9e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Fri, 22 Dec 2023 14:25:42 +0100
Subject: [PATCH 09/21] fixed all comments

- PassingTime right
- additional PassingTime example
- fixed documentation of values
- fixed example
---
 NeTEx.spp                                     |   4 +
 ...etex_10_Rail_SplittingJoiningTimetable.xml |   4 +-
 .../timetable/Netex_51.1_Occupancy.xml        | 941 +++++++++++++++---
 .../netex_journeyTiming_version.xsd           |   2 +-
 .../netex_servicePattern_version.xsd          |   5 -
 .../netex_timingPattern_version.xsd           |   2 +-
 .../netex_passingTimes_version.xsd            |   8 +-
 .../netex_oc_occupancy_support.xsd            |  24 +-
 .../netex_oc_occupancy_version.xsd            |   2 +-
 9 files changed, 802 insertions(+), 190 deletions(-)

diff --git a/NeTEx.spp b/NeTEx.spp
index 4ceeb1091..4d4b33ba8 100644
--- a/NeTEx.spp
+++ b/NeTEx.spp
@@ -304,6 +304,10 @@
 				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_2\part2_vehicleService\netex_duty_version.xsd" HomeFolder="Yes"/>
 			</Folder>
+			<Folder FolderName="netex_part_2_OC">
+				<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
+				<File FilePath="xsd\netex_part_2\part2_occupancy\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
+			</Folder>
 		</Folder>
 		<Folder FolderName="netex_part_3 Fares">
 			<Folder FolderName="netex_part_3_FM">
diff --git a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
index 9edb514f5..7d3bb9a28 100644
--- a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
+++ b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
@@ -366,8 +366,8 @@ The TIMETABLE FRAME groups the servicee  elements
 							<Description>447 Amsterdam to Warsaw</Description>
 							<occupancies>
 								<Occupancy>
-									<TrainRef version="any" ref="bbd:trn_40447"/>
-									<TrainElementRef version="any" ref="bbd:trne_40447_01"/>
+									<TrainRef version="any" ref="bbd:trn_447"/>
+									<TrainElementRef version="any" ref="bbd:trne_447_02"/>
 									<FareClass>businessClass</FareClass>
 									<OccupancyPercentage>20</OccupancyPercentage>
 								</Occupancy>
diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
index db7251275..add6f142b 100644
--- a/examples/functions/timetable/Netex_51.1_Occupancy.xml
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -2,44 +2,51 @@
 <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>
-	<!--- ======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="acs:CAL_02">
-						<FromDate>2010-11-01T00:00:00Z</FromDate>
-					</AvailabilityCondition>
-				</selectionValidityConditions>
-				<TimetableFrameRef ref="acs:TimetableFrameTIM_23_O">REQUEST</TimetableFrameRef>
-			</NetworkFrameTopic>
-		</topics>
-	</PublicationRequest>
-	<PublicationRefreshInterval>P1M</PublicationRefreshInterval>
-	<Description>Example  of simple timetable frame with two journeys and service calendar</Description>
 	<!--- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="acs:ACS@Line_24">
+		<CompositeFrame version="1.0" id="hde:ACS@Line_24">
 			<!--- ======= 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="mybus:ACS@Line_24@Network">
+				<ServiceFrame version="1.0" id="mybus:ACS@Line_24@network">
 					<Name>Stops for Winter timetable for route 24 </Name>
 					<codespaces>
-						<Codespace id="mybus">
-							<Xmlns>mybus</Xmlns>
-							<XmlnsUrl>http://www.mybuses.eu/stuff</XmlnsUrl>
-							<Description>My buses</Description>
+						<Codespace id="hde">
+							<Xmlns>hde</Xmlns>
+							<XmlnsUrl>http://www.halt.de/</XmlnsUrl>
+							<Description>Stop data  data</Description>
 						</Codespace>
 					</codespaces>
 					<prerequisites>
-						<ResourceFrameRef version="1.0" ref="acs:ACS@Common_Resources"/>
+						<ResourceFrameRef version="1.0" ref="acs:ACS@Common_resources"/>
 					</prerequisites>
+					<!--- =========DIRECTIONs=========== -->
+					<directions>
+						<Direction version="any" id="mybus:DR_Westbound">
+							<Name>Westbound</Name>
+						</Direction>
+						<Direction version="any" id="mybus:DR_Southbound">
+							<Name>Eastbound</Name>
+						</Direction>
+					</directions>
+					<!--- =========ROUTEs=========== -->
+					<routes>
+						<Route version="any" id="mybus:RT_24o">
+							<Name>Line 24 Alpha to Charley  (Details not GIVEN)</Name>
+							<DirectionType>outbound</DirectionType>
+							<DirectionRef version="any" ref="mybus:DR_Westbound"/>
+						</Route>
+					</routes>
 					<!--- =========LINEs=========== -->
 					<lines>
 						<Line version="any" id="mybus:LN_24">
@@ -48,30 +55,25 @@
 							<TransportMode>bus</TransportMode>
 							<PublicCode>24</PublicCode>
 							<OperatorRef version="1.0" ref="acs:ACS"/>
+							<routes>
+								<RouteRef ref="mybus:RT_24o"/>
+							</routes>
+							<Presentation>
+								<ColourName>Red</ColourName>
+							</Presentation>
 						</Line>
 					</lines>
 					<!--- =========DESTINATION DISPLAYs============ -->
 					<destinationDisplays>
-						<DestinationDisplay version="any" id="mybus:Bravo">
-							<Name>Bravo Road</Name>
-							<ShortName>Bravo Rd</ShortName>
-							<PublicCode>BRAV</PublicCode>
-							<variants>
-								<DestinationDisplayVariant>
-									<DestinationDisplayVariantMediaType>textToSpeech</DestinationDisplayVariantMediaType>
-									<Name>Bravo</Name>
-									<vias>
-										<Via>
-											<Name>Eye Hospital</Name>
-										</Via>
-									</vias>
-								</DestinationDisplayVariant>
-							</variants>
+						<DestinationDisplay version="any" id="mybus:DST_Bravo">
+							<Name>Bravo</Name>
+							<ShortName>Bravo</ShortName>
+							<PublicCode>Bravo</PublicCode>
 						</DestinationDisplay>
-						<DestinationDisplay version="any" id="mybus:Charley">
-							<Name>Charley Crescent</Name>
-							<ShortName>Charley C</ShortName>
-							<PublicCode>CHAS</PublicCode>
+						<DestinationDisplay version="any" id="mybus:DST_Charley">
+							<Name>Charley</Name>
+							<ShortName>Charley G</ShortName>
+							<PublicCode>Charley</PublicCode>
 						</DestinationDisplay>
 					</destinationDisplays>
 					<!--- =========STOP POINTs============ -->
@@ -112,93 +114,487 @@
 							<StopType>onstreetBus</StopType>
 							<VehicleModes>bus</VehicleModes>
 						</ScheduledStopPoint>
-						<ScheduledStopPoint version="any" id="mybus:SSP_015">
-							<Name>Park Lane</Name>
+					</scheduledStopPoints>
+					<!--- =========SERVICE LINKs=========== -->
+					<serviceLinks>
+						<ServiceLink version="any" id="mybus:SSP_001_to_SSP_002">
+							<Name>Alpha &amp; Castle to Bravo</Name>
+							<FromPointRef version="any" ref="mybus:SSP_001"/>
+							<ToPointRef version="any" ref="mybus:SSP_002"/>
+						</ServiceLink>
+						<ServiceLink version="any" id="mybus:SSP_002_to_SSP_077">
+							<Name>Bravo to Charley</Name>
+							<FromPointRef version="any" ref="mybus:SSP_002"/>
+							<ToPointRef version="any" ref="mybus:SSP_077"/>
+						</ServiceLink>
+					</serviceLinks>
+					<!--- =========SERVICE PATTERNs=========== -->
+					<servicePatterns>
+						<ServicePattern version="any" id="hde:svp_24o">
+							<Name>Alpha to Charley</Name>
+							<RouteRef version="any" ref="mybus:RT_24o"/>
+							<DirectionType>outbound</DirectionType>
+							<journeyPatterns>
+								<ServiceJourneyPatternRef version="any" ref="hde:sjp_24o"/>
+							</journeyPatterns>
+							<pointsInSequence>
+								<StopPointInJourneyPattern version="any" order="1" id="hde:spijp_24o_01">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_001_to_SSP_002">Redundant Information!</OnwardServiceLinkRef>
+									<ForAlighting>false</ForAlighting>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:spijp_24o_01" order="1">
+											<Name>Next Stop Announcement for SSP_001</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_001"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</StopPointInJourneyPattern>
+								<StopPointInJourneyPattern version="any" order="2" id="hde:spijp_24o_02">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_002_to_SSP_077">Redundant Information!</OnwardServiceLinkRef>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:spijp_24o_02" order="1">
+											<Name>Next Stop Announcement for SSP_002</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_002"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</StopPointInJourneyPattern>
+								<StopPointInJourneyPattern version="any" order="3" id="hde:spijp_24o_03">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<ForBoarding>false</ForBoarding>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:spijp_24o_03" order="1">
+											<Name>Next Stop Announcement for SSP_077</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_077"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</StopPointInJourneyPattern>
+							</pointsInSequence>
+							<linksInSequence>
+								<ServiceLinkInJourneyPattern version="any" order="1" id="hde:slijp_24o_01">
+									<ServiceLinkRef version="any" ref="mybus:SSP_001_to_SSP_002"/>
+								</ServiceLinkInJourneyPattern>
+								<ServiceLinkInJourneyPattern version="any" order="2" id="hde:slijp_24o_02">
+									<ServiceLinkRef version="any" ref="mybus:SSP_002_to_SSP_077"/>
+								</ServiceLinkInJourneyPattern>
+							</linksInSequence>
+						</ServicePattern>
+					</servicePatterns>
+					<!--- =========TIMING POINTs============ -->
+					<timingPoints>
+						<!--
+    The TIMING PATTERN has   three intermediate TIMING POINTs which are not SCHEDULED STOP POINTs, as well as the three     SCHEDULED STOP POINTs
+			  A - a_t1- a_t2 - B  - b-t1- C   
+-->
+						<TimingPoint version="any" id="mybus:SSP_001_t1">
+							<Name>Between  Alpha   and Bravo Point 1</Name>
 							<Location>
-								<Longitude>53.34000</Longitude>
-								<Latitude>0.34000</Latitude>
+								<Longitude>53.2000</Longitude>
+								<Latitude>0.2000</Latitude>
 							</Location>
 							<TimingPointStatus>timingPoint</TimingPointStatus>
-							<ShortName>Park Lane</ShortName>
-							<PublicCode>PARK</PublicCode>
-							<StopType>onstreetBus</StopType>
-							<VehicleModes>bus</VehicleModes>
-						</ScheduledStopPoint>
-					</scheduledStopPoints>
+						</TimingPoint>
+						<TimingPoint version="any" id="mybus:SSP_001_t2">
+							<Name>Between  Alpha   and Bravo  Point 2</Name>
+							<Location>
+								<Longitude>53.3000</Longitude>
+								<Latitude>0.3000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+						</TimingPoint>
+						<TimingPoint version="any" id="mybus:SSP_002_t3">
+							<Name>Between  Bravo   and Charley  Point 1</Name>
+							<Location>
+								<Longitude>53.4000</Longitude>
+								<Latitude>0.4000</Latitude>
+							</Location>
+							<TimingPointStatus>timingPoint</TimingPointStatus>
+						</TimingPoint>
+					</timingPoints>
+					<!--- =========TIMING LINKS=========== -->
+					<timingLinks>
+						<TimingLink version="any" id="mybus:SSP_001_to_SSP_077">
+							<Name>Overall timing Alpha  to  Charley reen</Name>
+							<FromPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_001"/>
+							<ToPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_077"/>
+						</TimingLink>
+						<TimingLink version="any" id="mybus:SSP_001_to_SSP_001_t1">
+							<Name>After Alpha   t1</Name>
+							<FromPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_001"/>
+							<ToPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t1"/>
+						</TimingLink>
+						<TimingLink version="any" id="mybus:SSP_001_t1_to_SSP_001_t2">
+							<Name>After Alpha   t1 to After Alpha  t2</Name>
+							<FromPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t1"/>
+							<ToPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+						</TimingLink>
+						<TimingLink version="any" id="mybus:SSP_001_t2_to_SSP_002">
+							<Name>After Alpha  t2 to Bravo</Name>
+							<FromPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t2"/>
+							<ToPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_002"/>
+						</TimingLink>
+						<TimingLink version="any" id="mybus:SSP_002_to_SSP_002_t3">
+							<Name>Bravo to After Bravo t1</Name>
+							<FromPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_002"/>
+							<ToPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+						</TimingLink>
+						<TimingLink version="any" id="mybus:SSP_002_t3_to_SSP_077">
+							<Name>After Bravo t1 to Charley</Name>
+							<FromPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+							<ToPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_077"/>
+						</TimingLink>
+					</timingLinks>
+					<!--- =========TIMING PATTERNs============ -->
+					<timingPatterns>
+						<TimingPattern version="any" id="hde:tp_24o">
+							<Name>Route 24</Name>
+							<RouteRef version="any" ref="mybus:RT_24o"/>
+							<DirectionType>outbound</DirectionType>
+							<pointsInSequence>
+								<TimingPointInJourneyPattern version="any" order="1" id="hde:tpijp_24o_01">
+									<TimingPointRef version="any" xsi:type="ScheduledStopPointRefStructure" ref="mybus:SSP_001"/>
+									<OnwardTimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_001_t1"/>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="2" id="hde:tpijp_24o_02">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t1"/>
+									<OnwardTimingLinkRef version="any" ref="mybus:SSP_001_t1_to_SSP_001_t2"/>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="3" id="hde:tpijp_24o_03">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t2"/>
+									<OnwardTimingLinkRef version="any" ref="mybus:SSP_001_t2_to_SSP_002"/>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="4" id="hde:tpijp_24o_04">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002"/>
+									<OnwardTimingLinkRef version="any" ref="mybus:SSP_002_to_SSP_002_t3"/>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="5" id="hde:tpijp_24o_05">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+									<OnwardTimingLinkRef version="any" ref="mybus:SSP_002_t3_to_SSP_077"/>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="6" id="hde:tpijp_24o_06">
+									<TimingPointRef version="any" ref="mybus:SSP_077"/>
+								</TimingPointInJourneyPattern>
+							</pointsInSequence>
+						</TimingPattern>
+					</timingPatterns>
+					<!--- ======JOURNEY PATTERNs=========== -->
+					<journeyPatterns>
+						<ServiceJourneyPattern version="any" id="hde:sjp_24o">
+							<Name>Alpha to Charley - All POINTs</Name>
+							<RouteRef version="any" ref="mybus:RT_24o"/>
+							<DirectionType>outbound</DirectionType>
+							<runTimes>
+								<JourneyPatternRunTime version="any" id="mybus:jprt_24o1_SSP_001_to_SSP_077">
+									<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+									<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_077"/>
+									<RunTime>PT70M</RunTime>
+								</JourneyPatternRunTime>
+							</runTimes>
+							<pointsInSequence>
+								<StopPointInJourneyPattern version="any" order="1" id="hde:pijp_24o_01">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+								</StopPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="2" id="hde:pijp_24o_02">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t1"/>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:pijp_24o_02" order="1">
+											<Name>Next Stop Announcement for SSP_001</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_001"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</TimingPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="3" id="hde:pijp_24o_03">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t2"/>
+								</TimingPointInJourneyPattern>
+								<StopPointInJourneyPattern version="any" order="4" id="hde:pijp_24o_04">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:pijp_24o_04" order="1">
+											<Name>Next Stop Announcement for SSP_002</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_002"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</StopPointInJourneyPattern>
+								<TimingPointInJourneyPattern version="any" order="5" id="hde:tpip_24o_05">
+									<TimingPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+								</TimingPointInJourneyPattern>
+								<StopPointInJourneyPattern version="any" order="6" id="hde:tpip_24o_06">
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
+									<noticeAssignments>
+										<NoticeAssignment version="any" id="mybus:tpip_24o_06" order="1">
+											<Name>Next Stop Announcement for SSP_077</Name>
+											<NoticeRef version="any" ref="mybus:Nxa_SSP_077"/>
+											<Advertised>true</Advertised>
+										</NoticeAssignment>
+									</noticeAssignments>
+								</StopPointInJourneyPattern>
+							</pointsInSequence>
+							<linksInSequence>
+								<ServiceLinkInJourneyPattern version="any" order="1" id="hde:lijp_24o_01">
+									<ServiceLinkRef version="any" ref="mybus:SSP_001_to_SSP_002"/>
+								</ServiceLinkInJourneyPattern>
+								<ServiceLinkInJourneyPattern version="any" order="2" id="hde:lijp_24o_02">
+									<ServiceLinkRef version="any" ref="mybus:SSP_002_to_SSP_077"/>
+								</ServiceLinkInJourneyPattern>
+							</linksInSequence>
+						</ServiceJourneyPattern>
+					</journeyPatterns>
+					<!--- ======TIME DEMAND TYPEs========= -->
+					<timeDemandTypes>
+						<!--			01			02		 	 
+	A	d		14:00	 	1500		    
+	  t1										+10m	RUN TIME 
+	  t2										+10m	RUN TIME 
+	B	a		14:30		15:30 		+10m	RUN TIME  
+	B	d		14:32	...	15:32 		+2m	 	WAIT TIME
+	  t1										+180m	 RUN TIME .
+	C	d		15:10		16:10		.+20m	RUN TIME  
+												+70m	 JOURNEY PATTERN RUN TIME  -->
+						<TimeDemandType version="any" id="mybus:tdt_01">
+							<Name>Normal Day</Name>
+							<runTimes>
+								<JourneyRunTime version="any" id="mybus:tdtr_TD01_SSP_001_to_SSP_001_t1">
+									<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_001_t1"/>
+									<RunTime>PT10M</RunTime>
+								</JourneyRunTime>
+								<JourneyRunTime version="any" id="mybus:tdtr_TD01_SSP_001_t1_to_SSP_001_t2">
+									<TimingLinkRef version="any" ref="mybus:SSP_001_t1_to_SSP_001_t2"/>
+									<RunTime>PT10M</RunTime>
+								</JourneyRunTime>
+								<JourneyRunTime version="any" id="mybus:tdtr_TD01_SSP_001_t2_to_SSP_002">
+									<TimingLinkRef version="any" ref="mybus:SSP_001_t2_to_SSP_002"/>
+									<RunTime>PT10M</RunTime>
+								</JourneyRunTime>
+								<JourneyRunTime version="any" id="mybus:tdtr_TD01_SSP_002_to_SSP_002_t3">
+									<TimingLinkRef version="any" ref="mybus:SSP_002_to_SSP_002_t3"/>
+									<RunTime>PT18M</RunTime>
+								</JourneyRunTime>
+								<JourneyRunTime version="any" id="mybus:tdtr_TD01_SSP_002_t3_to_SSP_077">
+									<TimingLinkRef version="any" ref="mybus:SSP_002_t3_to_SSP_077"/>
+									<RunTime>PT20M</RunTime>
+								</JourneyRunTime>
+							</runTimes>
+							<waitTimes>
+								<JourneyWaitTime version="any" id="mybus:tdwt_24o1_SSP_002">
+									<Name>Wait at Stop B</Name>
+									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<WaitTime>PT2M</WaitTime>
+								</JourneyWaitTime>
+							</waitTimes>
+						</TimeDemandType>
+					</timeDemandTypes>
+					<timeDemandTypeAssignments>
+						<TimeDemandTypeAssignment version="any" id="mybus:TA_001" order="1">
+							<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+							<TimebandRef ref="mybus:tdt_01"/>
+							<GroupOfTimingLinksRef version="any" ref="mybus:Bogus"/>
+						</TimeDemandTypeAssignment>
+					</timeDemandTypeAssignments>
+					<timingLinkGroups>
+						<GroupOfLinks version="any" id="mybus:Bogus">
+							<Name>bogus group</Name>
+							<members>
+								<TimingLinkRef version="any" ref="mybus:SSP_001_t2_to_SSP_002"/>
+								<TimingLinkRef version="any" ref="mybus:SSP_002_to_SSP_002_t3"/>
+							</members>
+						</GroupOfLinks>
+					</timingLinkGroups>
+					<notices>
+						<Notice version="any" id="mybus:Nxa_SSP_001">
+							<Name>Next Stop Announcement for SSP_002</Name>
+							<Text lang="en">Welcome This service goes to Charley Crescent. Stopping everywhere</Text>
+							<variants>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_001_en">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Welcome This service goes to Charley Crescent.</VariantText>
+								</DeliveryVariant>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_001_de">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Willkommen  Dieser Dienst   fahrt nach Charley Crescent.</VariantText>
+								</DeliveryVariant>
+							</variants>
+						</Notice>
+						<Notice version="any" id="mybus:Nxa_SSP_002">
+							<Name>Next Stop Announcement for SSP_002</Name>
+							<Text lang="en">Next Stop is Bravo Road. Alight here for Chocolate Museum</Text>
+							<variants>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_002_en">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Next Stop is Bravo Road</VariantText>
+								</DeliveryVariant>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_002_de">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Nachste Haltstelle Bravo Road.  </VariantText>
+								</DeliveryVariant>
+							</variants>
+						</Notice>
+						<Notice version="any" id="mybus:Nxa_SSP_077">
+							<Name>Next Stop Announcement for SSP_077</Name>
+							<Text lang="en">Next Stop is Charley Road. Service Terminates here</Text>
+							<variants>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_002_en">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Next Stop is Charley Crescent. All alight here.</VariantText>
+								</DeliveryVariant>
+								<DeliveryVariant version="any" id="mybus:Nxa_SSP_002_de">
+									<DeliveryVariantMediaType>textToSpeech</DeliveryVariantMediaType>
+									<VariantText lang="de">Nachste Haltstelle Charley Crescent. Aussteigen</VariantText>
+								</DeliveryVariant>
+							</variants>
+						</Notice>
+					</notices>
 				</ServiceFrame>
-				<!-- ======Timetable ======= -->
-				<TimetableFrame version="1.0" id="acs:ACS@Line_24@Timetable">
+				<!-- ======TIMETABLE ======= -->
+				<TimetableFrame version="1.0" id="hde:LN_24">
 					<validityConditions>
-						<AvailabilityCondition version="any" id="acs:Cnd001">
-							<Description>Sept  to March</Description>
+						<AvailabilityCondition version="any" id="hde:Cnd001">
+							<Description>Sept  to April</Description>
 							<FromDate>2010-11-01T00:00:00Z</FromDate>
-							<ToDate>2011-03-31T00:00:00Z</ToDate>
-							<dayTypes>
-								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
-								<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
-							</dayTypes>
+							<ToDate>2011-04-30T00:00:00Z</ToDate>
 						</AvailabilityCondition>
 					</validityConditions>
-					<Name>Winter timetable for route 24 outbound</Name>
+					<Name>Winter timetable for route 23 outbound</Name>
 					<prerequisites>
-						<ServiceFrameRef version="1.0" ref="mybus:ACS@Line_24@Network"/>
-						<ServiceFrameRef versionRef="EXTERNAL" ref="mybus:ACS@Line_24@Routes_and_JourneyPatterns"/>
-						<ServiceCalendarFrameRef version="1.0" ref="acs:ACS@Winter_2010"/>
-						<VehicleScheduleFrameRef versionRef="EXTERNAL" ref="mybus:ACS@Line_24@Schedule"/>
+						<ServiceFrameRef version="1.0" ref="mybus:ACS@Line_24@network"/>
+						<ServiceCalendarFrameRef version="1.0" ref="hde:Calendar@2010"/>
 					</prerequisites>
 					<VehicleModes>bus</VehicleModes>
 					<vehicleJourneys>
-						<ServiceJourney version="any" id="acs:sj_24o_01">
+						<ServiceJourney version="any" id="hde:sj_24o_01">
+							<journeyAccountings>
+								<JourneyAccounting version="any" id="mytim:ac02" order="1">
+									<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
+									<AccountingType>subsidy</AccountingType>
+									<Partial>false</Partial>
+									<Distance>20</Distance>
+								</JourneyAccounting>
+								<JourneyAccounting version="any" id="mytim:ac03" order="2">
+									<OrganisationRef xsi:type="AuthorityRefStructure" ref="txc:xshire">EXTERNAL</OrganisationRef>
+									<AccountingType>contract</AccountingType>
+									<Partial>false</Partial>
+									<Distance>20</Distance>
+								</JourneyAccounting>
+							</journeyAccountings>
 							<DepartureTime>14:20:00.0Z</DepartureTime>
 							<dayTypes>
-								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+								<DayTypeRef version="any" ref="hde:DT_02-Everyday-NotHoliday"/>
+								<DayTypeRef version="any" ref="hde:DT_ChristmasEve"/>
+								<DayTypeRef version="any" ref="hde:DT_ChristmasDay"/>
+								<DayTypeRef version="any" ref="hde:DT_ChristmasDayDisplacement"/>
+								<DayTypeRef version="any" ref="hde:DT_NewYearsEve"/>
+								<DayTypeRef version="any" ref="hde:DT_NewYearsDay"/>
+								<DayTypeRef version="any" ref="hde:DT_2ndJanuary"/>
+								<DayTypeRef version="any" ref="hde:DT_GoodFriday"/>
+								<DayTypeRef version="any" ref="hde:DT_EasterSunday"/>
+								<DayTypeRef version="any" ref="hde:DT_EasterMonday"/>
 							</dayTypes>
-							<ServiceJourneyPatternRef versionRef="EXTERNAL" ref="acs:jp_24o">EXTERNAL</ServiceJourneyPatternRef>
-							<TimeDemandTypeRef versionRef="EXTERNAL" ref="mybus:td_01">EXTERNAL</TimeDemandTypeRef>
-							<BlockRef versionRef="EXTERNAL" ref="mybus:BLK_24o5">EXTERNAL</BlockRef>
+							<ServicePatternRef version="any" ref="hde:svp_24o"/>
+							<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+							<BlockRef ref="mybus:BLK_24o5">EXTERNAL</BlockRef>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<JourneyPatternView>
-								<RouteRef ref="mybus:RT_24o">EXTERNAL</RouteRef>
+								<RouteRef version="any" ref="mybus:RT_24o"/>
 								<DirectionType>outbound</DirectionType>
-								<DestinationDisplayRef version="any" ref="mybus:Charley"/>
+								<DestinationDisplayRef version="any" ref="mybus:DST_Charley"/>
 							</JourneyPatternView>
+							<runTimes>
+								<VehicleJourneyRunTime id="hde:vjrt_sj_24o_01">
+									<Name>Overall run time</Name>
+									<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+									<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_077"/>
+									<RunTime>PT70M</RunTime>
+								</VehicleJourneyRunTime>
+							</runTimes>
+							<passingTimes>
+								<!--			01			02		 	 
+	A	d		14:00	 	15:00		    
+	  t1										+10m	RUN TIME 
+	  t2										+10m	RUN TIME 
+	B	a		14:30		15:30 		+10m	RUN TIME  
+	B	d		14:32	...	15:32 		+2m	 	WAIT TIME
+	  t1										+180m	 RUN TIME .
+	C	d		15:10		16:10		.+20m	RUN TIME  
+												+70m	 JOURNEY PATTERN RUN TIME  -->
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_01_SSP_001">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_01"/>
+									<DepartureTime>14:00:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_01_SSP_001_t1">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_02"/>
+									<DepartureTime>14:10:00.0Z</DepartureTime>
+									<occupancies>
+										<Occupancy>
+											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
+										</Occupancy>
+									</occupancies>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_01_SSP_001_t2">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_03"/>
+									<DepartureTime>14:20:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_01_SSP_002">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_02"/>
+									<DepartureTime>14:30:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_01_SSP_002_t3">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_05"/>
+									<DepartureTime>14:50:00.0Z</DepartureTime>
+									<occupancies>
+										<Occupancy>
+											<PassengerCategory>adult</PassengerCategory>
+											<OccupancyPercentage>60</OccupancyPercentage>
+										</Occupancy>
+										<OccupancyRef version="any" ref="occ4"/>
+									</occupancies>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_01_SSP_077">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_03"/>
+									<ArrivalTime>15:10:00.0Z</ArrivalTime>
+								</TimetabledPassingTime>
+							</passingTimes>
 							<calls>
-								<Call version="any" id="acs:sj_24o_01_001" order="1">
+								<Call version="any" id="hde:sj_24o_01_001" order="1">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<OnwardTimingLinkView>
+										<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_001_t1"/>
+										<ToPointRef version="any" ref="mybus:SSP_001_t1"/>
+									</OnwardTimingLinkView>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_001_to_SSP_002"/>
 									<Arrival>
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>14:20:00.0Z</Time>
-										<occupancies>
-											<Occupancy id="occ2" version="any">
-												<validityConditions>
-													<ValidityConditionRef ref="acs:Cnd001"/>
-												</validityConditions>
-												<FareClass>businessClass</FareClass>
-												<OccupancyLevel>standingAvailable</OccupancyLevel>
-												<OccupancyPercentage>60</OccupancyPercentage>
-												<TotalNumberOfReservedSeats>21</TotalNumberOfReservedSeats>
-												<GroupReservation>
-													<NameOfGroup>group 1</NameOfGroup>
-													<NumberOfReservedSeats>3</NumberOfReservedSeats>
-												</GroupReservation>
-											</Occupancy>
-										</occupancies>
+										<Time>14:00:00.0Z</Time>
 									</Departure>
 								</Call>
-								<Call version="any" id="acs:sj_24o_01_002" order="2">
+								<Call version="any" id="hde:sj_24o_01_002" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<OnwardTimingLinkView>
+										<TimingLinkRef version="any" ref="mybus:SSP_002_to_SSP_002_t3"/>
+										<ToPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_002_t3"/>
+									</OnwardTimingLinkView>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_002_to_SSP_077"/>
 									<Arrival>
 										<Time>14:30:00.0Z</Time>
 									</Arrival>
 									<Departure>
 										<Time>14:32:00.0Z</Time>
 										<WaitTime>PT2M</WaitTime>
+										<occupancies>
+											<Occupancy>
+												<OnboardCount>20</OnboardCount>
+											</Occupancy>
+											<OccupancyRef ref="occ4" version="any"/>
+										</occupancies>
 									</Departure>
 									<Note>Arrival at Terminus</Note>
 								</Call>
-								<Call version="any" id="acs:sj_24o_01_003" order="3">
+								<Call version="any" id="hde:sj_24o_01_003" order="3">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
 										<Time>15:10:00.0Z</Time>
@@ -209,44 +605,94 @@
 								</Call>
 							</calls>
 							<facilities>
-								<ServiceFacilitySetRef version="any" ref="acs:sfs_24o_01"/>
+								<ServiceFacilitySetRef version="any" ref="hde:sfs_24o_01"/>
 							</facilities>
 						</ServiceJourney>
-						<ServiceJourney version="any" id="acs:sj_24o_02">
-							<occupancies>
-								<OccupancyRef ref="occ1" version="any"/>
-							</occupancies>
+						<ServiceJourney version="any" id="hde:sj_24o_02">
 							<DepartureTime>15:20:00.0Z</DepartureTime>
 							<dayTypes>
-								<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+								<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 							</dayTypes>
-							<ServiceJourneyPatternRef ref="acs:jp_24o">EXTERNAL</ServiceJourneyPatternRef>
-							<TimeDemandTypeRef ref="mybus:td_01">EXTERNAL</TimeDemandTypeRef>
-							<BlockRef ref="mybus:BLK_24o5">EXTERNAL</BlockRef>
+							<ServicePatternRef version="any" ref="hde:svp_24o"/>
+							<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+							<BlockRef ref="mybus:BLK_24o8">EXTERNAL</BlockRef>
 							<LineRef version="any" ref="mybus:LN_24"/>
 							<JourneyPatternView>
-								<RouteRef ref="mybus:RT_24o">EXTERNAL</RouteRef>
+								<RouteRef version="any" ref="mybus:RT_24o"/>
 								<DirectionType>outbound</DirectionType>
-								<DestinationDisplayRef version="any" ref="mybus:Charley"/>
+								<DestinationDisplayRef version="any" ref="mybus:DST_Charley"/>
 							</JourneyPatternView>
+							<runTimes>
+								<VehicleJourneyRunTime id="hde:vjrt_sj_24o_02">
+									<Name>Overall run time</Name>
+									<TimeDemandTypeRef version="any" ref="mybus:tdt_01"/>
+									<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_077"/>
+									<RunTime>PT70M</RunTime>
+								</VehicleJourneyRunTime>
+							</runTimes>
+							<passingTimes>
+								<!--			01			02		 	 
+	A	d		14:00	 	15:00		    
+	  t1										+10m	RUN TIME 
+	  t2										+10m	RUN TIME 
+	B	a		14:30		15:30 		+10m	RUN TIME  
+	B	d		14:32	...	15:32 		+2m	 	WAIT TIME
+	  t1										+180m	 RUN TIME .
+	C	d		15:10		16:10		.+20m	RUN TIME  
+												+70m	 JOURNEY PATTERN RUN TIME  -->
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_02_SSP_001">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_01"/>
+									<DepartureTime>15:00:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_02_SSP_001_t1">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_02"/>
+									<DepartureTime>15:10:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_02_SSP_001_t2">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_03"/>
+									<DepartureTime>15:20:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_02_SSP_002">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_02"/>
+									<DepartureTime>15:30:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="hde:tpt_24o_02_SSP_002_t3">
+									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_05"/>
+									<DepartureTime>15:50:00.0Z</DepartureTime>
+								</TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="mybus:tpt_24o_02_SSP_077">
+									<StopPointInJourneyPatternRef version="any" ref="hde:spijp_24o_03"/>
+									<ArrivalTime>16:10:00.0Z</ArrivalTime>
+								</TimetabledPassingTime>
+							</passingTimes>
 							<calls>
-								<Call version="any" id="acs:sj_24o_02_001" order="1">
+								<Call version="any" id="hde:sj_24o_02_001" order="1">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_001"/>
+									<OnwardTimingLinkView>
+										<TimingLinkRef version="any" ref="mybus:SSP_001_to_SSP_001_t1"/>
+										<ToPointRef version="any" xsi:type="TimingPointRefStructure" ref="mybus:SSP_001_t1"/>
+									</OnwardTimingLinkView>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_001_to_SSP_002"/>
 									<Arrival>
 										<ForAlighting>false</ForAlighting>
 									</Arrival>
 									<Departure>
-										<Time>15:20:00.0Z</Time>
+										<Time>15:00:00.0Z</Time>
 									</Departure>
 									<vias>
 										<Via>
-											<DestinationDisplayRef version="any" ref="mybus:Bravo"/>
+											<DestinationDisplayRef version="any" ref="mybus:DST_Bravo"/>
 										</Via>
 									</vias>
-									<ChangeOfDestinationDisplay>true</ChangeOfDestinationDisplay>
+									<ChangeOfDestinationDisplay>false</ChangeOfDestinationDisplay>
 								</Call>
-								<Call version="any" id="acs:sj_24o_02_002" order="2">
+								<Call version="any" id="hde:sj_24o_02_002" order="2">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
+									<OnwardTimingLinkView>
+										<TimingLinkRef version="any" ref="mybus:SSP_002_to_SSP_002_t3"/>
+										<ToPointRef version="any" ref="mybus:SSP_002_t3"/>
+									</OnwardTimingLinkView>
+									<OnwardServiceLinkRef version="any" ref="mybus:SSP_002_to_SSP_077"/>
 									<Arrival>
 										<Time>15:30:00.0Z</Time>
 									</Arrival>
@@ -254,12 +700,8 @@
 										<Time>15:32:00.0Z</Time>
 										<WaitTime>PT2M</WaitTime>
 									</Departure>
-									<vias>
-										<None/>
-									</vias>
-									<ChangeOfDestinationDisplay>true</ChangeOfDestinationDisplay>
 								</Call>
-								<Call version="any" id="acs:sj_24o_02_003" order="3">
+								<Call version="any" id="hde:sj_24o_02_003" order="3">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 									<Arrival>
 										<Time>16:10:00.0Z</Time>
@@ -270,12 +712,12 @@
 								</Call>
 							</calls>
 							<facilities>
-								<ServiceFacilitySetRef version="any" ref="acs:sfs_24o_01"/>
+								<ServiceFacilitySetRef version="any" ref="hde:sfs_24o_01"/>
 							</facilities>
 						</ServiceJourney>
 					</vehicleJourneys>
 					<serviceFacilitySets>
-						<ServiceFacilitySet version="any" id="acs:sfs_24o_01">
+						<ServiceFacilitySet version="any" id="hde:sfs_24o_01">
 							<ProvidedByRef ref="xyz:4567">EXTERNAL</ProvidedByRef>
 							<AssistanceFacilityList>boardingAssistance conductor wheelchairAssistance</AssistanceFacilityList>
 							<FareClasses>standardClass</FareClasses>
@@ -283,30 +725,24 @@
 							<NuisanceFacilityList>noSmoking</NuisanceFacilityList>
 							<PassengerInformationFacilityList>nextStopIndicator   realTimeConnections stopAnnouncements</PassengerInformationFacilityList>
 							<TicketingServiceFacilityList> purchase </TicketingServiceFacilityList>
-							<LuggageCarriageFacilityList>noBaggageStorage</LuggageCarriageFacilityList>
+							<LuggageCarriageFacilityList> noBaggageStorage</LuggageCarriageFacilityList>
 						</ServiceFacilitySet>
 					</serviceFacilitySets>
 					<occupancies>
-						<OccupancyRef ref="occ2" version="any"/>
-						<Occupancy id="occ1" version="any">
-							<dayTypeRefs>
-								<DayTypeRef ref="acs:DT_01-MF-NH"/>
-							</dayTypeRefs>
-							<FareClass>businessClass</FareClass>
-							<OccupancyPercentage>50</OccupancyPercentage>
-							<AlightingCount>1</AlightingCount>
+						<Occupancy version="any" id="occ4">
+							<WheelchairsOnboardCount>2</WheelchairsOnboardCount>
 						</Occupancy>
 					</occupancies>
 				</TimetableFrame>
-				<!--  Service Calendar Nov 2010     Coding  === -->
-				<ServiceCalendarFrame version="1.0" id="acs:ACS@Winter_2010">
-					<Name>Service Calendar Nov 2010 ALTERNATE MORE COMPACT Coding  </Name>
-					<ServiceCalendar version="any" id="acs:ACS@Winter_2010">
+				<!--  Service Calendar Nov 2010   COMPACT Coding  === -->
+				<ServiceCalendarFrame version="1.0" id="hde:Calendar@2010">
+					<Name>Service Calendar Nov to April 2010  (Compact Coding) </Name>
+					<ServiceCalendar version="any" id="hde:Calendar@2010">
 						<FromDate>2010-11-01</FromDate>
 						<ToDate>2010-11-14</ToDate>
 					</ServiceCalendar>
 					<dayTypes>
-						<DayType version="any" id="acs:DT_01-MF-NH">
+						<DayType version="any" id="hde:DT_01-MF-NotHoliday">
 							<Name>Weekdays unless a holiday</Name>
 							<properties>
 								<PropertyOfDay>
@@ -315,7 +751,7 @@
 								</PropertyOfDay>
 							</properties>
 						</DayType>
-						<DayType version="any" id="acs:DT_02-AA-NH">
+						<DayType version="any" id="hde:DT_02-Everyday-NotHoliday">
 							<Name>Everyday unless a holiday</Name>
 							<properties>
 								<PropertyOfDay>
@@ -324,7 +760,7 @@
 								</PropertyOfDay>
 							</properties>
 						</DayType>
-						<DayType version="any" id="acs:DT_03-WE-NH">
+						<DayType version="any" id="hde:DT_03-WE-NotHoliday">
 							<Name>Weekends unless a holiday</Name>
 							<properties>
 								<PropertyOfDay>
@@ -333,7 +769,7 @@
 								</PropertyOfDay>
 							</properties>
 						</DayType>
-						<DayType version="any" id="acs:DT_04-AA-NH">
+						<DayType version="any" id="hde:DT_04-AA-NotHoliday">
 							<Name>Holidays</Name>
 							<properties>
 								<PropertyOfDay>
@@ -342,82 +778,259 @@
 								</PropertyOfDay>
 							</properties>
 						</DayType>
+						<!-- === holidays ==== -->
+						<DayType version="any" id="hde:DT_ChristmasEve">
+							<Name>Christmas Ev e  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DayOfYear>--12-24</DayOfYear>
+									<HolidayTypes>  EveOfHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_ChristmasDay">
+							<Name>Christmas Day  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DayOfYear>--12-25</DayOfYear>
+									<HolidayTypes>NationalHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_ChristmasDayDisplacement">
+							<Name>Christmas Day Displacement holidday </Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Monday   Tuesday Wednesday Thursday Friday</DaysOfWeek>
+									<HolidayTypes>  HolidayDisplacementDay</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<!-- === holidays New year==== -->
+						<DayType version="any" id="hde:DT_NewYearsEve">
+							<Name>NewYear's Eve  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DayOfYear>--12-31</DayOfYear>
+									<HolidayTypes>  EveOfHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_NewYearsDay">
+							<Name>NewYear's  Day  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DayOfYear>--01-01</DayOfYear>
+									<HolidayTypes>NationalHoliday </HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_2ndJanuary">
+							<Name>2nd January Holiday (Scotland)  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DayOfYear>--02-01</DayOfYear>
+									<HolidayTypes>RegionalHoliday </HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_NewYearsDayDisplacement">
+							<Name>NewYear's  Day Displacement holiday </Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Monday   Tuesday Wednesday Thursday Friday</DaysOfWeek>
+									<HolidayTypes>  HolidayDisplacementDay</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<!-- === holidays Easter year==== -->
+						<DayType version="any" id="hde:DT_GoodFriday">
+							<Name>Good Friday </Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Friday</DaysOfWeek>
+									<HolidayTypes>  NationalHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_EasterSunday">
+							<Name>Easter Sunday  </Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Sunday</DaysOfWeek>
+									<HolidayTypes>NationalHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
+						<DayType version="any" id="hde:DT_EasterMonday">
+							<Name>Easter Monday</Name>
+							<properties>
+								<PropertyOfDay>
+									<DaysOfWeek>Monday  </DaysOfWeek>
+									<HolidayTypes>  NationalHoliday</HolidayTypes>
+								</PropertyOfDay>
+							</properties>
+						</DayType>
 					</dayTypes>
+					<operatingDays>
+						<OperatingDay version="any" id="hde:OD_2010-11-01">
+							<CalendarDate>2010-11-01</CalendarDate>
+							<Name>Monday 2010-11-01</Name>
+							<EarliestTime>02:00:00</EarliestTime>
+							<DayLength>PT24H</DayLength>
+						</OperatingDay>
+						<OperatingDay version="any" id="hde:OD_2011-04-30">
+							<CalendarDate>2011-04-30</CalendarDate>
+							<Name>Saturday 2011-04-30</Name>
+							<EarliestTime>02:00:00</EarliestTime>
+							<DayLength>PT24H</DayLength>
+						</OperatingDay>
+					</operatingDays>
+					<operatingPeriods>
+						<OperatingPeriod version="any" id="hde:op_010">
+							<Name>WInter 2011</Name>
+							<FromOperatingDayRef version="any" ref="hde:OD_2010-11-01"/>
+							<ToOperatingDayRef version="any" ref="hde:OD_2011-04-30"/>
+							<HolidayType>NotHoliday</HolidayType>
+							<Season>Winter</Season>
+						</OperatingPeriod>
+					</operatingPeriods>
 					<dayTypeAssignments>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-01">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-01">
 							<Description>Monday 2010-11-01</Description>
-							<Date>2010-11-01</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<OperatingDayRef version="any" ref="hde:OD_2010-11-01"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-02">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-02">
 							<Description>Tuesday 2010-11-02</Description>
 							<Date>2010-11-02</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-03">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-03">
 							<Description>Wednesday 2010-11-03</Description>
 							<Date>2010-11-03</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-04">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-04">
 							<Description>Thusday 2010-11-04</Description>
 							<Date>2010-11-04</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-05">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-05">
 							<Description>MFriday 2010-11-05</Description>
 							<Date>2010-11-05</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-06">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-06">
 							<Description>Saturday 2010-11-06</Description>
 							<Date>2010-11-06</Date>
-							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_03-WE-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-07">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-07">
 							<Description>Sunday 2010-11-07</Description>
 							<Date>2010-11-07</Date>
-							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_03-WE-NotHoliday"/>
 						</DayTypeAssignment>
 						<!-- Week 2 -->
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-08">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-08">
 							<Description>Monday 2010-11-08</Description>
 							<Date>2010-11-08</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-09">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-09">
 							<Description>Tuesday 2010-11-09</Description>
 							<Date>2010-11-09</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-10">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-10">
 							<Description>Wednesday 2010-11-10</Description>
 							<Date>2010-11-10</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-11">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-11">
 							<Description>Thusday 2010-11-11</Description>
 							<Date>2010-11-11</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-12">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-12">
 							<Description>MFriday 2010-11-12</Description>
 							<Date>2010-11-12</Date>
-							<DayTypeRef version="any" ref="acs:DT_01-MF-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-113">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-13">
 							<Description>Saturday 2010-11-13</Description>
 							<Date>2010-11-13</Date>
-							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_03-WE-NotHoliday"/>
 						</DayTypeAssignment>
-						<DayTypeAssignment version="any" order="1" id="acs:2010-11-14">
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-11-14">
 							<Description>Sunday 2010-11-14</Description>
 							<Date>2010-11-14</Date>
-							<DayTypeRef version="any" ref="acs:DT_03-WE-NH"/>
+							<DayTypeRef version="any" ref="hde:DT_03-WE-NotHoliday"/>
+						</DayTypeAssignment>
+						<!--  etc etc   
+
+
+===  Holidays =====   -->
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-12-24">
+							<Description>Sunday 2010-12-24</Description>
+							<Date>2010-12-31</Date>
+							<DayTypeRef version="any" ref="hde:DT_ChristmasEve"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-12-25">
+							<Description>Saturday 2010-12-25 Christams Day</Description>
+							<Date>2010-12-25</Date>
+							<DayTypeRef version="any" ref="hde:DT_ChristmasDay"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-12-27">
+							<Description>Monday 2010-12-27 (Christjmas Day displacement holiday)</Description>
+							<Date>2010-12-27</Date>
+							<DayTypeRef version="any" ref="hde:DT_ChristmasDayDisplacement"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2010-12-31">
+							<Description>Friday 2010-12-31  New Years eve</Description>
+							<Date>2010-12-31</Date>
+							<DayTypeRef version="any" ref="hde:DT_NewYearsEve"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2011-01-01">
+							<Description>Saturday  2011-01-01 New Years day</Description>
+							<Date>2011-01-01</Date>
+							<DayTypeRef version="any" ref="hde:DT_NewYearsDay"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2011-01-03">
+							<Description>Satuurday  2011-01-03 New Years day displacement</Description>
+							<Date>2011-01-03</Date>
+							<DayTypeRef version="any" ref="hde:DT_NewYearsDayDisplacement"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_&gt;2011-04-22">
+							<Description>Friday 2011-04-22 Good Friday</Description>
+							<Date>2011-04-22</Date>
+							<DayTypeRef version="any" ref="hde:DT_GoodFriday"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_&gt;2011-04-24">
+							<Description>Sunday 2011-04-24 Easter Sunday</Description>
+							<Date>2011-04-24</Date>
+							<DayTypeRef version="any" ref="hde:DT_EasterSunday"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_&gt;2011-04-25">
+							<Description>Monday 2011-04-25 Easter Monday</Description>
+							<Date>2011-04-25</Date>
+							<DayTypeRef version="any" ref="hde:DT_EasterMonday"/>
+						</DayTypeAssignment>
+						<!--  etc etc   
+   -->
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2011-04-29">
+							<Description>Friday2011-04-29</Description>
+							<Date>2011-04-29</Date>
+							<DayTypeRef version="any" ref="hde:DT_01-MF-NotHoliday"/>
+						</DayTypeAssignment>
+						<DayTypeAssignment version="any" order="1" id="hde:DayAsgn_2011-04-30">
+							<Description>Saturday 2011-04-30</Description>
+							<OperatingDayRef version="any" ref="hde:OD_2011-04-30"/>
+							<DayTypeRef version="any" ref="hde:DT_03-WE-NotHoliday"/>
 						</DayTypeAssignment>
 					</dayTypeAssignments>
 				</ServiceCalendarFrame>
-				<ResourceFrame version="1.0" id="acs:ACS@Common_Resources">
+				<ResourceFrame version="1.0" id="acs:ACS@Common_resources">
 					<!--- ======= CODESPACEs======== -->
 					<codespaces>
 						<Codespace id="acs">
@@ -446,4 +1059,4 @@
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
+</PublicationDelivery>
\ No newline at end of file
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
index ebdbcdb6b..e80db6ffe 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
@@ -226,7 +226,7 @@ Rail transport, Roads and Road transport
 				<xsd:annotation>
 					<xsd:documentation>RUN TIME as an interval.</xsd:documentation>
 				</xsd:annotation>
-			</xsd:element>
+			</xsd:element>			
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ===JLayoverTime===================================================== -->
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index 5c120dc11..271ddb0a9 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -1031,11 +1031,6 @@ Rail transport, Roads and Road transport
 							<xsd:documentation>RUN TIME for SERVICE LINK.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
-					<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
-						<xsd:annotation>
-							<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
index bcf3a54c9..154870206 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
@@ -603,4 +603,4 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 0cc16f7e8..0f76346a2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -4,6 +4,7 @@
 	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>		
 	<!-- ======================================================================= -->
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
@@ -202,7 +203,12 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Number of days after the starting time of the journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->
-</xsd:schema>
+</xsd:schema>
\ No newline at end of file
diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
index 6b5826c6d..54e44fade 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_support.xsd
@@ -10,53 +10,47 @@
 		<xsd:restriction base="xsd:NMTOKEN">
 			<xsd:enumeration value="unknown">
 				<xsd:annotation>
-					<xsd:documentation>TPEG Pts45_0, unknown</xsd:documentation>
+					<xsd:documentation>Unknown. Maps to TPEG Pts45_0.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="empty">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "EMPTY"
-       The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers.</xsd:documentation>
+					<xsd:documentation>The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers. Maps to GTFS-R "EMPTY".</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="manySeatsAvailable">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available
-       The vehicle has a large percentage of seats available. What percentage of free seats out of the total seats available is to be considered large enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
+					<xsd:documentation>The vehicle has a large percentage of seats available. What percentage of free seats out of the total seats available is to be considered large enough to fall into this category is determined at the discretion of the producer. Maps to GTFS-R "MANY_SEATS_AVAILABLE" / TPEG Pts45_1, many seats available.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="fewSeatsAvailable">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available
-       The vehicle has a small percentage of seats available. What percentage of free seats out of the total seats available is to be considered small enough to fall into this category is determined at the discretion of the producer.</xsd:documentation>
+					<xsd:documentation>The vehicle has a small percentage of seats available. What percentage of free seats out of the total seats available is to be considered small enough to fall into this category is determined at the discretion of the producer.  Maps to GTFS-R "FEW_SEATS_AVAILABLE" / TPEG Pts45_2, few seats available.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="standingRoomOnly">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4, standing room only (and TPEG Pts45_3, no seats available)
-       The vehicle can currently accommodate only standing passengers.</xsd:documentation>
+					<xsd:documentation>The vehicle can currently accommodate only standing passengers. Standing room only (and TPEG Pts45_3, no seats available).  Maps to GTFS-R "STANDING_ROOM_ONLY" / TPEG Pts45_4.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="crushedStandingRoomOnly">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "CRUSHED_STANDING_ROOM_ONLY"
-       The vehicle can currently accommodate only standing passengers and has limited space for them.</xsd:documentation>
+					<xsd:documentation>The vehicle can currently accommodate only standing passengers and has limited space for them.  Maps to GTFS-R "CRUSHED_STANDING_ROOM_ONLY".</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="full">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "FULL" / TPEG Pts45_5, full</xsd:documentation>
+					<xsd:documentation>Depends on the MODE and MODE OF OPERATION. In general the vehicle will be at capacity at departure.  Maps to GTFS-R "FULL" / TPEG Pts45_5, full.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="notAcceptingPassengers">
 				<xsd:annotation>
-					<xsd:documentation>GTFS-R "NOT_ACCEPTING_PASSENGERS"
-       The vehicle cannot accept passengers.</xsd:documentation>
+					<xsd:documentation>The vehicle cannot accept passengers. Maps to GTFS-R "NOT_ACCEPTING_PASSENGERS"</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="undefined">
 				<xsd:annotation>
-					<xsd:documentation>TPEG Pts45_255, undefined occupancy</xsd:documentation>
+					<xsd:documentation>Undefined occupancy- Maps to TPEG Pts45_255.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:enumeration>
 			<xsd:enumeration value="seatsAvailable">
diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index 58ec36eca..c13024ab5 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -40,7 +40,7 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:element>
 			<xsd:element name="OccupancyPercentage" type="PercentageType" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Utilised percentage of maximum payload after departing the STOP POINT.</xsd:documentation>
+					<xsd:documentation>Utilised percentage of maximum payload after departing the STOP POINT. 100 means that no further passengers can be added.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="AlightingCount" type="NumberOfPassengers" minOccurs="0">

From 08005f0bc852c6951d6b2beca095bed9992ffb2b Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 13:27:12 +0000
Subject: [PATCH 10/21] Lint and update documentation tables

---
 examples/functions/timetable/Netex_51.1_Occupancy.xml         | 2 +-
 .../part1_tacticalPlanning/netex_journeyTiming_version.xsd    | 2 +-
 .../part1_tacticalPlanning/netex_timingPattern_version.xsd    | 2 +-
 .../part2_journeyTimes/netex_passingTimes_version.xsd         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
index add6f142b..838b7862c 100644
--- a/examples/functions/timetable/Netex_51.1_Occupancy.xml
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -1059,4 +1059,4 @@
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
\ No newline at end of file
+</PublicationDelivery>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
index e80db6ffe..ebdbcdb6b 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
@@ -226,7 +226,7 @@ Rail transport, Roads and Road transport
 				<xsd:annotation>
 					<xsd:documentation>RUN TIME as an interval.</xsd:documentation>
 				</xsd:annotation>
-			</xsd:element>			
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ===JLayoverTime===================================================== -->
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
index 154870206..bcf3a54c9 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
@@ -603,4 +603,4 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 0f76346a2..45776595b 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -4,7 +4,7 @@
 	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>		
+	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
@@ -211,4 +211,4 @@ Rail transport, Roads and Road transport
 		</xsd:sequence>
 	</xsd:group>
 	<!-- ======================================================================= -->
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

From cb758529d0a5c4cea67b298d96933287dc788457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:16:46 +0100
Subject: [PATCH 11/21] Update
 xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index c13024ab5..d0f0736fb 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -165,7 +165,7 @@ More accurate data can be provided by the individual occupancies or capacities b
 					</xsd:complexContent>
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="dayTypes" type="dayTypesInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="dayTypes" type="dayTypes_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Reusable DAY TYPE  in SERVICE CALENDAR FRAME.</xsd:documentation>
 				</xsd:annotation>

From 5a22e0587a10d59d6c055d4923c4c46300d6fa7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:16:57 +0100
Subject: [PATCH 12/21] Update
 xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 .../part2_occupancy/netex_oc_occupancy_version.xsd | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index d0f0736fb..4aa98c9d8 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -216,9 +216,9 @@ More accurate data can be provided by the individual occupancies or capacities b
 		</xsd:annotation>
 		<xsd:restriction base="ObjectIdType"/>
 	</xsd:simpleType>
-	<xsd:complexType name="OccupancyInFrame_RelStructure">
+	<xsd:complexType name="Occupancy_RelStructure">
 		<xsd:annotation>
-			<xsd:documentation>Type for containment in frame of OCCUPANCYs.</xsd:documentation>
+			<xsd:documentation>Type for containment for multiple OCCUPANCYs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="containmentAggregationStructure">
@@ -229,4 +229,14 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
+	<xsd:complexType name="OccupancyInFrame_RelStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for containment in FRAME of OCCUPANCYs.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="containmentAggregationStructure">
+				<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
 </xsd:schema>

From cbe7a8b1ed549efb95564b092ce22eae388980ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:17:02 +0100
Subject: [PATCH 13/21] Update
 xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index 2d9b34c7e..d9977bcf5 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -280,7 +280,7 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="CallPartGroup"/>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>

From 8167ebbaeaac1a2c9c16a1ca4e030212fbf723c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:17:10 +0100
Subject: [PATCH 14/21] Update
 xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 .../part2_journeyTimes/netex_coupledJourney_version.xsd         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index 0e75604b7..87f88de27 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -203,7 +203,7 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
 					<xsd:documentation>Positions in Train of JOURNEY PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>

From cc4f8e00382cf2b8ed34bed8968fa9a549dd599a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:17:15 +0100
Subject: [PATCH 15/21] Update
 xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index 5d8a7467d..e7aa3aeb7 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -133,7 +133,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>NOTICEs  relevant for the whole GROUP OF SERVICEs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>

From 8451bcbcb8fafe3657282005de3e2d3d87fd6b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Thu, 14 Mar 2024 18:17:22 +0100
Subject: [PATCH 16/21] Update
 xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 .../part2_journeyTimes/netex_passingTimes_version.xsd           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 45776595b..eaf5d8591 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -203,7 +203,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Number of days after the starting time of the journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>

From 1cc688b3ce14f5369d16963312f7bff5a8e51db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Fri, 15 Mar 2024 14:21:32 +0100
Subject: [PATCH 17/21] Update
 xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd

Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
---
 .../part2_occupancy/netex_oc_occupancy_version.xsd            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index 4aa98c9d8..a821f382a 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -235,7 +235,9 @@ More accurate data can be provided by the individual occupancies or capacities b
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="containmentAggregationStructure">
-				<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
+				<xsd:sequence>
+					<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
+				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>

From 37e70000c721adcc7dfc7473322c11e6005c6c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Sat, 6 Jul 2024 00:35:13 +0200
Subject: [PATCH 18/21] Occupancy -> OccupancyView

* added checking as well.
---
 ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml |  4 +--
 ...etex_10_Rail_SplittingJoiningTimetable.xml |  8 ++---
 .../timetable/Netex_51.1_Occupancy.xml        | 20 +++++------
 xsd/NeTEx_publication.xsd                     | 13 ++++++-
 .../netex_timetableFrame_version.xsd          |  2 +-
 .../part2_journeyTimes/netex_call_version.xsd |  2 +-
 .../netex_coupledJourney_version.xsd          |  2 +-
 .../netex_journey_version.xsd                 |  2 +-
 .../netex_passingTimes_version.xsd            |  2 +-
 .../netex_oc_occupancy_version.xsd            | 35 ++++++++-----------
 10 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
index f1f9f76a9..a3992ce18 100644
--- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
+++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
@@ -266,7 +266,7 @@ The Calendar is shown coded as
 									<Departure>
 										<Time>14:20:00.0Z</Time>
 										<occupancies>
-											<Occupancy version="any" id="occ1">
+											<OccupancyView version="any" id="occ1">
 												<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
 												<OccupancyPercentage>40</OccupancyPercentage>
 												<WheelchairsOnboardCount>1</WheelchairsOnboardCount>
@@ -274,7 +274,7 @@ The Calendar is shown coded as
 													<NameOfGroup>a group</NameOfGroup>
 													<NumberOfReservedSeats>4</NumberOfReservedSeats>
 												</GroupReservation>
-											</Occupancy>
+											</OccupancyView>
 										</occupancies>
 									</Departure>
 								</Call>
diff --git a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
index 7d3bb9a28..e27cc7b4f 100644
--- a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
+++ b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
@@ -365,12 +365,12 @@ The TIMETABLE FRAME groups the servicee  elements
 						<ServiceJourney version="any" id="bbd:sj_447">
 							<Description>447 Amsterdam to Warsaw</Description>
 							<occupancies>
-								<Occupancy>
+								<OccupancyView>
 									<TrainRef version="any" ref="bbd:trn_447"/>
 									<TrainElementRef version="any" ref="bbd:trne_447_02"/>
 									<FareClass>businessClass</FareClass>
 									<OccupancyPercentage>20</OccupancyPercentage>
-								</Occupancy>
+								</OccupancyView>
 							</occupancies>
 							<DepartureTime>09:00:00Z</DepartureTime>
 							<ServiceJourneyPatternRef version="any" ref="bbd:JP_447_amsterdam_warsaw"/>
@@ -400,9 +400,9 @@ The TIMETABLE FRAME groups the servicee  elements
 									<EndTime>12:00:00Z</EndTime>
 									<PurposeOfJourneyPartitionRef ref="bbd:coupling">coupling</PurposeOfJourneyPartitionRef>
 									<occupancies>
-										<Occupancy version="any" id="bbd:occ:1">
+										<OccupancyView version="any" id="bbd:occ:1">
 											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
-										</Occupancy>
+										</OccupancyView>
 									</occupancies>
 								</JourneyPart>
 								<JourneyPart version="any" id="bbd:jpt_447_02">
diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
index 838b7862c..4341a500c 100644
--- a/examples/functions/timetable/Netex_51.1_Occupancy.xml
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -528,9 +528,9 @@
 									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_02"/>
 									<DepartureTime>14:10:00.0Z</DepartureTime>
 									<occupancies>
-										<Occupancy>
+										<OccupancyView>
 											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
-										</Occupancy>
+										</OccupancyView>
 									</occupancies>
 								</TimetabledPassingTime>
 								<TimetabledPassingTime version="any" id="hde:tpt_24o_01_SSP_001_t2">
@@ -545,11 +545,11 @@
 									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_05"/>
 									<DepartureTime>14:50:00.0Z</DepartureTime>
 									<occupancies>
-										<Occupancy>
+										<OccupancyView>
 											<PassengerCategory>adult</PassengerCategory>
 											<OccupancyPercentage>60</OccupancyPercentage>
-										</Occupancy>
-										<OccupancyRef version="any" ref="occ4"/>
+										</OccupancyView>
+										<OccupancyViewRef version="any" ref="occ4"/>
 									</occupancies>
 								</TimetabledPassingTime>
 								<TimetabledPassingTime version="any" id="mybus:tpt_24o_01_SSP_077">
@@ -586,10 +586,10 @@
 										<Time>14:32:00.0Z</Time>
 										<WaitTime>PT2M</WaitTime>
 										<occupancies>
-											<Occupancy>
+											<OccupancyView>
 												<OnboardCount>20</OnboardCount>
-											</Occupancy>
-											<OccupancyRef ref="occ4" version="any"/>
+											</OccupancyView>
+											<OccupancyViewRef ref="occ4" version="any"/>
 										</occupancies>
 									</Departure>
 									<Note>Arrival at Terminus</Note>
@@ -729,9 +729,9 @@
 						</ServiceFacilitySet>
 					</serviceFacilitySets>
 					<occupancies>
-						<Occupancy version="any" id="occ4">
+						<OccupancyView version="any" id="occ4">
 							<WheelchairsOnboardCount>2</WheelchairsOnboardCount>
-						</Occupancy>
+						</OccupancyView>
 					</occupancies>
 				</TimetableFrame>
 				<!--  Service Calendar Nov 2010   COMPACT Coding  === -->
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 0e6dd03cd..e71835d0a 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -347,7 +347,7 @@
 			<xsd:field xpath="@ref"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSourceRef_AnyKeyRef" refer="netex:DataSource_AnyKey">
-			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessEquipment | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareContractEntry_ | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceAccessRight_ | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelSpecification_ | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection"/>
+			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessEquipment | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareContractEntry_ | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:OccupancyView | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceAccessRight_ | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelSpecification_ | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection"/>
 			<xsd:field xpath="@dataSourceRef"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSource_AnyVersionedKeyRef" refer="netex:DataSource_AnyVersionedKey">
@@ -7062,6 +7062,17 @@
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:key>
+		<!-- =====OccupancyView Key ========================== -->
+		<xsd:keyref name="OccupancyView_KeyRef" refer="netex:OccupancyView_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:OccupancyViewRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="OccupancyView_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:OccupancyView"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>		
 		<!-- =====SalesNoticeAssignment============================== -->
 		<!-- =====SalesNoticeAssignment unique========================== -->
 		<xsd:unique name="SalesNoticeAssignment_UniqueBy_Id_Version_Order">
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index 0bcd02969..d6bc0a985 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -122,7 +122,7 @@ Rail transport, Roads and Road transport
 			<xsd:group ref="InterchangeInFrameGroup"/>
 			<xsd:group ref="VehicleTypeInFrameGroup"/>
 			<xsd:group ref="JourneyAccountingInFrameGroup"/>
-			<xsd:group ref="OccupancyInFrameGroup"/>
+			<xsd:group ref="OccupancyViewInFrameGroup"/>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="TimetableDefaultsGroup">
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index 9b0447374..35f345fcf 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -250,7 +250,7 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="CallPartGroup"/>
-			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index 2cac6ee46..a38268e39 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -203,7 +203,7 @@ of the corresponding VEHICLE TYPE. true for forward.</xsd:documentation>
 					<xsd:documentation>Positions in Train of JOURNEY PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index e7aa3aeb7..517ce3e84 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -133,7 +133,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>NOTICEs  relevant for the whole GROUP OF SERVICEs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 85ea217c5..cfdd0bf41 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -203,7 +203,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Number of days after the starting time of the journey if  not same calendar day. Default is 0 for same day.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="occupancies" type="Occupancy_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
index a821f382a..5f0228379 100644
--- a/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
+++ b/xsd/netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd
@@ -102,18 +102,13 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:element name="Occupancy_" type="Occupancy_VersionStructure" abstract="true" substitutionGroup="DataManagedObject">
+	<xsd:element name="OccupancyView">
 		<xsd:annotation>
-			<xsd:documentation>Dummy supertype for Occupancy.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Occupancy" abstract="true" substitutionGroup="Occupancy_">
-		<xsd:annotation>
-			<xsd:documentation>An OCCUPANCY.</xsd:documentation>
+			<xsd:documentation>A simple VIEW of OCCUPANCY as a first implementation without full support of DECK PLAN.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:restriction base="Occupancy_VersionStructure">
+				<xsd:restriction base="OccupancyView_VersionStructure">
 					<xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
@@ -129,12 +124,12 @@ More accurate data can be provided by the individual occupancies or capacities b
 							</xsd:group>
 						</xsd:sequence>
 					</xsd:sequence>
-					<xsd:attribute name="id" type="OccupancyIdType"/>
+					<xsd:attribute name="id" type="OccupancyViewIdType"/>
 				</xsd:restriction>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
-	<xsd:complexType name="Occupancy_VersionStructure" abstract="false">
+	<xsd:complexType name="OccupancyView_VersionStructure" abstract="false">
 		<xsd:annotation>
 			<xsd:documentation>Type for an Occupancy.</xsd:documentation>
 		</xsd:annotation>
@@ -184,25 +179,25 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
-	<xsd:group name="OccupancyInFrameGroup">
+	<xsd:group name="OccupancyViewInFrameGroup">
 		<xsd:annotation>
 			<xsd:documentation>Elements for a OCCUPANCY in frame.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="occupancies" type="OccupancyInFrame_RelStructure" minOccurs="0">
+			<xsd:element name="occupancies" type="OccupancyViewInFrame_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs in frame.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
-	<xsd:complexType name="OccupancyRefStructure">
+	<xsd:complexType name="OccupancyViewRefStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a reference  to an OCCUPANCY.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleContent>
 			<xsd:restriction base="VersionOfObjectRefStructure">
-				<xsd:attribute name="ref" type="OccupancyIdType" use="required">
+				<xsd:attribute name="ref" type="OccupancyViewIdType" use="required">
 					<xsd:annotation>
 						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
 					</xsd:annotation>
@@ -210,33 +205,33 @@ More accurate data can be provided by the individual occupancies or capacities b
 			</xsd:restriction>
 		</xsd:simpleContent>
 	</xsd:complexType>
-	<xsd:simpleType name="OccupancyIdType">
+	<xsd:simpleType name="OccupancyViewIdType">
 		<xsd:annotation>
 			<xsd:documentation>Type for identifier of a OCCUPANCY.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="ObjectIdType"/>
 	</xsd:simpleType>
-	<xsd:complexType name="Occupancy_RelStructure">
+	<xsd:complexType name="OccupancyView_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for containment for multiple OCCUPANCYs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="containmentAggregationStructure">
 				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
-					<xsd:element name="OccupancyRef" type="OccupancyRefStructure"/>
+					<xsd:element name="OccupancyView" type="OccupancyView_VersionStructure"/>
+					<xsd:element name="OccupancyViewRef" type="OccupancyViewRefStructure"/>
 				</xsd:choice>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:complexType name="OccupancyInFrame_RelStructure">
+	<xsd:complexType name="OccupancyViewInFrame_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for containment in FRAME of OCCUPANCYs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="containmentAggregationStructure">
 				<xsd:sequence>
-					<xsd:element name="Occupancy" type="Occupancy_VersionStructure"/>
+					<xsd:element name="OccupancyView" type="OccupancyView_VersionStructure"/>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>

From 5b883c9515feaba1e976cd5a3a34e6f4877ba7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Sat, 6 Jul 2024 00:51:12 +0200
Subject: [PATCH 19/21] fixing examples with id

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

diff --git a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
index e27cc7b4f..1de5f2cc8 100644
--- a/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
+++ b/examples/functions/timetable/Netex_10_Rail_SplittingJoiningTimetable.xml
@@ -365,7 +365,7 @@ The TIMETABLE FRAME groups the servicee  elements
 						<ServiceJourney version="any" id="bbd:sj_447">
 							<Description>447 Amsterdam to Warsaw</Description>
 							<occupancies>
-								<OccupancyView>
+								<OccupancyView version="any" id="occ22">
 									<TrainRef version="any" ref="bbd:trn_447"/>
 									<TrainElementRef version="any" ref="bbd:trne_447_02"/>
 									<FareClass>businessClass</FareClass>

From be2ff36bca33590937ec134afe95e1b6dad4b635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Sat, 6 Jul 2024 00:54:33 +0200
Subject: [PATCH 20/21] Update Netex_51.1_Occupancy.xml

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

diff --git a/examples/functions/timetable/Netex_51.1_Occupancy.xml b/examples/functions/timetable/Netex_51.1_Occupancy.xml
index 4341a500c..c4b0eec73 100644
--- a/examples/functions/timetable/Netex_51.1_Occupancy.xml
+++ b/examples/functions/timetable/Netex_51.1_Occupancy.xml
@@ -528,7 +528,7 @@
 									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_02"/>
 									<DepartureTime>14:10:00.0Z</DepartureTime>
 									<occupancies>
-										<OccupancyView>
+										<OccupancyView id="occ1" version="any">
 											<OccupancyLevel>fewSeatsAvailable</OccupancyLevel>
 										</OccupancyView>
 									</occupancies>
@@ -545,7 +545,7 @@
 									<TimingPointInJourneyPatternRef version="any" ref="hde:tpijp_24o_05"/>
 									<DepartureTime>14:50:00.0Z</DepartureTime>
 									<occupancies>
-										<OccupancyView>
+										<OccupancyView id="occ2" version="any">
 											<PassengerCategory>adult</PassengerCategory>
 											<OccupancyPercentage>60</OccupancyPercentage>
 										</OccupancyView>
@@ -586,7 +586,7 @@
 										<Time>14:32:00.0Z</Time>
 										<WaitTime>PT2M</WaitTime>
 										<occupancies>
-											<OccupancyView>
+											<OccupancyView id="occ3" version="any">
 												<OnboardCount>20</OnboardCount>
 											</OccupancyView>
 											<OccupancyViewRef ref="occ4" version="any"/>

From b428089e50cd30901a1a7db9ac58dd53fe925f5a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:56:58 +0000
Subject: [PATCH 21/21] Lint and update documentation tables

---
 xsd/NeTEx_publication.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index e71835d0a..68d650cf4 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -7072,7 +7072,7 @@
 			<xsd:selector xpath=".//netex:OccupancyView"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
-		</xsd:key>		
+		</xsd:key>
 		<!-- =====SalesNoticeAssignment============================== -->
 		<!-- =====SalesNoticeAssignment unique========================== -->
 		<xsd:unique name="SalesNoticeAssignment_UniqueBy_Id_Version_Order">