Extension for Traffic Sign classification for better harmonisation with OpenDRIVE

osi_roadmarking.proto

@@ -121,15 +121,43 @@ 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 completely covering a road marking making it not visible.
         //
         // \image html OSI_RoadMaking_is_out_of_service.jpg width=800px
         //
         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. <br>
+        // e.g. "DE", "FR", "AT"
+        //
+        optional string country = 8;
+
+        // The year the traffic rules come into force. <br>
+        // e.g. "2017"
+        //
+        optional string country_revision = 9;
+
+        // Code identifier according to country code. <br>
+        // code is only unique in combination with #country and #country_revision.  <br>
+        // e.g. http://www.vzkat.de/2017/VzKat.htm
+        //
+        optional string code = 10;
+
+        // Subcode identifier according to country code. <br>
+        // sub_code is only unique in combination with #country and #country_revision.  <br>
+        // 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
+        // (see <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+        // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+        // Deprecated status planned for version 4.0.0
+        //
         enum Type
         {
             // Type of road marking is unknown (must not be used in ground

osi_trafficsign.proto

@@ -225,6 +225,10 @@ message TrafficSign
 
             // The type of the traffic sign.
             //
+            // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum
+            // (see <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             optional Type type = 2;
 
             // Additional value associated with the traffic sign, e.g. value of
@@ -256,6 +260,10 @@ 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the DirectionScope direction_scope will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             optional DirectionScope direction_scope = 4;
 
             // The IDs of the lanes that the sign is assigned to.
@@ -280,12 +288,39 @@ 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the bool vertically_mirrored will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // 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.
-            // 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. See ISO 3166-1, alpha-2 codes
+            // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2. <br>
+            // e.g. "DE", "FR", "AT"
+            //
+            optional string country = 8;
+
+            // The year the traffic rules come into force. <br>
+            // e.g. "2017"
+            //
+            optional string country_revision = 9;
+
+            // Code identifier according to country code. <br>
+            // code is only unique in combination with #country and #country_revision.  <br>
+            // e.g. http://www.vzkat.de/2017/VzKat.htm
+            //
+            optional string code = 10;
+
+            // Subcode identifier according to country code. <br>
+            // sub_code is only unique in combination with #country and #country_revision.  <br>
+            // e.g. http://www.vzkat.de/2017/VzKat.htm
+            //
+            optional string sub_code = 11;
 
             // Definition of traffic sign types.
             // Numbers are given according to German StVO.
@@ -306,6 +341,10 @@ 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the Type will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             enum Type
             {
                 // Type of traffic sign is unknown (must not be used in ground
@@ -5498,6 +5537,10 @@ message TrafficSign
 
             // Type of the supplementary sign.
             //
+            // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum
+            // (see <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the Type type will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             optional Type type = 2;
 
             // Additional value(s) associated with the traffic sign, e.g.
@@ -5527,17 +5570,48 @@ 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the Actor actor will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the Arrow arrow will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // 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.
-            // 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. See ISO 3166-1, alpha-2 codes
+            // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.  <br>
+            // e.g. "DE", "FR", "AT"
+            //
+            optional string country = 8;
+
+            // The year the traffic rules come into force. <br>
+            // e.g. "2017"
+            //
+            optional string country_revision = 9;
+
+            // Code identifier according to country code. <br>
+            // code is only unique in combination with #country and #country_revision.  <br>
+            // e.g. http://www.vzkat.de/2017/VzKat.htm
+            //
+            optional string code = 10;
+
+            // Subcode identifier according to country code. <br>
+            // sub_code is only unique in combination with #country and #country_revision.  <br>
+            // e.g. http://www.vzkat.de/2017/VzKat.htm
+            //
+            optional string sub_code = 11;
+
             // Definition of supplementary sign types.
             //
             // For general supplementary signs use \c #TYPE_TEXT.
@@ -5551,6 +5625,11 @@ 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.
+            //
+            // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum
+            // (see <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the enum Type will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             enum Type
             {
                 // Type of supplementary sign is unknown (must not be used in
@@ -8966,6 +9045,10 @@ 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 <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+            // How the enum Actor will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+            // Deprecated status planned for version 4.0.0
             enum Actor
             {
                 // An unknown actor
@@ -9191,6 +9274,10 @@ message TrafficSign
 
                 // The direction to which the arrow points to
                 //
+                // \attention Deprecated: OpenDRIVE categorization for traffic signs is more generic than OSI enum
+                // (see <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE V1-6-0</a>).<br>
+                // How the enum Direction will be dealt with in future will be discussed in Harmonization OpenX group.<br>
+                // Deprecated status planned for version 4.0.0
                 enum Direction
                 {
                     // Direction of sign is unknown (must not be used in ground