More external to privatecodes

NeTEx-CEN · Dec 13, 2023 · ce24b8e · ce24b8e
1 parent 2813a83
commit ce24b8e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml
@@ -7887,10 +7887,12 @@ TXC									NETEX
 					</responsibilitySets>
 					<organisations>
 						<Operator created="2003-06-09T14:20:00-05:00" changed="2004-05-09T14:20:00-05:00" modification="revise" version="2" id="noc:SCWW">
-							<!-- NationalOperatorCode: PublicCOde -->
+							<privateCodes>
+								<PrivateCode type="nocn">nocn:137725</PrivateCode>
+								<PrivateCode type="vosa:LicenceNumber">vosa:PD0000479</PrivateCode>
+							</privateCodes>
+							<!-- NationalOperatorCode: PublicCode -->
 							<PublicCode>SCCW</PublicCode>
-							<PrivateCode type="nocn">nocn:137725</PrivateCode>
-							<ExternalOperatorRef type="vosa:LicenceNumber" ref="vosa:PD0000479"/>
 							<!-- Name: TradingName  -->
 							<Name>Stagecoach</Name>
 							<ShortName>Stagecoach</ShortName>

diff --git a/examples/standards/vdv452/timetable/NeTEx VDV Example.xml b/examples/standards/vdv452/timetable/NeTEx VDV Example.xml
@@ -3379,31 +3379,39 @@
 			</routes>
 			<lines>
 				<Line id="LI_2" version="1">
+					<privateCodes>
+						<PrivateCode>3</PrivateCode>
+						<PrivateCode type="ExternalLineRef">VAG003</PrivateCode>
+					</privateCodes>
 					<Name>3</Name>
 					<ShortName>3</ShortName>
-					<PrivateCode>3</PrivateCode>
-					<ExternalLineRef ref="VAG003"/>
 					<OperationalContextRef ref="OPC_3" version="1"/>
 				</Line>
 				<Line id="LI_22" version="1">
+					<privateCodes>
+						<PrivateCode>11</PrivateCode>
+						<PrivateCode type="ExternalLineRef">VAG011</PrivateCode>
+					</privateCodes>
 					<Name>11</Name>
 					<ShortName>11</ShortName>
-					<PrivateCode>11</PrivateCode>
-					<ExternalLineRef ref="VAG011"/>
 					<OperationalContextRef ref="OPC_2" version="1"/>
 				</Line>
 				<Line id="LI_242" version="1">
+					<privateCodes>
+						<PrivateCode>14</PrivateCode>
+						<PrivateCode type="ExternalLineRef">VAG014</PrivateCode>
+					</privateCodes>
 					<Name>14</Name>
 					<ShortName>14</ShortName>
-					<PrivateCode>14</PrivateCode>
-					<ExternalLineRef ref="VAG014"/>
 					<OperationalContextRef ref="OPC_2" version="1"/>
 				</Line>
 				<Line id="LI_251" version="1">
+					<privateCodes>
+						<PrivateCode>1</PrivateCode>
+						<PrivateCode type="ExternalLineRef">VAG011</PrivateCode>
+					</privateCodes>
 					<Name>1</Name>
 					<ShortName>1</ShortName>
-					<PrivateCode>1</PrivateCode>
-					<ExternalLineRef ref="VAG011"/>
 					<OperationalContextRef ref="OPC_3" version="1"/>
 				</Line>
 			</lines>
@@ -107984,6 +107992,10 @@
 					</DistributorFilter>
 				</InterchangeRule>
 				<InterchangeRule id="IR_71" version="1">
+					<privateCodes>
+						<PrivateCode>100</PrivateCode>
+						<PrivateCode type="ExternalInterchangeRef">VAG009</PrivateCode>
+					</privateCodes>
 					<validityConditions>
 						<AvailabilityCondition id="AC_71" version="1">
 							<dayTypes>
@@ -107992,8 +108004,6 @@
 						</AvailabilityCondition>
 					</validityConditions>
 					<Name>OLIF</Name>
-					<PrivateCode>100</PrivateCode>
-					<ExternalInterchangeRef ref="VAG009"/>
 					<ControlCentreRef ref="CC_1" version="1"/>
 					<timings>
 						<InterchangeRuleTiming>