Bring backwards compatibility

NeTEx-CEN · Mar 19, 2024 · 73b48c8 · 73b48c8
1 parent 5189f1f
commit 73b48c8
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 24 deletions.
diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh
@@ -9,7 +9,7 @@ set -e
 
 echo "Validating NeTEx XML examples ..."
 
-if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
+if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deprecation/*.xml examples/functions/calendar/*.xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
   echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
 else
   echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'

diff --git a/examples/functions/deprecation/organisationref.xml b/examples/functions/deprecation/organisationref.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Deprecated OrganisationRef -->
+<PublicationDelivery xmlns:acsb="http://www.ifopt.org.uk/acsb" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns="http://www.netex.org.uk/netex" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.01" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
+	<PublicationTimestamp>2015-04-17T09:30:47.0Z</PublicationTimestamp>
+	<ParticipantRef>AURIGE001</ParticipantRef>
+	<PublicationRefreshInterval>P1Y</PublicationRefreshInterval>
+	<Description>Keeps OrganisationRef</Description>
+	<dataObjects>
+		<GeneralFrame version="001" id="AURIGE:TypeOfFrame:NETEX_ARRET-Le-Corbusier:LOC">
+			<Name>Frame NETEX_ARRET Le Corbusier</Name>
+			<Description>Frame NETEX_ARRET pour l'exemple d'arrêt Le Corbusier</Description>
+			<members modificationSet="all">
+				<!-- =========================================== -->
+				<!-- POLE MONOMODAL Le Corbusier -->
+				<StopPlace version="001" id="FR:78197:StopPlace:00001:LOC">
+					<Name>Le Corbusier</Name>
+					<Description>Pôle monomodal regroupant les arrêts monomodaux Le Corbusier, Lycée de Villaroy et Jules Michelet</Description>
+					<Centroid>
+						<Location id="AURIGE:Location:00001:LOC">
+							<Longitude>2.068554</Longitude>
+							<Latitude>48.764788</Latitude>
+						</Location>
+					</Centroid>
+					<CrossRoad>Intersection Avenue de l'Europe, Rue Eugène Violet Le Duc et Rue Le Corbusier</CrossRoad>
+					<Landmark>Lycée Villaroy et Gymnase de l'Aviation</Landmark>
+					<OrganisationRef version="001" ref="AURIGE:Operator:768:LOC"/>
+					<TransportMode>bus</TransportMode>
+					<StopPlaceType>onstreetBus</StopPlaceType>
+				</StopPlace>
+				<Operator version="001" id="AURIGE:Operator:768:LOC">
+					<CompanyNumber>768</CompanyNumber>
+					<Name>SQYBUS</Name>
+					<OrganisationType>operator</OrganisationType>
+				</Operator>
+			</members>
+		</GeneralFrame>
+	</dataObjects>
+</PublicationDelivery>
diff --git a/xsd/NX.xsd b/xsd/NX.xsd
@@ -132,7 +132,7 @@
 							<xsd:complexType>
 								<xsd:sequence>
 									<xsd:element ref="Organisation_" minOccurs="0" maxOccurs="unbounded"/>
-									<xsd:element ref="OrganisationRef"/>
+									<xsd:element ref="OrganisationRef_"/>
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -1372,6 +1372,17 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====Organisation============================== -->
+		<xsd:keyref name="Organisation_AnyKeyRef" refer="netex:Organisation_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:OrganisationRef | .//netex:ResponsibleOrganisationRef | .//netex:ProvidedByRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="Organisation_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:GeneralOrganisation | .//netex:Authority | .//netex:Operator | .//netex:ServicedOrganisation | .//netex:TravelAgent | .//netex:ManagementAgent | .//netex:RetailConsortium | .//netex:OnlineServiceOperator"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====OrganisationPart============================== -->
 		<!-- =====OrganisationPart unique========================== -->
 		<xsd:unique name="OrganisationPart_UniqueBy_Id_Version">

diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -414,7 +414,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Coordinates of ORGANISATIONAL UNIT.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element ref="TypeOfOrganisationPartRef" minOccurs="0"/>
 			<xsd:element name="administrativeZones" type="administrativeZones_RelStructure" minOccurs="0">
 				<xsd:annotation>
@@ -612,7 +612,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Description of the nature pf the  Relationship.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="OrganisationRoleType" type="OrganisationRoleEnumeration" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Role of the related Organbisation</xsd:documentation>
@@ -694,7 +694,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Public Code assosociated with Zone</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="responsibilities" type="responsibilitySets_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>RESPONSIBILITY SETs allocated to ADMINISTRATIVE ZONE.</xsd:documentation>
@@ -996,7 +996,7 @@ Rail transport, Roads and Road transport
 		<xsd:complexContent>
 			<xsd:extension base="DerivedViewStructure">
 				<xsd:sequence>
-					<xsd:element ref="OrganisationRef" minOccurs="0"/>
+					<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 					<xsd:group ref="OrganisationNameGroup"/>
 					<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
 						<xsd:annotation>

diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
@@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
 		<xsd:complexContent>
 			<xsd:extension base="oneToManyRelationshipStructure">
 				<xsd:sequence>
-					<xsd:element ref="OrganisationRef" maxOccurs="unbounded"/>
+					<xsd:element ref="OrganisationRef_" maxOccurs="unbounded"/>
 				</xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>
@@ -180,11 +180,16 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="ObjectIdType"/>
 	</xsd:simpleType>
-	<xsd:element name="OrganisationRef" type="OrganisationRefStructure" abstract="true" substitutionGroup="VersionOfObjectRef">
+	<xsd:element name="OrganisationRef_" type="OrganisationRefStructure" abstract="true" substitutionGroup="VersionOfObjectRef">
 		<xsd:annotation>
 			<xsd:documentation>Reference to an ORGANISATION.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
+	<xsd:element name="OrganisationRef" type="OrganisationRefStructure" substitutionGroup="OrganisationRef_">
+		<xsd:annotation>
+			<xsd:documentation>DEPRECATED reference to any ORGANISATION meeting the substitutiongroup. -v2.0</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
 	<xsd:complexType name="OrganisationRefStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a reference to an ORGANISATION.</xsd:documentation>
@@ -218,7 +223,7 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:choice>
 			<xsd:element ref="AllOrganisationsRef"/>
-			<xsd:element ref="OrganisationRef"/>
+			<xsd:element ref="OrganisationRef_"/>
 		</xsd:choice>
 	</xsd:group>
 	<!-- ======================================================================= -->

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
@@ -58,7 +58,7 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="OrganisationIdType"/>
 	</xsd:simpleType>
-	<xsd:element name="OtherOrganisationRef" type="OtherOrganisationRefStructure" substitutionGroup="OrganisationRef">
+	<xsd:element name="OtherOrganisationRef" type="OtherOrganisationRefStructure" substitutionGroup="OrganisationRef_">
 		<xsd:annotation>
 			<xsd:documentation>Reference to an OTHER ORGANISATION.</xsd:documentation>
 		</xsd:annotation>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
@@ -169,7 +169,7 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="TypeOfSecurityListRef" minOccurs="0"/>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="securityListings" type="securityListings_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Items in SECURITY LIST.</xsd:documentation>

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
@@ -92,7 +92,7 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="TransportOrganisationRef" type="TransportOrganisationRefStructure" abstract="true" substitutionGroup="OrganisationRef">
+	<xsd:element name="TransportOrganisationRef" type="TransportOrganisationRefStructure" abstract="true" substitutionGroup="OrganisationRef_">
 		<xsd:annotation>
 			<xsd:documentation>Reference to a TRANSPORT ORGANISATION.</xsd:documentation>
 		</xsd:annotation>

diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
@@ -235,7 +235,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element ref="Locale" minOccurs="0"/>
 			<xsd:choice minOccurs="0">
-				<xsd:element ref="OrganisationRef"/>
+				<xsd:element ref="OrganisationRef_"/>
 				<xsd:element name="OperatingOrganisationView" type="Organisation_DerivedViewStructure">
 					<xsd:annotation>
 						<xsd:documentation>Reference to OPERATOR of SITE - derived details can be included.</xsd:documentation>

diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
@@ -415,7 +415,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Contact details for GARAGE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="operators" type="transportOrganisationRefs_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OPERATORs assoicated with GARAGE.</xsd:documentation>

diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
@@ -150,7 +150,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Object for which this accounts.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0">
+			<xsd:element ref="OrganisationRef_" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>ORGANISATION contracting service.</xsd:documentation>
 				</xsd:annotation>

diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
@@ -903,7 +903,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Name of PRICING SERVICE parameter set.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="Url" type="xsd:anyURI" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>URL at which service is available.</xsd:documentation>

diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
@@ -275,7 +275,7 @@ Rail transport, Roads and Road transport
 					</xsd:annotation>
 				</xsd:element>
 			</xsd:choice>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element ref="ConditionSummary" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>

diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
@@ -240,7 +240,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Calculation Elements for TARIFF.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:choice>
-			<xsd:element ref="OrganisationRef"/>
+			<xsd:element ref="OrganisationRef_"/>
 			<xsd:element ref="GroupOfOperatorsRef"/>
 		</xsd:choice>
 	</xsd:group>

diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
@@ -277,7 +277,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Elements that use FARE TABLE that are not PRICEABLE OBJECTs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="FareTableCommonAssignmentsGroup">

diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
@@ -198,7 +198,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Contact details for distribution channel</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element name="PaymentMethods" type="PaymentMethodListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Payment methods allowed.</xsd:documentation>

diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
@@ -78,7 +78,7 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="OrganisationIdType"/>
 	</xsd:simpleType>
-	<xsd:element name="RetailConsortiumRef" type="RetailConsortiumRefStructure" substitutionGroup="OrganisationRef">
+	<xsd:element name="RetailConsortiumRef" type="RetailConsortiumRefStructure" substitutionGroup="OrganisationRef_">
 		<xsd:annotation>
 			<xsd:documentation>Reference to a RETAIL CONSORTIUM.</xsd:documentation>
 		</xsd:annotation>

diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
@@ -262,7 +262,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Status of Retail device.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element ref="TypeOfRetailDeviceRef" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:group>

diff --git a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd
@@ -128,7 +128,7 @@ Rail transport, Roads and Road transport
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="TypeOfMobilityServiceRef" minOccurs="0"/>
-			<xsd:element ref="OrganisationRef" minOccurs="0"/>
+			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
 			<xsd:element ref="TopographicPlaceRef" minOccurs="0"/>
 			<xsd:choice>
 				<xsd:element name="serviceBookingArrangements" type="serviceBookingArrangements_RelStructure" minOccurs="0">

diff --git a/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd b/xsd/netex_part_5/part5_rc/netex_nm_onlineService_support.xsd
@@ -74,7 +74,7 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="OrganisationIdType"/>
 	</xsd:simpleType>
-	<xsd:element name="OnlineServiceOperatorRef" type="OnlineServiceOperatorRefStructure" substitutionGroup="OrganisationRef">
+	<xsd:element name="OnlineServiceOperatorRef" type="OnlineServiceOperatorRefStructure" substitutionGroup="OrganisationRef_">
 		<xsd:annotation>
 			<xsd:documentation>Reference to an ONLINE SERVICE OPERATOR. +v1.2.2</xsd:documentation>
 		</xsd:annotation>