Merge lp:~neokore/ubuntu-weather-app/flippedInfo2 into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

Added wind speed, wind direction and rain to internal data and implemented flipped component for more forecast info.

Added wind speed, wind direction and rain to internal data and implemented flipped component for more forecast info.

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

PASSED: Continuous integration, rev:84
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/27/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/19

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Excellent work, Raul!

I'll fix a litte issue on the device (double digit wind speed and double char wind direction is too wide) and the broken tests later. (I have already a branch with updated tests in the work)

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-07-27 16:02:29 +0000
+++ components/CurrentWeather.qml	2013-08-05 18:56:25 +0000
@@ -13,109 +13,329 @@
     property int minTemp
     property int maxTemp
     property bool showMaxTemp
-    property string scale: (mainView.settings["units"] === "imperial") ? "F" : "C"
+    property int windSpeed
+    property string windDir
+    property int humidity
+    property real precipitation
+    property string tempScale: (mainView.settings["units"] === "imperial") ? "F" : "C"
+    property string speedScale: (mainView.settings["units"] === "imperial") ? "mph" : "km/h"
+    property string precipScale: (mainView.settings["units"] === "imperial") ? "in" : "mm"
 
     width: parent.width
-    height: childrenRect.height+units.gu(10)
+    height: units.gu(40)
     anchors.horizontalCenter: parent.horizontalCenter
 
-    Components.WeatherConditionIconComponent {
-        id: currentCondition
-        width: units.gu(30)
-        height: units.gu(30)
-        anchors.horizontalCenter: parent.horizontalCenter
-        condition: currentWeather.icon
-
-        NumberAnimation on opacity {
-            id: createAnimation
-            easing.type: Easing.Linear
-            from: 0
-            to: 1
-            duration: 1000
-        }
-
-        Component.onCompleted: {
-            createAnimation.start()
-        }
-    }
-
-    Rectangle {
-        id: rectangle1
-        width: units.gu(50)
-        height: units.gu(10)
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: currentCondition.bottom
-        anchors.topMargin: 0
-        color: "transparent"
-
-        Column {
-            id: column1
-            width: units.gu(5)
-            height: units.gu(5)
-            anchors.rightMargin: units.gu(2)
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: tempCurrent.left
-            visible: showMaxTemp
-
-            Label {
-                text: i18n.tr("Max.")
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("small")
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            Label {
-                id: tempMax
-                text: maxTemp+"°"+currentWeather.scale
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("large")
-                horizontalAlignment: Text.AlignHCenter
-                color: Theme.palette.normal.baseText
-            }
-        }
-
-        Text {
-            width: units.gu(17)
-            height: units.gu(10)
-            id: tempCurrent
-            objectName: "CurrentTempText"
-            text: currentTemp+String("°")+currentWeather.scale
-            style: Text.Normal
-            font.bold: false
-            font.family: "Ubuntu"
-            verticalAlignment: Text.AlignVCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4)
-            anchors.verticalCenter: parent.verticalCenter
-            font.pointSize: 52
-            horizontalAlignment: Text.AlignHCenter
-            color: Theme.palette.normal.baseText
-        }
-
-        Column {
-            id: column2
-            width: units.gu(5)
-            height: units.gu(5)
-            anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4)
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: tempCurrent.right
-
-            Label {
-                text: i18n.tr("Min.")
-                horizontalAlignment: Text.AlignHCenter
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("small")
-                color: Theme.palette.normal.baseText
-            }
-
-            Label {
-                id: tempMin
-                text: minTemp+"°"+currentWeather.scale
-                horizontalAlignment: Text.AlignHCenter
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: FontUtils.sizeToPixels("large")
-                color: Theme.palette.normal.baseText
-            }
-        }
-    }
-}
+    Flipable {
+            id: flipable
+            anchors.fill: parent
+
+            property bool flipped: false
+
+            MouseArea {anchors.fill: parent; onClicked: flipable.flipped = !flipable.flipped}
+
+            back:
+                Rectangle {
+                    anchors.fill: parent
+                    color: "transparent"
+
+                    Components.WeatherConditionIconComponent {
+                        id: currentCondition2
+                        width: units.gu(20)
+                        height: units.gu(20)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.horizontalCenterOffset: units.gu(-6)
+                        condition: currentWeather.icon
+
+                        NumberAnimation on opacity {
+                            id: createAnimation2
+                            easing.type: Easing.Linear
+                            from: 0
+                            to: 1
+                            duration: 1000
+                        }
+
+                        Component.onCompleted: {
+                            createAnimation2.start()
+                        }
+                    }
+
+                    Rectangle {
+                        id: rectangle12
+                        width: units.gu(50)
+                        height: units.gu(10)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.top: currentCondition2.bottom
+                        anchors.topMargin: 0
+                        color: "transparent"
+
+                        Column {
+                            id: column12
+                            width: units.gu(5)
+                            height: units.gu(5)
+                            anchors.rightMargin: units.gu(2)
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.right: tempCurrent2.left
+                            visible: showMaxTemp
+
+                            Label {
+                                text: i18n.tr("Max.")
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("small")
+                                horizontalAlignment: Text.AlignHCenter
+                            }
+
+                            Label {
+                                id: tempMax2
+                                text: maxTemp+"°"+currentWeather.tempScale
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("large")
+                                horizontalAlignment: Text.AlignHCenter
+                                color: Theme.palette.normal.baseText
+                            }
+                        }
+
+                        Text {
+                            width: units.gu(17)
+                            height: units.gu(10)
+                            id: tempCurrent2
+                            objectName: "CurrentTempText"
+                            text: currentTemp+String("°")+currentWeather.tempScale
+                            style: Text.Normal
+                            font.bold: false
+                            font.family: "Ubuntu"
+                            verticalAlignment: Text.AlignVCenter
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4)
+                            anchors.verticalCenter: parent.verticalCenter
+                            font.pointSize: 52
+                            horizontalAlignment: Text.AlignHCenter
+                            color: Theme.palette.normal.baseText
+                        }
+
+                        Column {
+                            id: column22
+                            width: units.gu(5)
+                            height: units.gu(5)
+                            anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4)
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.left: tempCurrent2.right
+
+                            Label {
+                                text: i18n.tr("Min.")
+                                horizontalAlignment: Text.AlignHCenter
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("small")
+                                color: Theme.palette.normal.baseText
+                            }
+
+                            Label {
+                                id: tempMin2
+                                text: minTemp+"°"+currentWeather.tempScale
+                                horizontalAlignment: Text.AlignHCenter
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("large")
+                                color: Theme.palette.normal.baseText
+                            }
+                        }
+                    }
+
+                    Column {
+                        id: windColumn
+                        anchors.left: currentCondition2.right
+                        anchors.leftMargin: units.gu(3)
+                        height: childrenRect.height
+                        width: childrenRect.width
+
+                        Label {
+                            id: windLabel
+                            text: i18n.tr("Wind")
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("small")
+                            color: Theme.palette.normal.baseText
+                        }
+                        Label {
+                            id: windValue
+                            text: currentWeather.windSpeed+" "+currentWeather.speedScale+" "+currentWeather.windDir
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("large")
+                            color: Theme.palette.normal.baseText
+                        }
+                    }
+
+                    Column {
+                        id: humidityColumn
+                        anchors.left: currentCondition2.right
+                        anchors.leftMargin: units.gu(3)
+                        anchors.top: windColumn.bottom
+                        anchors.topMargin: units.gu(2)
+                        height: childrenRect.height
+                        width: childrenRect.width
+
+                        Label {
+                            id: humidityLabel
+                            text: i18n.tr("Humidity")
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("small")
+                            color: Theme.palette.normal.baseText
+                        }
+                        Label {
+                            id: humidityValue
+                            text: currentWeather.humidity+"%"
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("large")
+                            color: Theme.palette.normal.baseText
+                        }
+                    }
+
+                    Column {
+                        id: precipitationColumn
+                        anchors.left: currentCondition2.right
+                        anchors.leftMargin: units.gu(3)
+                        anchors.top: humidityColumn.bottom
+                        anchors.topMargin: units.gu(2)
+                        height: childrenRect.height
+                        width: childrenRect.width
+
+                        Label {
+                            id: precipitationLabel
+                            text: i18n.tr("Precipitation")
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("small")
+                            color: Theme.palette.normal.baseText
+                        }
+                        Label {
+                            id: precipitationValue
+                            text: currentWeather.precipitation.toFixed(1)+" "+currentWeather.precipScale
+                            horizontalAlignment: Text.AlignLeft
+                            font.pixelSize: FontUtils.sizeToPixels("large")
+                            color: Theme.palette.normal.baseText
+                        }
+                    }
+                }
+
+            front:
+                Rectangle {
+                    anchors.fill: parent
+                    color: "transparent"
+
+                    Components.WeatherConditionIconComponent {
+                        id: currentCondition
+                        width: units.gu(30)
+                        height: units.gu(30)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        condition: currentWeather.icon
+
+                        NumberAnimation on opacity {
+                            id: createAnimation
+                            easing.type: Easing.Linear
+                            from: 0
+                            to: 1
+                            duration: 1000
+                        }
+
+                        Component.onCompleted: {
+                            createAnimation.start()
+                        }
+                    }
+
+                    Rectangle {
+                        id: rectangle1
+                        width: units.gu(50)
+                        height: units.gu(10)
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.top: currentCondition.bottom
+                        anchors.topMargin: 0
+                        color: "transparent"
+
+                        Column {
+                            id: column1
+                            width: units.gu(5)
+                            height: units.gu(5)
+                            anchors.rightMargin: units.gu(2)
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.right: tempCurrent.left
+                            visible: showMaxTemp
+
+                            Label {
+                                text: i18n.tr("Max.")
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("small")
+                                horizontalAlignment: Text.AlignHCenter
+                            }
+
+                            Label {
+                                id: tempMax
+                                text: maxTemp+"°"+currentWeather.tempScale
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("large")
+                                horizontalAlignment: Text.AlignHCenter
+                                color: Theme.palette.normal.baseText
+                            }
+                        }
+
+                        Text {
+                            width: units.gu(17)
+                            height: units.gu(10)
+                            id: tempCurrent
+                            objectName: "CurrentTempText"
+                            text: currentTemp+String("°")+currentWeather.tempScale
+                            style: Text.Normal
+                            font.bold: false
+                            font.family: "Ubuntu"
+                            verticalAlignment: Text.AlignVCenter
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            anchors.horizontalCenterOffset: (showMaxTemp) ? 0 : -units.gu(4)
+                            anchors.verticalCenter: parent.verticalCenter
+                            font.pointSize: 52
+                            horizontalAlignment: Text.AlignHCenter
+                            color: Theme.palette.normal.baseText
+                        }
+
+                        Column {
+                            id: column2
+                            width: units.gu(5)
+                            height: units.gu(5)
+                            anchors.leftMargin: (showMaxTemp) ? units.gu(2) : units.gu(4)
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.left: tempCurrent.right
+
+                            Label {
+                                text: i18n.tr("Min.")
+                                horizontalAlignment: Text.AlignHCenter
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("small")
+                                color: Theme.palette.normal.baseText
+                            }
+
+                            Label {
+                                id: tempMin
+                                text: minTemp+"°"+currentWeather.tempScale
+                                horizontalAlignment: Text.AlignHCenter
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                font.pixelSize: FontUtils.sizeToPixels("large")
+                                color: Theme.palette.normal.baseText
+                            }
+                        }
+                    }
+            }
+
+            transform: Rotation {
+                        id: rotation
+                        origin.x: flipable.width/2
+                        origin.y: flipable.height/2
+                        axis.x: 0; axis.y: 1; axis.z: 0     // set axis.y to 1 to rotate around y-axis
+                        angle: 0    // the default angle
+                    }
+
+            states: State {
+                    name: "back"
+                    PropertyChanges { target: rotation; angle: 180 }
+                    when: flipable.flipped
+                }
+
+            transitions: Transition {
+                    NumberAnimation { target: rotation; property: "angle"; duration: 500 }
+                }
+        }
+    }
+

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-07-27 16:02:29 +0000
+++ components/LocationTab.qml	2013-08-05 18:56:25 +0000
@@ -51,6 +51,27 @@
 
         // set daily forecasts
         for(var x=0;x<dailyLength;x++) {
+            var direction = "?";
+            var degrees = dailyForecasts[x].windDeg;
+            if(degrees >=0 && degrees <= 30){
+                direction = "N";
+            } else if(degrees >30 && degrees <= 60){
+                direction = "NE";
+            } else if(degrees >60 && degrees <= 120){
+                direction = "E";
+            } else if(degrees >120 && degrees <= 150){
+                direction = "SE";
+            } else if(degrees >150 && degrees <= 210){
+                direction = "S";
+            } else if(degrees >210 && degrees <= 240){
+                direction = "SW";
+            } else if(degrees >240 && degrees <= 300){
+                direction = "W";
+            } else if(degrees >300 && degrees <= 330){
+                direction = "NW";
+            }else if(degrees >330 && degrees <= 360){
+                direction = "N";
+            }
             dayForecastModel.append({
                 dateRel: "",//Tomorrow",
                 date: formatTimestamp(dailyForecasts[x].timestamp, 'dddd, dd MMMM yyyy'),
@@ -60,7 +81,11 @@
                 tempMax: (dailyForecasts[x]["current"] !== undefined) ? dailyForecasts[x][units].tempMax :
                                             null,
                 cond: dailyForecasts[x].condition.id,
-                condIcon: dailyForecasts[x].condition.icon
+                condIcon: dailyForecasts[x].condition.icon,
+                wind_speed: dailyForecasts[x][units].windSpeed,
+                wind_dir: direction,
+                humid: dailyForecasts[x].humidity,
+                precip: (dailyForecasts[x][units].rain !== null && dailyForecasts[x][units].rain !== undefined) ? dailyForecasts[x][units].rain : 0
             });
         }
     }
@@ -111,6 +136,10 @@
                         maxTemp: tempMax
                         icon: condIcon
                         condition: cond
+                        windSpeed: wind_speed
+                        windDir: wind_dir
+                        humidity: humid
+                        precipitation: precip
                         anchors.top: dateComponent.bottom
                         showMaxTemp: (index === 0)
                     }

=== modified file 'components/SettingsSheet.qml'
--- components/SettingsSheet.qml	2013-07-23 21:20:11 +0000
+++ components/SettingsSheet.qml	2013-08-05 18:56:25 +0000
@@ -31,8 +31,8 @@
         container: ListItem.ValueSelector {
             id: unitsSelector
             objectName: "UnitsSelector"
-            text: i18n.tr("Temperature unit")
-            values: [i18n.tr("°C"), i18n.tr("°F")]
+            text: i18n.tr("Units")
+            values: [i18n.tr("Metric"), i18n.tr("Imperial")]
             selectedIndex: (settings["units"] === "imperial") ? 1 : 0;
         }
 

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-07-27 16:01:13 +0000
+++ components/WeatherApi.js	2013-08-05 18:56:25 +0000
@@ -3,7 +3,7 @@
 *  Version of the response data format.
 *  Increase this number to force a refresh.
 */
-var RESPONSE_DATA_VERSION = 20130727;
+var RESPONSE_DATA_VERSION = 20130801;
 
 /**
 * Helper functions
@@ -11,8 +11,14 @@
 function calcFahrenheit(celsius) {
         return celsius * 1.8 + 32;
 }
-function calcMph(kmh) {
-        return kmh*0.62137;
+function calcMph(ms) {
+    return ms*2.24;
+}
+function calcInch(mm) {
+    return mm/25.4;
+}
+function calcKmh(ms) {
+    return ms*3.6;
 }
 
 var OpenWeatherMapApi = (function() {
@@ -42,13 +48,11 @@
         var result = {
             timestamp: data.dt,
             date: Qt.formatDateTime(new Date(data.dt*1000), "yyyy-MM-dd hh:mm"),
-            metric: { temp:data.main.temp },
-            imperial: { temp: calcFahrenheit(data.main.temp) },
+            metric: { temp:data.main.temp, windSpeed: calcKmh(data.main.speed), rain: data.main.rain},
+            imperial: { temp: calcFahrenheit(data.main.temp), windSpeed: calcMph(data.main.speed), rain: calcInch(data.main.rain)},
             humidity: data.main.humidity,
             pressure: data.main.pressure,
-            wind_speed_kmh: data.wind.speed,
-            wind_speed_mph: calcMph(data.wind.speed),
-            wind_deg: data.wind.deg,
+            windDeg: data.main.deg,
             condition: data.weather[0]
         };
         if(data.id !== undefined) {
@@ -64,17 +68,20 @@
             timestamp: data.dt,
             metric: {
                 tempMin: data.temp.min,
-                tempMax: data.temp.max
+                tempMax: data.temp.max,
+                windSpeed: calcKmh(data.speed),
+                rain: data.rain
             },
             imperial: {
                 tempMin: calcFahrenheit(data.temp.min),
-                tempMax: calcFahrenheit(data.temp.max)
+                tempMax: calcFahrenheit(data.temp.max),
+                windSpeed: calcMph(data.speed),
+                rain: calcInch(data.rain)
             },
             pressure: data.pressure,
             humidity: data.humidity,
             condition: data.weather[0],
-            wind_speed: data.speed,
-            wind_deg: data.deg,
+            windDeg: data.deg,
             hourly: []
         }
         return result;