Skip to content

Private codes now done, and potentially filtered out all other changes #876

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 2 commits into from
May 6, 2025
Merged

Private codes now done, and potentially filtered out all other changes #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4cb18
Format
skinkie Apr 23, 2025
3e9a8e7
All examples have privateCodes
skinkie Apr 24, 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 --format --pretty 1 "${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
56 changes: 42 additions & 14 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 @@ -643,11 +643,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
<!--- ====LINES===== -->
<lines>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:BAK">
<privateCodes>
<PrivateCode>B</PrivateCode>
</privateCodes>
<Name>Bakerloo Line</Name>
<ShortName>Bakerloo</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>BAK</PublicCode>
<PrivateCode>B</PrivateCode>
<Presentation>
<ColourName>brown</ColourName>
</Presentation>
Expand All @@ -667,11 +669,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:CEN">
<privateCodes>
<PrivateCode>C</PrivateCode>
</privateCodes>
<Name>Central Line</Name>
<ShortName>Central</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>CEN</PublicCode>
<PrivateCode>C</PrivateCode>
<Presentation>
<ColourName>red</ColourName>
</Presentation>
Expand All @@ -685,11 +689,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:CIR">
<privateCodes>
<PrivateCode>R</PrivateCode>
</privateCodes>
<Name>Circle Line</Name>
<ShortName>Circle</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>CIR</PublicCode>
<PrivateCode>R</PrivateCode>
<Presentation>
<ColourName>yellow</ColourName>
</Presentation>
Expand All @@ -703,11 +709,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:TRM">
<privateCodes>
<PrivateCode>T</PrivateCode>
</privateCodes>
<Name>Croydon DLR</Name>
<ShortName>DLR </ShortName>
<TransportMode>tram</TransportMode>
<PublicCode>TRM</PublicCode>
<PrivateCode>T</PrivateCode>
<Presentation>
<ColourName>green</ColourName>
</Presentation>
Expand All @@ -727,11 +735,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:DIS">
<privateCodes>
<PrivateCode>D</PrivateCode>
</privateCodes>
<Name>District Line</Name>
<ShortName>District </ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>DIS</PublicCode>
<PrivateCode>D</PrivateCode>
<Presentation>
<ColourName>green</ColourName>
</Presentation>
Expand All @@ -745,11 +755,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:JUB">
<privateCodes>
<PrivateCode>J</PrivateCode>
</privateCodes>
<Name>Jubilee Line</Name>
<ShortName>Jubilee </ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>JUB</PublicCode>
<PrivateCode>J</PrivateCode>
<Presentation>
<ColourName>silver</ColourName>
</Presentation>
Expand All @@ -769,11 +781,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:DLR">
<privateCodes>
<PrivateCode>L</PrivateCode>
</privateCodes>
<Name>Docklands light railway</Name>
<ShortName>DLR</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>DLR</PublicCode>
<PrivateCode>L</PrivateCode>
<Presentation>
<ColourName>lightGreen</ColourName>
</Presentation>
Expand All @@ -793,11 +807,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:HAM">
<privateCodes>
<PrivateCode>H</PrivateCode>
</privateCodes>
<Name>Hammersmith &amp; City Line</Name>
<ShortName>Hammersmith &amp; City</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>HAM</PublicCode>
<PrivateCode>H</PrivateCode>
<Presentation>
<ColourName>pink</ColourName>
</Presentation>
Expand All @@ -811,11 +827,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:MET">
<privateCodes>
<PrivateCode>M</PrivateCode>
</privateCodes>
<Name>Metropolitan Line</Name>
<ShortName>Metropolitan</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>MET</PublicCode>
<PrivateCode>M</PrivateCode>
<Presentation>
<ColourName>maroon</ColourName>
</Presentation>
Expand All @@ -835,11 +853,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:NTN">
<privateCodes>
<PrivateCode>N</PrivateCode>
</privateCodes>
<Name>Northern Line</Name>
<ShortName>Northern</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>NTN</PublicCode>
<PrivateCode>N</PrivateCode>
<Presentation>
<ColourName>black</ColourName>
</Presentation>
Expand All @@ -853,11 +873,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:OVR">
<privateCodes>
<PrivateCode>O</PrivateCode>
</privateCodes>
<Name>London Overground</Name>
<ShortName>Overground </ShortName>
<TransportMode>rail</TransportMode>
<PublicCode>OVR</PublicCode>
<PrivateCode>O</PrivateCode>
<Presentation>
<ColourName>orange</ColourName>
</Presentation>
Expand All @@ -874,11 +896,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:PIC">
<privateCodes>
<PrivateCode>P</PrivateCode>
</privateCodes>
<Name>Piccadilly Line</Name>
<ShortName>Piccadilly</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>PIC</PublicCode>
<PrivateCode>P</PrivateCode>
<Presentation>
<ColourName>darkblue</ColourName>
</Presentation>
Expand All @@ -892,11 +916,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:VIC">
<privateCodes>
<PrivateCode>V</PrivateCode>
</privateCodes>
<Name>VictoriaLine</Name>
<ShortName>Victoria</ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>VIC</PublicCode>
<PrivateCode>V</PrivateCode>
<Presentation>
<ColourName>lightblue</ColourName>
</Presentation>
Expand All @@ -910,11 +936,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
</allowedDirections>
</Line>
<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:WAC">
<privateCodes>
<PrivateCode>W</PrivateCode>
</privateCodes>
<Name>Waterloo &amp; City Line</Name>
<ShortName>Waterloo &amp; City </ShortName>
<TransportMode>metro</TransportMode>
<PublicCode>WAC</PublicCode>
<PrivateCode>W</PrivateCode>
<Presentation>
<ColourName>turquoise</ColourName>
</Presentation>
Expand Down
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
24 changes: 18 additions & 6 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 @@ -7677,10 +7677,12 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
<values>
<!--- ====PurposeOfGrouping method========= -->
<Branding version="any" id="tfc:TFC@brand">
<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 @@ -8503,18 +8505,24 @@ c
<values>
<!--- ====Types OfTariff ========= -->
<TypeOfPricingRule version="any" id="eura:vat@transport">
<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">
<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">
<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
Loading