Skip to content

privateCodes now done properly in examples #851

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

Closed
skinkie wants to merge 4 commits into from
Closed

privateCodes now done properly in examples #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87099c3
My automatic approch, ignoring inline comments
skinkie Apr 10, 2025
ea1fe7e
remove ns0:
ue71603 Apr 23, 2025
cfbb392
Lint and update documentation tables
github-actions[bot] Apr 23, 2025
5523a12
Fix remaining privateCodes
skinkie Apr 23, 2025
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
2 changes: 1 addition & 1 deletion .github/scripts/validate-and-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PARSING_ERROR=0
# Iterate all XML and XSD files
while IFS= read -r -d $'\0' filename; do
# Prettify the file using xmllint and save the result to ${filename}.pretty
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 -format "${filename}" >"${filename}.pretty"; then
# Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
else
Expand Down
162 changes: 95 additions & 67 deletions examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions examples/functions/fares/rail/Netex_era_crossborder_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3607,13 +3607,17 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
<PricingParameterSet id="eura:Common_Resources" version="any">
<priceUnits>
<PriceUnit id="eura:EUR" version="any">
<privateCodes>
<PrivateCode>€</PrivateCode>
</privateCodes>
<Name>Euro</Name>
<PrivateCode>€</PrivateCode>
<Precision>2</Precision>
</PriceUnit>
<PriceUnit id="eura:GBP" version="any">
<privateCodes>
<PrivateCode>£</PrivateCode>
</privateCodes>
<Name>Pound Sterling</Name>
<PrivateCode>£</PrivateCode>
<Precision>2</Precision>
</PriceUnit>
<PriceUnit id="eura:SFR" version="any">
Expand Down
32 changes: 22 additions & 10 deletions examples/functions/fares/rail/Netex_era_distance_ro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7676,11 +7676,13 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
<Name>Branding</Name>
<values>
<!--- ====PurposeOfGrouping method========= -->
<Branding version="any" id="tfc:TFC@brand">
<Branding id="tfc:TFC@brand" version="any">
<privateCodes>
<PrivateCode>TFC</PrivateCode>
</privateCodes>
<Name>Transferoviar Călători</Name>
<Image>TODO-BITMAPVALUE</Image>
<Url>https://www.transferoviarcalatori.ro/logo.png</Url>
<PrivateCode>TFC</PrivateCode>
</Branding>
</values>
</ValueSet>
Expand Down Expand Up @@ -8502,19 +8504,25 @@ c
<Name>VAt Tax categories</Name>
<values>
<!--- ====Types OfTariff ========= -->
<TypeOfPricingRule version="any" id="eura:vat@transport">
<TypeOfPricingRule id="eura:vat@transport" version="any">
<privateCodes>
<PrivateCode>q9876</PrivateCode>
</privateCodes>
<Name>VAT Tax classifcation - transport</Name>
<PrivateCode>q9876</PrivateCode>
<TaxCategory>transportation</TaxCategory>
</TypeOfPricingRule>
<TypeOfPricingRule version="any" id="eura:vat@food">
<TypeOfPricingRule id="eura:vat@food" version="any">
<privateCodes>
<PrivateCode>q9877</PrivateCode>
</privateCodes>
<Name>VAT Tax classifcation - transport</Name>
<PrivateCode>q9877</PrivateCode>
<TaxCategory>food</TaxCategory>
</TypeOfPricingRule>
<TypeOfPricingRule version="any" id="eura:vat@parking">
<TypeOfPricingRule id="eura:vat@parking" version="any">
<privateCodes>
<PrivateCode>q9877</PrivateCode>
</privateCodes>
<Name>VAT Tax classifcation - transport</Name>
<PrivateCode>q9877</PrivateCode>
<TaxCategory>parking</TaxCategory>
</TypeOfPricingRule>
</values>
Expand Down Expand Up @@ -8629,13 +8637,17 @@ c
<PricingParameterSet id="eura:Common_Resources" version="any">
<priceUnits>
<PriceUnit id="eura:EUR" version="any">
<privateCodes>
<PrivateCode>€</PrivateCode>
</privateCodes>
<Name>Euro</Name>
<PrivateCode>€</PrivateCode>
<Precision>2</Precision>
</PriceUnit>
<PriceUnit id="eura:GBP" version="any">
<privateCodes>
<PrivateCode>£</PrivateCode>
</privateCodes>
<Name>Pound Sterling</Name>
<PrivateCode>£</PrivateCode>
<Precision>2</Precision>
</PriceUnit>
<PriceUnit id="eura:SFR" version="any">
Expand Down
174 changes: 96 additions & 78 deletions examples/functions/fares/rail/Netex_era_toc_uk.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/functions/patterns/Netex_KBIC_ParisNetwork_with_bookingArrangements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ Includes the following:
<RouteRef version="004" ref="spq:Rt001o"/>
<bookingArrangements>
<BookingArrangementRef ref="standard:24h_prior:except_holidays"/>
</bookingArrangements>
</bookingArrangements>
<pointsInSequence>
<StopPointInJourneyPattern version="any" id="ssp:SvPip_001o_01">
<ScheduledStopPointRef version="001" ref="ssp:SSP1"/>
Expand Down
10 changes: 6 additions & 4 deletions examples/functions/relations/test-01-main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="UTF-8"?>
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" version="ntx:1.1">
<PublicationTimestamp>2022-01-11T16:04:26</PublicationTimestamp>
<ParticipantRef>DK</ParticipantRef>
Expand Down Expand Up @@ -94,14 +94,16 @@
<TypeOfFrameRef ref="epip:EU_PI_NETWORK" versionRef="1.0"/>
<lines>
<Line id="DK::Line:25294::" version="1641913466">
<privateCodes>
<PrivateCode>021</PrivateCode>
</privateCodes>
<Name>Arriva</Name>
<ShortName>021</ShortName>
<TransportMode>bus</TransportMode>
<PublicCode>Arriva</PublicCode>
<PrivateCode>021</PrivateCode>
<AuthorityRef ref="DK::Authority:516::" version="1641913466"/>
<AuthorityRef version="1641913466" ref="DK::Authority:516::"/>
<additionalOperators>
<OperatorRef ref="DK::Operator:306::" version="1641913466"/>
<OperatorRef version="1641913466" ref="DK::Operator:306::"/>
</additionalOperators>
</Line>
</lines>
Expand Down
Loading