From 2437594793191292e9dd7e7dcc81986e6cba3b7d Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 11 Feb 2021 15:33:29 +0100 Subject: [PATCH 01/22] add attribute country, country_revision, code and sub_code to traffic sign classification (mainSign and supplementarySign Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 55 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 3c9ac589b..9a3202c6f 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -283,9 +283,23 @@ message TrafficSign optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. - // This can be achieved by visibly crossing the sign or covering it completely. + // This can be achieved by visibly crossing the sign or covering it completely. // - optional bool is_out_of_service = 7; + optional bool is_out_of_service = 7; + + // Specifies the country + optional Country country = 8; + + // The year the traffic rules come into force + optional string country_revision = 9; + + // Code identifier according to country code + // + optional string code = 10; + + // Subcode identifier according to country code + // + optional string sub_code = 11; // Definition of traffic sign types. // Numbers are given according to German StVO. @@ -5534,10 +5548,24 @@ message TrafficSign repeated Arrow arrow = 6; // Boolean flag to indicate that the supplementary traffic sign is taken out of service. - // This can be achieved by visibly crossing the sign or covering it completely. + // This can be achieved by visibly crossing the sign or covering it completely. // optional bool is_out_of_service = 7; + // Specifies the country + optional Country country = 8; + + // The year the traffic rules come into force + optional string countryevision = 9; + + // Code identifier according to country code + // + optional string code = 10; + + // Subcode identifier according to country code + // + optional string sub_code = 11; + // Definition of supplementary sign types. // // For general supplementary signs use \c #TYPE_TEXT. @@ -9399,4 +9427,25 @@ message TrafficSign // VARIABILITY_VARIABLE = 3; } + + + // Definition of country. + enum Country + { + // Country is unknown + // + COUNTRY_UNKNOWN = 0; + + // Country is Germany + // + GERMANY = 1; + + // Country is USA + // + USA = 2; + + // Country is Japan + // + JAPAN = 3; + } } From f076a8a688ed65a4764872bcf411f88d0d0271d9 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 18 Feb 2021 11:18:17 +0100 Subject: [PATCH 02/22] Use string for country type. For country specification see ISO 3166-1, alpha-2 codes. Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 9a3202c6f..ac402c9ad 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -287,8 +287,9 @@ message TrafficSign // optional bool is_out_of_service = 7; - // Specifies the country - optional Country country = 8; + // Specifies the country. See ISO 3166-1, alpha-2 codes + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + optional string country = 8; // The year the traffic rules come into force optional string country_revision = 9; @@ -5552,11 +5553,12 @@ message TrafficSign // optional bool is_out_of_service = 7; - // Specifies the country - optional Country country = 8; + // Specifies the country. See ISO 3166-1, alpha-2 codes + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + optional string country = 8; // The year the traffic rules come into force - optional string countryevision = 9; + optional string country_revision = 9; // Code identifier according to country code // @@ -9427,25 +9429,4 @@ message TrafficSign // VARIABILITY_VARIABLE = 3; } - - - // Definition of country. - enum Country - { - // Country is unknown - // - COUNTRY_UNKNOWN = 0; - - // Country is Germany - // - GERMANY = 1; - - // Country is USA - // - USA = 2; - - // Country is Japan - // - JAPAN = 3; - } } From a303995a3e1222e180268f30608d723ff85a6166 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 18 Feb 2021 11:33:41 +0100 Subject: [PATCH 03/22] mark possible deprecated messages Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index ac402c9ad..ea7e212fe 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -280,6 +280,8 @@ message TrafficSign // As for every boolean in the protocol buffers language, the // default value of \c #vertically_mirrored is \c false. // + // May be deprecated in the future. + // Discussions will continue in OSI Harmonization OpenX group. optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. From e372f8b0495a50c996dac3c50fc11e36ec41968b Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 18 Feb 2021 11:34:42 +0100 Subject: [PATCH 04/22] mark possible deprecated messages Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index ea7e212fe..01c193e72 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -225,6 +225,8 @@ message TrafficSign // The type of the traffic sign. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. optional Type type = 2; // Additional value associated with the traffic sign, e.g. value of @@ -256,6 +258,8 @@ message TrafficSign // might have been intentionally unmounted and, hence, not be in // effect. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. optional DirectionScope direction_scope = 4; // The IDs of the lanes that the sign is assigned to. @@ -280,8 +284,8 @@ message TrafficSign // As for every boolean in the protocol buffers language, the // default value of \c #vertically_mirrored is \c false. // - // May be deprecated in the future. - // Discussions will continue in OSI Harmonization OpenX group. + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. @@ -323,6 +327,8 @@ message TrafficSign // https://www.gesetze-im-internet.de/stvo_2013/anlage_4.html // (Verkehrseinrichtungen) \arg https://traffic-rules.com/ // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. enum Type { // Type of traffic sign is unknown (must not be used in ground @@ -5515,6 +5521,8 @@ message TrafficSign // Type of the supplementary sign. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. optional Type type = 2; // Additional value(s) associated with the traffic sign, e.g. @@ -5544,10 +5552,14 @@ message TrafficSign // bikes, cars, trucks and so on), that the supplementary sign // makes reference to. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. repeated Actor actor = 5; // A direction arrow shown on the supplementary sign. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. repeated Arrow arrow = 6; // Boolean flag to indicate that the supplementary traffic sign is taken out of service. @@ -5583,6 +5595,9 @@ message TrafficSign // text, \c Type is used in descending order in the following // sequence: \c #TYPE_EXCEPT, \c #TYPE_CONSTRAINED_TO, \c // #TYPE_ARROW, \c #TYPE_TIME, \c #TYPE_SPACE, \c #TYPE_TEXT. + // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. enum Type { // Type of supplementary sign is unknown (must not be used in @@ -8998,6 +9013,8 @@ message TrafficSign // Definition of the traffic actors the supplementary sign makes // reference to. E.g. bikes, trucks, cars, etc. // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. enum Actor { // An unknown actor @@ -9223,6 +9240,8 @@ message TrafficSign // The direction to which the arrow points to // + // May be deprecated or changed in the future. + // Discussions will continue in Harmonization OpenX group. enum Direction { // Direction of sign is unknown (must not be used in ground From 238bba623d5dae30db149e0fdc46225560a23e8f Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:29:17 +0200 Subject: [PATCH 05/22] Modified comment to mark as deprecated in a uniform way - enum actor Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 01c193e72..4e033589e 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -9013,8 +9013,10 @@ message TrafficSign // Definition of the traffic actors the supplementary sign makes // reference to. E.g. bikes, trucks, cars, etc. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the enum Actor will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 enum Actor { // An unknown actor From 30eae414bb758231bed01d16a3a3b936d83e7906 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:30:51 +0200 Subject: [PATCH 06/22] Modified comment to mark as deprecated in a uniform way - enum Direction Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 4e033589e..576da1a29 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -9242,8 +9242,10 @@ message TrafficSign // The direction to which the arrow points to // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the enum Direction will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 enum Direction { // Direction of sign is unknown (must not be used in ground From b0d492b67b23c89c37cb04176e7df248ceec56d1 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:31:59 +0200 Subject: [PATCH 07/22] Modified comment to mark as deprecated in a uniform way - type Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 576da1a29..a367d81ce 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -225,8 +225,10 @@ message TrafficSign // The type of the traffic sign. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the type will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 optional Type type = 2; // Additional value associated with the traffic sign, e.g. value of From 592e63be7f70d66ddc7aaf4374a9bae2c801bfd3 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:32:50 +0200 Subject: [PATCH 08/22] Modified comment to mark as deprecated in a uniform way - DirectionScope Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index a367d81ce..01c9271db 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -260,8 +260,10 @@ message TrafficSign // might have been intentionally unmounted and, hence, not be in // effect. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the DirectionScope will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 optional DirectionScope direction_scope = 4; // The IDs of the lanes that the sign is assigned to. From 178331d13c4e70a66d1eaa1f7cd33d02ab38cfdd Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:34:05 +0200 Subject: [PATCH 09/22] Modified comment to mark as deprecated in a uniform way - vertically_mirrored Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 01c9271db..de150e988 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -288,8 +288,10 @@ message TrafficSign // As for every boolean in the protocol buffers language, the // default value of \c #vertically_mirrored is \c false. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the enum Actor will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. From 461b62eeb11b3701c8eb6ef41cbe6ca9b8d8a8ff Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:34:50 +0200 Subject: [PATCH 10/22] Modified comment to mark as deprecated in a uniform way - Type Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index de150e988..d70f5828a 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -333,8 +333,10 @@ message TrafficSign // https://www.gesetze-im-internet.de/stvo_2013/anlage_4.html // (Verkehrseinrichtungen) \arg https://traffic-rules.com/ // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the Type will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 enum Type { // Type of traffic sign is unknown (must not be used in ground From 5c8c16c492e2728a7df139e817ceac770c1d0ae6 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:35:31 +0200 Subject: [PATCH 11/22] Modified comment to mark as deprecated in a uniform way - Type type Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index d70f5828a..65f1b9d89 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -5529,8 +5529,10 @@ message TrafficSign // Type of the supplementary sign. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the Type type will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 optional Type type = 2; // Additional value(s) associated with the traffic sign, e.g. From 87c76cd74188fb58f0f41e9e6dd790ce630041ae Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:36:39 +0200 Subject: [PATCH 12/22] Modified comment to mark as deprecated in a uniform way - Actor actor Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 65f1b9d89..5c060de3a 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -5562,8 +5562,10 @@ message TrafficSign // bikes, cars, trucks and so on), that the supplementary sign // makes reference to. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the actor will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 repeated Actor actor = 5; // A direction arrow shown on the supplementary sign. From 051058739251003b1ba7eaca954a568b49dadcf3 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:37:17 +0200 Subject: [PATCH 13/22] Modified comment to mark as deprecated in a uniform way - Arrow arrow Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 5c060de3a..2def6deab 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -5570,8 +5570,10 @@ message TrafficSign // A direction arrow shown on the supplementary sign. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the arrow will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 repeated Arrow arrow = 6; // Boolean flag to indicate that the supplementary traffic sign is taken out of service. From accd1140632ed0a5b16d15d66d8e68ffd49c7363 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:37:46 +0200 Subject: [PATCH 14/22] Modified comment to mark as deprecated in a uniform way - Type Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 2def6deab..60a968b43 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -5610,8 +5610,10 @@ message TrafficSign // sequence: \c #TYPE_EXCEPT, \c #TYPE_CONSTRAINED_TO, \c // #TYPE_ARROW, \c #TYPE_TIME, \c #TYPE_SPACE, \c #TYPE_TEXT. // - // May be deprecated or changed in the future. - // Discussions will continue in Harmonization OpenX group. + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the enum Type will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 enum Type { // Type of supplementary sign is unknown (must not be used in From 0403989dc194ddad67ec902ba8126b48b1672b48 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:41:25 +0200 Subject: [PATCH 15/22] Modified comment to mark as deprecated in a uniform way Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 60a968b43..4e828b718 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -227,7 +227,7 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the type will be dealt in future will be discussed in Harmonization OpenX group.
+ // How the Type type will be dealt in future will be discussed in Harmonization OpenX group.
// Deprecated planned for version 4.0.0 optional Type type = 2; @@ -262,7 +262,7 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the DirectionScope will be dealt in future will be discussed in Harmonization OpenX group.
+ // How the DirectionScope direction_scope will be dealt in future will be discussed in Harmonization OpenX group.
// Deprecated planned for version 4.0.0 optional DirectionScope direction_scope = 4; @@ -290,7 +290,7 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the enum Actor will be dealt in future will be discussed in Harmonization OpenX group.
+ // How the bool vertically_mirrored will be dealt in future will be discussed in Harmonization OpenX group.
// Deprecated planned for version 4.0.0 optional bool vertically_mirrored = 6; @@ -5564,7 +5564,7 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the actor will be dealt in future will be discussed in Harmonization OpenX group.
+ // How the Actor actor will be dealt in future will be discussed in Harmonization OpenX group.
// Deprecated planned for version 4.0.0 repeated Actor actor = 5; @@ -5572,7 +5572,7 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the arrow will be dealt in future will be discussed in Harmonization OpenX group.
+ // How the Arrow arrow will be dealt in future will be discussed in Harmonization OpenX group.
// Deprecated planned for version 4.0.0 repeated Arrow arrow = 6; From 088386c9bc25a26192ae12daae4beedb2c8bac1c Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Thu, 22 Apr 2021 15:53:18 +0200 Subject: [PATCH 16/22] add examples for country and country_revision in comment Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 4e828b718..69fc1e709 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -301,9 +301,11 @@ message TrafficSign // Specifies the country. See ISO 3166-1, alpha-2 codes // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + // e.g. "Germany", "France", "Austria" optional string country = 8; // The year the traffic rules come into force + // e.g. "2017" optional string country_revision = 9; // Code identifier according to country code From 2130d2bc335678ebb7cfd87f7f85ac47d44953c3 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Mon, 10 May 2021 13:37:45 +0200 Subject: [PATCH 17/22] correct example for ISO 3166-1 alpha-2 code Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 69fc1e709..04b29a170 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -301,11 +301,13 @@ message TrafficSign // Specifies the country. See ISO 3166-1, alpha-2 codes // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 - // e.g. "Germany", "France", "Austria" + // e.g. "DE", "FR", "AT + //" optional string country = 8; // The year the traffic rules come into force // e.g. "2017" + // optional string country_revision = 9; // Code identifier according to country code From 25e96383bf7b131384896c31c996202e3625a62e Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Mon, 10 May 2021 14:37:06 +0200 Subject: [PATCH 18/22] better comments to clarify use of code and sub_code Signed-off-by: Marcel Sachse --- osi_trafficsign.proto | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 04b29a170..3c9831908 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -300,21 +300,25 @@ message TrafficSign optional bool is_out_of_service = 7; // Specifies the country. See ISO 3166-1, alpha-2 codes - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 - // e.g. "DE", "FR", "AT - //" + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
+ // e.g. "DE", "FR", "AT" + // optional string country = 8; - // The year the traffic rules come into force + // The year the traffic rules come into force.
// e.g. "2017" // optional string country_revision = 9; - // Code identifier according to country code + // Code identifier according to country code.
+ // code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm // optional string code = 10; - // Subcode identifier according to country code + // Subcode identifier according to country code.
+ // sub_code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm // optional string sub_code = 11; @@ -5586,17 +5590,25 @@ message TrafficSign optional bool is_out_of_service = 7; // Specifies the country. See ISO 3166-1, alpha-2 codes - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
+ // e.g. "DE", "FR", "AT" + // optional string country = 8; - // The year the traffic rules come into force + // The year the traffic rules come into force.
+ // e.g. "2017" + // optional string country_revision = 9; - // Code identifier according to country code + // Code identifier according to country code.
+ // code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm // optional string code = 10; - // Subcode identifier according to country code + // Subcode identifier according to country code.
+ // sub_code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm // optional string sub_code = 11; From 545a96e50854f4792e748165c6eccac97023fa8c Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Sun, 16 May 2021 13:14:39 +0200 Subject: [PATCH 19/22] mark Type as deprecated Signed-off-by: Marcel Sachse --- osi_roadmarking.proto | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index fd8cd0378..189c6d56a 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -121,8 +121,8 @@ message RoadMarking // Boolean flag to indicate that the road marking is taken out of service. - // This can be achieved by visibly crossing the road marking with stripes, - // or completly covering a road marking making it not visible. + // This can be achieved by visibly crossing the road marking with stripes, + // or completly covering a road marking making it not visible. // // \image html OSI_RoadMaking_is_out_of_service.jpg width=800px // @@ -130,6 +130,11 @@ message RoadMarking // Definition of road marking types. // + // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum + // (see OpenDRIVE V1-6-0).
+ // How the Type will be dealt in future will be discussed in Harmonization OpenX group.
+ // Deprecated planned for version 4.0.0 + // enum Type { // Type of road marking is unknown (must not be used in ground From c75aa0f583df370c9b75312e2b8c39305fa9ff3c Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Sun, 16 May 2021 13:17:56 +0200 Subject: [PATCH 20/22] add attribute country, country_revision, code and sub_code to roadmarking Signed-off-by: Marcel Sachse --- osi_roadmarking.proto | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index 189c6d56a..ba29b7444 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -128,6 +128,29 @@ message RoadMarking // optional bool is_out_of_service = 7; + // Specifies the country. See ISO 3166-1, alpha-2 codes + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
+ // e.g. "DE", "FR", "AT" + // + optional string country = 8; + + // The year the traffic rules come into force.
+ // e.g. "2017" + // + optional string country_revision = 9; + + // Code identifier according to country code.
+ // code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm + // + optional string code = 10; + + // Subcode identifier according to country code.
+ // sub_code is only unique in combination with #country and #country_revision.
+ // e.g. http://www.vzkat.de/2017/VzKat.htm + // + optional string sub_code = 11; + // Definition of road marking types. // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum From df50fbb37a7a23b1bd45bd1e7df8f4c96a0934f7 Mon Sep 17 00:00:00 2001 From: Marcel Sachse Date: Tue, 29 Jun 2021 10:33:45 +0200 Subject: [PATCH 21/22] Documentation Update (fix typo + better wording) Signed-off-by: Marcel Sachse --- osi_roadmarking.proto | 6 +++--- osi_trafficsign.proto | 40 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index ba29b7444..392533aca 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -122,7 +122,7 @@ message RoadMarking // Boolean flag to indicate that the road marking is taken out of service. // This can be achieved by visibly crossing the road marking with stripes, - // or completly covering a road marking making it not visible. + // or completely covering a road marking making it not visible. // // \image html OSI_RoadMaking_is_out_of_service.jpg width=800px // @@ -155,8 +155,8 @@ message RoadMarking // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Type will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 // enum Type { diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 3c9831908..a5841a97a 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -227,8 +227,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Type type will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 optional Type type = 2; // Additional value associated with the traffic sign, e.g. value of @@ -262,8 +262,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the DirectionScope direction_scope will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the DirectionScope direction_scope will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 optional DirectionScope direction_scope = 4; // The IDs of the lanes that the sign is assigned to. @@ -290,8 +290,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the bool vertically_mirrored will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the bool vertically_mirrored will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. @@ -343,8 +343,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Type will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 enum Type { // Type of traffic sign is unknown (must not be used in ground @@ -5539,8 +5539,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Type type will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 optional Type type = 2; // Additional value(s) associated with the traffic sign, e.g. @@ -5572,16 +5572,16 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Actor actor will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Actor actor will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 repeated Actor actor = 5; // A direction arrow shown on the supplementary sign. // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the Arrow arrow will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the Arrow arrow will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 repeated Arrow arrow = 6; // Boolean flag to indicate that the supplementary traffic sign is taken out of service. @@ -5628,8 +5628,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the enum Type will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the enum Type will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 enum Type { // Type of supplementary sign is unknown (must not be used in @@ -9047,8 +9047,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the enum Actor will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the enum Actor will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 enum Actor { // An unknown actor @@ -9276,8 +9276,8 @@ message TrafficSign // // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum // (see OpenDRIVE V1-6-0).
- // How the enum Direction will be dealt in future will be discussed in Harmonization OpenX group.
- // Deprecated planned for version 4.0.0 + // How the enum Direction will be dealt with in future will be discussed in Harmonization OpenX group.
+ // Deprecated status planned for version 4.0.0 enum Direction { // Direction of sign is unknown (must not be used in ground From 6fd1bec32becd773adae6a99fdbdd2f0508d7397 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Tue, 13 Jul 2021 13:21:36 +0200 Subject: [PATCH 22/22] Refer to OpenDRIVE, clarify deprecation intent Signed-off-by: Pierre R. Mai --- osi_roadmarking.proto | 87 +++++++++++++++++++---- osi_trafficsign.proto | 162 ++++++++++++++++++++++++++++-------------- 2 files changed, 182 insertions(+), 67 deletions(-) diff --git a/osi_roadmarking.proto b/osi_roadmarking.proto index 392533aca..38debc53e 100644 --- a/osi_roadmarking.proto +++ b/osi_roadmarking.proto @@ -73,6 +73,12 @@ message RoadMarking // \note Field need not be set (or set to \c #TYPE_OTHER) // if road marking type (\c #type) does not require it. // + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // // \rules // check_if this.type is_greater_than_or_equal_to 2 else do_check is_set // check_if this.type is_less_than_or_equal_to 4 else do_check is_set @@ -119,7 +125,6 @@ message RoadMarking // repeated Identifier assigned_lane_id = 6; - // Boolean flag to indicate that the road marking is taken out of service. // This can be achieved by visibly crossing the road marking with stripes, // or completely covering a road marking making it not visible. @@ -128,36 +133,92 @@ message RoadMarking // optional bool is_out_of_service = 7; - // Specifies the country. See ISO 3166-1, alpha-2 codes - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
- // e.g. "DE", "FR", "AT" + // Country specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Country is specified using the ISO 3166-1, alpha-2 code + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2, or the + // special OpenDRIVE country for generic signs.
+ // + // \rules + // check_if this.type is_greater_than_or_equal_to 2 else do_check is_set + // check_if this.type is_less_than_or_equal_to 4 else do_check is_set + // \endrules // optional string country = 8; - // The year the traffic rules come into force.
+ // Revision specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // The year the traffic rules came into force.
// e.g. "2017" // + // \note Field is set if ( \c #type == \c #TYPE_PAINTED_TRAFFIC_SIGN or + // \c #TYPE_SYMBOLIC_TRAFFIC_SIGN or \c #TYPE_TEXTUAL_TRAFFIC_SIGN ). + // + // \note Field need not be set (or set to \c #TYPE_OTHER) + // if road marking type (\c #type) does not require it. + // + // \rules + // check_if this.type is_greater_than_or_equal_to 2 else do_check is_set + // check_if this.type is_less_than_or_equal_to 4 else do_check is_set + // \endrules + // optional string country_revision = 9; - // Code identifier according to country code.
+ // Code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Code identifier according to country and country revision, + // corresponds to the type field of OpenDRIVE.
// code is only unique in combination with #country and #country_revision.
// e.g. http://www.vzkat.de/2017/VzKat.htm // + // \note Field is set if ( \c #type == \c #TYPE_PAINTED_TRAFFIC_SIGN or + // \c #TYPE_SYMBOLIC_TRAFFIC_SIGN or \c #TYPE_TEXTUAL_TRAFFIC_SIGN ). + // + // \note Field need not be set (or set to \c #TYPE_OTHER) + // if road marking type (\c #type) does not require it. + // + // \rules + // check_if this.type is_greater_than_or_equal_to 2 else do_check is_set + // check_if this.type is_less_than_or_equal_to 4 else do_check is_set + // \endrules + // optional string code = 10; - // Subcode identifier according to country code.
- // sub_code is only unique in combination with #country and #country_revision.
+ // Sub-code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Sub-code identifier according to country, country revision and code, + // corresponds to the subtype field of OpenDRIVE.
+ // sub_code is only unique in combination with #country, #country_revision, + // and #code.
// e.g. http://www.vzkat.de/2017/VzKat.htm // + // \note Field is set if ( \c #type == \c #TYPE_PAINTED_TRAFFIC_SIGN or + // \c #TYPE_SYMBOLIC_TRAFFIC_SIGN or \c #TYPE_TEXTUAL_TRAFFIC_SIGN ). + // + // \note Field need not be set (or set to \c #TYPE_OTHER) + // if road marking type (\c #type) does not require it. + // + // \rules + // check_if this.type is_greater_than_or_equal_to 2 else do_check is_set + // check_if this.type is_less_than_or_equal_to 4 else do_check is_set + // \endrules + // optional string sub_code = 11; // Definition of road marking types. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 - // enum Type { // Type of road marking is unknown (must not be used in ground diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index a5841a97a..8908dc52c 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -225,10 +225,12 @@ message TrafficSign // The type of the traffic sign. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // optional Type type = 2; // Additional value associated with the traffic sign, e.g. value of @@ -260,10 +262,12 @@ message TrafficSign // might have been intentionally unmounted and, hence, not be in // effect. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the DirectionScope direction_scope will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // optional DirectionScope direction_scope = 4; // The IDs of the lanes that the sign is assigned to. @@ -288,10 +292,12 @@ message TrafficSign // As for every boolean in the protocol buffers language, the // default value of \c #vertically_mirrored is \c false. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the bool vertically_mirrored will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // optional bool vertically_mirrored = 6; // Boolean flag to indicate that a traffic sign is taken out of service. @@ -299,25 +305,48 @@ message TrafficSign // optional bool is_out_of_service = 7; - // Specifies the country. See ISO 3166-1, alpha-2 codes - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
- // e.g. "DE", "FR", "AT" + // Country specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Country is specified using the ISO 3166-1, alpha-2 code + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2, or the + // special OpenDRIVE country for generic signs.
// optional string country = 8; - // The year the traffic rules come into force.
+ // Revision specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // The year the traffic rules came into force.
// e.g. "2017" // optional string country_revision = 9; - // Code identifier according to country code.
+ // Code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Code identifier according to country and country revision, + // corresponds to the type field of OpenDRIVE.
// code is only unique in combination with #country and #country_revision.
// e.g. http://www.vzkat.de/2017/VzKat.htm // optional string code = 10; - // Subcode identifier according to country code.
- // sub_code is only unique in combination with #country and #country_revision.
+ // Sub-code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Sub-code identifier according to country, country revision and code, + // corresponds to the subtype field of OpenDRIVE.
+ // sub_code is only unique in combination with #country, #country_revision, + // and #code.
// e.g. http://www.vzkat.de/2017/VzKat.htm // optional string sub_code = 11; @@ -341,10 +370,12 @@ message TrafficSign // https://www.gesetze-im-internet.de/stvo_2013/anlage_4.html // (Verkehrseinrichtungen) \arg https://traffic-rules.com/ // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // enum Type { // Type of traffic sign is unknown (must not be used in ground @@ -5537,10 +5568,12 @@ message TrafficSign // Type of the supplementary sign. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // optional Type type = 2; // Additional value(s) associated with the traffic sign, e.g. @@ -5570,18 +5603,22 @@ message TrafficSign // bikes, cars, trucks and so on), that the supplementary sign // makes reference to. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Actor actor will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // repeated Actor actor = 5; // A direction arrow shown on the supplementary sign. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the Arrow arrow will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // repeated Arrow arrow = 6; // Boolean flag to indicate that the supplementary traffic sign is taken out of service. @@ -5589,25 +5626,48 @@ message TrafficSign // optional bool is_out_of_service = 7; - // Specifies the country. See ISO 3166-1, alpha-2 codes - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
- // e.g. "DE", "FR", "AT" + // Country specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Country is specified using the ISO 3166-1, alpha-2 code + // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2, or the + // special OpenDRIVE country for generic signs.
// optional string country = 8; - // The year the traffic rules come into force.
+ // Revision specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // The year the traffic rules came into force.
// e.g. "2017" // optional string country_revision = 9; - // Code identifier according to country code.
+ // Code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Code identifier according to country and country revision, + // corresponds to the type field of OpenDRIVE.
// code is only unique in combination with #country and #country_revision.
// e.g. http://www.vzkat.de/2017/VzKat.htm // optional string code = 10; - // Subcode identifier according to country code.
- // sub_code is only unique in combination with #country and #country_revision.
+ // Sub-code specification of the traffic sign catalog specification + // that identifies the actual traffic sign. This is part of the + // 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // + // Sub-code identifier according to country, country revision and code, + // corresponds to the subtype field of OpenDRIVE.
+ // sub_code is only unique in combination with #country, #country_revision, + // and #code.
// e.g. http://www.vzkat.de/2017/VzKat.htm // optional string sub_code = 11; @@ -5626,10 +5686,12 @@ message TrafficSign // sequence: \c #TYPE_EXCEPT, \c #TYPE_CONSTRAINED_TO, \c // #TYPE_ARROW, \c #TYPE_TIME, \c #TYPE_SPACE, \c #TYPE_TEXT. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the enum Type will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 + // \attention Deprecated: A revision is planned for version 4.0.0 to + // replace the type enum with a more semantically defined enumeration, + // with the exact sign specification being relegated to the newly + // introduced 4-tupel traffic sign catalog specification as used in + // OpenDRIVE. + // enum Type { // Type of supplementary sign is unknown (must not be used in @@ -9045,10 +9107,6 @@ message TrafficSign // Definition of the traffic actors the supplementary sign makes // reference to. E.g. bikes, trucks, cars, etc. // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the enum Actor will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 enum Actor { // An unknown actor @@ -9274,10 +9332,6 @@ message TrafficSign // The direction to which the arrow points to // - // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum - // (see OpenDRIVE V1-6-0).
- // How the enum Direction will be dealt with in future will be discussed in Harmonization OpenX group.
- // Deprecated status planned for version 4.0.0 enum Direction { // Direction of sign is unknown (must not be used in ground