Skip to content

Extension for Traffic Sign classification for better harmonisation with OpenDRIVE #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 21, 2021
Merged

Extension for Traffic Sign classification for better harmonisation with OpenDRIVE #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2437594
add attribute country, country_revision, code and sub_code to traffic…
MarcelOliver Feb 11, 2021
f076a8a
Use string for country type. For country specification see ISO 3166-1…
MarcelOliver Feb 18, 2021
a303995
mark possible deprecated messages
MarcelOliver Feb 18, 2021
e372f8b
mark possible deprecated messages
MarcelOliver Feb 18, 2021
238bba6
Modified comment to mark as deprecated in a uniform way - enum actor
MarcelOliver Apr 22, 2021
30eae41
Modified comment to mark as deprecated in a uniform way - enum Direction
MarcelOliver Apr 22, 2021
b0d492b
Modified comment to mark as deprecated in a uniform way - type
MarcelOliver Apr 22, 2021
592e63b
Modified comment to mark as deprecated in a uniform way - DirectionScope
MarcelOliver Apr 22, 2021
178331d
Modified comment to mark as deprecated in a uniform way - vertically_…
MarcelOliver Apr 22, 2021
461b62e
Modified comment to mark as deprecated in a uniform way - Type
MarcelOliver Apr 22, 2021
5c8c16c
Modified comment to mark as deprecated in a uniform way - Type type
MarcelOliver Apr 22, 2021
87c76cd
Modified comment to mark as deprecated in a uniform way - Actor actor
MarcelOliver Apr 22, 2021
0510587
Modified comment to mark as deprecated in a uniform way - Arrow arrow
MarcelOliver Apr 22, 2021
accd114
Modified comment to mark as deprecated in a uniform way - Type
MarcelOliver Apr 22, 2021
0403989
Modified comment to mark as deprecated in a uniform way
MarcelOliver Apr 22, 2021
088386c
add examples for country and country_revision in comment
MarcelOliver Apr 22, 2021
2130d2b
correct example for ISO 3166-1 alpha-2 code
MarcelOliver May 10, 2021
25e9638
better comments to clarify use of code and sub_code
MarcelOliver May 10, 2021
545a96e
mark Type as deprecated
MarcelOliver May 16, 2021
c75aa0f
add attribute country, country_revision, code and sub_code to roadmar…
MarcelOliver May 16, 2021
df50fbb
Documentation Update (fix typo + better wording)
MarcelOliver Jun 29, 2021
6fd1bec
Refer to OpenDRIVE, clarify deprecation intent
pmai Jul 13, 2021
3f95b59
Merge branch 'master' into extension/traffic-sign-classification
pmai Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 91 additions & 2 deletions osi_roadmarking.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// \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
Expand Down Expand Up @@ -146,15 +152,98 @@ 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 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
//
optional bool is_out_of_service = 7;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// 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.<br>
//
// \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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// The year the traffic rules came into force. <br>
// 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 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Code identifier according to country and country revision,
// corresponds to the type field of OpenDRIVE. <br>
// code is only unique in combination with #country and #country_revision. <br>
// 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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Sub-code identifier according to country, country revision and code,
// corresponds to the subtype field of OpenDRIVE. <br>
// sub_code is only unique in combination with #country, #country_revision,
// and #code. <br>
// 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.
//
enum Type
Expand Down
147 changes: 144 additions & 3 deletions osi_trafficsign.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ message TrafficSign

// The type of the traffic sign.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
optional Type type = 2;

// Additional value associated with the traffic sign, e.g. value of
Expand Down Expand Up @@ -282,6 +288,12 @@ message TrafficSign
// might have been intentionally unmounted and, hence, not be in
// effect.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
optional DirectionScope direction_scope = 4;

// The IDs of the lanes that the sign is assigned to.
Expand All @@ -306,12 +318,64 @@ message TrafficSign
// As for every boolean in the protocol buffers language, the
// default value of \c #vertically_mirrored is \c false.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// 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.<br>
//
optional string country = 8;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// The year the traffic rules came into force. <br>
// e.g. "2017"
//
optional string country_revision = 9;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Code identifier according to country and country revision,
// corresponds to the type field of OpenDRIVE. <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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Sub-code identifier according to country, country revision and code,
// corresponds to the subtype field of OpenDRIVE. <br>
// sub_code is only unique in combination with #country, #country_revision,
// and #code. <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.
Expand All @@ -332,6 +396,12 @@ message TrafficSign
// https://www.gesetze-im-internet.de/stvo_2013/anlage_4.html
// (Verkehrseinrichtungen) \arg https://traffic-rules.com/
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
enum Type
{
// Type of traffic sign is unknown (must not be used in ground
Expand Down Expand Up @@ -5524,6 +5594,12 @@ message TrafficSign

// Type of the supplementary sign.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
optional Type type = 2;

// Additional value(s) associated with the traffic sign, e.g.
Expand Down Expand Up @@ -5553,17 +5629,75 @@ message TrafficSign
// bikes, cars, trucks and so on), that the supplementary sign
// makes reference to.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
repeated Actor actor = 5;

// A direction arrow shown on the supplementary sign.
//
// \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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// 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.<br>
//
optional string country = 8;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// The year the traffic rules came into force. <br>
// e.g. "2017"
//
optional string country_revision = 9;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Code identifier according to country and country revision,
// corresponds to the type field of OpenDRIVE. <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;

// 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
// Sub-code identifier according to country, country revision and code,
// corresponds to the subtype field of OpenDRIVE. <br>
// sub_code is only unique in combination with #country, #country_revision,
// and #code. <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.
Expand All @@ -5577,6 +5711,13 @@ 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: 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
// <a href="https://releases.asam.net/OpenDRIVE/1.6.0/ASAM_OpenDRIVE_BS_V1-6-0.html#_signals">OpenDRIVE</a>.
//
enum Type
{
// Type of supplementary sign is unknown (must not be used in
Expand Down