Metar: symbolic cloudnames and phenomena exposure

- use symbolic names for scattered, broken, overcast, etc. cloud
coverages.
- better approach to expose weather phenomena to the interface

diff --git a/simgear/environment/metar.cxx b/simgear/environment/metar.cxx
index 182a3995f2d8138944e415e04831c840a178d027..949995b226e936f0887ababae4425ca1cda2ddb5 100644 (file)
--- a/simgear/environment/metar.cxx
+++ b/simgear/environment/metar.cxx
@@ -85,8 +85,7 @@ SGMetar::SGMetar(const string& m, const string& proxy, const string& port,
        _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++)
@@ -618,8 +617,8 @@ bool SGMetar::scanRwyVisRange()
 
 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 }
 };
 
@@ -672,6 +671,7 @@ bool SGMetar::scanWeather()
        char *m = _m;
        string weather;
        const struct Token *a;
+
        if ((a = scanToken(&m, special))) {
                if (!scanBoundary(&m))
                        return false;
@@ -681,35 +681,35 @@ bool SGMetar::scanWeather()
        }
 
        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;
@@ -719,6 +719,8 @@ bool SGMetar::scanWeather()
        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;
 }
@@ -772,7 +774,7 @@ bool SGMetar::scanSkyCondition()
                        return false;
 
                if (i == 3) {
-                       cl._coverage = 0;
+            cl._coverage = SGMetarCloud::COVERAGE_CLEAR;
                        _clouds.push_back(cl);
                } else {
                        _cavok = true;
@@ -784,13 +786,13 @@ bool SGMetar::scanSkyCondition()
        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;
@@ -803,7 +805,7 @@ bool SGMetar::scanSkyCondition()
        } 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///'
@@ -1203,7 +1205,7 @@ const struct Token *SGMetar::scanToken(char **str, const struct Token *list)
 }
 
 
-void SGMetarCloud::set(double alt, int cov)
+void SGMetarCloud::set(double alt, Coverage cov)
 {
        _altitude = alt;
        if (cov != -1)

diff --git a/simgear/environment/metar.hxx b/simgear/environment/metar.hxx
index 870456d516777d268563ec0758cfd0d3a2be6898..18837284c579a6bde81570fbdbe40527cc875c3c 100644 (file)
--- a/simgear/environment/metar.hxx
+++ b/simgear/environment/metar.hxx
@@ -130,18 +130,27 @@ protected:
 class SGMetarCloud {
        friend class SGMetar;
 public:
-       SGMetarCloud() : _coverage(-1), _altitude(NaN), _type(0), _type_long(0) {}
+    enum Coverage {
+        COVERAGE_NIL = -1,
+        COVERAGE_CLEAR = 0,
+        COVERAGE_FEW = 1,
+        COVERAGE_SCATTERED = 2,
+        COVERAGE_BROKEN = 3,
+        COVERAGE_OVERCAST = 4
+    };
 
-       void set(double alt, int cov = -1);
+       SGMetarCloud() : _coverage(COVERAGE_NIL), _altitude(NaN), _type(0), _type_long(0) {}
 
-       inline int getCoverage() const { return _coverage; }
+       void set(double alt, Coverage cov = COVERAGE_NIL );
+
+       inline Coverage getCoverage() const { return _coverage; }
        inline double getAltitude_m() const { return _altitude; }
        inline double getAltitude_ft() const { return _altitude == NaN ? NaN : _altitude * SG_METER_TO_FEET; }
        inline const char *getTypeString() const { return _type; }
        inline const char *getTypeLongString() const { return _type_long; }
 
 protected:
-       int _coverage;          // quarters: 0 -> clear ... 4 -> overcast
+       Coverage _coverage;          // quarters: 0 -> clear ... 4 -> overcast
        double _altitude;       // 1000 m
        const char *_type;      // CU
        const char *_type_long; // cumulus
@@ -161,6 +170,21 @@ public:
                RTD
        };
 
+    enum Intensity {
+        NIL = 0,
+        LIGHT = 1,
+        MODERATE = 2,
+        HEAVY = 3
+    };
+
+    struct Weather {
+        Weather() { intensity = NIL; vincinity = false; }
+        Intensity intensity;
+        bool      vincinity;
+        vector<string> descriptions;
+        vector<string> phenomena;
+    };
+
        inline const char *getData()            const { return _data; }
        inline const char *getUnusedData()      const { return _m; }
        inline const bool getProxy()            const { return _x_proxy; }
@@ -208,8 +232,7 @@ public:
        inline const vector<SGMetarCloud>& getClouds()  const   { return _clouds; }
        inline const map<string, SGMetarRunway>& getRunways()   const   { return _runways; }
        inline const vector<string>& getWeather()               const   { return _weather; }
-       inline const map<string,vector<string> >& getPhenomena() const { return _phenomena; }
-       inline int getIntensity() const { return _intensity; }
+    inline const vector<struct Weather> getWeather2()      const   { return _weather2; }
 
 protected:
        string  _url;
@@ -236,6 +259,7 @@ protected:
        int     _hail;
        int     _snow;
        bool    _cavok;
+    vector<struct Weather> _weather2;
 
        SGMetarVisibility               _min_visibility;
        SGMetarVisibility               _max_visibility;
@@ -244,8 +268,6 @@ protected:
        vector<SGMetarCloud>            _clouds;
        map<string, SGMetarRunway>      _runways;
        vector<string>                  _weather;
-       map<string,vector<string> > _phenomena;
-       int _intensity;
 
        bool    scanPreambleDate();
        bool    scanPreambleTime();