Merge ~mterry/geonames/+git/country-code:master into geonames:master

[Michael Terry]

Add geonames_city_get_country_code, geonames_city_get_latitude, and geonames_city_get_longitude.

Expose country code, latitude, and longitude. This would be useful for the unity8 welcome wizard, to preseed the timezone selector with all countries that match the selected locale, and to use in a visual map of cities.

0fe003c... by Michael Terry on 2016-02-25

Expose latitude/longitude too

[Michael Terry (mterry)]

This has been replaced by bzr-based https://code.launchpad.net/~mterry/geonames/expose-more/+merge/287365

Unmerged commits

0fe003c... by Michael Terry on 2016-02-25

Expose latitude/longitude too

c0ea0eb... by Michael Terry on 2016-02-24

Expose country codes

diff --git a/src/geonames-mkdb.c b/src/geonames-mkdb.c
index 43466e2..23c1eb9 100644
--- a/src/geonames-mkdb.c
+++ b/src/geonames-mkdb.c
@@ -139,12 +139,15 @@ handle_city_line (gchar    **fields,
   if (country == NULL)
     return;
 
-  g_variant_builder_add (&data->builder, "(@s@s@s@su)",
+  g_variant_builder_add (&data->builder, "(@s@s@s@su@sdd)",
                          variant_new_normalize_string (fields[CITIES_NAME]),
                          variant_new_normalize_string (admin1),
                          variant_new_normalize_string (country),
                          variant_new_normalize_string (fields[CITIES_TIMEZONE]),
-                         strtoul (fields[CITIES_POPULATION], NULL, 10));
+                         strtoul (fields[CITIES_POPULATION], NULL, 10),
+                         variant_new_normalize_string (fields[CITIES_COUNTRY_CODE]),
+                         g_ascii_strtod (fields[CITIES_LATITUDE], NULL),
+                         g_ascii_strtod (fields[CITIES_LONGITUDE], NULL));
 }
 
 static gboolean
@@ -213,7 +216,7 @@ main (int argc, char **argv)
 
   data.admin1 = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
   data.countries = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-  g_variant_builder_init (&data.builder, G_VARIANT_TYPE ("a(ssssu)"));
+  g_variant_builder_init (&data.builder, G_VARIANT_TYPE ("a(ssssusdd)"));
 
   if (!parse_geo_names_file (admin1_file, 4, handle_admin1_line, data.admin1, &error))
     {
diff --git a/src/geonames-query.c b/src/geonames-query.c
index a956f55..b3e4df9 100644
--- a/src/geonames-query.c
+++ b/src/geonames-query.c
@@ -126,7 +126,7 @@ geonames_query_cities_db (GVariant    *db,
   gsize i;
   GArray *indices;
 
-  g_return_val_if_fail (g_variant_is_of_type (db, G_VARIANT_TYPE ("a(ssssu)")), NULL);
+  g_return_val_if_fail (g_variant_is_of_type (db, G_VARIANT_TYPE ("a(ssssusdd)")), NULL);
   g_return_val_if_fail (query != NULL, NULL);
 
   query_tokens = g_str_tokenize_and_fold (query, NULL, NULL);
@@ -139,7 +139,7 @@ geonames_query_cities_db (GVariant    *db,
       guint population;
       gdouble weight;
 
-      g_variant_get_child (db, i, "(&s&s&s&su)", &name, NULL, NULL, NULL, &population);
+      g_variant_get_child (db, i, "(&s&s&s&su&sdd)", &name, NULL, NULL, NULL, &population, NULL, NULL, NULL);
 
       weight = match_query (query_tokens, name);
       weight *= (gdouble) CLAMP (population, 1, 1000000) / 1000000;
diff --git a/src/geonames.c b/src/geonames.c
index e7a30ee..f23379b 100644
--- a/src/geonames.c
+++ b/src/geonames.c
@@ -43,7 +43,7 @@ ensure_geonames_data (void)
       data = g_resources_lookup_data ("/com/ubuntu/geonames/cities.compiled", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
       g_assert (data);
 
-      v = g_variant_new_from_bytes (G_VARIANT_TYPE ("a(ssssu)"), data, TRUE);
+      v = g_variant_new_from_bytes (G_VARIANT_TYPE ("a(ssssusdd)"), data, TRUE);
 
       g_once_init_leave (&geonames_data, v);
     }
@@ -270,6 +270,22 @@ geonames_city_get_country (GeonamesCity *city)
 }
 
 /**
+ * geonames_city_get_country_code:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the ISO-3166 two-letter country code of @city
+ */
+const gchar *
+geonames_city_get_country_code (GeonamesCity *city)
+{
+  const gchar *country_code;
+
+  g_variant_get_child (city, 5, "&s", &country_code);
+
+  return country_code;
+}
+
+/**
  * geonames_city_get_timezone:
  * @city: a #GeonamesCity
  *
@@ -284,3 +300,35 @@ geonames_city_get_timezone (GeonamesCity *city)
 
   return timezone;
 }
+
+/**
+ * geonames_city_get_latitude:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the latitude of @city
+ */
+double
+geonames_city_get_latitude (GeonamesCity *city)
+{
+  double latitude;
+
+  g_variant_get_child (city, 6, "d", &latitude);
+
+  return latitude;
+}
+
+/**
+ * geonames_city_get_longitude:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the longitude of @city
+ */
+double
+geonames_city_get_longitude (GeonamesCity *city)
+{
+  double longitude;
+
+  g_variant_get_child (city, 7, "d", &longitude);
+
+  return longitude;
+}
diff --git a/src/geonames.h b/src/geonames.h
index f1a474b..c90da6d 100644
--- a/src/geonames.h
+++ b/src/geonames.h
@@ -76,8 +76,17 @@ _GEONAMES_EXPORT
 const gchar *           geonames_city_get_country                       (GeonamesCity *city);
 
 _GEONAMES_EXPORT
+const gchar *           geonames_city_get_country_code                  (GeonamesCity *city);
+
+_GEONAMES_EXPORT
 const gchar *           geonames_city_get_timezone                      (GeonamesCity *city);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GeonamesCity, geonames_city_free);
+_GEONAMES_EXPORT
+double                  geonames_city_get_latitude                      (GeonamesCity *city);
+
+_GEONAMES_EXPORT
+double                  geonames_city_get_longitude                     (GeonamesCity *city);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GeonamesCity, geonames_city_free)
 
 #endif
diff --git a/tests/test-geonames.c b/tests/test-geonames.c
index 2496751..705533d 100644
--- a/tests/test-geonames.c
+++ b/tests/test-geonames.c
@@ -24,7 +24,10 @@
 static void
 assert_first (const gchar *query,
               const gchar *expected_city,
-              const gchar *expected_country)
+              const gchar *expected_country,
+              const gchar *expected_country_code,
+              double expected_latitude,
+              double expected_longitude)
 {
   g_autofree gint *indices;
   guint len;
@@ -39,17 +42,20 @@ assert_first (const gchar *query,
 
   g_assert_cmpstr (geonames_city_get_name (city), ==, expected_city);
   g_assert_cmpstr (geonames_city_get_country (city), ==, expected_country);
+  g_assert_cmpstr (geonames_city_get_country_code (city), ==, expected_country_code);
+  g_assert_cmpfloat (geonames_city_get_latitude (city), ==, expected_latitude);
+  g_assert_cmpfloat (geonames_city_get_longitude (city), ==, expected_longitude);
 }
 
 static void
 test_common_cities (void)
 {
-  assert_first ("berlin", "Berlin", "Germany");
-  assert_first ("new york", "New York City", "United States");
-  assert_first ("san fran", "San Francisco", "United States");
-  assert_first ("amster", "Amsterdam", "Netherlands");
-  assert_first ("montreal", "Montréal", "Canada");
-  assert_first ("montréal", "Montréal", "Canada");
+  assert_first ("berlin", "Berlin", "Germany", "DE", 52.52437, 13.41053);
+  assert_first ("new york", "New York City", "United States", "US", 40.71427, -74.00597);
+  assert_first ("san fran", "San Francisco", "United States", "US", 37.77493, -122.41942);
+  assert_first ("amster", "Amsterdam", "Netherlands", "NL", 52.37403, 4.88969);
+  assert_first ("montreal", "Montréal", "Canada", "CA", 45.50884, -73.58781);
+  assert_first ("montréal", "Montréal", "Canada", "CA", 45.50884, -73.58781);
 }
 
 static void