Skip to content

Commit 046f9c0

Browse files
Markus WaldmannMarkus Waldmann
Markus Waldmann
authored and
Markus Waldmann
committed
Rearranged structure to match message numbers
Sorted the file, so the messages with the given numbers e.g. optional Clouds clouds = 10 are defined before e.g. optional Wind wind = 11. Signed-off-by: Markus Waldmann <Markus.Waldmann@stud.hs-kempten.de>
1 parent 2d46427 commit 046f9c0

File tree

1 file changed

+86
-86
lines changed

1 file changed

+86
-86
lines changed

‎osi_environment.proto‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,6 @@ message EnvironmentalConditions
2222
// The time of day at the host vehicles location.
2323
//
2424
optional TimeOfDay time_of_day = 2;
25-
26-
// The Unix epoch (or Unix time or POSIX time or Unix timestamp) is
27-
// the number of seconds that have elapsed since January 1, 1970
28-
// (midnight UTC/GMT [1]), not counting leap seconds [2].
29-
// Historically, the origin of UNIX system time was referred to as
30-
// "00:00:00 GMT, January 1, 1970" [2]. Literally speaking the epoch
31-
// is Unix time 0 (midnight 1/1/1970), but 'epoch' is often used as
32-
// a synonym for 'Unix time'. Many Unix systems store epoch dates as
33-
// a signed 32-bit integer, which might cause problems on January 19,
34-
// 2038 (known as the Year 2038 problem or Y2038).
35-
//
36-
// \note You can convert the timestamp using the following [routines
37-
// sorted by languages](https://www.epochconverter.com/#code).
38-
//
39-
// \par References:
40-
// [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n
41-
// [2] The Open Group. (2018). <em>POSIX.1-2017</em> The Open Group Base Specifications Issue 7, 2018 edition. IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008). Retrieved January 25, 2020, from https://pubs.opengroup.org/onlinepubs/9699919799/xrat/contents.html
42-
//
43-
optional int64 unix_timestamp = 8;
4425

4526
// Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325
4627
// Pa).
@@ -87,6 +68,25 @@ message EnvironmentalConditions
8768
// Description of the fog.
8869
//
8970
optional Fog fog = 7;
71+
72+
// The Unix epoch (or Unix time or POSIX time or Unix timestamp) is
73+
// the number of seconds that have elapsed since January 1, 1970
74+
// (midnight UTC/GMT [1]), not counting leap seconds [2].
75+
// Historically, the origin of UNIX system time was referred to as
76+
// "00:00:00 GMT, January 1, 1970" [2]. Literally speaking the epoch
77+
// is Unix time 0 (midnight 1/1/1970), but 'epoch' is often used as
78+
// a synonym for 'Unix time'. Many Unix systems store epoch dates as
79+
// a signed 32-bit integer, which might cause problems on January 19,
80+
// 2038 (known as the Year 2038 problem or Y2038).
81+
//
82+
// \note You can convert the timestamp using the following [routines
83+
// sorted by languages](https://www.epochconverter.com/#code).
84+
//
85+
// \par References:
86+
// [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n
87+
// [2] The Open Group. (2018). <em>POSIX.1-2017</em> The Open Group Base Specifications Issue 7, 2018 edition. IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008). Retrieved January 25, 2020, from https://pubs.opengroup.org/onlinepubs/9699919799/xrat/contents.html
88+
//
89+
optional int64 unix_timestamp = 8;
9090

9191
// Optional external reference to the environmental condition sources.
9292
//
@@ -101,14 +101,14 @@ message EnvironmentalConditions
101101
//
102102
repeated ExternalReference source_reference = 9;
103103

104-
// Definition of the wind properties
105-
//
106-
optional Wind wind = 11;
107-
108104
// Definition of clouds.
109105
//
110106
optional Clouds clouds = 10;
111107

108+
// Definition of the wind properties
109+
//
110+
optional Wind wind = 11;
111+
112112
// Definition of the Sun.
113113
//
114114
optional Sun sun = 12;
@@ -337,69 +337,6 @@ message EnvironmentalConditions
337337
optional uint32 seconds_since_midnight = 1;
338338
}
339339

340-
//
341-
// \brief Defines wind properties.
342-
//
343-
// \note Aligns with the wind speed and direction as defined in ASAM OpenSCENARIO
344-
//
345-
message Wind
346-
{
347-
// The target direction of the wind (not the origin direction) in the ground/xy-plane of the \c
348-
// world coordinate system. Corresponds to the heading/yaw angle. \c
349-
// x-axis-direction is 0 rad. Unit [rad]. Range [0...2 pi[
350-
//
351-
optional Vector3d direction = 1;
352-
353-
// The wind speed. Unit [m/s]. Range [0...inf[
354-
//
355-
optional double speed = 2;
356-
}
357-
358-
//
359-
// \brief Specification of sun properties.
360-
//
361-
// \note Aligns with the specification of sun properties according to ASAM OpenSCENARIO
362-
//
363-
message Sun
364-
{
365-
// Azimuth of the sun
366-
//
367-
// Unit: rad
368-
//
369-
// \rules
370-
// Range: [0..2PI]
371-
// counted counterclockwise
372-
// 0=north
373-
// PI/2 = east
374-
// PI=south
375-
// 3/2 PI=west
376-
// \endrules
377-
//
378-
optional double azimuth = 1;
379-
380-
// Solar elevation angle
381-
//
382-
// Unit: rad
383-
//
384-
// \rules
385-
// Range: [-PI..PI]
386-
// 0=x/y plane
387-
// PI/2=zenith
388-
// \endrules
389-
//
390-
optional double elevation = 2;
391-
392-
// Illuminance of the sun, direct sunlight is around 100,00 lx.
393-
//
394-
// Unit: lx
395-
//
396-
// \rules
397-
// Range: [0..inf[
398-
// \endrules
399-
//
400-
optional double intensity = 3;
401-
}
402-
403340
//
404341
// \brief Specification of the cloud states
405342
//
@@ -483,4 +420,67 @@ message EnvironmentalConditions
483420
CLOUD_STATE_NO_SKY = 11;
484421
}
485422
}
423+
424+
//
425+
// \brief Defines wind properties.
426+
//
427+
// \note Aligns with the wind speed and direction as defined in ASAM OpenSCENARIO
428+
//
429+
message Wind
430+
{
431+
// The target direction of the wind (not the origin direction) in the ground/xy-plane of the \c
432+
// world coordinate system. Corresponds to the heading/yaw angle. \c
433+
// x-axis-direction is 0 rad. Unit [rad]. Range [0...2 pi[
434+
//
435+
optional Vector3d direction = 1;
436+
437+
// The wind speed. Unit [m/s]. Range [0...inf[
438+
//
439+
optional double speed = 2;
440+
}
441+
442+
//
443+
// \brief Specification of sun properties.
444+
//
445+
// \note Aligns with the specification of sun properties according to ASAM OpenSCENARIO
446+
//
447+
message Sun
448+
{
449+
// Azimuth of the sun
450+
//
451+
// Unit: rad
452+
//
453+
// \rules
454+
// Range: [0..2PI]
455+
// counted counterclockwise
456+
// 0=north
457+
// PI/2 = east
458+
// PI=south
459+
// 3/2 PI=west
460+
// \endrules
461+
//
462+
optional double azimuth = 1;
463+
464+
// Solar elevation angle
465+
//
466+
// Unit: rad
467+
//
468+
// \rules
469+
// Range: [-PI..PI]
470+
// 0=x/y plane
471+
// PI/2=zenith
472+
// \endrules
473+
//
474+
optional double elevation = 2;
475+
476+
// Illuminance of the sun, direct sunlight is around 100,00 lx.
477+
//
478+
// Unit: lx
479+
//
480+
// \rules
481+
// Range: [0..inf[
482+
// \endrules
483+
//
484+
optional double intensity = 3;
485+
}
486486
}

0 commit comments

Comments
 (0)