Skip to content

Prefix netex as namespace of DistributionGroupRef #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skinkie merged 22 commits into from
Feb 19, 2024
Merged

Prefix netex as namespace of DistributionGroupRef #449

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6860927
Prefix netex as namespace of DistributionGroupRef
skinkie Jun 16, 2023
05ce7a7
try to fix the DistributionGroupRef
ue71603 Jun 17, 2023
8c5c26a
fixing
ue71603 Jun 17, 2023
ae73fce
another thing to fix
ue71603 Jun 17, 2023
aeecfd7
another ref
ue71603 Jun 17, 2023
fa1fe2c
Lint and update documentation tables
github-actions[bot] Jun 17, 2023
00d67b8
probably right, but marked now
ue71603 Jun 17, 2023
ce49887
Merge branch 'fix_distributiongroupref' of https://github.com/NeTEx-C…
ue71603 Jun 17, 2023
310421f
Update xsd/NeTEx_publication.xsd
skinkie Jun 17, 2023
968147b
Update xsd/NeTEx_publication.xsd
skinkie Jun 17, 2023
f2f26fd
Merge branch 'fix_distributiongroupref' of https://github.com/NeTEx-C…
ue71603 Jun 19, 2023
2b123e3
Lint and update documentation tables
github-actions[bot] Jun 19, 2023
c0231de
Update Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
ue71603 Jun 20, 2023
df559aa
Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_Unit…
ue71603 Jun 20, 2023
32439ce
Lint and update documentation tables
github-actions[bot] Jun 20, 2023
ee847ae
Update Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
ue71603 Jun 20, 2023
0190911
Merge branch 'fix_distributiongroupref' of https://github.com/NeTEx-C…
ue71603 Jun 20, 2023
1460776
Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_Unit…
ue71603 Jun 20, 2023
fe36228
Lint and update documentation tables
github-actions[bot] Jun 20, 2023
b844402
Update examples/functions/fares/Netex_101.21_TfL_GeographicFares_Unit…
ue71603 Dec 16, 2023
62dd1b2
fixing example
ue71603 Feb 17, 2024
7fb773b
Lint and update documentation tables
github-actions[bot] Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Copy link
Contributor

@Aurige Aurige Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you want the DistributionGroup to have the exact same Id as the DistributionChannel !!!?? That will not work

Copy link
Contributor

@ue71603 ue71603 Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it worked fined. There is no nr:Visitor_Centers that could be referenced. And the id are per class so it works as well. The id references the GeneralGroupOfEntities (and there is only tfl:Visitor_Centres):
<GeneralGroupOfEntities version="any" id="tfl:Visitor_Centres" nameOfMemberClass="AccessSpace"> <Name>List of visitor centres</Name> <members> <AccessSpaceRef version="1" ref="tfl:Piccadilly_Circus_Visitor_Centre"/> <AccessSpaceRef version="1" ref="tfl:Euston_Station_Visitor_Centre"/> <AccessSpaceRef version="1" ref="tfl:Victoria_Station_Visitor_Centre"/> <AccessSpaceRef version="1" ref="tfl:Heathrow_Terminal_123_Visitor_Centre"/> </members> </GeneralGroupOfEntities>

it does not reference to the DistributionChannel:
<DistributionChannel version="any" id="tfl:Visitor_Centres"> <Name>Visitor centres</Name> <PaymentMethods>debitCard creditCard companyCheque cash</PaymentMethods> <DistributionGroupRef version="any" ref="tfl:Visitor_Centres"/> </DistributionChannel>

Copy link
Contributor

@Aurige Aurige Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm lost here: in this example tfl:Visitor_Centres is the id of the DistributionChannel <DistributionChannel version="any" id="tfl:Visitor_Centres"> that has an element refering itself as a DistributionGroup ! I don't get the semantinc, neither the technical side of it !

Copy link
Contributor

@ue71603 ue71603 Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Aurige This is no my example. I just made it working. That the DistributionChannel and the Group used the same id text I don't know. Who knows? @nick-knowles ?

Copy link
Contributor

@Aurige Aurige Jun 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in fact it was ok with a different namespace, but changing the namespace to "tfl" create an inconsistency !

</DistributionChannel>
<DistributionChannel version="any" id="tfl:OverseasAgents">
<Name>Overseas Agents centres</Name>
Expand All @@ -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 ref="nr:OysterTicketShops" version="any"/>
</DistributionChannel>
<DistributionChannel version="any" id="tfl:Oyster_Online">
<Name>Oyster Online</Name>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions xsd/NeTEx_publication.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down