METAR: mitigate wind sensor failures
This commit is contained in:
parent
15c6f73136
commit
da39e30439
@ -646,16 +646,21 @@ bool SGMetar::scanWind()
|
|||||||
double gust = NaN;
|
double gust = NaN;
|
||||||
if (*m == 'G') {
|
if (*m == 'G') {
|
||||||
m++;
|
m++;
|
||||||
if (!scanNumber(&m, &i, 2, 3))
|
if (!strncmp(m, "//", 2)) // speed not measurable
|
||||||
|
m += 2, i = -1;
|
||||||
|
else if (!scanNumber(&m, &i, 2, 3))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (i != -1)
|
||||||
gust = i;
|
gust = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
double factor;
|
double factor;
|
||||||
if (!strncmp(m, "KT", 2))
|
if (!strncmp(m, "KT", 2))
|
||||||
m += 2, factor = SG_KT_TO_MPS;
|
m += 2, factor = SG_KT_TO_MPS;
|
||||||
else if (!strncmp(m, "KMH", 3))
|
else if (!strncmp(m, "KMH", 3)) // invalid Km/h
|
||||||
m += 3, factor = SG_KMH_TO_MPS;
|
m += 3, factor = SG_KMH_TO_MPS;
|
||||||
else if (!strncmp(m, "KPH", 3)) // ??
|
else if (!strncmp(m, "KPH", 3)) // invalid Km/h
|
||||||
m += 3, factor = SG_KMH_TO_MPS;
|
m += 3, factor = SG_KMH_TO_MPS;
|
||||||
else if (!strncmp(m, "MPS", 3))
|
else if (!strncmp(m, "MPS", 3))
|
||||||
m += 3, factor = 1.0;
|
m += 3, factor = 1.0;
|
||||||
@ -680,18 +685,28 @@ bool SGMetar::scanVariability()
|
|||||||
{
|
{
|
||||||
char *m = _m;
|
char *m = _m;
|
||||||
int from, to;
|
int from, to;
|
||||||
if (!scanNumber(&m, &from, 3))
|
|
||||||
|
if (!strncmp(m, "///", 3)) // direction not measurable
|
||||||
|
m += 3, from = -1;
|
||||||
|
else if (!scanNumber(&m, &from, 3))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (*m++ != 'V')
|
if (*m++ != 'V')
|
||||||
return false;
|
return false;
|
||||||
if (!scanNumber(&m, &to, 3))
|
|
||||||
|
if (!strncmp(m, "///", 3)) // direction not measurable
|
||||||
|
m += 3, to = -1;
|
||||||
|
else if (!scanNumber(&m, &to, 3))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!scanBoundary(&m))
|
if (!scanBoundary(&m))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
_m = m;
|
_m = m;
|
||||||
_wind_range_from = from;
|
_wind_range_from = from;
|
||||||
_wind_range_to = to;
|
_wind_range_to = to;
|
||||||
_grpcount++;
|
_grpcount++;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,6 +87,15 @@ void test_sensor_failure_wind()
|
|||||||
SGMetar m1("2020/10/23 16:55 LIVD 231655Z /////KT 9999 OVC025 10/08 Q1020 RMK OVC VIS MIN 9999 BLU");
|
SGMetar m1("2020/10/23 16:55 LIVD 231655Z /////KT 9999 OVC025 10/08 Q1020 RMK OVC VIS MIN 9999 BLU");
|
||||||
SG_CHECK_EQUAL(m1.getWindDir(), -1);
|
SG_CHECK_EQUAL(m1.getWindDir(), -1);
|
||||||
SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), -1, TEST_EPSILON);
|
SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), -1, TEST_EPSILON);
|
||||||
|
|
||||||
|
SGMetar m2("2020/10/21 16:55 LIVD 211655Z /////KT CAVOK 07/03 Q1023 RMK SKC VIS MIN 9999 BLU");
|
||||||
|
SG_CHECK_EQUAL(m2.getWindDir(), -1);
|
||||||
|
SG_CHECK_EQUAL_EP2(m2.getWindSpeed_kt(), -1, TEST_EPSILON);
|
||||||
|
|
||||||
|
SGMetar m3("2020/11/17 16:00 CYAZ 171600Z 14040G//KT 10SM -RA OVC012 12/11 A2895 RMK NS8 VIA CYXY SLP806 DENSITY ALT 900FT");
|
||||||
|
SG_CHECK_EQUAL(m3.getWindDir(), 140);
|
||||||
|
SG_CHECK_EQUAL_EP2(m3.getWindSpeed_kt(), 40, TEST_EPSILON);
|
||||||
|
SG_CHECK_EQUAL_EP2(m3.getGustSpeed_kt(), SGMetarNaN, TEST_EPSILON);
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_wind_unit_not_specified()
|
void test_wind_unit_not_specified()
|
||||||
|
Loading…
Reference in New Issue
Block a user