Prefix netex as namespace of DistributionGroupRef (NeTEx-CEN#449)

* Prefix netex as namespace of DistributionGroupRef Fix NeTEx-CEN#448 * try to fix the DistributionGroupRef * fixing * another thing to fix * another ref * Lint and update documentation tables * probably right, but marked now * Update xsd/NeTEx_publication.xsd * Update xsd/NeTEx_publication.xsd * Lint and update documentation tables * Update Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml * Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml * Lint and update documentation tables * Update Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml * Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml Co-authored-by: Stefan de Konink <[email protected]> * Lint and update documentation tables * Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml * fixing example * 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>
Aurige · Feb 19, 2024 · ff044de · ff044de
1 parent 31efcde
commit ff044de
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
@@ -12,7 +12,7 @@ Data is (C) Copyright Transport for Lonond  2017-2019
 (C) CEN & Crown Copyright 2018, 2019 
 Free to use under a Creative Commons license.
 
-v1.1 Revised & corrected to use Tariff and simpler ids
+v1.1 Revised & corrected to use Tariff and simpler ids 
 
 ===================================================
 
@@ -5170,7 +5170,7 @@ You can only get these as paper tickets, not on an Oyster card, and they must be
 						<DistributionChannel version="any" id="tfl:Visitor_Centres">
 							<Name>Visitor centres</Name>
 							<PaymentMethods>debitCard creditCard companyCheque cash</PaymentMethods>
-							<DistributionGroupRef version="any" ref="nr:Visitor_Centres"/>
+							<DistributionGroupRef version="any" ref="tfl:Visitor_Centres"/>
 						</DistributionChannel>
 						<DistributionChannel version="any" id="tfl:OverseasAgents">
 							<Name>Overseas Agents centres</Name>
@@ -5196,7 +5196,7 @@ You can't
 	Buy paper tickets (cash single tickets and Day Travelcards)</Description>
 							<!-- TO DO -->
 							<PaymentMethods>debitCard creditCard   cash</PaymentMethods>
-							<DistributionGroupRef ref="nr:OysterTicketShops"/>
+							<DistributionGroupRef version="any" ref="nr:OysterTicketShops"/>
 						</DistributionChannel>
 						<DistributionChannel version="any" id="tfl:Oyster_Online">
 							<Name>Oyster Online</Name>
@@ -15583,6 +15583,13 @@ For more information on National Rail services see the
 								<!--  etc etc -->
 							</members>
 						</GeneralGroupOfEntities>
+						<GeneralGroupOfEntities version="any" id="nr:OysterTicketShops" nameOfMemberClass="OtherOrganisation">
+							<Name>List of registered universties</Name>
+							<members>
+								<OtherOrganisationRef ref="tfl:University_of_London"/>
+								<!--  etc etc -->
+							</members>
+						</GeneralGroupOfEntities>
 					</groupsOfEntities>
 				</ResourceFrame>
 			</frames>

diff --git a/examples/functions/newModes/NewModes-CarClubExample.xml b/examples/functions/newModes/NewModes-CarClubExample.xml
@@ -1074,6 +1074,7 @@ This Shows  sample Purchases
 										<SalesTransaction version="any" id="mct:Cust444@trans005@purchase_single_session">
 											<Name>Book and pay for  1-day use of a car</Name>
 											<Date>2021-10-01T10:10:00</Date>
+											<IsValid>true</IsValid>
 											<TypeOfFareContractEntryRef versionRef="EXTERNAL" ref="fxc:product_purchase"/>
 											<Amount>103.50</Amount>
 											<ruleStepResults>
@@ -1086,6 +1087,7 @@ This Shows  sample Purchases
 												</RuleStepResult>
 											</ruleStepResults>
 											<PaymentMethod>creditCard</PaymentMethod>
+											<CardNumber>1231 0000 0000 0000 0000</CardNumber>
 											<travelSpecifications>
 												<OfferedTravelSpecification version="any" id="mct:Cust444@trans005@purchase_single_session">
 													<Date>2021-10-08T11:15:00</Date>

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
@@ -2327,7 +2327,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
 </Description>
 							<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
 							<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
-							<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
+							<DistributionGroupRef version="1.0" ref="frst:travel_shops"/>
 						</DistributionChannel>
 					</distributionChannels>
 					<typesOfTravelDocuments>

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
@@ -7380,7 +7380,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
 </Description>
 							<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
 							<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
-							<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
+							<DistributionGroupRef version="1.0" ref="frst:WoE@travel_shops"/>
 						</DistributionChannel>
 					</distributionChannels>
 					<typesOfTravelDocuments>

diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
@@ -876,12 +876,12 @@ Correct COnstraints for PointOnRoute
 		</xsd:unique>
 		<!-- =====GeneralGroupOfEntities Key ========================== -->
 		<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | DistributionGroupRef"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>

diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
@@ -748,12 +748,12 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:unique>
 		<!-- =====GeneralGroupOfEntities Key ========================== -->
 		<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef   | DistributionGroupRef"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>