From 3ae8d48f9f98a80bd70f9eb01d1281d371f0018a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Wed, 5 Jun 2024 16:39:37 +0200
Subject: [PATCH] rebuilt for RestrictedFacilitySetRef and fixed missing
 CallRef

* CallRef was missing. Is now added
* facilities can contain a RestrictedFacilitySetRef in ServiceJourney. restriction in  From/To and AvailabilityCondition
---
 .../NewModes-ChauffeuredServiceExample.xml    | 14 +---
 xsd/NeTEx_publication.xsd                     | 21 -----
 .../netex_facility_support.xsd                | 59 +++++++-------
 .../netex_facility_version.xsd                | 80 +------------------
 .../part2_journeyTimes/netex_call_support.xsd | 21 +++++
 5 files changed, 59 insertions(+), 136 deletions(-)

diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
index cdc45e24a..8898c9d61 100644
--- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
+++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -213,18 +213,8 @@
 							<PassengerCommsFacilityList>freeWifi</PassengerCommsFacilityList>
 						</ServiceFacilitySet>
 						<ServiceFacilitySet version="any" id="GoF_based_set">
-							<GroupOfFacilitiesRef ref="GoF1" version="1.0"/>
 						</ServiceFacilitySet>
 					</serviceFacilitySets>
-					<groupsOfFacilities>
-						<GroupOfFacilities id="GoF1" version="1.0">
-							<ShortName>Elementary group of facilities.</ShortName>
-							<members>
-								<FacilityRef ref="wifi" version="any"/>
-								<FacilityRef ref="smoking" version="any"/>
-							</members>
-						</GroupOfFacilities>
-					</groupsOfFacilities>
 					<vehicleTypes>
 						<VehicleType version="any" id="stretch_limo">
 							<Name>Strech limo</Name>
@@ -245,6 +235,10 @@
 									<CateringFacilityList>bar</CateringFacilityList>
 									<PassengerCommsFacilityList>videoEntertainment publicWifi</PassengerCommsFacilityList>
 								</ServiceFacilitySet>
+								<RestrictedServiceFacilitySetRef>
+									<ServiceFacilitySetRef ref="no_smoking" version="any"/>
+									<AvailabilityConditionRef version="any" ref="r1"/>
+								</RestrictedServiceFacilitySetRef>
 							</facilities>
 						</VehicleType>
 					</vehicleTypes>
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 1b8d4d997..b94458131 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -8797,27 +8797,6 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====GroupOfFacilities============================== -->
-		<!-- =====GroupOfFacilities unique========================== -->
-		<xsd:unique name="GroupOfFacilities_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [GroupOfFacilities Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:GroupOfFacilities"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====GroupOfFacilities Key ========================== -->
-		<xsd:keyref name="GroupOfFacilities_AnyKeyRef" refer="netex:GroupOfFacilities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfFacilitiesRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="GroupOfFacilities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfFacilities"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Accommodation unique========================== -->
 		<xsd:unique name="Accommodation_UniqueBy_Id_Version">
 			<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
index bdb08c477..f1a16249e 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -1,6 +1,12 @@
 <?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:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="netex_facility_support">
 	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
+	
+	
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -800,32 +806,6 @@ Rail transport, Roads and Road transport
 			</xsd:restriction>
 		</xsd:simpleContent>
 	</xsd:complexType>
-	<!-- ====GROUP OF FACILITIES==================================== -->
-	<xsd:simpleType name="GroupOfFacilitiesIdType">
-		<xsd:annotation>
-			<xsd:documentation>Identifier of a GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="ObjectIdType"/>
-	</xsd:simpleType>
-	<xsd:element name="GroupOfFacilitiesRef" type="GroupOfFacilitiesRefStructure" substitutionGroup="VersionOfObjectRef">
-		<xsd:annotation>
-			<xsd:documentation>Reference to a GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:complexType name="GroupOfFacilitiesRefStructure">
-		<xsd:annotation>
-			<xsd:documentation>Type for a reference to a GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:restriction base="VersionOfObjectRefStructure">
-				<xsd:attribute name="ref" type="GroupOfFacilitiesIdType" use="required">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of a GROUP OF FACILITies.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
 	<!-- ====FACILITY SET==================================== -->
 	<xsd:simpleType name="FacilitySetIdType">
 		<xsd:annotation>
@@ -910,12 +890,37 @@ Rail transport, Roads and Road transport
 			<xsd:restriction base="FacilitySetRefStructure">
 				<xsd:attribute name="ref" type="ServiceFacilitySetIdType" use="required">
 					<xsd:annotation>
-						<xsd:documentation>Identifier of a FACILITY.</xsd:documentation>
+						<xsd:documentation>Identifier of a FACILITY SET.</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
 			</xsd:restriction>
 		</xsd:simpleContent>
 	</xsd:complexType>
+	<xsd:element name="RestrictedServiceFacilitySetRef" type="RestrictedServiceFacilitySetRefStructure">
+		<xsd:annotation>
+			<xsd:documentation>Reference to a restricted SERVICE FACILITY SET. The restriction can be an AvailabiltyCondition and/or a from - to relation. +V2.0</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:complexType name="RestrictedServiceFacilitySetRefStructure">
+		<xsd:annotation>
+			<xsd:documentation>Reference to a restricted SERVICE FACILITY SET. The restriction can be an AvailabiltyCondition and/or a from - to relation. +V2.0</xsd:documentation>
+		</xsd:annotation>		
+		<xsd:sequence>
+			<xsd:element ref="ServiceFacilitySetRef"/>
+			<xsd:choice minOccurs="0">
+				<xsd:sequence>
+					<xsd:element name="FromCall" type="CallRefStructure"/>
+					<xsd:element name="ToCall" type="CallRefStructure"/>
+				</xsd:sequence>
+				<xsd:sequence>
+					<xsd:element name="FromStopPointInJourneyPattern" type="StopPointInJourneyPatternRefStructure"/>
+					<xsd:element name="ToStopPointInJourneyPattern" type="StopPointInJourneyPatternRefStructure"/>				
+				</xsd:sequence>
+			</xsd:choice>
+			<xsd:element ref="AvailabilityConditionRef" minOccurs="0">
+			</xsd:element>	
+		</xsd:sequence>
+	</xsd:complexType>	
 	<!-- ==== ===================================================== -->
 	<xsd:simpleType name="AccommodationIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
index d57143d29..b538dd414 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
@@ -4,6 +4,7 @@
 	<xsd:include schemaLocation="netex_serviceRestrictions_version.xsd"/>
 	<xsd:include schemaLocation="netex_facilityUic_support.xsd"/>
 	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -86,11 +87,6 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>SERVICE FACILITY SETs in frame . +v1.2.2</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="groupsOfFacilities" type="groupsOfFacilites_RelStructure" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>GROUPS of Facilities in frame. +v2.0</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="SiteFacilitySetsInFrameGroup">
@@ -165,11 +161,6 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="CommonFacilityGroup"/>
-			<xsd:element name="GroupOfFacilitiesRef" type="GroupOfFacilitiesRefStructure" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>A reference to a GroupOfFacilities. +v2.0</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="CommonFacilityGroup">
@@ -293,6 +284,7 @@ Rail transport, Roads and Road transport
 				<xsd:choice maxOccurs="unbounded">
 					<xsd:element ref="ServiceFacilitySetRef"/>
 					<xsd:element ref="ServiceFacilitySet"/>
+					<xsd:element ref="RestrictedServiceFacilitySetRef"/>
 				</xsd:choice>
 			</xsd:extension>
 		</xsd:complexContent>
@@ -528,74 +520,6 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
-	<!-- ==== GroupOfFacilities=======================================-->
-	<xsd:complexType name="groupsOfFacilites_RelStructure">
-		<xsd:annotation>
-			<xsd:documentation>Type for list of  GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="containmentAggregationStructure">
-				<xsd:sequence>
-					<xsd:element ref="GroupOfFacilities" maxOccurs="unbounded"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:element name="GroupOfFacilities" abstract="false" substitutionGroup="GroupOfEntities">
-		<xsd:annotation>
-			<xsd:documentation>A grouping of FACILITies which will be commonly referenced for a specific purpose. +v2.0</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:restriction base="GroupOfFacilities_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="GroupOfEntitiesGroup"/>
-						</xsd:sequence>
-						<xsd:sequence>
-							<xsd:group ref="GroupOfFacilitiesGroup"/>
-						</xsd:sequence>
-					</xsd:sequence>
-					<xsd:attribute name="id" type="GroupOfFacilitiesIdType"/>
-				</xsd:restriction>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="GroupOfFacilities_VersionStructure">
-		<xsd:annotation>
-			<xsd:documentation>Type for GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:complexContent>
-			<xsd:extension base="GroupOfEntities_VersionStructure">
-				<xsd:sequence>
-					<xsd:group ref="GroupOfFacilitiesGroup"/>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<xsd:group name="GroupOfFacilitiesGroup">
-		<xsd:annotation>
-			<xsd:documentation>Elements for GROUP OF FACILITies.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="PublicCode" type="ExternalObjectRefStructure" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>Public code for GROUP OF SITES.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element name="members" type="facilitiesRefs_RelStructure" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>SITEs in a GROUP OF FACILITies</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:group>
 	<!-- ====TYPE OF FACILITY======================================== -->
 	<xsd:complexType name="typesOfFacility_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
index b98c14aa0..8149acaf0 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
@@ -1,6 +1,8 @@
 <?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" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_call_support">
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
+		
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -73,4 +75,23 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="CallIdType"/>
 	</xsd:simpleType>
+	<xsd:element name="CallRef" type="CallRefStructure">
+		<xsd:annotation>
+			<xsd:documentation>Reference to a CALL.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:complexType name="CallRefStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for a reference to an ADDRESSED PLACE.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:restriction base="VersionOfObjectRefStructure">
+				<xsd:attribute name="ref" type="CallIdType" use="required">
+					<xsd:annotation>
+						<xsd:documentation>Identifier of an AddressedPlace.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:restriction>
+		</xsd:simpleContent>
+	</xsd:complexType>	
 </xsd:schema>