Skip to content

Commit ff044de

Browse files
skinkieue71603github-actions[bot]
authored
Prefix netex as namespace of DistributionGroupRef (#449)
* Prefix netex as namespace of DistributionGroupRef Fix #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 <stefan@konink.de> * 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 <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 31efcde commit ff044de

6 files changed

+18
-9
lines changed

‎examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Data is (C) Copyright Transport for Lonond 2017-2019
1212
(C) CEN & Crown Copyright 2018, 2019
1313
Free to use under a Creative Commons license.
1414

15-
v1.1 Revised & corrected to use Tariff and simpler ids
15+
v1.1 Revised & corrected to use Tariff and simpler ids
1616

1717
===================================================
1818

@@ -5170,7 +5170,7 @@ You can only get these as paper tickets, not on an Oyster card, and they must be
51705170
<DistributionChannel version="any" id="tfl:Visitor_Centres">
51715171
<Name>Visitor centres</Name>
51725172
<PaymentMethods>debitCard creditCard companyCheque cash</PaymentMethods>
5173-
<DistributionGroupRef version="any" ref="nr:Visitor_Centres"/>
5173+
<DistributionGroupRef version="any" ref="tfl:Visitor_Centres"/>
51745174
</DistributionChannel>
51755175
<DistributionChannel version="any" id="tfl:OverseasAgents">
51765176
<Name>Overseas Agents centres</Name>
@@ -5196,7 +5196,7 @@ You can't
51965196
Buy paper tickets (cash single tickets and Day Travelcards)</Description>
51975197
<!-- TO DO -->
51985198
<PaymentMethods>debitCard creditCard cash</PaymentMethods>
5199-
<DistributionGroupRef ref="nr:OysterTicketShops"/>
5199+
<DistributionGroupRef version="any" ref="nr:OysterTicketShops"/>
52005200
</DistributionChannel>
52015201
<DistributionChannel version="any" id="tfl:Oyster_Online">
52025202
<Name>Oyster Online</Name>
@@ -15583,6 +15583,13 @@ For more information on National Rail services see the
1558315583
<!-- etc etc -->
1558415584
</members>
1558515585
</GeneralGroupOfEntities>
15586+
<GeneralGroupOfEntities version="any" id="nr:OysterTicketShops" nameOfMemberClass="OtherOrganisation">
15587+
<Name>List of registered universties</Name>
15588+
<members>
15589+
<OtherOrganisationRef ref="tfl:University_of_London"/>
15590+
<!-- etc etc -->
15591+
</members>
15592+
</GeneralGroupOfEntities>
1558615593
</groupsOfEntities>
1558715594
</ResourceFrame>
1558815595
</frames>

‎examples/functions/newModes/NewModes-CarClubExample.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,7 @@ This Shows sample Purchases
10741074
<SalesTransaction version="any" id="mct:Cust444@trans005@purchase_single_session">
10751075
<Name>Book and pay for 1-day use of a car</Name>
10761076
<Date>2021-10-01T10:10:00</Date>
1077+
<IsValid>true</IsValid>
10771078
<TypeOfFareContractEntryRef versionRef="EXTERNAL" ref="fxc:product_purchase"/>
10781079
<Amount>103.50</Amount>
10791080
<ruleStepResults>
@@ -1086,6 +1087,7 @@ This Shows sample Purchases
10861087
</RuleStepResult>
10871088
</ruleStepResults>
10881089
<PaymentMethod>creditCard</PaymentMethod>
1090+
<CardNumber>1231 0000 0000 0000 0000</CardNumber>
10891091
<travelSpecifications>
10901092
<OfferedTravelSpecification version="any" id="mct:Cust444@trans005@purchase_single_session">
10911093
<Date>2021-10-08T11:15:00</Date>

‎examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
23272327
</Description>
23282328
<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
23292329
<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
2330-
<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
2330+
<DistributionGroupRef version="1.0" ref="frst:travel_shops"/>
23312331
</DistributionChannel>
23322332
</distributionChannels>
23332333
<typesOfTravelDocuments>

‎examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7380,7 +7380,7 @@ BS5 0DZ or email your details to ticketssww@firstgroup</Description>
73807380
</Description>
73817381
<Url>https://www.firstgroup.com/bristol-bath-and-west/tickets/where-buy</Url>
73827382
<OperatorRef version="1.0" ref="noc:FBRI">First Somerset &amp; Avon Ltd nocn:136361</OperatorRef>
7383-
<DistributionGroupRef version="1.0" ref="frst:Travel_shops"/>
7383+
<DistributionGroupRef version="1.0" ref="frst:WoE@travel_shops"/>
73847384
</DistributionChannel>
73857385
</distributionChannels>
73867386
<typesOfTravelDocuments>

‎xsd/NeTEx_publication.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,12 +876,12 @@ Correct COnstraints for PointOnRoute
876876
</xsd:unique>
877877
<!-- =====GeneralGroupOfEntities Key ========================== -->
878878
<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
879-
<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | DistributionGroupRef"/>
879+
<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
880880
<xsd:field xpath="@ref"/>
881881
<xsd:field xpath="@version"/>
882882
</xsd:keyref>
883883
<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
884-
<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
884+
<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
885885
<xsd:field xpath="@id"/>
886886
<xsd:field xpath="@version"/>
887887
</xsd:key>

‎xsd/NeTEx_publication_timetable.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,12 +748,12 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
748748
</xsd:unique>
749749
<!-- =====GeneralGroupOfEntities Key ========================== -->
750750
<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
751-
<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | DistributionGroupRef"/>
751+
<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | .//netex:DistributionGroupRef"/>
752752
<xsd:field xpath="@ref"/>
753753
<xsd:field xpath="@version"/>
754754
</xsd:keyref>
755755
<xsd:key name="GeneralGroupOfEntities_AnyVersionedKey">
756-
<xsd:selector xpath=".//netex:GeneralGroupOfEntities"/>
756+
<xsd:selector xpath=".//netex:GeneralGroupOfEntities | .//netex:GroupOfPlaces"/>
757757
<xsd:field xpath="@id"/>
758758
<xsd:field xpath="@version"/>
759759
</xsd:key>

0 commit comments

Comments
 (0)