[geocode-glib/wip/nominatim] tmp
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib/wip/nominatim] tmp
- Date: Thu, 27 Jun 2013 01:19:28 +0000 (UTC)
commit 4834ace54d6d47fd65424f993770219d99f129bc
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Jun 20 23:25:12 2013 +0300
tmp
geocode-glib/geocode-forward.c | 530 +++++++++++------------------------
geocode-glib/geocode-glib-private.h | 2 -
geocode-glib/geocode-glib.symbols | 1 +
geocode-glib/geocode-place.c | 25 ++-
geocode-glib/geocode-place.h | 65 +++--
geocode-glib/geocode-reverse.c | 50 +++-
geocode-glib/test-gcglib.c | 22 +-
7 files changed, 261 insertions(+), 434 deletions(-)
---
diff --git a/geocode-glib/geocode-forward.c b/geocode-glib/geocode-forward.c
index e559409..372a49e 100644
--- a/geocode-glib/geocode-forward.c
+++ b/geocode-glib/geocode-forward.c
@@ -82,241 +82,6 @@ geocode_forward_init (GeocodeForward *forward)
forward->priv->answer_count = DEFAULT_ANSWER_COUNT;
}
-static void
-set_is_search (GeocodeForward *forward,
- GObject *object)
-{
- if (forward->priv->answer_count != 1)
- g_object_set_data (object, "is-search", GINT_TO_POINTER (1));
-}
-
-static gboolean
-is_search (GObject *object)
-{
- return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (object), "is-search"));
-}
-
-static struct {
- const char *pf_attr;
- const char *xep_attr;
-} rev_attrs_map[] = {
- { "longitude", "longitude" },
- { "latitude", "latitude" },
- { "offsetlat", NULL },
- { "offsetlon", NULL },
- { "name", "description" },
- { "line1", "building" },
- { "line2", NULL },
- { "line3", NULL },
- { "line4", NULL },
- { "street", "street" },
- { "postal", "postalcode" },
- { "neighborhood", "area" },
- { "city", "locality" },
- { "county", NULL },
- { "state", "region" },
- { "country", "country" },
- { "countrycode", "countrycode" },
- { "countycode", NULL },
- { "timezone", NULL },
- { "uzip", NULL },
-};
-
-static const char *
-pf_to_xep (const char *attr)
-{
- guint i;
-
- for (i = 0; i < G_N_ELEMENTS (rev_attrs_map); i++) {
- if (g_str_equal (attr, rev_attrs_map[i].pf_attr))
- return rev_attrs_map[i].xep_attr;
- }
-
- g_debug ("Can't convert unknown attribute '%s'", attr);
-
- return NULL;
-}
-
-GHashTable *
-_geocode_parse_resolve_json (const char *contents,
- GError **error)
-{
- GHashTable *ret;
- JsonParser *parser;
- JsonNode *root;
- JsonReader *reader;
- gint64 err_code, found;
- guint i;
- const GError *err = NULL;
- char **members;
-
- ret = NULL;
-
- parser = json_parser_new ();
- if (json_parser_load_from_data (parser, contents, -1, error) == FALSE) {
- g_object_unref (parser);
- return ret;
- }
-
- root = json_parser_get_root (parser);
- reader = json_reader_new (root);
-
- if (json_reader_read_member (reader, "ResultSet") == FALSE)
- goto parse;
-
- if (json_reader_read_member (reader, "Error") == FALSE)
- goto parse;
-
- err_code = json_reader_get_int_value (reader);
- json_reader_end_member (reader);
-
- if (err_code != 0) {
- const char *msg;
-
- json_reader_read_member (reader, "ErrorMessage");
- msg = json_reader_get_string_value (reader);
- json_reader_end_member (reader);
- if (msg && *msg == '\0')
- msg = NULL;
-
- switch (err_code) {
- case 1:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"Query not supported");
- break;
- case 100:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"No input parameters");
- break;
- case 102:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"Address data not recognized as valid UTF-8");
- break;
- case 103:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"Insufficient address data");
- break;
- case 104:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"Unknown language");
- break;
- case 105:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"No country detected");
- break;
- case 106:
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NOT_SUPPORTED, msg ? msg :
"Country not supported");
- break;
- default:
- if (msg == NULL)
- g_set_error (error, GEOCODE_ERROR, GEOCODE_ERROR_PARSE, "Unknown error code
%"G_GINT64_FORMAT, err_code);
- else
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_PARSE, msg);
- break;
- }
- g_object_unref (parser);
- g_object_unref (reader);
- return NULL;
- }
-
- /* Check for the number of results */
- if (json_reader_read_member (reader, "Found") == FALSE)
- goto parse;
-
- found = json_reader_get_int_value (reader);
- json_reader_end_member (reader);
-
- if (!found) {
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_NO_MATCHES, "No matches found for
request");
- g_object_unref (parser);
- g_object_unref (reader);
- return NULL;
- }
-
- if (json_reader_read_member (reader, "Results") == FALSE)
- goto parse;
-
- if (json_reader_read_element (reader, 0) == FALSE)
- goto parse;
-
- members = json_reader_list_members (reader);
-
- /* Yay, start adding data */
- ret = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
-
- for (i = 0; members[i] != NULL; i++) {
- const char *value;
-
- json_reader_read_member (reader, members[i]);
-
- if (g_str_equal (members[i], "radius") ||
- g_str_equal (members[i], "quality") ||
- g_str_equal (members[i], "woeid")) {
- gint64 num;
-
- num = json_reader_get_int_value (reader);
- g_hash_table_insert (ret, g_strdup (members[i]), g_strdup_printf ("%"G_GINT64_FORMAT,
num));
- json_reader_end_member (reader);
- continue;
- }
-
- value = json_reader_get_string_value (reader);
- if (value && *value == '\0')
- value = NULL;
-
- if (value != NULL) {
- const char *xep_attr;
-
- xep_attr = pf_to_xep (members[i]);
- if (xep_attr != NULL)
- g_hash_table_insert (ret, g_strdup (xep_attr), g_strdup (value));
- else
- g_hash_table_insert (ret, g_strdup (members[i]), g_strdup (value));
- }
- json_reader_end_member (reader);
- }
- g_strfreev (members);
-
- g_object_unref (parser);
- g_object_unref (reader);
-
- return ret;
-
-parse:
- if (ret != NULL)
- g_hash_table_destroy (ret);
- err = json_reader_get_error (reader);
- g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_PARSE, err->message);
- g_object_unref (parser);
- g_object_unref (reader);
- return NULL;
-}
-
-static GList *
-_geocode_parse_single_result_json (const char *contents,
- GError **error)
-{
- GHashTable *ht;
- GeocodePlace *place = NULL;
- const char *name;
- GeocodeLocation *loc;
- gdouble longitude;
- gdouble latitude;
-
- ht = _geocode_parse_resolve_json (contents, error);
- if (ht == NULL)
- return NULL;
-
- longitude = g_ascii_strtod (g_hash_table_lookup (ht, "longitude"), NULL);
- latitude = g_ascii_strtod (g_hash_table_lookup (ht, "latitude"), NULL);
- name = g_hash_table_lookup (ht, "line2");
- loc = geocode_location_new_with_description (longitude,
- latitude,
- GEOCODE_LOCATION_ACCURACY_UNKNOWN,
- name);
- place = geocode_place_new_with_location (name, GEOCODE_PLACE_TYPE_UNKNOWN, loc);
-
- g_object_unref (loc);
- g_hash_table_destroy (ht);
-
- return g_list_append (NULL, place);
-}
-
static struct {
const char *tp_attr;
const char *gc_attr; /* NULL to ignore */
@@ -475,10 +240,7 @@ on_query_data_loaded (SoupSession *session,
}
contents = g_strndup (query->response_body->data, query->response_body->length);
- if (is_search (G_OBJECT (query)))
- ret = _geocode_parse_search_json (contents, &error);
- else
- ret = _geocode_parse_single_result_json (contents, &error);
+ ret = _geocode_parse_search_json (contents, &error);
if (ret == NULL) {
g_simple_async_result_set_from_error (simple, error);
@@ -521,8 +283,6 @@ on_cache_data_loaded (GObject *source_forward,
object = g_async_result_get_source_object (G_ASYNC_RESULT (simple));
query = g_object_get_data (G_OBJECT (cache), "query");
- g_object_set_data (G_OBJECT (query), "is-search",
- g_object_get_data (G_OBJECT (cache), "is-search"));
g_object_ref (query); /* soup_session_queue_message steals ref */
soup_session_queue_message (GEOCODE_FORWARD (object)->priv->soup_session,
query,
@@ -531,10 +291,7 @@ on_cache_data_loaded (GObject *source_forward,
return;
}
- if (is_search (G_OBJECT (cache)))
- ret = _geocode_parse_search_json (contents, &error);
- else
- ret = _geocode_parse_single_result_json (contents, &error);
+ ret = _geocode_parse_search_json (contents, &error);
g_free (contents);
if (ret == NULL) {
@@ -673,7 +430,6 @@ geocode_forward_search_async (GeocodeForward *forward,
cache_path = _geocode_glib_cache_path_for_query (query);
if (cache_path == NULL) {
- set_is_search (forward, G_OBJECT (query));
soup_session_queue_message (forward->priv->soup_session,
query,
on_query_data_loaded,
@@ -682,7 +438,6 @@ geocode_forward_search_async (GeocodeForward *forward,
GFile *cache;
cache = g_file_new_for_path (cache_path);
- set_is_search (forward, G_OBJECT (cache));
g_object_set_data_full (G_OBJECT (cache), "query", query, (GDestroyNotify) g_object_unref);
g_file_load_contents_async (cache,
cancellable,
@@ -727,90 +482,29 @@ out:
return ret;
}
-#define IS_EL(x) (g_str_equal (element_name, x))
-
-static void
-insert_place_attr (GHashTable *ht,
- JsonReader *reader,
- const char *element_name)
-{
- char *value;
-
- if (json_reader_read_member (reader, element_name) == FALSE) {
- json_reader_end_member (reader);
- return;
- }
-
- /* FIXME: check all the member names against what Place Finder outputs */
-
- if (IS_EL("woeid") ||
- IS_EL("popRank") ||
- IS_EL("areaRank")) {
- value = g_strdup_printf ("%"G_GINT64_FORMAT, json_reader_get_int_value (reader));
- } else if (IS_EL("centroid")) {
- char str[16];
-
- json_reader_read_member (reader, "longitude");
- g_ascii_dtostr (str, sizeof(str), json_reader_get_double_value (reader));
- g_hash_table_insert (ht, g_strdup ("longitude"), g_strdup (str));
- json_reader_end_member (reader);
-
- json_reader_read_member (reader, "latitude");
- g_ascii_dtostr (str, sizeof(str), json_reader_get_double_value (reader));
- g_hash_table_insert (ht, g_strdup ("latitude"), g_strdup (str));
- json_reader_end_member (reader);
- goto end;
- } else if (g_str_has_suffix (element_name, " attrs")) {
- if (IS_EL("placeTypeName attrs")) {
- char *code;
-
- json_reader_read_member (reader, "code");
- code = g_strdup_printf ("%" G_GINT64_FORMAT,
- json_reader_get_int_value (reader));
- g_hash_table_insert (ht, g_strdup ("placeType"), code);
- json_reader_end_member (reader);
- goto end;
- } else {
- g_debug ("Ignoring attributes element '%s'", element_name);
- value = g_strdup (""); /* So that they're ignored */
- }
- } else if (IS_EL("boundingBox")) {
- g_debug ("Ignoring element '%s'", element_name);
- value = g_strdup (""); /* So that they're ignored */
- } else if (IS_EL("placeTypeName")) {
- /* This string is also localized so we want the code rather
- * than name, so we ignore name and extract the code above.
- */
- g_debug ("Ignoring element '%s'", element_name);
- value = g_strdup (""); /* So that they're ignored */
- } else {
- value = g_strdup (json_reader_get_string_value (reader));
- }
-
- if (value != NULL && *value == '\0') {
- g_clear_pointer (&value, g_free);
- goto end;
- }
-
- if (value != NULL)
- g_hash_table_insert (ht, g_strdup (element_name), value);
- else
- g_warning ("Ignoring element %s, don't know how to parse it", element_name);
-
-end:
- json_reader_end_member (reader);
-}
-
static struct {
- const char *yahoo_attr;
+ const char *nominatim_attr;
const char *place_prop; /* NULL to ignore */
-} yahoo_to_place_map[] = {
- { "postal", "postal-code" },
- { "locality1", "town" },
- { "admin1", "state" },
- { "admin2", "county" },
- { "admin3", "administrative-area" },
+} nominatim_to_place_map[] = {
+ { "license", NULL },
+ { "osm_type", NULL },
+ { "osm_id", NULL },
+ { "lat", NULL },
+ { "lon", NULL },
+ { "display_name", NULL },
+ { "house_number", "building" },
+ { "road", "street" },
+ { "suburb", NULL },
+ { "city", "town" },
+ { "village", "town" },
+ { "county", "county" },
+ { "state_district", "administrative-area" },
+ { "state", "state" },
+ { "postcode", "postal-code" },
{ "country", "country" },
+ { "country_code", "country-code" },
+ { "continent", "continent" },
+ { "address", NULL },
};
static void
@@ -820,10 +514,10 @@ fill_place_from_entry (const char *key,
{
guint i;
- for (i = 0; i < G_N_ELEMENTS (yahoo_to_place_map); i++) {
- if (g_str_equal (key, yahoo_to_place_map[i].yahoo_attr)){
+ for (i = 0; i < G_N_ELEMENTS (nominatim_to_place_map); i++) {
+ if (g_str_equal (key, nominatim_to_place_map[i].nominatim_attr)){
g_object_set (G_OBJECT (place),
- yahoo_to_place_map[i].place_prop,
+ nominatim_to_place_map[i].place_prop,
value,
NULL);
break;
@@ -846,14 +540,120 @@ node_free_func (GNode *node,
#define N_ATTRS 7
static const char const *attributes[7] = {
"country",
- "admin1",
- "admin2",
- "admin3",
- "postal",
- "placeTypeName",
- "locality1"
+ "state",
+ "county",
+ "state_district",
+ "postalcode",
+ "city",
+ "suburb",
+ "village",
};
+static GeocodePlace *
+create_place_from_attributes (GHashTable *ht)
+{
+ char *class, *type;
+ const char *name, *street, *building;
+ GeocodePlaceType place_type = GEOCODE_PLACE_TYPE_UNKNOWN;
+
+ class = g_hash_table_lookup (ht, "class");
+ type = g_hash_table_lookup (ht, "type");
+
+ if (g_strcmp0 (class, "place") == 0) {
+ if (g_strcmp0 (type, "house") == 0 ||
+ g_strcmp0 (type, "building") == 0 ||
+ g_strcmp0 (type, "residential") == 0 ||
+ g_strcmp0 (type, "plaza") == 0 ||
+ g_strcmp0 (type, "office") == 0)
+ place_type = GEOCODE_PLACE_TYPE_BUILDING;
+ else if (g_strcmp0 (type, "estate") == 0)
+ place_type = GEOCODE_PLACE_TYPE_ESTATE;
+ else if (g_strcmp0 (type, "town") == 0 ||
+ g_strcmp0 (type, "city") == 0 ||
+ g_strcmp0 (type, "hamlet") == 0 ||
+ g_strcmp0 (type, "isolated_dwelling") == 0 ||
+ g_strcmp0 (type, "village") == 0)
+ place_type = GEOCODE_PLACE_TYPE_TOWN;
+ else if (g_strcmp0 (type, "suburb") == 0 ||
+ g_strcmp0 (type, "neighbourhood") == 0)
+ place_type = GEOCODE_PLACE_TYPE_SUBURB;
+ else if (g_strcmp0 (type, "state") == 0 ||
+ g_strcmp0 (type, "region") == 0)
+ place_type = GEOCODE_PLACE_TYPE_STATE;
+ else if (g_strcmp0 (type, "farm") == 0 ||
+ g_strcmp0 (type, "forest") == 0 ||
+ g_strcmp0 (type, "valey") == 0 ||
+ g_strcmp0 (type, "park") == 0 ||
+ g_strcmp0 (type, "hill") == 0)
+ place_type = GEOCODE_PLACE_TYPE_LAND_FEATURE;
+ else if (g_strcmp0 (type, "island") == 0 ||
+ g_strcmp0 (type, "islet") == 0)
+ place_type = GEOCODE_PLACE_TYPE_ISLAND;
+ else if (g_strcmp0 (type, "country") == 0)
+ place_type = GEOCODE_PLACE_TYPE_COUNTRY;
+ else if (g_strcmp0 (type, "continent") == 0)
+ place_type = GEOCODE_PLACE_TYPE_CONTINENT;
+ else if (g_strcmp0 (type, "lake") == 0 ||
+ g_strcmp0 (type, "bay") == 0 ||
+ g_strcmp0 (type, "river") == 0)
+ place_type = GEOCODE_PLACE_TYPE_DRAINAGE;
+ else if (g_strcmp0 (type, "sea") == 0)
+ place_type = GEOCODE_PLACE_TYPE_SEA;
+ else if (g_strcmp0 (type, "ocean") == 0)
+ place_type = GEOCODE_PLACE_TYPE_OCEAN;
+ } else if (g_strcmp0 (class, "highway") == 0) {
+ if (g_strcmp0 (type, "motorway") == 0)
+ place_type = GEOCODE_PLACE_TYPE_MOTORWAY;
+ else if (g_strcmp0 (type, "bus_stop") == 0)
+ place_type = GEOCODE_PLACE_TYPE_BUS_STOP;
+ else
+ place_type = GEOCODE_PLACE_TYPE_STEET;
+ } else if (g_strcmp0 (class, "railway") == 0) {
+ if (g_strcmp0 (type, "station") == 0)
+ place_type = GEOCODE_PLACE_TYPE_RAILWAY_STATION;
+ } else if (g_strcmp0 (class, "waterway") == 0) {
+ place_type = GEOCODE_PLACE_TYPE_DRAINAGE;
+ } else if (g_strcmp0 (class, "boundry") == 0) {
+ if (g_strcmp0 (type, "administrative") == 0) {
+ int rank;
+
+ rank = atoi (g_hash_table_lookup (ht, "place_rank"));
+ if (rank < 2)
+ place_type = GEOCODE_PLACE_TYPE_UNKNOWN;
+
+ if (rank == 28)
+ place_type = GEOCODE_PLACE_TYPE_BUILDING;
+ else if (rank == 16)
+ place_type = GEOCODE_PLACE_TYPE_TOWN;
+ else if (rank == 12)
+ place_type = GEOCODE_PLACE_TYPE_COUNTY;
+ else if (rank == 10 || rank = 8)
+ place_type = GEOCODE_PLACE_TYPE_STATE;
+ else if (rank == 4)
+ place_type = GEOCODE_PLACE_TYPE_COUNTRY;
+ }
+ }
+
+ name = g_hash_table_lookup (ht, "name");
+ if (name == NULL)
+ name = g_hash_table_lookup (ht, "display_name");
+
+ place = geocode_place_new (name, place_type);
+
+ /* Nominatim doesn't give us street addresses as such */
+ street = g_hash_table_lookup (ht, "road");
+ building = g_hash_table_lookup (ht, "house_number");
+ if (street != NULL && building != NULL) {
+ char *address;
+
+ address = g_strjoin (" ", street, building, NULL);
+ geocode_place_set_street_address (address);
+ g_free (address);
+ }
+
+ return place;
+}
+
static void
insert_place_into_tree (GNode *place_tree, GHashTable *ht)
{
@@ -889,25 +689,15 @@ insert_place_into_tree (GNode *place_tree, GHashTable *ht)
start = child;
}
- name = g_hash_table_lookup (ht, "name");
- place_type = atoi (g_hash_table_lookup (ht, "placeType"));
- place = geocode_place_new (name, place_type);
+ place = create_place_from_attributes (ht);
g_hash_table_foreach (ht, (GHFunc) fill_place_from_entry, place);
- /* Yahoo API doesn't give us street addresses so we'll just have to
- * live with only street name for now. */
- if (place_type == GEOCODE_PLACE_TYPE_SUBURB) {
- const char *street = g_hash_table_lookup (ht, "locality2");
- if (street != NULL)
- geocode_place_set_street_address (place, street);
- }
-
/* Get latitude and longitude and create GeocodeLocation object.
* The leaf node of the tree is the GeocodePlace object, containing
* associated GeocodeLocation object */
- longitude = g_ascii_strtod (g_hash_table_lookup (ht, "longitude"), NULL);
- latitude = g_ascii_strtod (g_hash_table_lookup (ht, "latitude"), NULL);
+ longitude = g_ascii_strtod (g_hash_table_lookup (ht, "lon"), NULL);
+ latitude = g_ascii_strtod (g_hash_table_lookup (ht, "lat"), NULL);
loc = geocode_location_new_with_description (latitude,
longitude,
@@ -935,8 +725,7 @@ make_place_list_from_tree (GNode *node,
GPtrArray *rev_s_array;
GeocodePlace *place;
GeocodeLocation *loc;
- const char *name;
- char *description;
+ char *name;
int counter = 0;
rev_s_array = g_ptr_array_new ();
@@ -944,21 +733,21 @@ make_place_list_from_tree (GNode *node,
/* If leaf node, then add all the attributes in the s_array
* and set it to the description of the loc object */
place = (GeocodePlace *) node->data;
+ name = geocode_place_get_name (place);
loc = geocode_place_get_location (place);
- name = geocode_location_get_description (loc);
-
/* To print the attributes in a meaningful manner
* reverse the s_array */
- g_ptr_array_add (rev_s_array, (gpointer) name);
+ g_ptr_array_add (rev_s_array, (gpointer) name);
for (counter = 1; counter <= i; counter++)
g_ptr_array_add (rev_s_array, s_array[i - counter]);
g_ptr_array_add (rev_s_array, NULL);
- description = g_strjoinv (", ", (char **) rev_s_array->pdata);
+ name = g_strjoinv (", ", (char **) rev_s_array->pdata);
g_ptr_array_unref (rev_s_array);
- geocode_location_set_description (loc, description);
- g_free (description);
+ geocode_place_set_name (place, name);
+ geocode_location_set_description (loc, name);
+ g_free (name);
*place_list = g_list_prepend (*place_list, place);
} else {
@@ -1002,14 +791,16 @@ _geocode_parse_search_json (const char *contents,
root = json_parser_get_root (parser);
reader = json_reader_new (root);
- if (json_reader_read_member (reader, "places") == FALSE)
- goto parse;
- if (json_reader_read_member (reader, "place") == FALSE)
- goto parse;
-
num_places = json_reader_count_elements (reader);
if (num_places < 0)
goto parse;
+ if (num_places == 0) {
+ g_set_error_literal (error,
+ GEOCODE_ERROR,
+ GEOCODE_ERROR_NO_MATCHES,
+ "No matches found for request");
+ goto no_results;
+ }
place_tree = g_node_new (NULL);
@@ -1020,12 +811,7 @@ _geocode_parse_search_json (const char *contents,
json_reader_read_element (reader, i);
- ht = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
-
- members = json_reader_list_members (reader);
- for (j = 0; members != NULL && members[j] != NULL; j++)
- insert_place_attr (ht, reader, members[j]);
+ ht = _geocode_read_nominatim_attributes (reader, false);
/* Populate the tree with place details */
insert_place_into_tree (place_tree, ht);
@@ -1055,6 +841,7 @@ _geocode_parse_search_json (const char *contents,
parse:
err = json_reader_get_error (reader);
g_set_error_literal (error, GEOCODE_ERROR, GEOCODE_ERROR_PARSE, err->message);
+no_results:
g_object_unref (parser);
g_object_unref (reader);
return NULL;
@@ -1105,10 +892,7 @@ geocode_forward_search (GeocodeForward *forward,
to_cache = TRUE;
}
- if (forward->priv->answer_count != 1)
- ret = _geocode_parse_search_json (contents, error);
- else
- ret = _geocode_parse_single_result_json (contents, error);
+ ret = _geocode_parse_search_json (contents, error);
if (to_cache && ret != NULL)
_geocode_glib_cache_save (query, contents);
diff --git a/geocode-glib/geocode-glib-private.h b/geocode-glib/geocode-glib-private.h
index 0e07a22..ca7bdd9 100644
--- a/geocode-glib/geocode-glib-private.h
+++ b/geocode-glib/geocode-glib-private.h
@@ -37,8 +37,6 @@ typedef enum {
GEOCODE_GLIB_RESOLVE_REVERSE
} GeocodeLookupType;
-GHashTable *_geocode_parse_resolve_json (const char *contents,
- GError **error);
GList *_geocode_parse_search_json (const char *contents,
GError **error);
GeocodeLocation *_geocode_ip_json_to_location (const char *json,
diff --git a/geocode-glib/geocode-glib.symbols b/geocode-glib/geocode-glib.symbols
index 64c635a..0bf7a93 100644
--- a/geocode-glib/geocode-glib.symbols
+++ b/geocode-glib/geocode-glib.symbols
@@ -36,6 +36,7 @@ geocode_place_type_get_type
geocode_place_new
geocode_place_new_with_location
geocode_place_get_name
+geocode_place_set_name
geocode_place_get_place_type
geocode_place_set_location
geocode_place_get_location
diff --git a/geocode-glib/geocode-place.c b/geocode-glib/geocode-place.c
index 0521e1e..cdc686e 100644
--- a/geocode-glib/geocode-place.c
+++ b/geocode-glib/geocode-place.c
@@ -292,7 +292,6 @@ geocode_place_class_init (GeocodePlaceClass *klass)
"Name",
NULL,
G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS);
g_object_class_install_property (gplace_class, PROP_NAME, pspec);
@@ -509,7 +508,7 @@ geocode_place_new (const char *name,
}
/**
- * geocode_place_new_with_description:
+ * geocode_place_new_with_location:
* @name: the name of place
* @place_type: the type of place
* @location: the location info for the place
@@ -534,10 +533,24 @@ geocode_place_new_with_location (const char *name,
* geocode_place_get_name:
* @place: A place
*
- * Gets the name of the @place. This is simply a short name. You want to read
- * the #GeocodeLocation:description property from the associated
- * #GeocodeLocation object to get unique names for each place object in
- * geocode_forward_search() results.
+ * Sets the name of the @place to @name.
+ **/
+void
+geocode_place_set_name (GeocodePlace *place,
+ const char *name)
+{
+ g_return_if_fail (GEOCODE_IS_PLACE (place));
+ g_return_if_fail (name != NULL);
+
+ g_free (place->priv->name);
+ place->priv->name = g_strdup (name);
+}
+
+/**
+ * geocode_place_get_name:
+ * @place: A place
+ *
+ * Gets the name of the @place.
**/
const char *
geocode_place_get_name (GeocodePlace *place)
diff --git a/geocode-glib/geocode-place.h b/geocode-glib/geocode-place.h
index 8c9322f..0d92c7d 100644
--- a/geocode-glib/geocode-place.h
+++ b/geocode-glib/geocode-place.h
@@ -66,6 +66,8 @@ struct _GeocodePlaceClass {
/**
* GeocodePlaceType:
* @GEOCODE_PLACE_TYPE_UNKNOWN: Type is unknown for this place.
+ * @GEOCODE_PLACE_TYPE_BUILDING: A building or house.
+ * @GEOCODE_PLACE_TYPE_STREET: A street.
* @GEOCODE_PLACE_TYPE_TOWN: A populated settlement such as a city, town, village.
* @GEOCODE_PLACE_TYPE_STATE: One of the primary administrative areas within a country.
* @GEOCODE_PLACE_TYPE_COUNTY: One of the secondary administrative areas within a country.
@@ -74,6 +76,9 @@ struct _GeocodePlaceClass {
* @GEOCODE_PLACE_TYPE_COUNTRY: One of the countries or dependent territories defined by the ISO 3166-1
standard.
* @GEOCODE_PLACE_TYPE_ISLAND: An island.
* @GEOCODE_PLACE_TYPE_AIRPORT: An airport.
+ * @GEOCODE_PLACE_TYPE_RAILWAY_STATION: A railway station.
+ * @GEOCODE_PLACE_TYPE_BUS_STOP: A bus stop.
+ * @GEOCODE_PLACE_TYPE_MOTORWAY: A high capacity highways designed to safely carry fast motor traffic.
* @GEOCODE_PLACE_TYPE_DRAINAGE: A water feature such as a river, canal, lake, bay or ocean.
* @GEOCODE_PLACE_TYPE_LAND_FEATURE: A land feature such as a park, mountain or beach.
* @GEOCODE_PLACE_TYPE_MISCELLANEOUS: A uncategorized place.
@@ -95,37 +100,37 @@ struct _GeocodePlaceClass {
*/
typedef enum {
GEOCODE_PLACE_TYPE_UNKNOWN = 0,
- GEOCODE_PLACE_TYPE_TOWN = 7,
- GEOCODE_PLACE_TYPE_STATE = 8,
- GEOCODE_PLACE_TYPE_COUNTY = 9,
- GEOCODE_PLACE_TYPE_LOCAL_ADMINISTRATIVE_AREA = 10,
- GEOCODE_PLACE_TYPE_POSTAL_CODE = 11,
- GEOCODE_PLACE_TYPE_COUNTRY = 12,
- GEOCODE_PLACE_TYPE_ISLAND = 13,
- GEOCODE_PLACE_TYPE_AIRPORT = 14,
- GEOCODE_PLACE_TYPE_DRAINAGE = 15,
- GEOCODE_PLACE_TYPE_LAND_FEATURE = 16,
- GEOCODE_PLACE_TYPE_MISCELLANEOUS = 17,
- GEOCODE_PLACE_TYPE_SUPERNAME = 19,
- GEOCODE_PLACE_TYPE_POINT_OF_INTEREST = 20,
- GEOCODE_PLACE_TYPE_SUBURB = 22,
- GEOCODE_PLACE_TYPE_COLLOQUIAL = 24,
- GEOCODE_PLACE_TYPE_ZONE = 25,
- GEOCODE_PLACE_TYPE_HISTORICAL_STATE = 26,
- GEOCODE_PLACE_TYPE_HISTORICAL_COUNTY = 27,
- GEOCODE_PLACE_TYPE_CONTINENT = 29,
- GEOCODE_PLACE_TYPE_TIME_ZONE = 31,
- GEOCODE_PLACE_TYPE_ESTATE = 33,
- GEOCODE_PLACE_TYPE_HISTORICAL_TOWN = 35,
- GEOCODE_PLACE_TYPE_OCEAN = 37,
- GEOCODE_PLACE_TYPE_SEA = 38
+ GEOCODE_PLACE_TYPE_BUILDING,
+ GEOCODE_PLACE_TYPE_STREET,
+ GEOCODE_PLACE_TYPE_TOWN,
+ GEOCODE_PLACE_TYPE_STATE,
+ GEOCODE_PLACE_TYPE_COUNTY,
+ GEOCODE_PLACE_TYPE_LOCAL_ADMINISTRATIVE_AREA,
+ GEOCODE_PLACE_TYPE_POSTAL_CODE,
+ GEOCODE_PLACE_TYPE_COUNTRY,
+ GEOCODE_PLACE_TYPE_ISLAND,
+ GEOCODE_PLACE_TYPE_AIRPORT,
+ GEOCODE_PLACE_TYPE_RAILWAY_STATION,
+ GEOCODE_PLACE_TYPE_BUS_STOP,
+ GEOCODE_PLACE_TYPE_MOTORWAY,
+ GEOCODE_PLACE_TYPE_DRAINAGE,
+ GEOCODE_PLACE_TYPE_LAND_FEATURE,
+ GEOCODE_PLACE_TYPE_MISCELLANEOUS,
+ GEOCODE_PLACE_TYPE_SUPERNAME,
+ GEOCODE_PLACE_TYPE_POINT_OF_INTEREST,
+ GEOCODE_PLACE_TYPE_SUBURB,
+ GEOCODE_PLACE_TYPE_COLLOQUIAL,
+ GEOCODE_PLACE_TYPE_ZONE,
+ GEOCODE_PLACE_TYPE_HISTORICAL_STATE,
+ GEOCODE_PLACE_TYPE_HISTORICAL_COUNTY,
+ GEOCODE_PLACE_TYPE_CONTINENT,
+ GEOCODE_PLACE_TYPE_TIME_ZONE,
+ GEOCODE_PLACE_TYPE_ESTATE,
+ GEOCODE_PLACE_TYPE_HISTORICAL_TOWN,
+ GEOCODE_PLACE_TYPE_OCEAN,
+ GEOCODE_PLACE_TYPE_SEA
} GeocodePlaceType;
-/* The above values and their explanation is based on Yahoo places API:
- *
- * http://where.yahooapis.com/v1/placetypes?select=long&appid=YOUR_APP_ID
- */
-
#define GEOCODE_TYPE_PLACE (geocode_place_get_type ())
GeocodePlace *geocode_place_new (const char *name,
@@ -134,6 +139,8 @@ GeocodePlace *geocode_place_new_with_location (const char *name,
GeocodePlaceType place_type,
GeocodeLocation *location);
+void geocode_place_set_name (GeocodePlace *place,
+ const char *name);
const char *geocode_place_get_name (GeocodePlace *place);
GeocodePlaceType geocode_place_get_place_type (GeocodePlace *place);
diff --git a/geocode-glib/geocode-reverse.c b/geocode-glib/geocode-reverse.c
index a436eca..f801b78 100644
--- a/geocode-glib/geocode-reverse.c
+++ b/geocode-glib/geocode-reverse.c
@@ -120,7 +120,7 @@ static struct {
{ "county", NULL },
{ "state_district", NULL },
{ "state", "region" },
- { "postalcode", NULL },
+ { "postcode", "postalcode" },
{ "country", "country" },
{ "country_code", "countrycode" },
{ "continent", NULL },
@@ -142,11 +142,20 @@ nominatim_to_xep (const char *attr)
return NULL;
}
-static void
-add_nominatim_attributes (JsonReader *reader, GHashTable *hash_table)
+static GHashTable *
+_geocode_read_nominatim_attributes (JsonReader *reader,
+ gboolean translate_to_xep)
{
+ GHashTable *ret;
char **members;
guint i;
+ gboolean is_address;
+
+ /* Yay, start adding data */
+ ret = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_free);
+
+ is_address = (strcmp (json_reader_get_member_name (reader), "address") == 0);
members = json_reader_list_members (reader);
@@ -161,18 +170,36 @@ add_nominatim_attributes (JsonReader *reader, GHashTable *hash_table)
if (value != NULL) {
const char *xep_attr;
+
+ if (translate_to_xep)
+ xep_attr = nominatim_to_xep (members[i]);
+ else
+ xep_attr = NULL;
- xep_attr = nominatim_to_xep (members[i]);
if (xep_attr != NULL)
- g_hash_table_insert (hash_table, g_strdup (xep_attr), g_strdup (value));
+ g_hash_table_insert (ret, g_strdup (xep_attr), g_strdup (value));
else
- g_hash_table_insert (hash_table, g_strdup (members[i]), g_strdup (value));
+ g_hash_table_insert (ret, g_strdup (members[i]), g_strdup (value));
+
+ if (i == 0 && is_address) {
+ /* Since Nominatim doesn't give us a short name,
+ * we use the first component of address as name.
+ */
+ g_hash_table_insert (ret, g_strdup ("name"), g_strdup (value));
+ }
}
json_reader_end_member (reader);
}
g_strfreev (members);
+
+ if (json_reader_read_member (reader, "address")) {
+ add_nominatim_attributes (reader, ret);
+ json_reader_end_member (reader);
+ }
+
+ return ret;
}
static GHashTable *
@@ -212,16 +239,7 @@ resolve_json (const char *contents,
return NULL;
}
- /* Yay, start adding data */
- ret = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
-
- add_nominatim_attributes (reader, ret);
-
- if (json_reader_read_member (reader, "address")) {
- add_nominatim_attributes (reader, ret);
- json_reader_end_member (reader);
- }
+ ret = _geocode_read_nominatim_attributes (reader, true);
g_object_unref (parser);
g_object_unref (reader);
diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c
index ae24f65..c283ac7 100644
--- a/geocode-glib/test-gcglib.c
+++ b/geocode-glib/test-gcglib.c
@@ -396,13 +396,14 @@ test_locale (void)
static void
test_resolve_json (void)
{
- GHashTable *ht;
+ GList *list;
+ GeocodePlace *place;
GError *error = NULL;
guint i;
struct {
const char *fname;
const char *error;
- const char *key;
+ const char *prop;
const char *value;
} tests[] = {
{ "placefinder-area.json", NULL, "area", "Onslow Village" },
@@ -413,6 +414,7 @@ test_resolve_json (void)
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
char *contents;
char *filename;
+ char *value;
filename = g_strdup_printf (TEST_SRCDIR "/%s", tests[i].fname);
if (g_file_get_contents (filename, &contents, NULL, &error) == FALSE) {
@@ -421,24 +423,28 @@ test_resolve_json (void)
}
g_free (filename);
- ht = _geocode_parse_resolve_json (contents, &error);
+ list = _geocode_parse_search_json (contents, &error);
g_free (contents);
if (tests[i].error) {
- g_assert (ht == NULL);
+ g_assert (list == NULL);
g_assert_cmpstr (error->message, ==, tests[i].error);
} else {
- g_assert (ht != NULL);
+ g_assert (list != NULL);
+ g_assert_cmpint (g_list_length (list), ==, 1);
}
- if (ht == NULL) {
+ if (list == NULL) {
g_error_free (error);
error = NULL;
continue;
}
- g_assert_cmpstr (g_hash_table_lookup (ht, tests[i].key), ==, tests[i].value);
- g_hash_table_destroy (ht);
+ place = GEOCODE_PLACE (list->data);
+ g_object_get (place, tests[i].prop, &value, NULL);
+ g_assert_cmpstr (value, ==, tests[i].value);
+ g_free (value);
+ g_list_free (list);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
