From 90eba68b8cdfa0747ff14cafba1c0bbc8f095717 Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Fri, 12 Apr 2024 13:43:07 +0200 Subject: [PATCH 1/7] update of Keywords annotation --- xsd/siri_model/siri_situation.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/siri_model/siri_situation.xsd b/xsd/siri_model/siri_situation.xsd index 1878f96d..4469c986 100644 --- a/xsd/siri_model/siri_situation.xsd +++ b/xsd/siri_model/siri_situation.xsd @@ -713,7 +713,7 @@ Rail transport, Roads and road transport - Arbitrary application specific classifiers. + Arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual PassengerInformationAction. From 5e93e98a537bff4ea1df80eb0e4807d68d84eb61 Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Fri, 12 Apr 2024 13:46:14 +0200 Subject: [PATCH 2/7] add Keywords on PassengerInformationAction level --- xsd/siri_model/siri_situationActions.xsd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xsd/siri_model/siri_situationActions.xsd b/xsd/siri_model/siri_situationActions.xsd index 7b540937..53f93f49 100644 --- a/xsd/siri_model/siri_situationActions.xsd +++ b/xsd/siri_model/siri_situationActions.xsd @@ -575,7 +575,7 @@ Rail transport, Roads and road transport - The monotonically inscresing version of the passenger information instance. If absent, is the same version as the enclosing Situation + The monotonically increasing version of the passenger information instance. If absent, is the same version as the enclosing Situation @@ -604,6 +604,11 @@ Rail transport, Roads and road transport The actual, structured passenger information for a specific TextualContentSize. + + + Arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). + + From 7db0b876b35060575eb743191c90a431605ac25b Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Mon, 27 Oct 2025 14:33:19 +0100 Subject: [PATCH 3/7] change keywords on action level from nmtokens to list of strings --- xsd/siri_model/siri_situationActions.xsd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xsd/siri_model/siri_situationActions.xsd b/xsd/siri_model/siri_situationActions.xsd index 53f93f49..d18b67ff 100644 --- a/xsd/siri_model/siri_situationActions.xsd +++ b/xsd/siri_model/siri_situationActions.xsd @@ -604,10 +604,13 @@ Rail transport, Roads and road transport The actual, structured passenger information for a specific TextualContentSize. - + - Arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). + A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). + + + From 5923d94b493c85e28014afbb55dcdfbbca25b1ac Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Mon, 27 Oct 2025 14:34:44 +0100 Subject: [PATCH 4/7] harmonize existing keywords on situation level with action level --- xsd/siri_model/siri_situation.xsd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xsd/siri_model/siri_situation.xsd b/xsd/siri_model/siri_situation.xsd index 4469c986..fbe1a320 100644 --- a/xsd/siri_model/siri_situation.xsd +++ b/xsd/siri_model/siri_situation.xsd @@ -711,10 +711,13 @@ Rail transport, Roads and road transport Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned. - + - Arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual PassengerInformationAction. + A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual PassengerInformationAction. + + + From b068b45485c4c6beed69af64482667a732fa2a26 Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Fri, 7 Nov 2025 14:59:01 +0100 Subject: [PATCH 5/7] add keywords example --- examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml b/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml index aff8f2eb..8dc02f3e 100644 --- a/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml +++ b/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml @@ -31,6 +31,7 @@ Fire brigade action at Haldenstrasse 3 route + CategoryRef:1 Meldungskategorie:Umleitung #Feuerwehreinsatz #Haldenstrasse DE Unterbruch zwischen Luzernerhof und Verkehrshaus Line disruption between Luzernerhof and Verkehrshaus From 1589b1dc3e02a3c3a039088d25783cfba68a6d28 Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Wed, 3 Dec 2025 11:41:48 +0100 Subject: [PATCH 6/7] move keywords to ParameterisedActionStructure --- xsd/siri_model/siri_situationActions.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xsd/siri_model/siri_situationActions.xsd b/xsd/siri_model/siri_situationActions.xsd index d18b67ff..0a996243 100644 --- a/xsd/siri_model/siri_situationActions.xsd +++ b/xsd/siri_model/siri_situationActions.xsd @@ -144,6 +144,14 @@ Rail transport, Roads and road transport Description of action. + + + A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). + + + + + Data associated with action. @@ -604,14 +612,6 @@ Rail transport, Roads and road transport The actual, structured passenger information for a specific TextualContentSize. - - - A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). - - - - - From 69eee42af88714660f98a2bb4627b3b7982ca3cb Mon Sep 17 00:00:00 2001 From: haeckerbaer Date: Fri, 19 Dec 2025 16:46:16 +0100 Subject: [PATCH 7/7] revert type back to list of nmtokens --- examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml | 2 +- xsd/siri_model/siri_situation.xsd | 7 ++----- xsd/siri_model/siri_situationActions.xsd | 7 ++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml b/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml index 8dc02f3e..64184c0d 100644 --- a/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml +++ b/examples/siri_exm_SX/VDV736_exm/SX_1022_main_message.xml @@ -31,7 +31,7 @@ Fire brigade action at Haldenstrasse 3 route - CategoryRef:1 Meldungskategorie:Umleitung #Feuerwehreinsatz #Haldenstrasse + CategoryRef:1 Meldungskategorie:Umleitung Feuerwehreinsatz Haldenstrasse DE Unterbruch zwischen Luzernerhof und Verkehrshaus Line disruption between Luzernerhof and Verkehrshaus diff --git a/xsd/siri_model/siri_situation.xsd b/xsd/siri_model/siri_situation.xsd index fbe1a320..d7ae32c6 100644 --- a/xsd/siri_model/siri_situation.xsd +++ b/xsd/siri_model/siri_situation.xsd @@ -711,13 +711,10 @@ Rail transport, Roads and road transport Whether the SITUATION was planned (eg engineering works) or unplanned (eg service alteration). Default is 'false', i.e. unplanned. - + - A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual PassengerInformationAction. + A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Can be overwritten in an individual action. - - - diff --git a/xsd/siri_model/siri_situationActions.xsd b/xsd/siri_model/siri_situationActions.xsd index 0a996243..77715ddf 100644 --- a/xsd/siri_model/siri_situationActions.xsd +++ b/xsd/siri_model/siri_situationActions.xsd @@ -144,13 +144,10 @@ Rail transport, Roads and road transport Description of action. - + - A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this PassengerInformationAction). + A whitespace-separated list of arbitrary application specific classifiers, tags or message categories for filtering or display, for example as icons on a situation map. Overwrites Keywords on PtSituationElement level (in the context of this action). - - -