Skip to content

Conversation

@MarcelOliver
Copy link
Contributor

As suggested in #504:
1. Color orange is added to road mark colors
2. Color violet is marked as deprecated

Some questions to ask:
What is this change? --> only extension
What does it fix? --> harmonisation with OpenDrive
Is this a bug fix or a feature? Does it break any existing functionality or force me to update to a new version?
How has it been tested? --> only extension

Take this checklist as orientation for yourself, if this PR is ready for the Change Control Board:

  • My suggestion follows the style and contributors guidelines.
  • I have taken care about the documentation.
  • I have done the DCO signoff.
  • My changes generate no errors when passing CI tests.
  • I have successfully implemented and tested my fix/feature locally.
  • Appropriate reviewer(s) are assigned.

If you can’t check all of them, please explain why.
If all boxes are checked or commented and you have achieved at least one positive review, you can assign the label ReadyForCCBReview!

@MarcelOliver MarcelOliver added Documentation Everything which impacts the quality of the documentation and guidelines. Harmonisation The Group in the ASAM development project working on harmonisation with other standards. labels Apr 15, 2021
@MarcelOliver MarcelOliver linked an issue Apr 15, 2021 that may be closed by this pull request
Copy link
Contributor

@HendrikAmelunxen HendrikAmelunxen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@HendrikAmelunxen
Copy link
Contributor

Harmonisation 22.04.:
Change comment regarding to Architecture group:

\attention Deprecated: info 

"info" should contain the following: Provide information about the deprecated message.What needs to be changed/code adaption etc..e.g. Use assigned_lane_id in MovingObjectClassification instead.Provide information on when it will be deprecated.Specify the release version (usually, a major release )

@HendrikAmelunxen
Copy link
Contributor

Harmonisation 22.04.:
Extend Roadmarkings and Laneboudnaries by "orange"; "violet" stays; no deprecated comment
=> For OSI 4.0: centralize color in osi_common

@MarcelOliver
Copy link
Contributor Author

At the moment, color is defined in four different files (osi_lane, osi_object, osi_featuredata and osi_roadmarking) as shown here:

osi_lane.proto:

  • COLOR_UNKNOWN = 0;
  • COLOR_OTHER = 1;
  • COLOR_NONE = 2;
  • COLOR_WHITE = 3;
  • COLOR_YELLOW = 4;
  • COLOR_RED = 5;
  • COLOR_BLUE = 6;
  • COLOR_GREEN = 7;
  • COLOR_VIOLET = 8;
  • COLOR_ORANGE = 9;

osi_object.proto:

  • COLOR_UNKNOWN = 0;
  • COLOR_OTHER = 1;
  • COLOR_YELLOW = 2;
  • COLOR_GREEN = 3;
  • COLOR_BLUE = 4;
  • COLOR_VIOLET = 5;
  • COLOR_RED = 6;
  • COLOR_ORANGE = 7;
  • COLOR_BLACK = 8;
  • COLOR_GREY = 9;
  • COLOR_WHITE = 10;

osi_featuredata.proto:

  • COLOR_UNKNOWN = 0;
  • COLOR_OTHER = 1;
  • COLOR_BLACK = 2;
  • COLOR_GREY = 3;
  • COLOR_WHITE = 4;
  • COLOR_YELLOW = 5;
  • COLOR_ORANGE = 6;
  • COLOR_RED = 7;
  • COLOR_VIOLET = 8;
  • COLOR_BLUE = 9;
  • COLOR_GREEN = 10;
  • COLOR_REFLECTIVE = 11;

osi_roadmarking.proto:

  • COLOR_UNKNOWN = 0;
  • COLOR_OTHER = 1;
  • COLOR_WHITE = 2;
  • COLOR_YELLOW = 3;
  • COLOR_BLUE = 5;
  • COLOR_RED = 6;
  • COLOR_GREEN = 7;
  • COLOR_VIOLET = 8;
  • COLOR_ORANGE = 9;

--> For OSI 4.0: centralize color in osi_common

@MarcelOliver MarcelOliver added the ReadyForCCBReview Indicates that this PR is ready for a final review and merge by the CCB. label Apr 22, 2021
@HendrikAmelunxen
Copy link
Contributor

HendrikAmelunxen commented Apr 22, 2021

This topic is addressed in issue 512 #512

osi_lane.proto Outdated
//
COLOR_VIOLET = 8;

// Marking with orange color.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably White space issue.

@kmeids
Copy link

kmeids commented May 12, 2021

Output CCB 12.05.2021:

  1. @pmai will fix the DCO, white space issues and merge.

@kmeids kmeids added ReadyToMerge This PR has been approved to merge and will be merged by a member of the CCB. and removed ReadyForCCBReview Indicates that this PR is ready for a final review and merge by the CCB. labels May 12, 2021
…Harmonization of road mark colors with OpenDRIVE

Signed-off-by: Pierre R. Mai <pmai@pmsf.de>
@pmai pmai force-pushed the extention/road-mark-color-harmonisation branch from 02b92c0 to 829c9fc Compare May 12, 2021 11:31
@pmai pmai merged commit 7cb894b into OpenSimulationInterface:master May 12, 2021
@stefancyliax stefancyliax added this to the V3.4.0 milestone Jun 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation Everything which impacts the quality of the documentation and guidelines. Harmonisation The Group in the ASAM development project working on harmonisation with other standards. ReadyToMerge This PR has been approved to merge and will be merged by a member of the CCB.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Harmonization of road mark colors with OpenDRIVE

5 participants