From b2093e48491a70c971c49dbb1882e02571aa4523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 20 May 2026 17:58:40 +0200 Subject: [PATCH 01/13] allow new restriction for JourneyPart --- .../netex_coupledJourney_version.xsd | 10 ++++++++++ 1 file changed, 10 insertions(+) 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..85c880910 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -239,6 +239,16 @@ Rail transport, Roads and Road transport Point at which this JOURNEY PART ends. + + + + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. + + + + + POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. + From 33611661e029c761d6798363a7ca5ee2fefddc9b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 May 2026 16:01:13 +0000 Subject: [PATCH 02/13] Lint and update documentation tables --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 85c880910..61c1860d3 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -240,7 +240,7 @@ Rail transport, Roads and Road transport Point at which this JOURNEY PART ends. - + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. From e21481f2d88177a2fa64017689bd8b0241b36eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 21 May 2026 10:26:26 +0200 Subject: [PATCH 03/13] Apply suggestions from code review Co-authored-by: Stefan de Konink --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 61c1860d3..11cd17fbc 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -240,12 +240,12 @@ Rail transport, Roads and Road transport Point at which this JOURNEY PART ends. - + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. - + POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. From 00024c2b1ad16c90822b9cfe90c93dc907d73491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 21 May 2026 10:36:49 +0200 Subject: [PATCH 04/13] add choice --- .../netex_coupledJourney_version.xsd | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) 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 11cd17fbc..9732d796c 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -230,26 +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 applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. - - - - - POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. - - + + + + + Point at which this JOURNEY PART starts. + + + + + Point at which this JOURNEY PART ends. + + + + + + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. + + + + + POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. + + + + + @@ -562,4 +568,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From 72cf02a659c6022b3a37d39dadc213d954b9523c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 08:39:17 +0000 Subject: [PATCH 05/13] Lint and update documentation tables --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9732d796c..22a3011de 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -568,4 +568,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 54ee18be07e35b550f4bd14ed9efee6d08c1d9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 21 May 2026 11:13:22 +0200 Subject: [PATCH 06/13] Update xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd Co-authored-by: Stefan de Konink --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 22a3011de..3d90a657c 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -243,17 +243,17 @@ Rail transport, Roads and Road transport + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. - + POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. - From 9201f0df609ac237ff0023e01b9b675578d23ec6 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 09:15:56 +0000 Subject: [PATCH 07/13] Lint and update documentation tables --- .../netex_coupledJourney_version.xsd | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 3d90a657c..752b832c5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -244,16 +244,16 @@ Rail transport, Roads and Road transport - - - POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. - - - - - POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. - - + + + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. + + + + + POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. + + From 7a752ffea959ef80128d4c4e99862c6b052b5add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 21 May 2026 11:28:55 +0200 Subject: [PATCH 08/13] more mandatory stuff. --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3d90a657c..25224aa57 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -239,19 +239,19 @@ Rail transport, Roads and Road transport - Point at which this JOURNEY PART ends. + 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. + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. +v2.1 - POINT at which applicabiity of JOURNEY PART ends. If absent same as Start Point. + POINT at which applicabity of JOURNEY PART ends. +v2.1 From b8854ab8eef03fd60878963a3644b1c8eb4c52b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 21 May 2026 11:29:41 +0200 Subject: [PATCH 09/13] typo --- .../part2_journeyTimes/netex_coupledJourney_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 25224aa57..f30ab36fe 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -251,7 +251,7 @@ Rail transport, Roads and Road transport - POINT at which applicabity of JOURNEY PART ends. +v2.1 + POINT at which applicability of JOURNEY PART ends. +v2.1 From 6d94045ebc4b184cfa1f7921b2a32c57c83bf205 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 09:35:03 +0000 Subject: [PATCH 10/13] Lint and update documentation tables --- .../netex_coupledJourney_version.xsd | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 f30ab36fe..217bf4fd5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -244,16 +244,16 @@ Rail transport, Roads and Road transport - - - 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 - - + + + 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 + + From 45fb777f2413504caa343b6b500599d6e6584f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= Date: Fri, 26 Jun 2026 21:56:25 +0200 Subject: [PATCH 11/13] Empty commit, to ensure last commit is not done by the bot From 3648e3ba5932155de45b99d8d892c044abf7612a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 8 Jul 2026 00:28:00 +0200 Subject: [PATCH 12/13] adding example for JourneyPattern usage --- ...HB_Winterthur_StGallen_with_Facilities.xml | 632 ++++++++++++++++++ 1 file changed, 632 insertions(+) create mode 100644 examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml 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..b180bffa9 --- /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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7a430c49f55f82a9e48301aa9f9acda7dd046de8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 22:30:33 +0000 Subject: [PATCH 13/13] Lint and update documentation tables --- ...rn_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index b180bffa9..5ecbd423b 100644 --- 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 @@ -79,7 +79,7 @@ with attributes - ch:1:sboid:100001> + ch:1:sboid:100001> 11 Schweizer Bundesbahn @@ -629,4 +629,4 @@ with attributes - \ No newline at end of file +