Introduce dataSourceRef checking, so we can see seriously broken exam…

…ples and implementations (#454) * Introduce dataSourceRef checking, so we can see seriously broken examples and implementations. * to force a rerun * updated examples * more example corrections * Lint and update documentation tables * remove checking for version in DataSource and DataSourceRef * Aurige example with id without version for DataSource * removed comments * change to the way validation is done. * fix validation * Update Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml * Lint and update documentation tables --------- Co-authored-by: Matthias Günter <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
NeTEx-CEN · Apr 17, 2024 · 56046b2 · 56046b2
1 parent de9d705
commit 56046b2
Show file tree

Hide file tree

Showing 57 changed files with 854 additions and 56 deletions.
diff --git a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml
@@ -11,6 +11,11 @@
 		<CompositeFrame version="1" id="ENT:school_carnet:38" dataSourceRef="ENT:fare_data">
 			<frames>
 				<!--==== FRAME DEFAULTS ==== -->
+				<ResourceFrame id="ENT:1" version="1">
+					<dataSources>
+						<DataSource id="ENT:fare_data" version="1"/>
+					</dataSources>
+				</ResourceFrame>
 				<FareFrame id="ENT:1" version="1">
 					<tariffs>
 						<Tariff version="1" id="ENT:school_carnet:380">

diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml
@@ -61,7 +61,7 @@
 			<FrameDefaults>
 				<!---  The default means that actually we could leave off all id s that belong to the mc: namespace. -->
 				<DefaultCodespaceRef ref="mc_data"/>
-				<DefaultDataSourceRef ref="mc:my_car" version="any"/>
+				<DefaultDataSourceRef ref="mc:my_car" version="1.0"/>
 				<DefaultCurrency>EUR</DefaultCurrency>
 			</FrameDefaults>
 			<frames>
@@ -76,7 +76,7 @@
 						</Codespace>
 					</codespaces>
 					<dataSources>
-						<DataSource id="mc:my_car" version="any">
+						<DataSource id="mc:my_car" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
 					</dataSources>

diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml
@@ -88,7 +88,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
 			<!--==== FRAME DEFAULTS ==== -->
 			<FrameDefaults>
 				<DefaultCodespaceRef ref="ryd_data"/>
-				<DefaultDataSourceRef ref="rd:ryde" version="any"/>
+				<DefaultDataSourceRef ref="rd:ryde" version="1.0"/>
 				<DefaultCurrency>GBP</DefaultCurrency>
 			</FrameDefaults>
 			<frames>
@@ -103,7 +103,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held
 						</Codespace>
 					</codespaces>
 					<dataSources>
-						<DataSource id="rd:ryde" version="any">
+						<DataSource id="rd:ryde" version="1.0">
 							<Email>[email protected]</Email>
 							<DataLicenceCode type="SPX" ref="GSCYQ"/>
 							<DataLicenceUrl>https://opendata.eu/vanilla</DataLicenceUrl>

diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -54,7 +54,7 @@
 			<!--==== FRAME DEFAULTS ==== -->
 			<FrameDefaults>
 				<DefaultCodespaceRef ref="hjm_data"/>
-				<DefaultDataSourceRef ref="hjm:home_james" version="any"/>
+				<DefaultDataSourceRef ref="hjm:home_james" version="1.0"/>
 				<DefaultCurrency>GBP</DefaultCurrency>
 			</FrameDefaults>
 			<frames>
@@ -69,7 +69,7 @@
 						</Codespace>
 					</codespaces>
 					<dataSources>
-						<DataSource id="hjm:home_james" version="any">
+						<DataSource id="hjm:home_james" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
 					</dataSources>

diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml
@@ -67,7 +67,7 @@
 			<FrameDefaults>
 				<!---  The default means that actually we could leave off all id s that belong to the mb: namespace. -->
 				<DefaultCodespaceRef ref="mb_data"/>
-				<DefaultDataSourceRef ref="mb:metrobike" version="any"/>
+				<DefaultDataSourceRef ref="mb:metrobike" version="1.0"/>
 				<DefaultCurrency>EUR</DefaultCurrency>
 			</FrameDefaults>
 			<frames>
@@ -82,7 +82,7 @@
 						</Codespace>
 					</codespaces>
 					<dataSources>
-						<DataSource id="mb:metrobike" version="any">
+						<DataSource id="mb:metrobike" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
 					</dataSources>

diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
@@ -218,6 +218,11 @@ It is based on the 2012 London Olympic Park. See accompanying paper for diagram
 				<DefaultCodespaceRef ref="oda"/>
 			</FrameDefaults>
 			<frames>
+				<ResourceFrame id="oda:RES_01" version="any">
+					<dataSources>
+						<DataSource id="NaPTAN" version="any"/>
+					</dataSources>
+				</ResourceFrame>
 				<!-- - ==== SERVICE CALENDAR === -->
 				<ServiceCalendarFrame version="any" id="oda:CAL_01">
 					<Name>Olympic Park2 2012  </Name>

diff --git a/examples/functions/site/Netex_21_Sites_Parking_1.xml b/examples/functions/site/Netex_21_Sites_Parking_1.xml
@@ -34,6 +34,11 @@ Overview
 	<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
 	<!--- =============== RESULTS =========== -->
 	<dataObjects>
+		<ResourceFrame id="pkg:RF01" version="any">
+			<dataSources>
+				<DataSource id="parkopedia" version="any"/>
+			</dataSources>
+		</ResourceFrame>
 		<SiteFrame version="any" id="pkg:SF01">
 			<validityConditions>
 				<AvailabilityCondition version="any" id="pkg:PP01_Opening_Hours">

diff --git a/examples/functions/site/Netex_21_Sites_Parking_2.xml b/examples/functions/site/Netex_21_Sites_Parking_2.xml
@@ -50,6 +50,11 @@ v1.1 revised ids and corrections
 	<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
 	<!--- =============== RESULTS =========== -->
 	<dataObjects>
+		<ResourceFrame id="mypark:RF01" version="any">
+			<dataSources>
+				<DataSource id="parkopedia" version="any"/>
+			</dataSources>
+		</ResourceFrame>
 		<SiteFrame version="any" id="mypark:SF01">
 			<validityConditions>
 				<AvailabilityCondition version="any" id="mypark:PP01@Opening_Hours">

diff --git a/examples/functions/site/Netex_Address_Example_1.xml b/examples/functions/site/Netex_Address_Example_1.xml
@@ -30,6 +30,11 @@ Overview
 	<PublicationRefreshInterval>PT5M0S</PublicationRefreshInterval>
 	<!--- =============== RESULTS =========== -->
 	<dataObjects>
+		<ResourceFrame version="any" id="ResourceFrame:RF01">
+			<dataSources>
+				<DataSource id="parkopedia" version="any"/>
+			</dataSources>
+		</ResourceFrame>
 		<SiteFrame version="any" id="SiteFrame:SF01">
 			<validityConditions>
 				<AvailabilityCondition version="any" id="mysite:PP01_OpeningHours">

diff --git a/...les/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/...les/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
@@ -269,6 +269,7 @@ Changes
 						<DefaultResponsibilitySetRef ref="nptgAdminArea:082" version="nptg:v2.1"/>
 					</FrameDefaults>
 					<dataSources>
+						<DataSource id="nptg:NaPTAN" version="001"/>
 						<DataSource id="tbd:accessibility_data" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
@@ -4838,7 +4839,7 @@ Changes
 									<equipmentPlaces>
 										<EquipmentPlace version="001" created="2010-05-17T09:30:47Z" modification="new" id="tbd:4900ZZLUWIM3n4">
 											<equipmentPositions>
-												<EquipmentPosition version="001" created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="tbd:accessibility_data" changed="2010-05-17T09:30:47Z" id="tbd:4900ZZLUWIM3n4">
+												<EquipmentPosition version="1.0" created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="tbd:accessibility_data" changed="2010-05-17T09:30:47Z" id="tbd:4900ZZLUWIM3n4">
 													<EquipmentRef version="any" ref="tbd:4900ZZLUWIM3n4_Eq-Seats1"/>
 													<Description>Seats on Platform 1 and 2. "0 metres from Platform entrance</Description>
 													<ReferencePointRef version="001" ref="tbd:9100WIMBLDN@5n6-EL1p"/>

diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
@@ -281,10 +281,10 @@ Changes
 				<ResourceFrame version="any" id="tbd:SVC01">
 					<!-- ==  For each NPTG Admin area a responsibility  is created : = -->
 					<dataSources>
-						<DataSource version="any" id="nptg:NaPTAN">
+						<DataSource version="001" id="nptg:NaPTAN">
 							<Name>DfT Naptan database </Name>
 						</DataSource>
-						<DataSource version="any" id="tbd:XtraAccessibilityData">
+						<DataSource version="001" id="tbd:XtraAccessibilityData">
 							<Name>Additional accessibility Data </Name>
 						</DataSource>
 					</dataSources>

diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
@@ -277,10 +277,10 @@ Changes
 				<ResourceFrame version="any" id="nptg:SVC01">
 					<!-- ==  For each NPTG Admin area a responsibility  is created : = -->
 					<dataSources>
-						<DataSource version="any" id="nptg:NaPTAN">
+						<DataSource version="001" id="nptg:NaPTAN">
 							<Name>DfT Naptan database </Name>
 						</DataSource>
-						<DataSource version="any" id="nptg:Xtra_accessibility_data">
+						<DataSource version="001" id="nptg:Xtra_accessibility_data">
 							<Name>Additional accessibility Data </Name>
 						</DataSource>
 					</dataSources>

diff --git a/examples/standards/epip/epip_common_profile.xml b/examples/standards/epip/epip_common_profile.xml
@@ -55,6 +55,9 @@
 						<DataSource id="epip:CEN_TC278_WG3_SG9" version="epip:1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
+						<DataSource id="epip:common" version="epip:1.0">
+							<Email>[email protected]</Email>
+						</DataSource>
 					</dataSources>
 					<!-- ========Responsibility Sets========== -->
 					<responsibilitySets>

diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml
@@ -210,6 +210,7 @@ We group the elements in separate frames
 						<DataSource id="op:src" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
+						<DataSource id="operator" version="1.0"/>
 					</dataSources>
 					<!-- ========Responsibility Sets========== -->
 					<responsibilitySets>

diff --git a/.../standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml b/.../standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml
@@ -233,7 +233,7 @@ At the end are shown some sample transactions showing the parameters that define
 	<Description>Fares for West of England</Description>
 	<!-- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="epd:UK:FBRI:FareFrame_UK_PI_LINE_FARE_OFFER:WoE@Bristol@48:frst" dataSourceRef="frst:WoE" responsibilitySetRef="frst:tariffs">
+		<CompositeFrame version="1.0" id="epd:UK:FBRI:FareFrame_UK_PI_LINE_FARE_OFFER:WoE@Bristol@48:frst" dataSourceRef="frst:first_WoE" responsibilitySetRef="frst:tariffs">
 			<ValidBetween>
 				<FromDate>2018-11-01T00:00:00</FromDate>
 			</ValidBetween>

diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml
@@ -240,7 +240,7 @@ At the end are shown  some sample transactions showing the parameters that defin
 	<Description>Example  of simple point to point fares</Description>
 	<!-- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="epd:UK:FBRI:CompositeFrame_UK_PI_NETWORK_FARE_OFFER:WoE:frst" dataSourceRef="frst:WoE" responsibilitySetRef="frst:tariffs">
+		<CompositeFrame version="1.0" id="epd:UK:FBRI:CompositeFrame_UK_PI_NETWORK_FARE_OFFER:WoE:frst" dataSourceRef="frst:first_WoE" responsibilitySetRef="frst:tariffs">
 			<ValidBetween>
 				<FromDate>2016-02-01T00:00:00</FromDate>
 				<ToDate>2018-10-31T12:00:00</ToDate>
@@ -7923,7 +7923,7 @@ WestonRider £4 Adult	£3 Student/
 				</ResourceFrame>
 			</frames>
 		</CompositeFrame>
-		<CompositeFrame id="frst-t:pass_transaction_examples" version="1.0" responsibilitySetRef="frst:transaction_data" dataSourceRef="frst:First">
+		<CompositeFrame id="frst-t:pass_transaction_examples" version="1.0" responsibilitySetRef="frst:transaction_data" dataSourceRef="trw:travelwest">
 			<!--  ===============
 This Shows  sample Purchases 
 

diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
@@ -290,7 +290,7 @@ At the end are shown some sample transactions showing the parameters that define
 	<Description>Fares for West of England</Description>
 	<!-- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="epd:UK:FBRI:CompositeFrame_UK_PI_LINE_FARE_OFFER:Trip@Bristol@48:frst" dataSourceRef="frst:WoE" responsibilitySetRef="frst:tariffs">
+		<CompositeFrame version="1.0" id="epd:UK:FBRI:CompositeFrame_UK_PI_LINE_FARE_OFFER:Trip@Bristol@48:frst" dataSourceRef="frst:first_WoE" responsibilitySetRef="frst:tariffs">
 			<ValidBetween>
 				<FromDate>2018-11-01T00:00:00</FromDate>
 			</ValidBetween>
@@ -10665,7 +10665,7 @@ Zone A B C D: Bristol, Bath &amp; Weston-super-Mare | £ 18.00 	|	£ 76.00 	|	29
 			</frames>
 		</CompositeFrame>
 		<!-- ====== EXAMPLE TRANSACTIONS ===== -->
-		<CompositeFrame id="frst-t:pass_transaction_examples" version="1.0" responsibilitySetRef="frst:transaction_data" dataSourceRef="frst:First">
+		<CompositeFrame id="frst-t:pass_transaction_examples" version="1.0" responsibilitySetRef="frst:transaction_data" dataSourceRef="frst:first_WoE">
 			<!-- ===============
 This Shows sample Purchases as they might be logged to refernce the specific product choices
 

diff --git a/...es/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/...es/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml
@@ -347,7 +347,7 @@ We group the elements in separate frames
 					</organisations>
 				</ResourceFrame>
 				<!--==== NETWORK - including lines 271 & 272 ==== -->
-				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="operator" responsibilitySetRef="tariffs">
+				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="op:src" responsibilitySetRef="tariffs">
 					<Name>Extra Lines included in Travelmaster product</Name>
 					<Description>This frame contains the stop and line definitions for the service. It Could also be exchanged separately.</Description>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP" version="fxc:v1.0"/>

diff --git a/...ples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/...ples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml
@@ -343,7 +343,7 @@ We group the elements in separate frames
 					</organisations>
 				</ResourceFrame>
 				<!--==== NETWORK - including lines 271 & 272 ==== -->
-				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="operator" responsibilitySetRef="tariffs">
+				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="op:src" responsibilitySetRef="tariffs">
 					<Name>Extra Lines included in Travelmaster product</Name>
 					<Description>This frame contains the stop and line definitions for the service. It Could also be exchanged separately.</Description>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP" version="fxc:v1.0"/>

diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml
@@ -360,7 +360,7 @@ We group the elements in separate frames
 					</organisations>
 				</ResourceFrame>
 				<!--==== NETWORK - including lines 271 & 272 ==== -->
-				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="operator" responsibilitySetRef="tariffs">
+				<ServiceFrame version="1.0" id="epd:UK:FSYO:ServiceFrame_UK_PI_NETWORK:FSYO:op" dataSourceRef="op:src" responsibilitySetRef="tariffs">
 					<Name>Extra Lines included in Travelmaster product</Name>
 					<Description>This frame contains the stop and line definitions for the service. It Could also be exchanged separately.</Description>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP" version="fxc:v1.0"/>

diff --git a/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml b/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml
@@ -66,7 +66,7 @@ Free to use under a Creative Commons license.
 	<Description>Fares for York</Description>
 	<!-- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="epd:UK:FYOR_NoE:FareFrame_UK_PI_NETWORK_FARE_OFFER:Trip@York@10etc:frst" dataSourceRef="frst:NoE" responsibilitySetRef="frst:tariffs">
+		<CompositeFrame version="1.0" id="epd:UK:FYOR_NoE:FareFrame_UK_PI_NETWORK_FARE_OFFER:Trip@York@10etc:frst" dataSourceRef="frst:First_York" responsibilitySetRef="frst:tariffs">
 			<ValidBetween>
 				<FromDate>2018-11-01T00:00:00</FromDate>
 			</ValidBetween>

diff --git a/...ples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-26-trip-(stages-Z2Z)-20181101.xml b/...ples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-26-trip-(stages-Z2Z)-20181101.xml
@@ -250,7 +250,7 @@ Prices in FARE FRAME
 	<Description>Fares for York</Description>
 	<!-- =============== RESULTS =========== -->
 	<dataObjects>
-		<CompositeFrame version="1.0" id="epd:UK:FYOR_NoE:CompositeFrame_UK_PI_LINE_FARE_OFFER:Products@Trip@York@26:frst" dataSourceRef="frst:NoE" responsibilitySetRef="frst:tariffs">
+		<CompositeFrame version="1.0" id="epd:UK:FYOR_NoE:CompositeFrame_UK_PI_LINE_FARE_OFFER:Products@Trip@York@26:frst" dataSourceRef="frst:first_NoE" responsibilitySetRef="frst:tariffs">
 			<ValidBetween>
 				<FromDate>2018-11-01T00:00:00</FromDate>
 			</ValidBetween>
@@ -895,6 +895,7 @@ Prices in FARE FRAME
 						<DataSource id="frst:first_NoE" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
+						<DataSource id="fxc:common" version="fxc:v1.0"/>
 					</dataSources>
 					<!-- ========Responsibility Sets========== -->
 					<responsibilitySets>

diff --git a/examples/standards/fxc/FX-PI-01_UK_HCTY_LINE_FARE_Line-016-trip_2020-03-11T22_19_20.696Z.xml b/examples/standards/fxc/FX-PI-01_UK_HCTY_LINE_FARE_Line-016-trip_2020-03-11T22_19_20.696Z.xml
@@ -2609,6 +2609,7 @@ Acomb Green Lane
 						<DataSource id="fxc:common" version="fxc:v1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
+						<DataSource id="nptg:dft" version="1.0"/>
 					</dataSources>
 					<responsibilitySets>
 						<ResponsibilitySet version="fxc:v1.0" id="fxc:FXC_metadata">

diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml
@@ -121,7 +121,7 @@ Concessionary passes are valid throughout from 0930-2300 Mon-Fri, and anytime at
 					<prerequisites>
 						<ServiceFrameRef version="1.0" ref="epd:UK:METR:ServiceFrame_UK_PI_NETWORK:Line_1:mb"/>
 						<FareFrameRef version="1.0" ref="epd:UK:METR:FareFrame_UK_PI_FARE_NETWORK:Line_1:mb"/>
-						<SiteFrameRef version="1.0" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
+						<SiteFrameRef version="nptg:v2.1" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
 					</prerequisites>
 					<!--==== Fare Structure ==== -->
 					<tariffs>
@@ -1292,7 +1292,7 @@ Bewbush West (loop)
 					<Name>Metrobus 1</Name>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP" version="fxc:v1.0"/>
 					<prerequisites>
-						<SiteFrameRef version="1.0" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
+						<SiteFrameRef version="nptg:v2.1" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
 						<ServiceFrameRef version="1.0" ref="epd:UK:METR:ServiceFrame_UK_PI_NETWORK:Line_1:mb"/>
 						<ServiceFrameRef versionRef="EXTERNAL" ref="epd:UK:NaPTAN:ServiceFrame_UK_PI_NETWORK:AdminArea@440:napt"/>
 					</prerequisites>
@@ -1426,7 +1426,7 @@ Bewbush West (loop)
 						</FareZone>
 					</fareZones>
 				</FareFrame>
-				<SiteFrame version="1.0" id="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg" responsibilitySetRef="nptg:data" dataSourceRef="nptg:dft">
+				<SiteFrame version="nptg:v2.1" id="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg" responsibilitySetRef="nptg:data" dataSourceRef="nptg:dft">
 					<Name>NPTG localities used by Metrobus 1</Name>
 					<Description>This frame contains the NPTG locality definitions used by the stops  the service. It could also be exchanged separately.</Description>
 					<TypeOfFrameRef version="fxc:v1.0" ref="fxc:UK:DFT:TypeOfFrame_UK_PI_STOP:FXCP"/>

diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml
@@ -118,7 +118,7 @@ Concessionary passes are valid throughout from 0930-2300 Mon-Fri, and anytime at
 					<prerequisites>
 						<ServiceFrameRef version="1.0" ref="epd:UK:METR:ServiceFrame_UK_PI_NETWORK:Line_1:mb"/>
 						<FareFrameRef version="1.0" ref="epd:UK:METR:FareFrame_UK_PI_FARE_NETWORK:Line_1:mb"/>
-						<SiteFrameRef version="1.0" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
+						<SiteFrameRef version="nptg:v2.1" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
 					</prerequisites>
 					<!--==== Fare Structure ==== -->
 					<tariffs>
@@ -1289,7 +1289,7 @@ Bewbush West (loop)
 					<Name>Metrobus 1</Name>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_NETWORK:FXCP" version="fxc:v1.0"/>
 					<prerequisites>
-						<SiteFrameRef version="1.0" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
+						<SiteFrameRef version="nptg:v2.1" ref="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg"/>
 						<ServiceFrameRef version="1.0" ref="epd:UK:METR:ServiceFrame_UK_PI_NETWORK:Line_1:mb"/>
 						<ServiceFrameRef versionRef="EXTERNAL" ref="epd:UK:NaPTAN:ServiceFrame_UK_PI_NETWORK:AdminArea@440:napt"/>
 					</prerequisites>
@@ -1423,7 +1423,7 @@ Bewbush West (loop)
 						</FareZone>
 					</fareZones>
 				</FareFrame>
-				<SiteFrame version="1.0" id="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg" responsibilitySetRef="nptg:data" dataSourceRef="nptg:dft">
+				<SiteFrame version="nptg:v2.1" id="epd:UK:METR:SiteFrame_UK_PI_NETWORK:Crawley:nptg" responsibilitySetRef="nptg:data" dataSourceRef="nptg:dft">
 					<Name>NPTG localities used by Metrobus 1</Name>
 					<Description>This frame contains the NPTG locality definitions used by the stops  the service. It could also be exchanged separately.</Description>
 					<TypeOfFrameRef ref="fxc:UK:DFT:TypeOfFrame_UK_PI_STOP:FXCP" version="fxc:v1.0"/>
@@ -2788,7 +2788,7 @@ This Shows  sample Purchases
 					</groupsOfEntities>
 				</ResourceFrame>
 				<!-- === TransXchange Common fixed definitions  ===  -->
-				<ResourceFrame version="txc:v1.0" id="fxc:UK:DFT:ResourceFrame_UK_PI_METADATA:TransXChange:txc" responsibilitySetRef="txc:TransXChange_metadata" dataSourceRef="txc:dft">
+				<ResourceFrame version="txc:v2.1" id="fxc:UK:DFT:ResourceFrame_UK_PI_METADATA:TransXChange:txc" responsibilitySetRef="txc:TransXChange_metadata" dataSourceRef="txc:dft">
 					<ValidBetween>
 						<FromDate>2005-01-01T00:00:00</FromDate>
 					</ValidBetween>

diff --git a/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml b/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml
@@ -328,6 +328,7 @@ Alpha
 						<DataSource id="myb:Mybus" version="1.0">
 							<Email>[email protected]</Email>
 						</DataSource>
+						<DataSource id="fxc:dft" version="fxc:v1.0"/>
 					</dataSources>
 					<!-- ========Responsibility Sets========== -->
 					<responsibilitySets>