Merge lp:~mterry/geonames/expose-more into lp:geonames

[Michael Terry]

Add geonames_city_get_country_code, geonames_city_get_latitude, geonames_city_get_longitude, and geonames_city_get_population.

Expose country code, latitude, longitude, and population. This will 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.

[lp:~mterry/geonames/expose-more]

22. By Michael Terry on 2016-02-26

Merge trainify

23. By Michael Terry on 2016-02-26

Merge trainify

24. By Michael Terry on 2016-02-29

Add get_population

25. By Michael Terry on 2016-02-29

Mention it in changelog

26. By Michael Terry on 2016-02-29

And add symbol; geeze

[Nick Dedekind (nick-dedekind)]

Looks fine. Confirm tests pass.

review: Approve

[Allison Lortie (desrt)]

(style only) seems quite good -- one minor comment below.

review: Approve

[Michael Terry (mterry)]

Comment replied inline. I agree with you, but better safe than sorry.

[lp:~mterry/geonames/expose-more]

27. By Michael Terry on 2016-03-21

And for safety, initialize static geonames_data to NULL

=== modified file 'configure.ac'
--- configure.ac	2016-02-26 20:55:20 +0000
+++ configure.ac	2016-03-21 23:37:48 +0000
@@ -1,4 +1,4 @@
-AC_INIT(geonames, 0.1)
+AC_INIT(geonames, 0.2)
 
 AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-15 13:33:03 +0000
+++ debian/changelog	2016-03-21 23:37:48 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 geonames (0.1+16.04.20160315-0ubuntu1) xenial; urgency=medium
 
   [ Lars Uebernickel ]
@@ -31,6 +32,15 @@
 
  -- Ken VanDine <[e-mail]>  Tue, 15 Mar 2016 13:33:03 +0000
 
+=======
+geonames (0.2) UNRELEASED; urgency=medium
+
+  * Add geonames_city_get_country_code, geonames_city_get_latitude,
+    geonames_city_get_longitude, and geonames_city_get_population
+
+ -- Michael Terry <[e-mail]>  Fri, 26 Feb 2016 15:17:11 -0500
+
+>>>>>>> MERGE-SOURCE
 geonames (0.1-0ubuntu1) xenial; urgency=low
 
   * Initial release

=== modified file 'debian/libgeonames0.symbols'
--- debian/libgeonames0.symbols	2015-12-09 14:10:20 +0000
+++ debian/libgeonames0.symbols	2016-03-21 23:37:48 +0000
@@ -1,7 +1,11 @@
 libgeonames.so.0 libgeonames0 #MINVER#
  geonames_city_free@Base 0.1
  geonames_city_get_country@Base 0.1
+ geonames_city_get_country_code@Base 0replaceme
+ geonames_city_get_latitude@Base 0replaceme
+ geonames_city_get_longitude@Base 0replaceme
  geonames_city_get_name@Base 0.1
+ geonames_city_get_population@Base 0replaceme
  geonames_city_get_state@Base 0.1
  geonames_city_get_timezone@Base 0.1
  geonames_get_city@Base 0.1

=== modified file 'src/geonames-mkdb.c'
--- src/geonames-mkdb.c	2015-09-15 09:59:14 +0000
+++ src/geonames-mkdb.c	2016-03-21 23:37:48 +0000
@@ -139,12 +139,15 @@
   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 @@
 
   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))
     {

=== modified file 'src/geonames-query.c'
--- src/geonames-query.c	2015-10-05 09:33:43 +0000
+++ src/geonames-query.c	2016-03-21 23:37:48 +0000
@@ -126,7 +126,7 @@
   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 @@
       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;

=== modified file 'src/geonames.c'
--- src/geonames.c	2016-03-01 20:03:50 +0000
+++ src/geonames.c	2016-03-21 23:37:48 +0000
@@ -30,7 +30,7 @@
  * and country data of geonames.org.
  */
 
-static GVariant *geonames_data;
+static GVariant *geonames_data = NULL;
 
 static void
 ensure_geonames_data (void)
@@ -43,7 +43,7 @@
       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_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,52 @@
 
   return timezone;
 }
+
+/**
+ * geonames_city_get_latitude:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the latitude of @city
+ */
+gdouble
+geonames_city_get_latitude (GeonamesCity *city)
+{
+  gdouble latitude;
+
+  g_variant_get_child (city, 6, "d", &latitude);
+
+  return latitude;
+}
+
+/**
+ * geonames_city_get_longitude:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the longitude of @city
+ */
+gdouble
+geonames_city_get_longitude (GeonamesCity *city)
+{
+  gdouble longitude;
+
+  g_variant_get_child (city, 7, "d", &longitude);
+
+  return longitude;
+}
+
+
+/**
+ * geonames_city_get_population:
+ * @city: a #GeonamesCity
+ *
+ * Returns: the population of @city
+ */
+guint
+geonames_city_get_population (GeonamesCity *city)
+{
+  guint population;
+
+  g_variant_get_child (city, 4, "u", &population);
+
+  return population;
+}

=== modified file 'src/geonames.h'
--- src/geonames.h	2016-02-26 21:26:48 +0000
+++ src/geonames.h	2016-03-21 23:37:48 +0000
@@ -78,8 +78,20 @@
 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);
 
+_GEONAMES_EXPORT
+gdouble                 geonames_city_get_latitude                      (GeonamesCity *city);
+
+_GEONAMES_EXPORT
+gdouble                 geonames_city_get_longitude                     (GeonamesCity *city);
+
+_GEONAMES_EXPORT
+guint                   geonames_city_get_population                    (GeonamesCity *city);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GeonamesCity, geonames_city_free)
 
 G_END_DECLS

=== modified file 'tests/test-geonames.c'
--- tests/test-geonames.c	2015-10-05 10:27:50 +0000
+++ tests/test-geonames.c	2016-03-21 23:37:48 +0000
@@ -24,7 +24,11 @@
 static void
 assert_first (const gchar *query,
               const gchar *expected_city,
-              const gchar *expected_country)
+              const gchar *expected_country,
+              const gchar *expected_country_code,
+              gdouble expected_latitude,
+              gdouble expected_longitude,
+              guint expected_population)
 {
   g_autofree gint *indices;
   guint len;
@@ -39,17 +43,21 @@
 
   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);
+  g_assert_cmpint (geonames_city_get_population (city), ==, expected_population);
 }
 
 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, 3426354);
+  assert_first ("new york", "New York City", "United States", "US", 40.71427, -74.00597, 8175133);
+  assert_first ("san fran", "San Francisco", "United States", "US", 37.77493, -122.41942, 805235);
+  assert_first ("amster", "Amsterdam", "Netherlands", "NL", 52.37403, 4.88969, 741636);
+  assert_first ("montreal", "Montréal", "Canada", "CA", 45.50884, -73.58781, 3268513);
+  assert_first ("montréal", "Montréal", "Canada", "CA", 45.50884, -73.58781, 3268513);
 }
 
 static void