Merge lp:~vthompson/ubuntu-weather-app/fix-1286589 into lp:ubuntu-weather-app/obsolete.trunk

[Victor Thompson]

* Fix conversion of wind speed data for TWC data

The OWM wind speed data was in "meters/s", while the TWC data comes as "MPH". A conversion function was added to convert "MPH" to "KPH" to support the metric value.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/152/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/44
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/150
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/150
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/64

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/152/rebuild

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Hi Victor,

thanks, there's an error, you're right!

But the error lies in the function "calcMph(ms)", which does its job right for OWM, because their wind speed value is in meters per second. Where as TWC gives us km/h (not mph).

You can verify this, by calling the TWC one time with units=m and another time without. Also checking the TWC webpage gives a reference value to check against.

The fix you've proposed just makes the kmh value in TWC to the mph value. So the right fix, I guess, would be to change the calcMph() function in _buildDataPoint() *and* _buildDayFormat() of the TWC api to something like

function convertKmhToMph(kmh) {
   return kmh/1.609344
}

Cheers
Martin

review: Needs Fixing

[lp:~vthompson/ubuntu-weather-app/fix-1286589]

213. By Victor Thompson on 2014-03-03

Fix for TWC base speed in KMH

[Victor Thompson (vthompson)]

Thanks Martin! I had assumed TWC always returned MPH based on code I had seen elsewhere. I've fixed the conversion.

[Martin Borho (martin-borho)]

Victor, you've mashed up kmh and mph variable names in convertKmhToMph func ;)

[lp:~vthompson/ubuntu-weather-app/fix-1286589]

214. By Victor Thompson on 2014-03-03

Fix for TWC base speed in KMH

[Victor Thompson (vthompson)]

Thanks Martin! Fingers were quicker than my thoughts.

[Martin Borho (martin-borho)]

Yeah, thanks! Now it looks good!

So good, I've found a bug in the hourly scrolling. The correct values for wind-mph don't get picked up when scrolling through hours. You can test it when enlarge the window to a big tablet size and by scrolling slowly.

Could you please do me a favour and replace Line 56 in components/ScrollingArea.qml with

currentWeather.windSpeed = currentHour[(mainView.settings.wind_units === 'mph') ? 'imperial' : 'metric'].windSpeed

Would be really cool! Then another bug would be fixed... :)

Cheers
Martin

[lp:~vthompson/ubuntu-weather-app/fix-1286589]

215. By Victor Thompson on 2014-03-03

Fix wind speeds for mph in hourly forecast for tablet view

[Victor Thompson (vthompson)]

Cool, I've fixed it. I wasn't aware of the tablet view--now I have something to play around with!

[Martin Borho (martin-borho)]

Have fun! :)

[Martin Borho (martin-borho)]

Thanks again, great bugfix!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/153/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/151
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/151
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/65

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/153/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'components/ScrollingArea.qml'
--- components/ScrollingArea.qml	2014-02-22 15:38:15 +0000
+++ components/ScrollingArea.qml	2014-03-03 14:01:39 +0000
@@ -53,7 +53,7 @@
                     adjustBackground(Math.round(temp));
                     // adjust detail data
                     currentWeather.humidity = currentHour.humidity
-                    currentWeather.windSpeed = currentHour[mainView.settings["units"]].windSpeed
+                    currentWeather.windSpeed = currentHour[(mainView.settings.wind_units === 'mph') ? 'imperial' : 'metric'].windSpeed
                     currentWeather.windDir = currentHour.windDir
                     if(currentHour.propPrecip !== undefined && currentHour.propPrecip !== "") {
                         currentWeather.propPrecip = currentHour.propPrecip;

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2014-02-22 15:38:15 +0000
+++ components/WeatherApi.js	2014-03-03 14:01:39 +0000
@@ -48,6 +48,10 @@
     return ms*3.6;
 }
 //
+function convertKmhToMph(kmh) {
+    return kmh*0.621;
+}
+//
 function calcWindDir(degrees) {
     var direction =  "?";
     if(degrees >=0 && degrees <= 30){
@@ -445,7 +449,7 @@
                 imperial: {
                     temp: calcFahrenheit(data.temp),
                     tempFeels: calcFahrenheit(data.feelsLike),
-                    windSpeed: calcMph(data.wSpeed)
+                    windSpeed: convertKmhToMph(data.wSpeed)
                 },
                 precipType: data.precip_type || null,
                 propPrecip: data.pop || null,
@@ -476,7 +480,7 @@
             imperial: {
                 tempMin: calcFahrenheit(data.minTemp),
                 tempMax: calcFahrenheit(data.maxTemp || data.minTemp),
-                windSpeed: calcMph(partData.wSpeed)
+                windSpeed: convertKmhToMph(partData.wSpeed)
             },
             precipType: partData.precip_type,
             propPrecip: partData.pop,