Merge lp:~uriboni/camera-app/gps-accuracy into lp:camera-app/staging

[Ugo Riboni]

When the GPS fix is accurate to less than 100m display the GPS icon in red and don't save location

When the GPS fix is accurate to less than 100m display the GPS icon in red and don't save location

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:624
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/32/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/403
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/978
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27415

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/32/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'BottomEdgeIndicators.qml'
--- BottomEdgeIndicators.qml	2015-11-17 15:25:03 +0000
+++ BottomEdgeIndicators.qml	2016-02-09 15:26:47 +0000
@@ -83,7 +83,7 @@
                 Icon {
                     id: indicatorIcon
                     anchors.fill: parent
-                    color: "white"
+                    color: modelData.colorize ? "red" : "white"
                     name: modelData && modelData.isToggle ? modelData.icon : (modelData.get(model.selectedIndex) ? modelData.get(model.selectedIndex).icon : "")
                     source: name ? "image://theme/%1".arg(name) : (modelData.iconSource || "")
                     visible: source != ""

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-02-01 13:58:09 +0000
+++ ViewFinderOverlay.qml	2016-02-09 15:26:47 +0000
@@ -341,6 +341,7 @@
                     property bool available: true
                     property bool visible: true
                     property bool showInIndicators: true
+                    property bool colorize: !positionSource.isPrecise
 
                     ListElement {
                         icon: ""
@@ -705,9 +706,7 @@
                 }
                 camera.imageCapture.setMetadata("Orientation", orientation);
                 var position = positionSource.position;
-                if (settings.gpsEnabled && positionSource.valid
-                        && position.latitudeValid
-                        && position.longitudeValid) {
+                if (settings.gpsEnabled && positionSource.isPrecise) {
                     camera.imageCapture.setMetadata("GPSLatitude", position.coordinate.latitude);
                     camera.imageCapture.setMetadata("GPSLongitude", position.coordinate.longitude);
                     camera.imageCapture.setMetadata("GPSTimeStamp", position.timestamp);
@@ -779,6 +778,11 @@
             id: positionSource
             updateInterval: 1000
             active: settings.gpsEnabled
+            property bool isPrecise: valid
+                                     && position.latitudeValid
+                                     && position.longitudeValid
+                                     && (!position.horizontalAccuracyValid ||
+                                          position.horizontalAccuracy <= 100)
         }
 
         Connections {