working

NeTEx-CEN · Sep 30, 2024 · 3e31d34 · 3e31d34
1 parent c831096
commit 3e31d34
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -235,7 +235,7 @@
 									<CateringFacilityList>bar</CateringFacilityList>
 									<PassengerCommsFacilityList>videoEntertainment publicWifi</PassengerCommsFacilityList>
 								</ServiceFacilitySet>
-								<RestrictedServiceFacilitySetRef>
+								<RestrictedServiceFacilitySetRef id="rsfsr" version="any">
 									<ServiceFacilitySetRef ref="no_smoking" version="any"/>
 									<AvailabilityConditionRef version="any" ref="r1"/>
 								</RestrictedServiceFacilitySetRef>

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
@@ -2,32 +2,41 @@
 <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_journey_facility_support">
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_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"/>
+	<!-- ====SERVICE FACILITY SET================================================================ -->
+	<xsd:complexType name="restrictedServiceFacilitySets_RelStructure">
+		<xsd:annotation>
+			<xsd:documentation>SERVICE FACILITY SETs associated with entity.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="containmentAggregationStructure">
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element ref="RestrictedServiceFacilitySetRef"/>
+					<xsd:element ref="RestrictedServiceFacilitySet"/>
+				</xsd:choice>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
 
-
-		<!-- ====SERVICE FACILITY SET================================================================ -->
 	<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="RestrictedSeviceFacilitySet" abstract="false" substitutionGroup="FacilitySet">
+	<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="RestrictedServiceFacilitySet_VersionStructure">
+				<xsd:restriction base="ServiceFacilitySet_VersionStructure">
 					<xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
@@ -49,9 +58,9 @@
 	</xsd:element>
 	<xsd:complexType name="RestrictedServiceFacilitySet_VersionStructure">
 		<xsd:annotation>
-			<xsd:documentation>Type for a restrictedSERVICE FACILITY.</xsd:documentation>
+			<xsd:documentation>Type for a restricted SERVICE FACILITY.</xsd:documentation>
 		</xsd:annotation>
-				<xsd:complexContent>
+		<xsd:complexContent>
 			<xsd:extension base="ServiceFacilitySet_VersionStructure">
 				<xsd:sequence>
 					<xsd:group ref="RestrictedServiceFacilitySetGroup"/>
@@ -63,7 +72,7 @@
 		<xsd:annotation>
 			<xsd:documentation>Restriction .</xsd:documentation>
 		</xsd:annotation>
-	<xsd:sequence>
+		<xsd:sequence>
 			<xsd:element ref="ServiceFacilitySetRef"/>
 			<xsd:choice minOccurs="0">
 				<xsd:sequence>
@@ -79,8 +88,6 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
-
-
 	<xsd:complexType name="RestrictedServiceFacilitySetRefStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a reference to a restricted SERVICE FACILITY SET.</xsd:documentation>
@@ -95,8 +102,4 @@
 			</xsd:restriction>
 		</xsd:simpleContent>
 	</xsd:complexType>
-
-
-
-	</xsd:schema>
-
+</xsd:schema>