Ticket #8356: wind-source.patch

mythweather/weather-screens.xml

@@ -6 +6 @@
         <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" />

mythweather/weatherSource.cpp

@@ -645 +645 @@
     }
 }
 
+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 +689 @@
             m_data[temp[0]] = temp[1];
     }
     processPrecip(m_data);
+    processWind(m_data);
 }
 
 void WeatherSource::scriptTimeout()

theme/default-wide/weather-ui.xml

@@ -89 +89 @@
 
         <textarea name="windlbl" from="humiditylbl">
             <area>220,336,245,32</area>
-            <value>Wind(Gust)</value>
         </textarea>
 
         <textarea name="wind_spdgst" from="basetextarea">

theme/default/weather-ui.xml

@@ -95 +95 @@
 
         <textarea name="windlbl" from="humiditylbl">
             <area>60,276,420,32</area>
-            <value>Wind(Gust)</value>
         </textarea>
 
         <textarea name="wind_spdgst" from="relative_humidity">