Skip to content

Commit 3588e69

Browse files
authored
Merge pull request #180 from OpenSimulationInterface/feature/environment-humidity
Add relative humidity to environment data
2 parents 52d2e7b + 32442e3 commit 3588e69

File tree

1 file changed

+36
-27
lines changed

1 file changed

+36
-27
lines changed

osi_environment.proto

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ message EnvironmentalConditions
1616

1717
// The time of day.
1818
//
19-
optional TimeOfDay time_of_day = 2;
19+
optional TimeOfDay time_of_day = 2;
2020

2121
// Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325
2222
// [Pa]).
@@ -29,18 +29,27 @@ message EnvironmentalConditions
2929
// Unit: [K]
3030
optional double temperature = 4;
3131

32+
// Relative humidity in at z=0.0 in world frame.
33+
//
34+
// Note that physically more relevant measures, like absolute or specific
35+
// humidity can be easily derived from relative_humidity, given that the
36+
// temperature and atmospheric_pressure are known.
37+
//
38+
// Unit: [%]
39+
optional double relative_humidity = 5;
40+
3241
// Description of the precipitation.
3342
//
34-
optional Precipitation precipitation = 5;
43+
optional Precipitation precipitation = 6;
3544

3645
// Description of the fog.
3746
//
38-
optional Fog fog = 6;
39-
47+
optional Fog fog = 7;
48+
4049
// Definition of discretized precipitation states according to [1].
4150
// (I = Intensity of precipitation in mm per hour [mm/h])
4251
//
43-
// \par References:
52+
// \par References:
4453
// [1] PAULAT, Marcus, et al. A gridded dataset of hourly precipitation in Germany: Its construction, climatology and application. Meteorologische Zeitschrift, 2008, 17. Jg. Nr. 6, S. 719-732.
4554
enum Precipitation
4655
{
@@ -82,19 +91,19 @@ message EnvironmentalConditions
8291
}
8392

8493
// Definition of discretized fog states according to [2].
85-
// The bandwidth of thick and dense fog was adjusted to fit the German StVO
94+
// The bandwidth of thick and dense fog was adjusted to fit the German StVO
8695
// regarding rear fog lights [3].
87-
// (V = Visibility in meters [m])
96+
// (V = Visibility in meters [m])
8897
//
89-
// Visibility is defined as the length of the atmosphere over which a beam
90-
// of light travels before its luminous flux is reduced to 5% of its
91-
// original value (definition used by the Meteorological Office [4]).
92-
// This is approximately equivalent to visibility measured in terms of the
98+
// Visibility is defined as the length of the atmosphere over which a beam
99+
// of light travels before its luminous flux is reduced to 5% of its
100+
// original value (definition used by the Meteorological Office [4]).
101+
// This is approximately equivalent to visibility measured in terms of the
93102
// contrast of a distant object against its background.
94103
//
95-
// \par References:
104+
// \par References:
96105
// [2] SHEPARD, Frank D. Reduced visibility due to fog on the highway. Transportation Research Board, 1996.
97-
// [3] [StVO §17 chapter 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung)
106+
// [3] [StVO §17 chapter 3](https://www.stvo.de/strassenverkehrsordnung/101-17-beleuchtung)
98107
// [4] [Homepage of the Meteorological Office](http://www.metoffice.gov.uk/guide/weather/observations-guide/how-we-measure-visibility)
99108
enum Fog
100109
{
@@ -143,18 +152,18 @@ message EnvironmentalConditions
143152
// Ambient light is any light in the vehicle's environment that is not
144153
// emitted by the vehicle itself. It can include sun/moon light, light from
145154
// other cars, street lights, etc.
146-
//
155+
//
147156
// Lux [lx] is the SI unit of luminance or illumination of an area of exact
148-
// one square metre, which is equal to one lumen per square meter 1 [lx] =
157+
// one square metre, which is equal to one lumen per square meter 1 [lx] =
149158
// 1 [lm/m^2] [5].
150159
// The lumen [lm] is the SI derived unit of luminous flux and a measure of
151-
// the total quantity of visible light emitted by a source. The lumen is
152-
// defined in relation to the candela [cd] as 1 [lm] =1 [cd sr] where [sr]
153-
// denotes steradian, the unit of solid angle used in 3D geometry analogous
154-
// to the radian.
160+
// the total quantity of visible light emitted by a source. The lumen is
161+
// defined in relation to the candela [cd] as 1 [lm] =1 [cd sr] where [sr]
162+
// denotes steradian, the unit of solid angle used in 3D geometry analogous
163+
// to the radian.
155164
//
156-
// Categorization is done based on natural day/night time illuminance levels
157-
// [6] and standards for required lighting levels on roads [6, 7, 8, 9].
165+
// Categorization is done based on natural day/night time illuminance levels
166+
// [6] and standards for required lighting levels on roads [6, 7, 8, 9].
158167
//
159168
// \par References:
160169
// [5] [The NIST Reference on Constants, Units, and Uncertainty](https://physics.nist.gov/cuu/Units/units.html)
@@ -183,23 +192,23 @@ message EnvironmentalConditions
183192
AMBIENT_ILLUMINATION_LEVEL2 = 3;
184193

185194
// Level 3 illumination in [1, 3[ [lx]
186-
// E.g. Deep to average twilight / Minimum lighting on local low
195+
// E.g. Deep to average twilight / Minimum lighting on local low
187196
// pedestrian conflict roads.
188197
AMBIENT_ILLUMINATION_LEVEL3 = 4;
189198

190199
// Level 4 illumination in [3, 10[ [lx]
191200
// E.g. Average to full twilight / Minimum lighting on collector roads /
192-
// Minimum lighting on major and expressway roads with low to average
201+
// Minimum lighting on major and expressway roads with low to average
193202
// pedestrian conflict.
194203
AMBIENT_ILLUMINATION_LEVEL4 = 5;
195204

196205
// Level 5 illumination in [10, 20[ [lx]
197-
// E.g. Minimum lighting on major and expressway roads with high
206+
// E.g. Minimum lighting on major and expressway roads with high
198207
// pedestrian conflict.
199208
AMBIENT_ILLUMINATION_LEVEL5 = 6;
200209

201210
// Level 6 illumination in [20, 400[ [lx]
202-
// E.g. Roads with more lighting / Very dark overcast day to sunrise or
211+
// E.g. Roads with more lighting / Very dark overcast day to sunrise or
203212
// sunset on a clear day.
204213
AMBIENT_ILLUMINATION_LEVEL6 = 7;
205214

@@ -225,10 +234,10 @@ message EnvironmentalConditions
225234
message TimeOfDay
226235
{
227236
// The number of seconds [s] that have passed since midnight local time.
228-
// Used for determining the current state of the circadian rhythm of a
237+
// Used for determining the current state of the circadian rhythm of a
229238
// driver.
230239
//
231-
// \note No changes of daylight saving time or time zones are
240+
// \note No changes of daylight saving time or time zones are
232241
// considered.
233242
optional uint32 seconds_since_midnight = 1;
234243
}

0 commit comments

Comments
 (0)