Skip to content

Commit 4035f8f

Browse files
Markus Waldmannpmai
authored andcommitted
Changed descriptions for Sun and Wind
Harmonisation group output: Rework of range and counting methods for azimuth, elevation and wind direction. Signed-off-by: Markus Waldmann <Markus.Waldmann@stud.hs-kempten.de>
1 parent 267c327 commit 4035f8f

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

osi_environment.proto

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ message EnvironmentalConditions
342342
//
343343
message CloudLayer
344344
{
345-
// Definition of the cloud state level, i.e. cloud state and sky visualization settings.
345+
// Definition of the cloud layer, i.e. cloud layer level and sky visualization settings.
346346
//
347347
optional CloudLayerLevel cloud_layer_level = 1;
348348

349-
// Defines the cloud state levels given by observation of total cloud amount in oktas.
349+
// Defines the cloud layer levels given by observation of total cloud amount in oktas.
350350
//
351351
// For visual alignment please see reference[1].
352352
//
@@ -374,11 +374,11 @@ message EnvironmentalConditions
374374
//
375375
enum CloudLayerLevel
376376
{
377-
// Cloud State is unknown (must not be used in ground truth).
377+
// Cloud layer level is unknown (must not be used in ground truth).
378378
//
379379
CLOUD_LAYER_LEVEL_UNKNOWN = 0;
380380

381-
// Other (unspecified but known) CloudState.
381+
// Other (unspecified but known) cloud layer level.
382382
//
383383
CLOUD_LAYER_LEVEL_OTHER = 1;
384384

@@ -427,20 +427,21 @@ message EnvironmentalConditions
427427
//
428428
// \brief Defines wind properties.
429429
//
430-
// \note Inspired by the wind speed and direction as defined in ASAM OpenSCENARIO.
431-
//
432430
message Wind
433431
{
434432
// The origin direction of the wind (not the target direction) in the ground/xy-plane of the \c
435-
// world coordinate system. Corresponds to the heading/yaw angle. \c
436-
// x-axis-direction is 0 rad.
433+
// world coordinate system. Corresponds to the heading/yaw angle, counted counterclockwise. \c
434+
// 0 pointing north. If north not explicitly defined via proj4 reference in ground truth, \c
435+
// then north is pointing in y-axis direction. The default orientation (x, y, z) is easting, northing, up [1].
437436
//
438437
// Unit: rad
439438
//
440-
// The preferred angular range is [-pi, pi].
439+
// The preferred angular range is [0, 2pi].
440+
//
441+
// \note The direction is the origin, not the target direction.
441442
//
442-
// \note The direction is the origin, not the target direction. \c
443-
// The range in openSCENARIO is Range [0...2 pi[. Mind the conversion.
443+
// \par References:
444+
// [1] https://proj.org/usage/projections.html#:~:text=E%20%20%20%200dN%200.000-,Axis%20orientation,%C2%B6,-Starting%20in%20PROJ
444445
//
445446
optional double origin_direction = 1;
446447

@@ -456,23 +457,31 @@ message EnvironmentalConditions
456457
//
457458
// \brief Specification of sun properties.
458459
//
459-
// \note Aligns with the specification of sun properties according to ASAM OpenSCENARIO.
460-
//
461460
message Sun
462461
{
463462
// Azimuth of the sun, counted counterclockwise.
463+
// 0 pointing north. If north not explicitly defined via proj4 reference in ground truth, \c
464+
// then north is pointing in y-axis direction. The default orientation (x, y, z) is “easting, northing, up” [1].
465+
//
466+
// \note 0: north; +pi/2: west; pi: south, 3/2 pi: east.
464467
//
465468
// Unit: rad
466469
//
467-
// The preferred angular range is [-pi, pi].
470+
// The preferred angular range is [0, 2pi].
471+
//
472+
// \par References:
473+
// [1] https://proj.org/usage/projections.html#:~:text=E%20%20%20%200dN%200.000-,Axis%20orientation,%C2%B6,-Starting%20in%20PROJ
468474
//
469475
optional double azimuth = 1;
470476

471-
// Solar elevation angle.
477+
// Solar elevation angle. Counted in positive direction around x-axis.
478+
//
479+
// \note This is different to ASAM OpenSCENARIO for an unique definition of azimuth and elevation.\c
480+
// 0: xy-plane; +pi/2: zenith.
472481
//
473482
// Unit: rad
474483
//
475-
// The preferred angular range is [-pi, pi].
484+
// The preferred angular range is [-pi/2, +pi/2].
476485
//
477486
optional double elevation = 2;
478487

0 commit comments

Comments
 (0)