Merge lp:~fboucault/camera-app/gps_work_with_no_altitude into lp:camera-app

[Florian Boucault]

Store location even if no valid altitude was provided.

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2014-12-05 18:43:54 +0000
+++ ViewFinderOverlay.qml	2014-12-09 11:23:34 +0000
@@ -405,13 +405,14 @@
                 var position = positionSource.position;
                 if (settings.gpsEnabled && positionSource.valid
                         && position.latitudeValid
-                        && position.longitudeValid
-                        && position.altitudeValid) {
+                        && position.longitudeValid) {
                     camera.imageCapture.setMetadata("GPSLatitude", position.coordinate.latitude);
                     camera.imageCapture.setMetadata("GPSLongitude", position.coordinate.longitude);
-                    camera.imageCapture.setMetadata("GPSAltitude", position.coordinate.altitude);
                     camera.imageCapture.setMetadata("GPSTimeStamp", position.timestamp);
                     camera.imageCapture.setMetadata("GPSProcessingMethod", "GPS");
+                    if (position.altitudeValid) {
+                        camera.imageCapture.setMetadata("GPSAltitude", position.coordinate.altitude);
+                    }
                 }
                 if (main.contentExportMode) {
                     camera.imageCapture.captureToLocation(application.temporaryLocation);