From 7159ec93fd2c1d9fd256e9dc533b3163fd01e55c Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Thu, 23 Oct 2025 21:15:08 +0200 Subject: [PATCH 01/12] AllCountriesRef restriction For this one, the double restriction does not work as it generates a weird loop by adding under the restriction --- .../netex_reusableComponents/netex_country_support.xsd | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd index d449150fd..792c1a8e0 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd @@ -1383,13 +1383,7 @@ Rail transport, Roads and Road transport - - - - Iso 3166-1 Two Character country code. - - - + From aeaf1305e32b9022e86ae351408659eade4bceb9 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Thu, 23 Oct 2025 21:21:07 +0200 Subject: [PATCH 02/12] Undo restrictions for xxxRefStructure Undo the restriction on AllTransportOrganisationsRefStructure, AllPublicTransportOrganisationsRefStructure, and AllOperatorsRefStructure due to it creating a double contraints with the complexType --- .../netex_transportOrganisation_support.xsd | 95 ++----------------- 1 file changed, 7 insertions(+), 88 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 6952a71af..c2a8747bf 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -67,34 +67,7 @@ Rail transport, Roads and Road transport Type for a reference to all TRANSPORT ORGANISATIONs. - - - - Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. - - - - - Nature of last modification: new, revise, delete, unchanged. - - - - - Identifier of referenced entity. - - - - - Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version - - - - - Location of the external entity. +v2.0 - - - - + @@ -175,36 +148,9 @@ Rail transport, Roads and Road transport Type for a reference to all TRANSPORT ORGANISATIONs. - - - - - Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. - - - - - Nature of last modification: new, revise, delete, unchanged. - - - - - Identifier of referenced entity. - - - - - Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version - - - - - Location of the external entity. +v2.0 - - - - - + + + @@ -261,36 +207,9 @@ Rail transport, Roads and Road transport Type for a reference to all OPERATORss. - - - - - Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. - - - - - Nature of last modification: new, revise, delete, unchanged. - - - - - Identifier of referenced entity. - - - - - Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version - - - - - Location of the external entity. +v2.0 - - - - - + + + From 213c50ec8f228be347bfd7f22406d730f0c95344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 24 Oct 2025 16:58:23 +0200 Subject: [PATCH 03/12] fixed="All" needed for one more example --- .../netex_transportOrganisation_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index c2a8747bf..64abdf57d 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -320,7 +320,7 @@ Rail transport, Roads and Road transport Nature of last modification: new, revise, delete, unchanged. - + Identifier of referenced entity. From 6d076b7a49a27b0b7f61ce55a3155d02c689680a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 24 Oct 2025 17:50:38 +0200 Subject: [PATCH 04/12] fixing problem with VehicleRef --- .../part5_fm/netex_nm_accessCredentialsAssignment_version.xsd | 3 ++- .../part5_fm/netex_nm_individualTraveller_version.xsd | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd index cf9e8ed5d..01f0219e4 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd @@ -4,6 +4,7 @@ + @@ -189,7 +190,7 @@ Rail transport, Roads and Road transport - + diff --git a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd index f5e724270..391e348f2 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd @@ -3,6 +3,7 @@ + From e5ae91d5e23ed2dee9f4d7ffd4aaf350359465bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 24 Oct 2025 17:51:16 +0200 Subject: [PATCH 05/12] fixing files that were not removed from project --- NeTEx.spp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/NeTEx.spp b/NeTEx.spp index 9a936fdac..11d91fa2d 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -475,7 +475,6 @@ - @@ -578,8 +577,6 @@ - - @@ -613,10 +610,6 @@ - - - - From 58a9b5161885a96ac3f3bb2e98fc17d317f42ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 24 Oct 2025 18:33:09 +0200 Subject: [PATCH 06/12] Update netex_transportOrganisation_support.xsd --- .../netex_transportOrganisation_support.xsd | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 64abdf57d..18d68c4f1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -32,8 +32,7 @@ [ISO 639-2/B] ENG Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX Unclassified - CEN, Crown Copyright 2009-2020 - + CEN, Crown Copyright 2009-2020
  • Derived from the SIRI standards.
    • @@ -148,9 +147,9 @@ Rail transport, Roads and Road transport Type for a reference to all TRANSPORT ORGANISATIONs. - + - + @@ -207,9 +206,9 @@ Rail transport, Roads and Road transport Type for a reference to all OPERATORss. - + - + @@ -234,7 +233,7 @@ Rail transport, Roads and Road transport - + Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. @@ -572,9 +571,9 @@ Rail transport, Roads and Road transport Reference to a TRANSPORT ADMINISTRATIVE ZONE. - + - + @@ -630,4 +629,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From ac6be789b741735d1b99de07b5aef785b053ebbe Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Oct 2025 16:35:42 +0000 Subject: [PATCH 07/12] Lint and update documentation tables --- .../netex_transportOrganisation_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 18d68c4f1..d7bdb0fcb 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -629,4 +629,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From e0ac59e7179b2d7a2e9b152327deaa7782675fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Fri, 24 Oct 2025 22:09:47 +0200 Subject: [PATCH 08/12] align the way it is done to the other files fo rref="VehicleRef" --- .../part5_fm/netex_nm_accessCredentialsAssignment_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd index 01f0219e4..bcb46e83f 100644 --- a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd +++ b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd @@ -190,7 +190,7 @@ Rail transport, Roads and Road transport - + From ce9990be031bdc0c5949520f7fcbbfe7787a5453 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Sat, 25 Oct 2025 14:55:17 +0200 Subject: [PATCH 09/12] Apply suggestion from @skinkie --- .../netex_transportOrganisation_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index d7bdb0fcb..db601b56a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -233,7 +233,7 @@ Rail transport, Roads and Road transport - + Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. From 5e123ee7fda357eac213f22823ec61c6086e5e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 25 Oct 2025 15:28:52 +0200 Subject: [PATCH 10/12] making Stefan happy * undoing two problems he identified. --- .../netex_responsibility/netex_responsibility_support.xsd | 4 ++-- .../netex_transportOrganisation_support.xsd | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd index 5cf2cfef3..05d94c833 100644 --- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd @@ -307,11 +307,11 @@ Rail transport, Roads and Road transport - Type for a reference tto all oranisationsORGANISATION. + Type for a reference to all ORGANISATIONs. - + Identifier of an ORGANISATION. diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index db601b56a..5d1077432 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -319,7 +319,7 @@ Rail transport, Roads and Road transport Nature of last modification: new, revise, delete, unchanged. - + Identifier of referenced entity. @@ -571,9 +571,9 @@ Rail transport, Roads and Road transport Reference to a TRANSPORT ADMINISTRATIVE ZONE. - + - + From 9a793cec454eecd4d852a13e8e673805be70644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 27 Oct 2025 13:11:58 +0100 Subject: [PATCH 11/12] Update netex_transportOrganisation_support.xsd --- .../netex_transportOrganisation_support.xsd | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index 5d1077432..ba14f81e3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -233,7 +233,7 @@ Rail transport, Roads and Road transport - + Name of Class of the referenced entity. Allows reflection. Fixed for each entity type. @@ -319,11 +319,6 @@ Rail transport, Roads and Road transport Nature of last modification: new, revise, delete, unchanged. - - - Identifier of referenced entity. - - Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version @@ -571,9 +566,9 @@ Rail transport, Roads and Road transport Reference to a TRANSPORT ADMINISTRATIVE ZONE. - + - + @@ -629,4 +624,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From 06f94c2a25b7adfe90ddef476c2e4b082dac6fb8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 12:14:28 +0000 Subject: [PATCH 12/12] Lint and update documentation tables --- .../netex_transportOrganisation_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd index ba14f81e3..62d08726a 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd @@ -624,4 +624,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file +