Display the average windspeed if gusting wind speed is not available.

From: Alec Leamas <leamas.alec%AT%gmail.com>

Also updates the label depending on what's displayed.
---

 mythweather/weather-screens.xml   |    1 +
 mythweather/weatherSource.cpp     |   19 +++++++++++++++++++
 theme/default-wide/weather-ui.xml |    1 -
 theme/default/weather-ui.xml      |    1 -
 4 files changed, 20 insertions(+), 2 deletions(-)


diff --git a/mythweather/weather-screens.xml b/mythweather/weather-screens.xml
index e743e52..980f29c 100644
--- a/mythweather/weather-screens.xml
+++ b/mythweather/weather-screens.xml
@@ -6,6 +6,7 @@
         <datum name="pressure" />
         <!-- <datum name="wind_dir" />  -->
         <datum name="wind_spdgst" />
+        <datum name="windlbl" />
         <!-- <datum name="wind_gust" /> -->
         <datum name="wind_dir" />
         <datum name="visibility" />
diff --git a/mythweather/weatherSource.cpp b/mythweather/weatherSource.cpp
index c0e7f9a..d0b05eb 100644
--- a/mythweather/weatherSource.cpp
+++ b/mythweather/weatherSource.cpp
@@ -645,6 +645,24 @@ static void processPrecip(DataMap& data)
     }
 }
 
+static void processWind(DataMap& data)
+{
+    QString label = QObject::tr( "Wind (Gust)");
+
+    QString w = data["wind_spdgst"];
+    if (w == "" || w == "NA")
+    {
+        w = data["wind_speed"];
+        if (w != "" && w != "NA")
+        {
+            data.changeKey( "wind_speed", "wind_spdgst");
+            label = QObject::tr( "Wind (avg)");
+        }
+    }
+    VERBOSE(VB_MOST, QString("Wind label: %1").arg(label));
+    data[ "windlbl"] = label;
+}
+
 void WeatherSource::processData()
 {
     QStringList data = QString(m_buffer).split('\n', QString::SkipEmptyParts);
@@ -671,6 +689,7 @@ void WeatherSource::processData()
             m_data[temp[0]] = temp[1];
     }
     processPrecip(m_data);
+    processWind(m_data);
 }
 
 void WeatherSource::scriptTimeout()
diff --git a/theme/default-wide/weather-ui.xml b/theme/default-wide/weather-ui.xml
index 5c8054d..4b6519a 100644
--- a/theme/default-wide/weather-ui.xml
+++ b/theme/default-wide/weather-ui.xml
@@ -89,7 +89,6 @@
 
         <textarea name="windlbl" from="humiditylbl">
             <area>220,336,245,32</area>
-            <value>Wind(Gust)</value>
         </textarea>
 
         <textarea name="wind_spdgst" from="basetextarea">
diff --git a/theme/default/weather-ui.xml b/theme/default/weather-ui.xml
index 3ec8d8f..4d50c24 100644
--- a/theme/default/weather-ui.xml
+++ b/theme/default/weather-ui.xml
@@ -95,7 +95,6 @@
 
         <textarea name="windlbl" from="humiditylbl">
             <area>60,276,420,32</area>
-            <value>Wind(Gust)</value>
         </textarea>
 
         <textarea name="wind_spdgst" from="relative_humidity">