Skip to content

Commit 3d90725

Browse files
Markus Waldmannpmai
authored andcommitted
Changed cloud, wind descriptions to fulfill comments
Changed Definition -> Description several times Changed description texts Changed Ranges of wind direction Changed ENUM cloud layer ENUM CloudLayerLevel -> FractionalCloudCover Added new reference changed naming and description text Signed-off-by: Markus Waldmann <Markus.Waldmann@stud.hs-kempten.de> Changed ENUM FractionalCloudCover Signed-off-by: Markus Waldmann <Markus.Waldmann@stud.hs-kempten.de>
1 parent 4035f8f commit 3d90725

File tree

1 file changed

+34
-47
lines changed

1 file changed

+34
-47
lines changed

osi_environment.proto

Lines changed: 34 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ message EnvironmentalConditions
101101
//
102102
repeated ExternalReference source_reference = 9;
103103

104-
// Definition of clouds.
104+
// Description of the clouds.
105105
//
106106
optional CloudLayer clouds = 10;
107107

108-
// Definition of the wind properties.
108+
// Description of the wind.
109109
//
110110
optional Wind wind = 11;
111111

112-
// Definition of the Sun.
112+
// Description of the sun.
113113
//
114114
optional Sun sun = 12;
115115

@@ -338,89 +338,75 @@ message EnvironmentalConditions
338338
}
339339

340340
//
341-
// \brief Specification of a cloud layer.
341+
// \brief Description of a cloud layer.
342342
//
343343
message CloudLayer
344344
{
345-
// Definition of the cloud layer, i.e. cloud layer level and sky visualization settings.
345+
// Properties of a cloud layer by discrete cloud layer levels.
346346
//
347-
optional CloudLayerLevel cloud_layer_level = 1;
347+
optional FractionalCloudCover cloud_layer_level = 1;
348348

349-
// Defines the cloud layer levels given by observation of total cloud amount in oktas.
349+
// Defines the fractional cloud cover given by observation of total cloud amount in eights (oktas) of the sky.
350350
//
351351
// For visual alignment please see reference[1].
352352
//
353-
// The total degree of coverage indicates how large the part of the sky vault is which is covered
354-
// with clouds altogether. It is given in eighths, because this division is easier to estimate
355-
// for the observer. 0 eighths means that there are no traces of clouds in the sky,
356-
// 4 eighths means that the sky is covered with clouds up to half, 8 eighths means that the sky is
357-
// completely covered with clouds and no sky blue can be recognized.
358-
//
359-
// For cloud determination, the observer will choose a location from which he can overlook the entire sky.
360-
// When determining the total cloud cover, all clouds or parts of clouds, regardless of height and genus,
361-
// that are above his location will be added. Aircraft contrails are also counted as cloud cover if they remain
362-
// in the sky for more than 15 minutes. On the other hand, fog is not counted as cloud cover.
363-
//
364-
// With a little practice, the observer can easily determine the total amount of cloud cover.
365-
// Problems occur only with scattered clouds or many single clouds (cumulus).
366-
// Their cloud cover is often overestimated. On the other hand,
367-
// the coverage of thin ice clouds (cirrus) is often underestimated [2].
353+
// The total degree of coverage indicates how much of the sky is covered with clouds altogether.
354+
// 0 oktas means that there are no traces of clouds in the sky, \c
355+
// 8 oktas means that the sky is completely covered with clouds and no sky blue can be recognized.
368356
//
369357
// \par References:
370-
// ISO 15469:2004(E) / CIE S 011/E:2003 : Spatial distribution of skylight
371-
// https://en.wikipedia.org/wiki/Cloud_cover
358+
// https://cie.co.at/eilvterm/17-29-116
372359
// [1] https://www.eoas.ubc.ca/courses/atsc113/flying/met_concepts/01-met_concepts/01c-cloud_coverage/index.html
373-
// [2] https://www.dwd.de/DE/service/lexikon/Functions/glossar.html?lv2=100932&lv3=101016
374360
//
375-
enum CloudLayerLevel
361+
enum FractionalCloudCover
376362
{
377363
// Cloud layer level is unknown (must not be used in ground truth).
378364
//
379-
CLOUD_LAYER_LEVEL_UNKNOWN = 0;
365+
FRACTIONAL_CLOUD_COVER_UNKNOWN = 0;
380366

381367
// Other (unspecified but known) cloud layer level.
382368
//
383-
CLOUD_LAYER_LEVEL_OTHER = 1;
369+
FRACTIONAL_CLOUD_COVER_OTHER = 1;
384370

385371
// 0/8 of the sky is covered with clouds.
386372
//
387-
CLOUD_LAYER_LEVEL_0 = 2;
373+
FRACTIONAL_CLOUD_COVER_ZERO_OKTAS = 2;
388374

389375
// 1/8 of the sky is covered with clouds.
390376
//
391-
CLOUD_LAYER_LEVEL_1 = 3;
377+
FRACTIONAL_CLOUD_COVER_ONE_OKTAS = 3;
392378

393379
// 2/8 of the sky is covered with clouds.
394380
//
395-
CLOUD_LAYER_LEVEL_2 = 4;
381+
FRACTIONAL_CLOUD_COVER_TWO_OKTAS = 4;
396382

397383
// 3/8 of the sky is covered with clouds.
398384
//
399-
CLOUD_LAYER_LEVEL_3 = 5;
385+
FRACTIONAL_CLOUD_COVER_THREE_OKTAS = 5;
400386

401387
// 4/8 of the sky is covered with clouds.
402388
//
403-
CLOUD_LAYER_LEVEL_4 = 6;
389+
FRACTIONAL_CLOUD_COVER_FOUR_OKTAS = 6;
404390

405391
// 5/8 of the sky is covered with clouds.
406392
//
407-
CLOUD_LAYER_LEVEL_5 = 7;
393+
FRACTIONAL_CLOUD_COVER_FIVE_OKTAS = 7;
408394

409395
// 6/8 of the sky is covered with clouds.
410396
//
411-
CLOUD_LAYER_LEVEL_6 = 8;
397+
FRACTIONAL_CLOUD_COVER_SIX_OKTAS = 8;
412398

413399
// 7/8 of the sky is covered with clouds.
414400
//
415-
CLOUD_LAYER_LEVEL_7 = 9;
401+
FRACTIONAL_CLOUD_COVER_SEVEN_OKTAS = 9;
416402

417403
// 8/8 of the sky is covered with clouds.
418404
//
419-
CLOUD_LAYER_LEVEL_8 = 10;
405+
FRACTIONAL_CLOUD_COVER_EIGHT_OKTAS = 10;
420406

421407
// Sky obscured, describes situations where the sky is not perceivable, e.g. in dense fog.
422408
//
423-
CLOUD_LAYER_LEVEL_SKY_OBSCURED = 11;
409+
FRACTIONAL_CLOUD_COVER_SKY_OBSCURED = 11;
424410
}
425411
}
426412

@@ -434,12 +420,12 @@ message EnvironmentalConditions
434420
// 0 pointing north. If north not explicitly defined via proj4 reference in ground truth, \c
435421
// then north is pointing in y-axis direction. The default orientation (x, y, z) is easting, northing, up [1].
436422
//
423+
// \note 0: north; +pi/2: west; pi: south, 3/2 pi: east.
424+
//
437425
// Unit: rad
438426
//
439427
// The preferred angular range is [0, 2pi].
440428
//
441-
// \note The direction is the origin, not the target direction.
442-
//
443429
// \par References:
444430
// [1] https://proj.org/usage/projections.html#:~:text=E%20%20%20%200dN%200.000-,Axis%20orientation,%C2%B6,-Starting%20in%20PROJ
445431
//
@@ -449,19 +435,21 @@ message EnvironmentalConditions
449435
//
450436
// Unit: m/s
451437
//
452-
// Range [0...inf[
438+
// \rules
439+
// is_greater_than_or_equal_to: 0
440+
// \endrules
453441
//
454442
optional double speed = 2;
455443
}
456444

457445
//
458-
// \brief Specification of sun properties.
446+
// \brief Properties of the sun.
459447
//
460448
message Sun
461449
{
462450
// Azimuth of the sun, counted counterclockwise.
463451
// 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].
452+
// then north is pointing in y-axis direction. The default orientation (x, y, z) is easting, northing, up [1].
465453
//
466454
// \note 0: north; +pi/2: west; pi: south, 3/2 pi: east.
467455
//
@@ -470,14 +458,13 @@ message EnvironmentalConditions
470458
// The preferred angular range is [0, 2pi].
471459
//
472460
// \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
461+
// [1] https://proj.org/usage/projections.html
474462
//
475463
optional double azimuth = 1;
476464

477-
// Solar elevation angle. Counted in positive direction around x-axis.
465+
// Solar elevation angle. Counted in positive direction (clockwise) around xy-plane.
478466
//
479-
// \note This is different to ASAM OpenSCENARIO for an unique definition of azimuth and elevation.\c
480-
// 0: xy-plane; +pi/2: zenith.
467+
// \note 0: xy-plane; +pi/2: zenith.
481468
//
482469
// Unit: rad
483470
//

0 commit comments

Comments
 (0)