Merge lp:~elementary-apps/pantheon-photos/sidebar-geo into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Metadata Sidebar: Get a human-readable location from gps data

This needs to be tested for locations that might not have town or state fields and we need to figure out smart fallbacks

[lp:~elementary-apps/pantheon-photos/sidebar-geo]

3052. By Felipe Escoto on 2016-11-18

Add County layer between town and state

3053. By Felipe Escoto on 2016-11-18

Add testing location

[Danielle Foré (danrabbit)]

Felipe's change works for me :)

[Felipe Escoto (philip.scott)]

And i'm happy with the rest of it!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-28 20:08:59 +0000
+++ CMakeLists.txt	2016-11-18 18:10:38 +0000
@@ -21,6 +21,7 @@
 set (DEPS_PKG
     gee-0.8>=0.8.5
     gexiv2>=0.4.90
+    geocode-glib-1.0
     gio-unix-2.0>=2.20
     glib-2.0>=2.30.0
     gmodule-2.0>=2.24.0
@@ -46,6 +47,7 @@
     atk
     gdk-3.0
     gee-0.8
+    geocode-glib-1.0
     gexiv2
     gio-unix-2.0
     glib-2.0

=== modified file 'src/sidebar/metadata/BasicProperties.vala'
--- src/sidebar/metadata/BasicProperties.vala	2016-11-11 22:18:54 +0000
+++ src/sidebar/metadata/BasicProperties.vala	2016-11-18 18:10:38 +0000
@@ -10,6 +10,7 @@
     private Dimensions dimensions;
     private EditableTitle title_entry;
     private MediaSource? source;
+    private Gtk.Label place_label;
     private int photo_count;
     private int event_count;
     private int video_count;
@@ -19,6 +20,11 @@
     private string exposure_bias;
     private string flash;
     private string focal_length;
+    private double gps_lat;
+    private string gps_lat_ref;
+    private double gps_long;
+    private string gps_long_ref;
+    private double gps_alt;
     private string title;
     private string aperture;
     private string iso;
@@ -45,6 +51,10 @@
         flash = "";
         filesize = 0;
         focal_length = "";
+        gps_lat = -1;
+        gps_lat_ref = "";
+        gps_long = -1;
+        gps_long_ref = "";
         photo_count = -1;
         event_count = -1;
         video_count = -1;
@@ -98,6 +108,8 @@
                              Dimensions (0, 0);
 
                 focal_length = metadata.get_focal_length_string ();
+
+                metadata.get_gps (out gps_long, out gps_long_ref, out gps_lat, out gps_lat_ref, out gps_alt);
             }
 
             if (source is PhotoSource)
@@ -280,6 +292,19 @@
             }
         }
 
+        if (gps_lat != -1 && gps_long != -1) {
+            place_label = new Gtk.Label ("");
+            place_label.no_show_all = true;
+            place_label.visible = false;
+            place_label.xalign = 0;
+
+            create_place_label (gps_lat, gps_long);
+
+            attach (place_label, 0, (int) line_count, 2, 1);
+
+            line_count++;
+        }
+
         if (dimensions.has_area ()) {
             var size_label = new Gtk.Label ("%s — %d × %d".printf (format_size ((int64) filesize), dimensions.width, dimensions.height));
             size_label.use_markup = true;
@@ -367,6 +392,31 @@
         }
     }
 
+    // Unit test: https://github.com/Philip-Scott/misc/blob/master/GeolocationTest.vala
+    private async void create_place_label (double lat, double long) {
+        var location = new Geocode.Location (lat, long);
+        var reverse = new Geocode.Reverse.for_location (location);
+
+        try {
+            Geocode.Place place = yield reverse.resolve_async ();
+
+            if (place.get_state () != null) {
+                if (place.get_town () != null) {
+                    place_label.label = place.get_town () + ", " + place.get_state ();
+                } else if (place.get_county () != null) {
+                    place_label.label = place.get_county () + ", " + place.get_state ();
+                } else {
+                    place_label.label = place.get_state () + ", " + place.get_country ();
+                }
+
+                place_label.no_show_all = false;
+                place_label.visible = true;
+            }
+        } catch (Error e) {
+            warning ("Failed to obtain place: %s", e.message);
+        }
+    }
+
     private void title_entry_changed () {
         title = title_entry.text;
     }

=== modified file 'src/sidebar/metadata/ExtendedProperties.vala'
--- src/sidebar/metadata/ExtendedProperties.vala	2016-11-06 18:37:03 +0000
+++ src/sidebar/metadata/ExtendedProperties.vala	2016-11-18 18:10:38 +0000
@@ -8,11 +8,6 @@
     private const string NO_VALUE = "";
     // Photo stuff
     private string file_path;
-    private double gps_lat;
-    private string gps_lat_ref;
-    private double gps_long;
-    private string gps_long_ref;
-    private double gps_alt;
     private string artist;
     private string copyright;
     private string exposure_date;
@@ -37,10 +32,6 @@
         file_path = "";
         development_path = "";
         is_raw = false;
-        gps_lat = -1;
-        gps_lat_ref = "";
-        gps_long = -1;
-        gps_long_ref = "";
         artist = "";
         copyright = "";
         exposure_date = "";
@@ -91,7 +82,6 @@
                 metadata.set_exposure_date_time (new MetadataDateTime (photo.get_timestamp ()));
 
             is_raw = (photo.get_master_file_format () == PhotoFileFormat.RAW);
-            metadata.get_gps (out gps_long, out gps_long_ref, out gps_lat, out gps_lat_ref, out gps_alt);
             artist = metadata.get_artist ();
             copyright = metadata.get_copyright ();
             time_t exposure_time_obj = metadata.get_exposure_date_time ().get_timestamp ();
@@ -121,12 +111,6 @@
             add_line (_ ("Exposure time:"), (exposure_time != "" && exposure_time != null) ?
                       exposure_time : NO_VALUE);
 
-            add_line (_ ("GPS latitude:"), (gps_lat != -1 && gps_lat_ref != "" &&
-                                            gps_lat_ref != null) ? "%f °%s".printf (gps_lat, gps_lat_ref) : NO_VALUE);
-
-            add_line (_ ("GPS longitude:"), (gps_long != -1 && gps_long_ref != "" &&
-                                             gps_long_ref != null) ? "%f °%s".printf (gps_long, gps_long_ref) : NO_VALUE);
-
             add_line (_ ("Artist:"), (artist != "" && artist != null) ? artist : NO_VALUE);
 
             add_line (_ ("Copyright:"), (copyright != "" && copyright != null) ? copyright : NO_VALUE);