From e7b7e39dafb2c14eb8385d2ef1b556aad6402094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Mon, 30 Sep 2024 13:35:53 +0200
Subject: [PATCH] reorder to avoid forward referencing

---
 .../netex_facility_support.xsd                | 28 +------------------
 .../netex_journey_facility_support.xsd        | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
index 42b22edd9..d171a250e 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -3,8 +3,7 @@
 	<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">
@@ -882,31 +881,6 @@ Rail transport, Roads and Road transport
 			</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_part_2/part2_journeyTimes/netex_journey_facility_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd
new file mode 100644
index 000000000..dcbe058a5
--- /dev/null
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_facility_support.xsd
@@ -0,0 +1,28 @@
+<?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_journey_facility_support">
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.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: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:schema>
\ No newline at end of file