_rain(false),
_hail(false),
_snow(false),
- _cavok(false),
- _intensity(0)
+ _cavok(false)
{
if (m.length() == 4 && isalnum(m[0]) && isalnum(m[1]) && isalnum(m[2]) && isalnum(m[3])) {
for (int i = 0; i < 4; i++)
static const struct Token special[] = {
{ "NSW", "no significant weather" },
- { "VCSH", "showers in the vicinity" },
- { "VCTS", "thunderstorm in the vicinity" },
+/* { "VCSH", "showers in the vicinity" },
+ { "VCTS", "thunderstorm in the vicinity" }, */
{ 0, 0 }
};
char *m = _m;
string weather;
const struct Token *a;
+
if ((a = scanToken(&m, special))) {
if (!scanBoundary(&m))
return false;
}
string pre, post;
+ struct Weather w;
if (*m == '-')
- m++, pre = "light ", _intensity = 1;
+ m++, pre = "light ", w.intensity = LIGHT;
else if (*m == '+')
- m++, pre = "heavy ", _intensity = 3;
+ m++, pre = "heavy ", w.intensity = HEAVY;
else if (!strncmp(m, "VC", 2))
- m += 2, post = "in the vicinity ";
+ m += 2, post = "in the vicinity ", w.vincinity=true;
else
- pre = "moderate ", _intensity = 2;
+ pre = "moderate ", w.intensity = MODERATE;
- vector<string> descriptions;
int i;
for (i = 0; i < 3; i++) {
if (!(a = scanToken(&m, description)))
break;
- descriptions.push_back(a->id);
+ w.descriptions.push_back(a->id);
weather += string(a->text) + " ";
}
for (i = 0; i < 3; i++) {
if (!(a = scanToken(&m, phenomenon)))
break;
- _phenomena[a->id] = descriptions;
+ w.phenomena.push_back(a->id);
weather += string(a->text) + " ";
if (!strcmp(a->id, "RA"))
- _rain = _intensity;
+ _rain = w.intensity;
else if (!strcmp(a->id, "HA"))
- _hail = _intensity;
+ _hail = w.intensity;
else if (!strcmp(a->id, "SN"))
- _snow = _intensity;
+ _snow = w.intensity;
}
if (!weather.length())
return false;
weather = pre + weather + post;
weather.erase(weather.length() - 1);
_weather.push_back(weather);
+ if( w.phenomena.size() > 0 )
+ _weather2.push_back( w );
_grpcount++;
return true;
}
if (!strncmp(m, "CLR", i = 3) // clear
|| !strncmp(m, "SKC", i = 3) // sky clear
+ || !strncmp(m, "NCD", i = 3) // nil cloud detected
|| !strncmp(m, "NSC", i = 3) // no significant clouds
|| !strncmp(m, "CAVOK", i = 5)) { // ceiling and visibility OK (implies 9999)
m += i;
return false;
if (i == 3) {
- cl._coverage = 0;
+ cl._coverage = SGMetarCloud::COVERAGE_CLEAR;
_clouds.push_back(cl);
} else {
_cavok = true;
if (!strncmp(m, "VV", i = 2)) // vertical visibility
;
else if (!strncmp(m, "FEW", i = 3))
- cl._coverage = 1;
+ cl._coverage = SGMetarCloud::COVERAGE_FEW;
else if (!strncmp(m, "SCT", i = 3))
- cl._coverage = 2;
+ cl._coverage = SGMetarCloud::COVERAGE_SCATTERED;
else if (!strncmp(m, "BKN", i = 3))
- cl._coverage = 3;
+ cl._coverage = SGMetarCloud::COVERAGE_BROKEN;
else if (!strncmp(m, "OVC", i = 3))
- cl._coverage = 4;
+ cl._coverage = SGMetarCloud::COVERAGE_OVERCAST;
else
return false;
m += i;
} else if (!scanNumber(&m, &i, 3))
i = -1;
- if (cl._coverage == -1) {
+ if (cl._coverage == SGMetarCloud::COVERAGE_NIL) {
if (!scanBoundary(&m))
return false;
if (i == -1) // 'VV///'
}
-void SGMetarCloud::set(double alt, int cov)
+void SGMetarCloud::set(double alt, Coverage cov)
{
_altitude = alt;
if (cov != -1)
_coverage = cov;
}
+SGMetarCloud::Coverage SGMetarCloud::getCoverage( const std::string & coverage )
+{
+ if( coverage == "clear" ) return COVERAGE_CLEAR;
+ if( coverage == "few" ) return COVERAGE_FEW;
+ if( coverage == "scattered" ) return COVERAGE_SCATTERED;
+ if( coverage == "broken" ) return COVERAGE_BROKEN;
+ if( coverage == "overcast" ) return COVERAGE_OVERCAST;
+ return COVERAGE_NIL;
+}
+
+const char * SGMetarCloud::COVERAGE_NIL_STRING = "nil";
+const char * SGMetarCloud::COVERAGE_CLEAR_STRING = "clear";
+const char * SGMetarCloud::COVERAGE_FEW_STRING = "few";
+const char * SGMetarCloud::COVERAGE_SCATTERED_STRING = "scattered";
+const char * SGMetarCloud::COVERAGE_BROKEN_STRING = "broken";
+const char * SGMetarCloud::COVERAGE_OVERCAST_STRING = "overcast";
void SGMetarVisibility::set(double dist, int dir, int mod, int tend)
{