restrictedServiceFacilities added to TimetableFrame

adapted example As the only place to put restrictedServiceFacilities is the TimetableFrame for the time being, I had to add it in the example.
NeTEx-CEN · Oct 1, 2024 · 7371a47 · 7371a47
1 parent 3e31d34
commit 7371a47
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -235,10 +235,7 @@
 									<CateringFacilityList>bar</CateringFacilityList>
 									<PassengerCommsFacilityList>videoEntertainment publicWifi</PassengerCommsFacilityList>
 								</ServiceFacilitySet>
-								<RestrictedServiceFacilitySetRef id="rsfsr" version="any">
-									<ServiceFacilitySetRef ref="no_smoking" version="any"/>
-									<AvailabilityConditionRef version="any" ref="r1"/>
-								</RestrictedServiceFacilitySetRef>
+								<RestrictedServiceFacilitySetRef ref="rsfsr" version="any"/>
 							</facilities>
 						</VehicleType>
 					</vehicleTypes>
@@ -1241,7 +1238,15 @@ This Shows  sample Purchases
 						</FareContract>
 					</fareContracts>
 				</SalesTransactionFrame>
+				<TimetableFrame id="tt1" version="any">
+					<restrictedServiceFacilitySets>
+						<RestrictedServiceFacilitySet id="rsfsr" version="any">
+							<ServiceFacilitySetRef ref="no_smoking" version="any"/>
+							<AvailabilityConditionRef version="any" ref="r1"/>
+						</RestrictedServiceFacilitySet>
+					</restrictedServiceFacilitySets>
+				</TimetableFrame>
 			</frames>
 		</CompositeFrame>
 	</dataObjects>
-</PublicationDelivery>
+</PublicationDelivery>
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -3,6 +3,7 @@
 	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_journey_facility_support.xsd"/>	
 	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version.xsd"/>
 	<xsd:include schemaLocation="../part2_journeyTimes/netex_deckPlanAssignment_version.xsd"/>
 	<xsd:annotation>
@@ -211,6 +212,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>SERVICE FACILITies in frame.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="restrictedServiceFacilitySets" type="restrictedServiceFacilitySetsInFrame_RelStructure" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Restricted SERVICE FACILITies in frame.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>			
 			<xsd:element name="deckPlanAssignments" type="deckPlanAssignments_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>DECK PLAN ASSIGNMENTs in frame.</xsd:documentation>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
@@ -3,6 +3,7 @@
 	<!-- ===Dependencies ======================================= -->
 	<xsd:include schemaLocation="netex_journey_version.xsd"/>
 	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="netex_journey_facility_support.xsd"/>	
 	<xsd:include schemaLocation="netex_call_version.xsd"/>
 	<xsd:include schemaLocation="netex_call_support.xsd"/>
 	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd
@@ -13,30 +13,45 @@
 			<xsd:extension base="containmentAggregationStructure">
 				<xsd:choice maxOccurs="unbounded">
 					<xsd:element ref="RestrictedServiceFacilitySetRef"/>
-					<xsd:element ref="RestrictedServiceFacilitySet"/>
+					<!-- <xsd:element ref="RestrictedServiceFacilitySet"/> -->
 				</xsd:choice>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>	
 
+		<xsd:complexType name="restrictedServiceFacilitySetsInFrame_RelStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for containment in frame of restricted SERVICE FACILITY SETs.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="containmentAggregationStructure">
+				<xsd:sequence>
+					<xsd:element ref="RestrictedServiceFacilitySet" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
 	<xsd:simpleType name="RestrictedServiceFacilitySetIdType">
 		<xsd:annotation>
 			<xsd:documentation>Identifier of a restricted SERVICE FACILITY SET.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="ServiceFacilitySetIdType"/>
 	</xsd:simpleType>
+
 	<xsd:element name="RestrictedServiceFacilitySetRef" type="RestrictedServiceFacilitySetRefStructure" substitutionGroup="ServiceFacilitySetRef">
 		<xsd:annotation>
 			<xsd:documentation>Reference to a restricted SERVICE FACILITY SET.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
+
 	<xsd:element name="RestrictedServiceFacilitySet" abstract="false" substitutionGroup="FacilitySet">
 		<xsd:annotation>
 			<xsd:documentation>Restricted Service FACILITY. Set of enumerated FACILITY values (Where available names are based on TPEG classifications, augmented with UIC etc.).</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:restriction base="ServiceFacilitySet_VersionStructure">
+				<xsd:restriction base="RestrictedServiceFacilitySet_VersionStructure">
 					<xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
@@ -50,7 +65,10 @@
 						<xsd:sequence>
 							<xsd:group ref="ServiceFacilitySetGroup"/>
 						</xsd:sequence>
-					</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="RestrictedServiceFacilitySetGroup"/>
+						</xsd:sequence>
+					</xsd:sequence>										
 					<xsd:attribute name="id" type="RestrictedServiceFacilitySetIdType"/>
 				</xsd:restriction>
 			</xsd:complexContent>