From 376923795bcfd3af65b47746820bb056015f4a7b Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Tue, 9 Aug 2022 15:54:30 +0200 Subject: [PATCH 1/5] Add DAY to TrafficSign-Value-Unit and change DAY to WEEKDAY Issue: #635 Signed-off-by: FlorianMueller87 --- osi_trafficsign.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 4a68c35e2..aa00b6f8c 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -112,7 +112,7 @@ message TrafficSignValue // Day of the week. // Days since Monday. Monday = 0; Tuesday = 1; ... // - UNIT_DAY = 13; + UNIT_WEEKDAY = 13; // Percentage. // Value. @@ -120,6 +120,10 @@ message TrafficSignValue // Unit: % // UNIT_PERCENTAGE = 14; + + // Day of the month. + // + UNIT_DAY = 15; } // Text associated with a sign, e.g. the name of a location whose distance From 9b64ec26985f2c792971a871e5bcc6e6734968cd Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Tue, 9 Aug 2022 16:04:07 +0200 Subject: [PATCH 2/5] Add HOUR to TrafficSignsValue-Unit Issue: #635 Signed-off-by: FlorianMueller87 --- osi_trafficsign.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index aa00b6f8c..397610af1 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -124,6 +124,13 @@ message TrafficSignValue // Day of the month. // UNIT_DAY = 15; + + // Time of day. + // Hour since midnight. + // + // Unit: h + // + UNIT_HOUR = 15; } // Text associated with a sign, e.g. the name of a location whose distance From 315989087cc177900690db9f37af7a96d590bbe9 Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Tue, 9 Aug 2022 16:06:15 +0200 Subject: [PATCH 3/5] Change description of UNIT_MINUTES Issue: #638 Signed-off-by: FlorianMueller87 --- osi_trafficsign.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 397610af1..12fbe3a88 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -103,7 +103,7 @@ message TrafficSignValue UNIT_SHORT_TON = 11; // Time of day. - // Hour since midnight. + // Minutes since last hour. // // Unit: min // From 399e5b019afa7e3197501ec406d5023087bb3072 Mon Sep 17 00:00:00 2001 From: FlorianMueller87 Date: Fri, 12 Aug 2022 08:45:01 +0200 Subject: [PATCH 4/5] Change value of UNIT_HOUR from 15 to 16 Signed-off-by: FlorianMueller87 --- osi_trafficsign.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 12fbe3a88..70d9336f9 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -130,7 +130,7 @@ message TrafficSignValue // // Unit: h // - UNIT_HOUR = 15; + UNIT_HOUR = 16; } // Text associated with a sign, e.g. the name of a location whose distance From 96f9f4827fd0889387475dd2dbab753417faf3ce Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Wed, 23 Nov 2022 11:51:40 +0100 Subject: [PATCH 5/5] Added changes for v3.6.0 * Added DURATION_* * Added UNIT_DAY_OF_MONTH * Added UNIT_HOUR for time of day * Fixed bug in comment for UNIT_MINUTES Signed-off-by: Carlo van Driesten --- osi_trafficsign.proto | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/osi_trafficsign.proto b/osi_trafficsign.proto index 70d9336f9..8bc362d72 100644 --- a/osi_trafficsign.proto +++ b/osi_trafficsign.proto @@ -101,18 +101,32 @@ message TrafficSignValue // Unit: tn. sh. // UNIT_SHORT_TON = 11; + + // Time of day. + // Hours since midnight. Starting with 0. + // + // Unit: h + // + UNIT_HOUR = 15; // Time of day. - // Minutes since last hour. + // Minutes since last hour. Starting with 0. // // Unit: min // UNIT_MINUTES = 12; + + // Day of the month. + // Starting with 1. + // + UNIT_DAY_OF_MONTH = 16; // Day of the week. // Days since Monday. Monday = 0; Tuesday = 1; ... // - UNIT_WEEKDAY = 13; + // \note For consistency this field will be renamed to UNIT_DAY_OF_WEEK in v4.0.0 . + // + UNIT_DAY = 13; // Percentage. // Value. @@ -120,17 +134,24 @@ message TrafficSignValue // Unit: % // UNIT_PERCENTAGE = 14; - - // Day of the month. + + // Duration in days. // - UNIT_DAY = 15; - - // Time of day. - // Hour since midnight. + // Unit: day + // + UNIT_DURATION_DAY = 17; + + // Duration in hours. // // Unit: h // - UNIT_HOUR = 16; + UNIT_DURATION_HOUR = 18; + + // Duration in minutes. + // + // Unit: min + // + UNIT_DURATION_MINUTE = 19; } // Text associated with a sign, e.g. the name of a location whose distance