From 63db08719da387200752419e965ebb1f8d2a70d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 9 Apr 2025 19:18:01 +0200 Subject: [PATCH 01/10] Fixes #558 --- .../Netex_VersioningExample_Step_05.xml | 5 ++- .../netex_alternativeName_support.xsd | 8 +++-- .../netex_utility/netex_utility_xml.xsd | 31 +++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 3ec1bce88..266ff6a39 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -109,7 +109,10 @@ This is part 4 of a multistep example on versioning. mycodeA - Haltstelle B + + Haltstelle B + stop B + Version two of stop B mycodeB diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd index f3698bdfa..f838e6b3c 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd @@ -93,11 +93,15 @@ Rail transport, Roads and Road transport - + + + Deprecated in v2.0 for AlternativeName. Use MultiligualString directly with Text subelements. + + - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index c417e651b..fac09485e 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -55,22 +55,21 @@ Rail transport, Roads and Road transport Xml utility types for NeTEX - - - Type for a string in a specified language. - + + + Either use with simple text (as was used in NeTEx priori to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. + + + + + + + + - - - - Language of string contents. - - - - - Resource id of string. - - + + + @@ -100,4 +99,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file From b3f34ee67bc5b52c7e98b6ffb0c20b1032bbba83 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 17:21:05 +0000 Subject: [PATCH 02/10] Lint and update documentation tables --- .../netex_alternativeName_support.xsd | 2 +- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd index f838e6b3c..3d03a441d 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd @@ -104,4 +104,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index fac09485e..38f7ebe0b 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -56,9 +56,9 @@ Rail transport, Roads and Road transport - - Either use with simple text (as was used in NeTEx priori to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. - + + Either use with simple text (as was used in NeTEx priori to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. + @@ -99,4 +99,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From d7a3b5df8a7e32a566f252750bd173537329564f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 19 Apr 2025 12:47:03 +0200 Subject: [PATCH 03/10] Update xsd/netex_framework/netex_utility/netex_utility_xml.xsd Co-authored-by: Stefan de Konink --- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index 38f7ebe0b..1acb97065 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -68,7 +68,7 @@ Rail transport, Roads and Road transport - + From cbc673c18d763af654e9abc04425601eab42482a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Sat, 19 Apr 2025 12:47:21 +0200 Subject: [PATCH 04/10] Update xsd/netex_framework/netex_utility/netex_utility_xml.xsd Co-authored-by: Stefan de Konink --- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index 1acb97065..68efcbbf7 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -62,7 +62,7 @@ Rail transport, Roads and Road transport - + From 61ba417e464a295337a99fca373910565b01429f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 22 Apr 2025 15:28:03 +0200 Subject: [PATCH 05/10] Update xsd/netex_framework/netex_utility/netex_utility_xml.xsd --- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index 68efcbbf7..d1fe301e8 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -57,7 +57,7 @@ Rail transport, Roads and Road transport - Either use with simple text (as was used in NeTEx priori to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. + Either use with simple text (as was used in NeTEx prior to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. From 62cfde863b4f4ddb25769d6fa858e0f65fa7fffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 22 Apr 2025 15:37:21 +0200 Subject: [PATCH 06/10] Update examples/functions/versioning/Netex_VersioningExample_Step_05.xml --- .../functions/versioning/Netex_VersioningExample_Step_05.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 266ff6a39..119b475b8 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -109,8 +109,7 @@ This is part 4 of a multistep example on versioning. mycodeA - - Haltstelle B + arrêt BHaltstelle B stop B Version two of stop B From 5f5d3189a514f5fcabb9105bc5caec1ce3bfd54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 22 Apr 2025 15:41:34 +0200 Subject: [PATCH 07/10] Update Netex_VersioningExample_Step_05.xml --- .../functions/versioning/Netex_VersioningExample_Step_05.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 119b475b8..266ff6a39 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -109,7 +109,8 @@ This is part 4 of a multistep example on versioning. mycodeA - arrêt BHaltstelle B + + Haltstelle B stop B Version two of stop B From 0ddd337c25a69d237d5adfbc09e85fee61dd9597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 22 Apr 2025 15:43:35 +0200 Subject: [PATCH 08/10] Update netex_utility_xml.xsd --- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index d1fe301e8..853eab9b1 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -57,7 +57,7 @@ Rail transport, Roads and Road transport - Either use with simple text (as was used in NeTEx prior to v2.0) or use only Text elements withing the MultilingualString. The old version will be deprecated. Also to take advantage of mixed may not be processable by some data consumers. + *Either* use with simple text (as was used in NeTEx prior to v2.0) or use *only* Text elements withing the MultilingualString. The old version (simple text) will be deprecated. As this is a mixed type this is not enforced by the schema currently. From a6cfeff66dcd742a6715138c66d6f885ab5b66ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 23 Apr 2025 13:19:08 +0200 Subject: [PATCH 09/10] Update xsd/netex_framework/netex_utility/netex_utility_xml.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- xsd/netex_framework/netex_utility/netex_utility_xml.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd index 853eab9b1..74128b00c 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd @@ -57,7 +57,7 @@ Rail transport, Roads and Road transport - *Either* use with simple text (as was used in NeTEx prior to v2.0) or use *only* Text elements withing the MultilingualString. The old version (simple text) will be deprecated. As this is a mixed type this is not enforced by the schema currently. + *Either* use with simple text (as in NeTEx prior to v2.0) or use *only* Text elements within the MultilingualString. The old version (simple text) will be deprecated. As this is a mixed type this is not currently enforced by the schema. From 0cd98686e1f1d44f0e15c76f5fcad7cd58800023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 23 Apr 2025 13:19:19 +0200 Subject: [PATCH 10/10] Update examples/functions/versioning/Netex_VersioningExample_Step_05.xml Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../functions/versioning/Netex_VersioningExample_Step_05.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml index 266ff6a39..d16fcc9e6 100644 --- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml +++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml @@ -110,7 +110,7 @@ This is part 4 of a multistep example on versioning. - Haltstelle B + Haltestelle B stop B Version two of stop B