From ca4108d0a8bcb5cffa3061799c1ce4e443d15dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 4 Dec 2024 13:36:52 +0100 Subject: [PATCH 1/8] First draft of using privateCodes --- ...UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml | 6 ++++-- .../versioning/Netex_VersioningExample_Step_02.xml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index 4d1d63c1a..7feeed212 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -647,9 +647,11 @@ Changes + + 86738 + Wimbledon Rail Station Wimbledon Station - 86738 @@ -8831,4 +8833,4 @@ Changes - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml index 8ef2a0ff7..d821b6d4d 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml @@ -84,9 +84,11 @@ This is part 2 of a multistep example on versioning + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - mycodeA Haltstelle B @@ -97,4 +99,4 @@ This is part 2 of a multistep example on versioning - + \ No newline at end of file From 8815dead185274b73c775fb9d58f6f0e61415bdf Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:39:15 +0000 Subject: [PATCH 2/8] Lint and update documentation tables --- ...-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml | 2 +- .../functions/versioning/Netex_VersioningExample_Step_02.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml index 7feeed212..20ca2ace7 100644 --- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml +++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml @@ -8833,4 +8833,4 @@ Changes - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml index d821b6d4d..1e2a80906 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml @@ -99,4 +99,4 @@ This is part 2 of a multistep example on versioning - \ No newline at end of file + From c72a3781273fcc1df569fce5705b81832b8ae5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 11 Dec 2024 22:01:41 +0100 Subject: [PATCH 3/8] more --- .../versioning/Netex_VersioningExample_Step_03.xml | 10 +++++++--- .../versioning/Netex_VersioningExample_Step_04.xml | 10 +++++++--- .../versioning/Netex_VersioningExample_Step_05.xml | 8 ++++++-- .../Netex_VersioningExample_Step_05_GeneralFrame.xml | 8 ++++++-- .../Netex_VersioningExample_VersionHistories_01.xml | 10 +++++++--- .../Netex_VersioningExample_VersionHistories_02.xml | 10 +++++++--- 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml index 652391380..2bd754926 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml @@ -105,14 +105,18 @@ This is part 3 of a multistep example on versioning + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - mycodeA + + mycodeB + Haltstelle B Version two of stop B - mycodeB @@ -133,4 +137,4 @@ This is part 3 of a multistep example on versioning - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml index 5603f8753..e26a529d9 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml @@ -108,14 +108,18 @@ This is part 4 of a multistep example on versioning. EXTERNAL + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - mycodeA + + mycodeB + Haltstelle B Version two of stop B - mycodeB Haltstelle C @@ -181,4 +185,4 @@ This is part 4 of a multistep example on versioning. - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 3ec1bce88..332672c31 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -104,14 +104,18 @@ This is part 4 of a multistep example on versioning. + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - mycodeA + + mycodeB + Haltstelle B Version two of stop B - mycodeB Haltstelle C diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml index d84be3ae4..f1732b575 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml @@ -72,14 +72,18 @@ This is part 4 of a multistep example on versioning. + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - mycodeA + + mycodeB + Haltstelle B Version two of stop B - mycodeB Haltstelle C diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml index b2cb9c03e..8f2b04ada 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml @@ -75,18 +75,22 @@ Version History Version one of stop A + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed and code addded - mycodeA Haltstelle B Version one of stop B + + mycodeB + Haltstelle B Version two of stop B - mycodeB @@ -172,4 +176,4 @@ Version History - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml index afb7b9f50..e38e16358 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml @@ -74,9 +74,11 @@ Version History Version one of stop A + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed and code addded - mycodeA @@ -87,9 +89,11 @@ Version History Version one of stop B + + mycodeB + Haltstelle B Version two of stop B - mycodeB @@ -187,4 +191,4 @@ Version History - + \ No newline at end of file From 5a6d8565f4e46473f77e02328269e2aba0c03f49 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 21:04:11 +0000 Subject: [PATCH 4/8] Lint and update documentation tables --- .../versioning/Netex_VersioningExample_Step_03.xml | 2 +- .../versioning/Netex_VersioningExample_Step_04.xml | 2 +- .../versioning/Netex_VersioningExample_Step_05.xml | 12 ++++++------ .../Netex_VersioningExample_Step_05_GeneralFrame.xml | 12 ++++++------ .../Netex_VersioningExample_VersionHistories_01.xml | 2 +- .../Netex_VersioningExample_VersionHistories_02.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml index 2bd754926..dc807a43e 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml @@ -137,4 +137,4 @@ This is part 3 of a multistep example on versioning - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml index e26a529d9..9dac93ae8 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml @@ -185,4 +185,4 @@ This is part 4 of a multistep example on versioning. - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 332672c31..2318a8c22 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -104,16 +104,16 @@ This is part 4 of a multistep example on versioning. - - mycodeA - + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - - mycodeB - + + mycodeB + Haltstelle B Version two of stop B diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml index f1732b575..2df64baf7 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml @@ -72,16 +72,16 @@ This is part 4 of a multistep example on versioning. - - mycodeA - + + mycodeA + Haltstelle A - Museum Version two of stop A. Name is Changed - - mycodeB - + + mycodeB + Haltstelle B Version two of stop B diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml index 8f2b04ada..6fafbc0a6 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml @@ -176,4 +176,4 @@ Version History - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml index e38e16358..4dcd3d77f 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml @@ -191,4 +191,4 @@ Version History - \ No newline at end of file + From 9aea04a32d9d35543ff9caaa9babf9f0925fd319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 9 Apr 2025 14:52:38 +0200 Subject: [PATCH 5/8] more privateCodes --- .../functions/fares/rail/Netex_era_crossborder_de.xml | 6 ++++-- .../functions/simpleNetwork/Netex_uk_underground_1.xml | 6 ++++-- .../functions/site/Netex_11_Sites_OlympicPark_1.xml | 4 +++- .../stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml | 4 +++- .../stopPlace/Netex_10_StopPlace_withParking_1.xml | 10 +++++++--- .../Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml | 6 ++++-- .../Netex_VersioningExample_Step_05_GeneralFrame.xml | 2 +- .../Netex_VersioningExample_VersionHistories_01.xml | 2 +- .../Netex_VersioningExample_VersionHistories_02.xml | 2 +- .../EPIAP_Accessibility_Chur_V08_vehicletypes.xml | 10 +++++++--- examples/standards/epiap/eiap_test1_ramp.xml | 6 ++++-- ...1_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml | 6 ++++-- ...B_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml | 6 ++++-- examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml | 6 ++++-- examples/standards/fxc/uk_fxc_common_profile.xml | 10 +++++++--- examples/standards/txc/uk_nptg_localities_extract1.xml | 6 ++++-- .../txc/uk_txc_SCWW-86_extract1-with-sections.xml | 4 +++- .../txc/uk_txc_SCWW-86_extract2-simplified.xml | 6 ++++-- .../netex_transportOrganisation_version.xsd | 2 +- 19 files changed, 70 insertions(+), 34 deletions(-) diff --git a/examples/functions/fares/rail/Netex_era_crossborder_de.xml b/examples/functions/fares/rail/Netex_era_crossborder_de.xml index b427ea36b..a6ab4ac32 100644 --- a/examples/functions/fares/rail/Netex_era_crossborder_de.xml +++ b/examples/functions/fares/rail/Netex_era_crossborder_de.xml @@ -3607,8 +3607,10 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in + + € + Euro - € 2 @@ -3824,4 +3826,4 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in - + \ No newline at end of file diff --git a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml index 423de27e2..3823c6e06 100644 --- a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml +++ b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml @@ -230,11 +230,13 @@ A COMPOSITE FRAME Is used to group the above frames as a cohernet version. + + B + Bakerloo Line BaKerloo metro BAK - B brown @@ -19197,4 +19199,4 @@ A COMPOSITE FRAME Is used to group the above frames as a cohernet version. - + \ No newline at end of file diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml index b961979a7..2076f8d76 100644 --- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml +++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml @@ -724,11 +724,13 @@ Updated to give exampel of group of SItes + + 20026 + Stratford DLRStation Stratford DLR - 20026 diff --git a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml index 07df31188..241167611 100644 --- a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml +++ b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml @@ -213,8 +213,10 @@ B. Frames and grouping - Poste, St Jean + legacy3452 + + Poste, St Jean bus true true diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index 561efec03..afaee9a8c 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -782,10 +782,12 @@ Changes + + 86738 + Wimbledon Rail Station Wimbledon Station - 86738 @@ -6660,9 +6662,11 @@ Changes + + INT123 + Wimbledon Rail Station SWt trains - INT123 rail true true @@ -8385,4 +8389,4 @@ Changes - + \ No newline at end of file diff --git a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml index 2c5b3dc84..c6a62fbff 100644 --- a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml +++ b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml @@ -1419,6 +1419,9 @@ The Calendar is shown coded in two differnt ways --> + + MyPoint23 + AP 1 before Bravo start of activation link al1 0.3 @@ -1445,7 +1448,6 @@ The Calendar is shown coded in two differnt ways 80 - MyPoint23 AP2 at Bravo end of activation link @@ -1835,4 +1837,4 @@ The Calendar is shown coded in two differnt ways - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml index 2df64baf7..3477d5956 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml @@ -129,4 +129,4 @@ This is part 4 of a multistep example on versioning. - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml index 6fafbc0a6..8f2b04ada 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml @@ -176,4 +176,4 @@ Version History - + \ No newline at end of file diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml index 4dcd3d77f..e38e16358 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml @@ -191,4 +191,4 @@ Version History - + \ No newline at end of file diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index 7e6895c1c..5600b0ebb 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -605,9 +605,11 @@ 8581044 + + 8581044 + Chur, Bahnhofplatz CHBA - 8581044 @@ -618,9 +620,11 @@ + + 1 + Bahnsteig 1 BS1 - 1 BS1 other @@ -2464,4 +2468,4 @@ - + \ No newline at end of file diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index 9e5f3b1da..03e021277 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -109,10 +109,12 @@ + + 11 + Region - 11 Angebot @@ -137857,4 +137859,4 @@ - + \ No newline at end of file diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml index 4070da9c0..6bad145e4 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml @@ -1460,9 +1460,11 @@ Bewbush West (loop) + + CRAWLEY + CRAWLEY - CRAWLEY PlusBus @@ -2969,4 +2971,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml index dffb0b4f2..3bde630f3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml @@ -1460,9 +1460,11 @@ Bewbush West (loop) + + CRAWLEY + CRAWLEY - CRAWLEY PlusBus @@ -3194,4 +3196,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 3b8b76392..58631d89f 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -912,6 +912,9 @@ Train companies prefer customers to buy their tickets before getting on a train + + PBD + PlusBus Day - Smartcard Add On - bought separately rather than bundled with product @@ -924,7 +927,6 @@ Day Return rail ticket = issue a PlusBus Day (PBD) ticket for origin and/or dest Period Return rail ticket = issue two PlusBus Day (PBD) tickets for origin and/or destination town, one for the outward date and a second for the return date. If the return date is not known, you can only issue a PlusBus Day ticket for the customers outward journey date. http://www.plusbus.info/how-issue - PBD self service @@ -6068,4 +6070,4 @@ West Midlands Railway - + \ No newline at end of file diff --git a/examples/standards/fxc/uk_fxc_common_profile.xml b/examples/standards/fxc/uk_fxc_common_profile.xml index b87a723af..8ad5a9282 100644 --- a/examples/standards/fxc/uk_fxc_common_profile.xml +++ b/examples/standards/fxc/uk_fxc_common_profile.xml @@ -184,13 +184,17 @@ + + £ + Pound Sterling - £ 2 + + € + Euro - € 2 @@ -2310,4 +2314,4 @@ - + \ No newline at end of file diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml index 8256763d5..7b84cdf2b 100644 --- a/examples/standards/txc/uk_nptg_localities_extract1.xml +++ b/examples/standards/txc/uk_nptg_localities_extract1.xml @@ -589,9 +589,11 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro + + ABDARE + ABDARE - ABDARE @@ -9424,4 +9426,4 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - + \ No newline at end of file diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml index 8dca14fd5..4f7da93af 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml @@ -190,12 +190,14 @@ This example maps + + B6 + B6 - B6 diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml index 52891ea04..28e55b8f4 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml @@ -2436,8 +2436,10 @@ TXC JPTL ==> NeTEX Timing Pattern + + 119993 + Timing pattern part of TXC JourneyPattern - 119993 - 20026 + 20026 diff --git a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml index 241167611..35a77e3ba 100644 --- a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml +++ b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml @@ -213,9 +213,9 @@ B. Frames and grouping - - legacy3452 - + + legacy3452 + Poste, St Jean bus true diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml index afaee9a8c..c5ea5d579 100644 --- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml +++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml @@ -8389,4 +8389,4 @@ Changes - \ No newline at end of file + diff --git a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml index c6a62fbff..1c9176234 100644 --- a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml +++ b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml @@ -1837,4 +1837,4 @@ The Calendar is shown coded in two differnt ways - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml index 3477d5956..2df64baf7 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml @@ -129,4 +129,4 @@ This is part 4 of a multistep example on versioning. - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml index 8f2b04ada..6fafbc0a6 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml @@ -176,4 +176,4 @@ Version History - \ No newline at end of file + diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml index e38e16358..4dcd3d77f 100644 --- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml +++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml @@ -191,4 +191,4 @@ Version History - \ No newline at end of file + diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml index 5600b0ebb..ec3c40258 100644 --- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml +++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml @@ -2468,4 +2468,4 @@ - \ No newline at end of file + diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml index 03e021277..3b32c5b84 100644 --- a/examples/standards/epiap/eiap_test1_ramp.xml +++ b/examples/standards/epiap/eiap_test1_ramp.xml @@ -137859,4 +137859,4 @@ - \ No newline at end of file + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml index 6bad145e4..1a995e26f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml @@ -2971,4 +2971,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml index 3bde630f3..e3c476af6 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml @@ -3196,4 +3196,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 58631d89f..c70c592e2 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -6070,4 +6070,4 @@ West Midlands Railway - \ No newline at end of file + diff --git a/examples/standards/fxc/uk_fxc_common_profile.xml b/examples/standards/fxc/uk_fxc_common_profile.xml index 8ad5a9282..ff4cd11f0 100644 --- a/examples/standards/fxc/uk_fxc_common_profile.xml +++ b/examples/standards/fxc/uk_fxc_common_profile.xml @@ -2314,4 +2314,4 @@ - \ No newline at end of file + diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml index 7b84cdf2b..432021601 100644 --- a/examples/standards/txc/uk_nptg_localities_extract1.xml +++ b/examples/standards/txc/uk_nptg_localities_extract1.xml @@ -9426,4 +9426,4 @@ NeTEx separates organisational structure (ORGANISATION, ORGANISATION PART) fro - \ No newline at end of file + diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml index 4f7da93af..2b7da2805 100644 --- a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml +++ b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml @@ -190,9 +190,9 @@ This example maps - - B6 - + + B6 + + + B + Bakerloo Line Bakerloo metro BAK - B brown @@ -667,11 +669,14 @@ Special peak and off-peak times apply on journeys that start at stations north o + + C + C__ + Central Line Central metro CEN - C red @@ -15595,4 +15600,4 @@ For more information on National Rail services see the - + \ No newline at end of file diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml index 735d20e8e..bc0f90167 100644 --- a/examples/functions/fares/rail/Netex_era_distance_ro.xml +++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml @@ -7677,10 +7677,12 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun + + TFC + Transferoviar Călători TODO-BITMAPVALUE https://www.transferoviarcalatori.ro/logo.png - TFC @@ -8837,4 +8839,4 @@ c - + \ No newline at end of file diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index e38efa569..91555e0fc 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -8968,8 +8968,10 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g + + PlusBus + All Zones - PlusBus @@ -12451,4 +12453,4 @@ West Midlands Railway - + \ No newline at end of file diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml index 4b93ed67f..0b0194c10 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml @@ -2468,8 +2468,10 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 + + £ + Pound Sterling - £ 2 @@ -3840,4 +3842,4 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 - + \ No newline at end of file From 0f2271a1cc3a7669a8700bd316c50c4f4714b354 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:46:47 +0000 Subject: [PATCH 8/8] Lint and update documentation tables --- ...etex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml | 2 +- examples/functions/fares/rail/Netex_era_distance_ro.xml | 2 +- examples/functions/fares/rail/Netex_era_toc_uk.xml | 2 +- .../fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 index 196855086..6f9bb1540 100644 --- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml +++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml @@ -15600,4 +15600,4 @@ For more information on National Rail services see the - \ No newline at end of file + diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml index bc0f90167..56147e356 100644 --- a/examples/functions/fares/rail/Netex_era_distance_ro.xml +++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml @@ -8839,4 +8839,4 @@ c - \ No newline at end of file + diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index 91555e0fc..e9e057839 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -12453,4 +12453,4 @@ West Midlands Railway - \ No newline at end of file + diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml index 0b0194c10..fbde1e4b2 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml @@ -3842,4 +3842,4 @@ Summer Term 10 April 2020 22 July 2020 £80 £85 3 February 2020 - \ No newline at end of file +