diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abef8b4f9..0cc1e3674 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,8 @@ name: CI -on: push +on: + push: + pull_request: permissions: contents: write @@ -26,7 +28,11 @@ jobs: - name: Validate NeTEx XML examples run: ./.github/scripts/validate-examples.sh + # Only on push: a pull_request run from a fork gets a read-only token + # and cannot commit back. Target branches are still normalized by the + # push-triggered run that follows the merge. - name: Commit changes + if: github.event_name == 'push' uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit with: default_author: github_actions diff --git a/.gitignore b/.gitignore index 3ce15e17c..ea923de8d 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ fabric.properties # Editor-based Rest Client .idea/httpRequests +.idea/.name +/.idea diff --git a/NeTEx.spp b/NeTEx.spp index 11d91fa2d..b5a8a143e 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -734,6 +734,7 @@ + diff --git a/README.md b/README.md index 582390b9f..3717dd239 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,23 @@ For new features, the decision between targetting v2.1-wip or v3.0-wip will be m _Upcoming: templates for Pull Request_ +### The use of AI in this repo 🤖 + +In this repository, the use of AI should follow these guidelines. The guiding principle is that any contributor is ultimately reponsible for their work on NeTEx and they should be the last reviewer of any AI-guided work before submitting it for peer-review; in other words, only contributors can be authors or co-authors of any change made to NeTEx. + +AI **can** be used for: +- Generation of code for contributors to work on the XSD by themselves, +- Analysis of any change proposed to the XSD before it is edited / commented / approved, +- Improvements to the general language in the documentation (i.e, anything in `` and ``) or to check for typos in any work. + +AI **cannot** be used for: +- Committing a change in a Pull Request, i.e. the AI agent cannot be an author or co-author of any commit, +- Authoring a change, i.e. the AI agent cannot be an author or co-author of any Pull Request, +- Automated code review as a stand alone action, i.e. the result of a review must be proof-read by a contributor, +- Produce documentation from scratch (i.e, anything in `` and `` should be proof-read by a contributor if it was suggested by AI). + +In case you have a GitHub Pro account, please disable the feature `Automated Copilot code review` before contributing here. + ---- ## Changelog 📰 diff --git a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml index 5ca209688..9a6a69d24 100644 --- a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml +++ b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml @@ -120,7 +120,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml b/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml index 39336b637..54410bb9a 100644 --- a/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml +++ b/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml @@ -152,7 +152,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml b/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml index 1d5f6c775..399ee1b84 100644 --- a/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml +++ b/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml @@ -147,7 +147,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml b/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml index c2dabe149..679300a50 100644 --- a/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml +++ b/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml @@ -197,7 +197,7 @@ The Calendar is shown coded as myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml b/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml index 470d60750..a1fee2dbf 100644 --- a/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml +++ b/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml @@ -157,7 +157,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml b/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml index 4dd208386..121da9bea 100644 --- a/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml +++ b/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml @@ -185,7 +185,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml b/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml index d5d8f6df6..c6e03a29b 100644 --- a/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml +++ b/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml @@ -142,7 +142,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml b/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml index 3a2e7ce01..a9c50c8cd 100644 --- a/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml +++ b/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml @@ -158,7 +158,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml b/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml index 82d50fe41..950a259c4 100644 --- a/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml +++ b/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml @@ -111,7 +111,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml index e78ea3f99..10eda14e3 100644 --- a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml +++ b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml @@ -91,7 +91,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml b/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml new file mode 100644 index 000000000..5ecbd423b --- /dev/null +++ b/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml @@ -0,0 +1,632 @@ + + + + 2025-06-26T14:16:54+02:00 + SBB-Prod + + + + 2025-12-15T00:00:00 + 2026-12-14T23:59:59 + + + + + + SBB + SBB + + + EntityLegalOwnership + + + + Operation + + + + + + + + ProductCategories + + + Intercity + IC + + + + + Usage of JourneyPart + + + Facility change + + + + + Type Of Notice + + + Allgemeiner Hinweis + 1 + + + Angebot + 10 + + + + + + + + + GO + 11 + + + SBOID + ch:1:sboid:100001 + + + + ch:1:sboid:100001> + 11 + + Schweizer Bundesbahn + SBB + + + + + + + + + SLOID + ch:1:sloid:7000 + + + DIDOK + 8507000 + + + + x + 8507000 + + Bern + + + 7.4391308 + 46.9488322 + 540.2 + + + + + + + sloid + ch:1:sloid:7000:4:7 + + + + ch:1:sloid:7000:4:7 + + + + 7.4391308 + 46.9488322 + 540.2 + + + 1 + + + + + + + SLOID + ch:1:sloid:218 + + + DIDOK + 8500218 + + + + ch:1:sloid:218 + 8500218 + + Olten + + + 7.9084951 + 47.3526357 + 398 + + + + + + + SLOID + ch:1:sloid:218:7 + + + + ch:1:sloid:218:7 + + + + 7.9084951 + 47.3526357 + 398 + + + 1 + + + + + + + SLOID + ch:1:sloid:3000 + + + DIDOK + 8572203 + + + + ch:1:sloid:3000 + 8572203 + + Zuerich_HB + + + 8.54021234910 + 47.3781766 + 407.7 + + + + + + + SLOID + ch:1:sloid:3000:501:33 + + + + ch:1:sloid:3000:501:33 + + + + 8.54021234910 + 47.3781766 + 407.7 + + + 1 + + + + + + + SLOID + ch:1:sloid:6000 + + + DIDOK + 8506000 + + + + ch:1:sloid:6000 + 8506000 + + Winterthur + + + 7.558970 + 47.4464565 + 426 + + + + + + + SLOID + ch:1:sloid:6000:5 + + + + ch:1:sloid:6000:5 + + + + 7.558970 + 47.4464565 + 426 + + + 1 + + + + + + + SLOID + ch:1:sloid:6302 + + + DIDOK + 8506302 + + + + ch:1:sloid:630 + 8506302 + + St_Gallen + + + 9.3698966 + 47.4231789 + 669.6 + + + + + + + SLOID + ch:1:sloid:6302 + + + + ch:1:sloid:6302 + + + + 9.3698966 + 47.4231789 + 669.6 + + + 1 + + + + + + + + + + + SLNID + ch:1:slnid:1024329 + + + + ch:1:slnid:1024329 + + Bern_Olten_Zurich_HB_Winterthur_St_Gallen + rail + + highSpeedRail + + IC8 + + fixed + + + + + + Bern + + + Olten + + + Zuerich_HB + + + Winterthur + + + St_Gallen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bahn-2000 Strecke + + + + + + + + + + + + + + + + + + + Bern_Olten_Zurich_HB_Winterthur_St_Gallen + + + + outbound + + + + false + true + + + + true + true + + + + true + true + + + + true + true + + + + true + false + + + + + + + + + + PT59M + + + + PT18M + + + + PT9M + + + + PT44M + + + + + + PT9M + + + + PT2M + + + + PT2M + + + + + + + + + 2025-12-14T00:00:00 + 2026-12-13T23:59:59 + 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000 + + + + + + + + + + + + + + SJYID + sjyid-1 + + + + sjyid-1 + + rail + + + planned + 05:29:00 + + + + + inbound + + + + + + + + + 05:29:00 + 0 + 06:28:00 + 0 + + + + + + + + + + 06:57:00 + 0 + 07:52:00 + 0 + + + + + + + + + + + + + + 703 + + + + + + firstClass + freeWifi + + + + bistro + + + + + running + + + + + + + + Bistro + + + Zone catering / Distributeur + + + Zona catering / Distributore + + + Bistro + A__WS + A__WS + + true + + + Erste Klasse + A___1 + A___1 + + true + + + WLAN Hotspot verfügbar + A__WV + A__WV + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml b/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml new file mode 100644 index 000000000..918106381 --- /dev/null +++ b/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml @@ -0,0 +1,786 @@ + + + + 2025-06-26T14:16:54+02:00 + TUXALP + NeTEx Zweisimmen Example edited by Urs + + + + + 2025-12-15T00:00:00 + 2026-12-12T23:59:59 + + + + + + Fahrplanjahr 2025/26 + + + + + BLS + BLS AG + + + entityLegalOwnership + + + + operation + + + + + + + + ProductCategories + + + Regio Express + RE + + + Regionalzug + R + + + + + + + + + SBOID + ch:1:sboid:100015 + + + ch:1:sboid:101105 + BLS AG + BLS + + + + + + + + + DIDOK + 7000 + + + SLOID + ch:1:sloid:7000 + + + Bern + 7000 + + + 7.43913088992 + 46.94883228914 + 540.2 + + + + + Berna + + + railStation + + + + + SLOID + ch:1:sloid:7000:5:9 + + + + + 7.43913088992 + 46.94883228914 + 540.2 + + + + + + + + + DIDOK + 7100 + + + SLOID + ch:1:sloid:7100 + + + Thun + 7100 + + + 7.62960582867 + 46.75485272921 + 559.75 + + + railStation + + + + + SLOID + ch:1:sloid:7100:1:1 + + + + + 7.62960582867 + 46.75485272921 + 559.75 + + + + + + + + + DIDOK + 8507483 + + + SLOID + ch:1:sloid:7483 + + + Spiez + 8507483 + + + 7.68010305780 + 46.68639566696 + 627.82 + + + railStation + + + + + SLOID + ch:1:sloid:7483:0:3AB + + + + + 7.68010305780 + 46.68639566696 + 627.82 + + + + + + + + + DIDOK + 8507290 + + + SLOID + ch:1:sloid:7290 + + + Zweisimmen + 8507290 + + + 7.37486190719 + 46.55348254993 + 941.6 + + + railStation + + + + + SLOID + ch:1:sloid:7290:0:930269 + + + + + 7.37486190719 + 46.55348254993 + 941.6 + + + + + + + + + DIDOK + 8507478 + + + SLOID + ch:1:sloid:7478 + + + Frutigen + 8507478 + + + 7.65158908644 + 46.58857680502 + 779.8 + + + railStation + + + + + SLOID + ch:1:sloid:7478:0:852180 + + + + + 7.65158908644 + 46.58857680502 + 779.8 + + + + + + + + + DIDOK + 8501609 + + + SLOID + ch:1:sloid:1609 + + + Brig + 8507290 + + + 7.99057910188 + 46.32002223690 + 677.9 + + + railStation + + + + + SLOID + ch:1:sloid:1609:4:9 + + + + + 7.99057910188 + 46.32002223690 + 677.9 + + + + + + + + + + + + + + + + SLNID + ch:1:slnid:1024437 + + + Bern - Spiez - Kandersteg - Brig (- Domodossola) + RE1 + rail + RE1 + + + + + + + + SLNID + ch:1:slnid:1024426 + + + Spiez - Zweisimmen + R11 + rail + R11 + + + + + Brig / Zweisimmen + + + + + + + DIDOK + 8507000 + + + SLOID + ch:1:sloid:7000:5:9 + + + Bern + 9 + railStation + + + + + DIDOK + 8507100 + + + SLOID + ch:1:sloid:7100:1:1 + + + Thun + 1 + railStation + + + + + DIDOK + 8507483 + + + SLOID + ch:1:sloid:7483:0:954324 + + + Spiez + 3 + railStation + + + + + DIDOK + 8507290 + + + SLOID + ch:1:sloid:7290:0:930269 + + + Zweisimmen + 6 + railStation + + + + + DIDOK + 8507478 + + + SLOID + ch:1:sloid:7478:0:852180 + + + Frutigen + 3 + railStation + + + + + DIDOK + 8501609 + + + SLOID + ch:1:sloid:1609:4:9 + + + Brig + 9 + railStation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bern-Spiez + + + + outbound + + + + + false + true + + + + + + + + true + true + + + + true + false + + + passenger + + + Spiez-Zweisimmen + + + + outbound + + + + + false + true + + + + true + false + + + passenger + + + + + + Spiez-Brig + + + + outbound + + + + + false + true + + + + + true + true + + + + true + false + + + passenger + + + + + + + + PT21M + + + + PT10M10S + + + + + + + + PT1M + + + + + + + + PT47M + + + + + + + + PT12M + + + + PT57M + + + + + + + PT1M + + + + + + + + + + 2025-12-14T00:00:00 + 2026-12-13T23:59:59 + 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000 + + + + + + + + + + + + + SJYID + ch:1:sjyid:100015:4175-001 + + + ch:1:ServiceJourney:1 + rail + + + planned + 14:39:00 + 0 + + + + + outbound + + + + + + + + + + + SJYID + ch:1:sjyid:100015:6829-001 + + + ch:1:VehicleJourney:2 + rail + + + planned + 08:30:00 + 0 + + + + + outbound + + + + + + + + + + + SJYID + ch:1:sjyid:100015:4179-001 + + + ch:1:ServiceJourney:1 + rail + + + planned + 15:12:00 + 0 + + + + + outbound + + + + + + + + RE1 4175 Bern - Spiez + 4175 + + + R11 6829 Spiez - Zweisimmen + 6829 + + + RE1 4179 Spiez - Brig + 4179 + + + + + + + + + + + + true + false + true + true + + + + + + + + + + + false + false + + + true + true + + + + + + + + + + + diff --git a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml index 5aca118bd..fd73a4314 100644 --- a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml +++ b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml @@ -420,6 +420,12 @@ The Calendar is shown coded as true + + + + noWaiting + + diff --git a/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml b/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml index 8af4a93ea..18889888a 100644 --- a/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml +++ b/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml @@ -362,6 +362,8 @@ The Calendar is shown coded as + outbound + diff --git a/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml b/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml index eb3bb3323..48174101a 100644 --- a/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml +++ b/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml @@ -410,7 +410,7 @@ RS 0 100 10 Reservations available# (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:47.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml b/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml index 8b978d180..db2d6e08f 100644 --- a/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml +++ b/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml @@ -11,7 +11,7 @@ HRDF records NeTEx format . (C) NTA , IR 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml index 9324fe52e..fb16ecbe4 100644 --- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml +++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml @@ -309,7 +309,7 @@ attribution002,0,1,Transdev,12345 (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml index a33b8d52d..f4ad4dc8b 100644 --- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml +++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml @@ -312,7 +312,7 @@ attribution002,0,1,Transdev,12345 (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml index 8ede5b50c..a6a2203be 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml @@ -1,6 +1,6 @@ - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 @@ -51,7 +51,7 @@ stg - http:///www.transdevireland.ie/timetable + http://www.transdevireland.ie/timetable Stage coach TXC data diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml index b06d4b8bd..060400f0f 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml @@ -7,7 +7,7 @@ This Example shows an extract of encoding a single Operator data encoded (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 @@ -58,7 +58,7 @@ This Example shows an extract of encoding a single Operator data encoded stg - http:///www.transdevireland.ie/timetable + http://www.transdevireland.ie/timetable Stage coach TXC data diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml index 1ea83cc31..fa45caf31 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml @@ -1,6 +1,6 @@ - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml index 926b5a4d6..4c3fe149a 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml @@ -64,7 +64,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT noc - http:///www.nta.ie/noc + http://www.nta.ie/noc National operator codes diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index a06fa9282..fcc8391dc 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -17,6 +17,8 @@ 2010-11-05 + 2026-07-09Add correctly spelt Exchangeable* / IsExchangeable values to NameOfClass alongside deprecated misspelt forms. +

NeTEx - Network Exchange. This subschema defines data Modification base types.

 @@ -940,15 +942,96 @@ Rail transport, Roads and Road transport - - - - - - - - - + + + DEPRECATED due to mispelling, use ExchangeableFromAnyTime instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableFromDuration instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableFromIntervalRef instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableTo instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableUntilAnyTime instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableUntilDuration instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableUntilIntervalRef instead. -v2.1 + + + + + DEPRECATED due to mispelling, use ExchangeableUntilPercentUse instead. -v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + @@ -1375,7 +1458,16 @@ Rail transport, Roads and Road transport - + + + DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1 + + + + + Replaces previously missplet value. +v2.1 + + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index d765daa13..4e41ad415 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -320,6 +320,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index 40f5462c8..08aff636b 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -373,7 +373,7 @@ Rail transport, Roads and Road transport - Public identifier of a LINe. + Public identifier of a LINE. @@ -987,6 +987,11 @@ Rail transport, Roads and Road transport + + + A Direction of a ROUTE, that can be used instead of DirectionRef. The enumeration provides a restricted set of values. +v2.1. + + Alternative LINE Reference for AVMS system. DEPRECATED - v2.0 diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd index cfcd99378..a2e6defd8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd @@ -2,6 +2,7 @@ + @@ -157,7 +158,26 @@ Rail transport, Roads and Road transport Elements of a JOURNEY WAIT TIME. - + + + In some cases there are multiple visits to the same stop with a different WaitTime (e.g., on the second there is a change in the driver). Then, one of the PointInJourneyPatternRef is needed instead of the TimingPoint. Must be optional, because in the JourneyPatternWaitTime other element make the reference to the pattern. Otherwise a TimingPointRef is the element to be used. +v2.1 + + + + The standard way to use JourneyWaitTime is with a TimingPointRef. + + + + + +v2.1 + + + + + +v2.1 + + + Wait time as interval. diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 05f21f6d0..dd455b791 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -3,11 +3,13 @@ + + @@ -901,6 +903,13 @@ Rail transport, Roads and Road transport Nature of use of stop, e.g. access, interchange only, or pass through. Default is Access. + + + + + Implements the navigation from processes or barriers that the travellers will be facing (e.g., security check, check-in, etc.). +v2.1 + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd index bcee07323..217bf4fd5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -230,16 +230,32 @@ Rail transport, Roads and Road transport - - - Point at which this JOURNEY PART starts. - - - - - Point at which this JOURNEY PART ends. - - + + + + + Point at which this JOURNEY PART starts. + + + + + Point at which this JOURNEY PART ends. If not set it is until the end of the JOURNEY. We will make this element mandatory in the future. + + + + + + + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. +v2.1 + + + + + POINT at which applicability of JOURNEY PART ends. +v2.1 + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index e3607ea9d..fa650d000 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -533,6 +533,11 @@ Default is false. Default is false. + + + In case of train splitting, the passenger may have to change to a different part of the train to continue the journey. Default is false. +v2.1 + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd index 1faa2c962..ab2345d40 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd @@ -3,6 +3,7 @@ + @@ -204,6 +205,11 @@ Rail transport, Roads and Road transport Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day. + + + CHECK CONSTRAINTs can be used on StopPointInJourneyPattern as well. It should be used there, if it affects every SERVICE JOURNEY with that SERVICE JOURNEY PATTERN. If the CONSTRAINT only affects one single SERVICE JOURNEY and PASSING TIME, then it is better to use this CHECK CONSTRAINT directly in PASSING TIME. +v2.1 + + OCCUPANCYs associated with this journey. +v2.0 diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd index 22f5a1416..f2c8b4f2a 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd @@ -25,6 +25,8 @@ Add __RequiresDepost__ and __noCashPayment__ to CommercialCondition summary. Add __VehicleCOlelction_ + 2026-07-09Add correctly spelt IsExchangeable; deprecate misspelt IsExchangable. +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the CONDITION SUMMARY types.

@@ -222,11 +224,18 @@ Rail transport, Roads and Road transport Whether the ticket can be refunded. - - - Whether the ticket can be exchanged. - - + + + + Whether the ticket can be exchanged. +v2.1 + + + + + DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1 + + + Whether there is a charge for exchanges. diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd index 85e9e859d..acad7da8d 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd @@ -34,6 +34,8 @@ 2019-03-12NORWAY-103 *FARES* Add purchaseGracePeriod new enum value to Reselling \ ResellWhen + 2026-07-09Rename misspelt ExchangableToEnumeration to ExchangeableToEnumeration. +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the After Sales USAGE PARAMETER types.

@@ -226,9 +228,9 @@ Rail transport, Roads and Road transport - + - Allowed values for Exchangeable to. + Allowed values for Exchangeable to. +v2.1 diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index c8c1ea1fc..31db1082a 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -32,6 +32,8 @@ 2019-03-26NL-27 CD #58 Add default TypeOfProductCategory and TypeOfService to Line: Move TypeOfProductCategory amnd TypeOfService from netex_journey_version to Framework reusable components (netex_travelRights_version) so they are visible from part 1 Can therefore drop include of netex_travelRights_version from File netex_usageParameterAfterSales_version.xsd. + + 2026-07-09Add correctly spelt Exchangeable* elements; deprecate misspelt Exchangable* forms.

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -161,49 +163,93 @@ Rail transport, Roads and Road transport + + + Special value - Can be resold from any point after purchase. +v2.1 + + + + + Duration to start of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) after which ticket may be resold. +v2.1 + + + + + Can be resold once a certain percentage of duration or use has been achieved. +v2.1 + + - Special value - Can be resold from any point after purchase. + DEPRECATED due to misspelling, use ExchangeableFromAnyTime instead. -v2.1 - Duration to start of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) after which ticket may be resold. + DEPRECATED due to misspelling, use ExchangeableFromDuration instead. -v2.1 - Can be resold once a certain percentage of duration or use has been achieved. +v1.1 + DEPRECATED due to misspelling, use ExchangeableFromPercentUse instead. -v2.1 - - - Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. - - + + + Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. +v2.1 + + + + + DEPRECATED due to misspelling, use ExchangeableFromIntervalRef instead. -v2.1 + + + + + + + Can be resold anyTime. +v2.1 + + + + + Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) of that ticket. +v2.1 + + + + + Can be resold until a certain percentage of duration or use has been achieved. +v2.1 + + - Can be resold anyTime. + DEPRECATED due to misspelling, use ExchangeableUntilAnyTime instead. -v2.1 - Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) or that ticket. + DEPRECATED due to misspelling, use ExchangeableUntilDuration instead. -v2.1 - Can be resold until a certain percentage of duration or use has been achieved. +v1.1 + DEPRECATED due to misspelling, use ExchangeableUntilPercentUse instead. -v2.1 + + + + + + + Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. +v2.1 + + + + + DEPRECATED due to misspelling, use ExchangeableUntilIntervalRef instead. -v2.1 - - - Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. - - Constraint on when change can be made +v1.1 @@ -315,11 +361,18 @@ Rail transport, Roads and Road transport Fare class to which can exchange, if specifically limited. - - - Type of fare for which product can be exchanged. - - + + + + Type of fare for which product can be exchanged. +v2.1 + + + + + DEPRECATED due to misspelling, use ExchangeableTo instead. -v2.1 + + +