X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/93c47137bcc1dba235db9787d7ef0a305493407e..dade5f874b05c2263bbbe668a77021d487b0761b:/src/geonamessearch.c diff --git a/src/geonamessearch.c b/src/geonamessearch.c index 17800894..3af6426a 100644 --- a/src/geonamessearch.c +++ b/src/geonamessearch.c @@ -1,7 +1,8 @@ /* * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * - * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2009, Hein Ragas + * Copyright (C) 2013, Rob Norris * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Created by Quy Tonthat */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,251 +31,451 @@ #include #include "viking.h" -#include "curl_download.h" +#include "util.h" +#include "geonamessearch.h" -#define GEONAMES_SEARCH_URL_FMT "http://ws.geonames.org/searchJSON?formatted=true&style=medium&maxRows=10&lang=en&q=%s" -#define GEONAMES_SEARCH_PATTERN_2 "\"lat\": " -#define GEONAMES_SEARCH_PATTERN_1 "\"lng\": " +/* Compatibility */ +#if ! GLIB_CHECK_VERSION(2,22,0) +#define g_mapped_file_unref g_mapped_file_free +#endif + +/** + * See http://www.geonames.org/export/wikipedia-webservice.html#wikipediaBoundingBox + */ +// Translators may wish to change this setting as appropriate to get Wikipedia articles in that language +#define GEONAMES_LANG N_("en") +// TODO - offer configuration of this value somewhere +// ATM decided it's not essential enough to warrant putting in the preferences +#define GEONAMES_MAX_ENTRIES 20 + +#define GEONAMES_WIKIPEDIA_URL_FMT "http://ws.geonames.org/wikipediaBoundingBoxJSON?formatted=true&north=%s&south=%s&east=%s&west=%s&lang=%s&maxRows=%d" + +#define GEONAMES_FEATURE_PATTERN "\"feature\": \"" +#define GEONAMES_LONGITUDE_PATTERN "\"lng\": " +#define GEONAMES_NAME_PATTERN "\"name\": \"" +#define GEONAMES_LATITUDE_PATTERN "\"lat\": " +#define GEONAMES_ELEVATION_PATTERN "\"elevation\": " +#define GEONAMES_TITLE_PATTERN "\"title\": \"" +#define GEONAMES_WIKIPEDIAURL_PATTERN "\"wikipediaUrl\": \"" +#define GEONAMES_THUMBNAILIMG_PATTERN "\"thumbnailImg\": \"" #define GEONAMES_SEARCH_NOT_FOUND "not understand the location" -static gchar *last_search_str = NULL; -static VikCoord *last_coord = NULL; -static gchar *last_successful_search_str = NULL; +/* found_geoname: Type to contain data returned from GeoNames.org */ -gchar * a_geonamessearch_get_search_string_for_this_place(VikWindow *vw) -{ - if (!last_coord) - return NULL; +typedef struct { + gchar *name; + gchar *feature; + struct LatLon ll; + gdouble elevation; + gchar *cmt; + gchar *desc; +} found_geoname; - VikViewport *vvp = vik_window_viewport(vw); - const VikCoord *cur_center = vik_viewport_get_center(vvp); - if (vik_coord_equals(cur_center, last_coord)) { - return(last_successful_search_str); - } - else - return NULL; +static found_geoname *new_found_geoname() +{ + found_geoname *ret; + + ret = (found_geoname *)g_malloc(sizeof(found_geoname)); + ret->name = NULL; + ret->feature = NULL; + ret->cmt = NULL; + ret->desc = NULL; + ret->ll.lat = 0.0; + ret->ll.lon = 0.0; + ret->elevation = VIK_DEFAULT_ALTITUDE; + return ret; } -static gboolean prompt_try_again(VikWindow *vw) +static found_geoname *copy_found_geoname(found_geoname *src) { - GtkWidget *dialog = NULL; - gboolean ret = TRUE; - - dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL ); - gtk_window_set_title(GTK_WINDOW(dialog), _("Search")); - - GtkWidget *search_label = gtk_label_new(_("I don't know that place. Do you want another search?")); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), search_label, FALSE, FALSE, 5 ); - gtk_widget_show_all(dialog); + found_geoname *dest = new_found_geoname(); + dest->name = g_strdup(src->name); + dest->feature = g_strdup(src->feature); + dest->ll.lat = src->ll.lat; + dest->ll.lon = src->ll.lon; + dest->elevation = src->elevation; + dest->cmt = g_strdup(src->cmt); + dest->desc = g_strdup(src->desc); + return(dest); +} - if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) - ret = FALSE; +static void free_list_geonames(found_geoname *geoname, gpointer userdata) +{ + g_free(geoname->name); + g_free(geoname->feature); + g_free(geoname->cmt); + g_free(geoname->desc); +} - gtk_widget_destroy(dialog); - return ret; +static void free_geoname_list(GList *found_places) +{ + g_list_foreach(found_places, (GFunc)free_list_geonames, NULL); + g_list_free(found_places); } -static gchar * a_prompt_for_search_string(VikWindow *vw) +static void none_found(VikWindow *vw) { GtkWidget *dialog = NULL; - dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL ); + dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL ); gtk_window_set_title(GTK_WINDOW(dialog), _("Search")); - GtkWidget *search_label = gtk_label_new(_("Enter address or place name:")); - GtkWidget *search_entry = gtk_entry_new(); - if (last_search_str) - gtk_entry_set_text(GTK_ENTRY(search_entry), last_search_str); - + GtkWidget *search_label = gtk_label_new(_("No entries found!")); gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), search_label, FALSE, FALSE, 5 ); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), search_entry, FALSE, FALSE, 5 ); + gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT ); gtk_widget_show_all(dialog); - if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) { - gtk_widget_destroy(dialog); - return NULL; - } - - gchar *search_str = g_strdup ( gtk_entry_get_text ( GTK_ENTRY(search_entry) ) ); - + gtk_dialog_run ( GTK_DIALOG(dialog) ); gtk_widget_destroy(dialog); +} - if (search_str[0] != '\0') { - if (last_search_str) - g_free(last_search_str); - last_search_str = g_strdup(search_str); +static GList *a_select_geoname_from_list(GtkWindow *parent, GList *geonames, gboolean multiple_selection_allowed, const gchar *title, const gchar *msg) +{ + GtkTreeIter iter; + GtkCellRenderer *renderer; + GtkWidget *view; + found_geoname *geoname; + gchar *latlon_string; + int column_runner; + + GtkWidget *dialog = gtk_dialog_new_with_buttons (title, + parent, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + /* When something is selected then OK */ + gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT ); + GtkWidget *response_w = NULL; +#if GTK_CHECK_VERSION (2, 20, 0) + /* Default to not apply - as initially nothing is selected! */ + response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_REJECT ); +#endif + GtkWidget *label = gtk_label_new ( msg ); + GtkTreeStore *store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + + GList *geoname_runner = geonames; + while (geoname_runner) + { + geoname = (found_geoname *)geoname_runner->data; + latlon_string = g_strdup_printf("(%f,%f)", geoname->ll.lat, geoname->ll.lon); + gtk_tree_store_append(store, &iter, NULL); + gtk_tree_store_set(store, &iter, 0, geoname->name, 1, geoname->feature, 2, latlon_string, -1); + geoname_runner = g_list_next(geoname_runner); + g_free(latlon_string); } - return(search_str); /* search_str needs to be freed by caller */ + view = gtk_tree_view_new(); + renderer = gtk_cell_renderer_text_new(); + column_runner = 0; + GtkTreeViewColumn *column; + // NB could allow columns to be shifted around by doing this after each new + // gtk_tree_view_column_set_reorderable ( column, TRUE ); + // However I don't think is that useful, so I haven't put it in + column = gtk_tree_view_column_new_with_attributes( _("Name"), renderer, "text", column_runner, NULL); + gtk_tree_view_column_set_sort_column_id (column, column_runner); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + + column_runner++; + column = gtk_tree_view_column_new_with_attributes( _("Feature"), renderer, "text", column_runner, NULL); + gtk_tree_view_column_set_sort_column_id (column, column_runner); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + + column_runner++; + column = gtk_tree_view_column_new_with_attributes( _("Lat/Lon"), renderer, "text", column_runner, NULL); + gtk_tree_view_column_set_sort_column_id (column, column_runner); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + + gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store)); + gtk_tree_selection_set_mode( gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), + multiple_selection_allowed ? GTK_SELECTION_MULTIPLE : GTK_SELECTION_BROWSE ); + g_object_unref(store); + + GtkWidget *scrolledwindow = gtk_scrolled_window_new ( NULL, NULL ); + gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); + gtk_container_add ( GTK_CONTAINER(scrolledwindow), view ); + + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolledwindow, TRUE, TRUE, 0); + + // Ensure a reasonable number of items are shown, but let the width be automatically sized + gtk_widget_set_size_request ( dialog, -1, 400) ; + gtk_widget_show_all ( dialog ); + + if ( response_w ) + gtk_widget_grab_focus ( response_w ); + + while ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT ) + { + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); + GList *selected_geonames = NULL; + + // Possibily not the fastest method but we don't have thousands of entries to process... + if ( gtk_tree_model_get_iter_first( GTK_TREE_MODEL(store), &iter) ) { + do { + if ( gtk_tree_selection_iter_is_selected ( selection, &iter ) ) { + // For every selected item, + // compare the name from the displayed view to every geoname entry to find the geoname this selection represents + gchar* name; + gtk_tree_model_get (GTK_TREE_MODEL(store), &iter, 0, &name, -1 ); + // I believe the name of these items to be always unique + geoname_runner = geonames; + while ( geoname_runner ) { + if ( !strcmp ( ((found_geoname*)geoname_runner->data)->name, name ) ) { + found_geoname *copied = copy_found_geoname(geoname_runner->data); + selected_geonames = g_list_prepend(selected_geonames, copied); + break; + } + geoname_runner = g_list_next(geoname_runner); + } + } + } + while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL(store), &iter ) ); + } + + if (selected_geonames) + { + gtk_widget_destroy ( dialog ); + return selected_geonames; + } + a_dialog_error_msg(parent, _("Nothing was selected")); + } + gtk_widget_destroy ( dialog ); + return NULL; } -static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll) +static GList *get_entries_from_file(gchar *file_name) { gchar *text, *pat; GMappedFile *mf; gsize len; - gboolean found = TRUE; - gchar lat_buf[32], lon_buf[32]; + gboolean more = TRUE; + gchar lat_buf[32], lon_buf[32], elev_buf[32]; gchar *s; + gint fragment_len; + GList *found_places = NULL; + found_geoname *geoname = NULL; + gchar **found_entries; + gchar *entry; + int entry_runner; + gchar *wikipedia_url = NULL; + gchar *thumbnail_url = NULL; - lat_buf[0] = lon_buf[0] = '\0'; + lat_buf[0] = lon_buf[0] = elev_buf[0] = '\0'; if ((mf = g_mapped_file_new(file_name, FALSE, NULL)) == NULL) { g_critical(_("couldn't map temp file")); - exit(1); + return NULL; } len = g_mapped_file_get_length(mf); text = g_mapped_file_get_contents(mf); if (g_strstr_len(text, len, GEONAMES_SEARCH_NOT_FOUND) != NULL) { - found = FALSE; - goto done; + more = FALSE; } - - if ((pat = g_strstr_len(text, len, GEONAMES_SEARCH_PATTERN_1)) == NULL) { - found = FALSE; - goto done; - } - pat += strlen(GEONAMES_SEARCH_PATTERN_1); - s = lon_buf; - if (*pat == '-') - *s++ = *pat++; - while ((s < (lon_buf + sizeof(lon_buf))) && (pat < (text + len)) && - (g_ascii_isdigit(*pat) || (*pat == '.'))) - *s++ = *pat++; - *s = '\0'; - if ((pat >= (text + len)) || (lon_buf[0] == '\0')) { - found = FALSE; - goto done; - } - - if ((pat = g_strstr_len(text, len, GEONAMES_SEARCH_PATTERN_2)) == NULL) { - found = FALSE; - goto done; - } - - pat += strlen(GEONAMES_SEARCH_PATTERN_2); - s = lat_buf; - - if (*pat == '-') - *s++ = *pat++; - while ((s < (lat_buf + sizeof(lat_buf))) && (pat < (text + len)) && - (g_ascii_isdigit(*pat) || (*pat == '.'))) - *s++ = *pat++; - *s = '\0'; - if ((pat >= (text + len)) || (lat_buf[0] == '\0')) { - found = FALSE; - goto done; - } - - ll->lat = g_ascii_strtod(lat_buf, NULL); - ll->lon = g_ascii_strtod(lon_buf, NULL); - -done: - g_mapped_file_free(mf); - return (found); - -} - -gchar *uri_escape(gchar *str) -{ - gchar *esc_str = g_malloc(3*strlen(str)); - gchar *dst = esc_str; - gchar *src; - - for (src = str; *src; src++) { - if (*src == ' ') - *dst++ = '+'; - else if (g_ascii_isalnum(*src)) - *dst++ = *src; + found_entries = g_strsplit(text, "},", 0); + entry_runner = 0; + entry = found_entries[entry_runner]; + while (entry) + { + more = TRUE; + geoname = new_found_geoname(); + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_FEATURE_PATTERN))) { + pat += strlen(GEONAMES_FEATURE_PATTERN); + fragment_len = 0; + s = pat; + while (*pat != '"') { + fragment_len++; + pat++; + } + geoname->feature = g_strndup(s, fragment_len); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_LONGITUDE_PATTERN)) == NULL) { + more = FALSE; + } + else { + pat += strlen(GEONAMES_LONGITUDE_PATTERN); + s = lon_buf; + if (*pat == '-') + *s++ = *pat++; + while ((s < (lon_buf + sizeof(lon_buf))) && (pat < (text + len)) && + (g_ascii_isdigit(*pat) || (*pat == '.'))) + *s++ = *pat++; + *s = '\0'; + if ((pat >= (text + len)) || (lon_buf[0] == '\0')) { + more = FALSE; + } + geoname->ll.lon = g_ascii_strtod(lon_buf, NULL); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_ELEVATION_PATTERN))) { + pat += strlen(GEONAMES_ELEVATION_PATTERN); + s = elev_buf; + if (*pat == '-') + *s++ = *pat++; + while ((s < (elev_buf + sizeof(elev_buf))) && (pat < (text + len)) && + (g_ascii_isdigit(*pat) || (*pat == '.'))) + *s++ = *pat++; + *s = '\0'; + geoname->elevation = g_ascii_strtod(elev_buf, NULL); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_NAME_PATTERN))) { + pat += strlen(GEONAMES_NAME_PATTERN); + fragment_len = 0; + s = pat; + while (*pat != '"') { + fragment_len++; + pat++; + } + geoname -> name = g_strndup(s, fragment_len); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_TITLE_PATTERN))) { + pat += strlen(GEONAMES_TITLE_PATTERN); + fragment_len = 0; + s = pat; + while (*pat != '"') { + fragment_len++; + pat++; + } + geoname -> name = g_strndup(s, fragment_len); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_WIKIPEDIAURL_PATTERN))) { + pat += strlen(GEONAMES_WIKIPEDIAURL_PATTERN); + fragment_len = 0; + s = pat; + while (*pat != '"') { + fragment_len++; + pat++; + } + wikipedia_url = g_strndup(s, fragment_len); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_THUMBNAILIMG_PATTERN))) { + pat += strlen(GEONAMES_THUMBNAILIMG_PATTERN); + fragment_len = 0; + s = pat; + while (*pat != '"') { + fragment_len++; + pat++; + } + thumbnail_url = g_strndup(s, fragment_len); + } + if ((pat = g_strstr_len(entry, strlen(entry), GEONAMES_LATITUDE_PATTERN)) == NULL) { + more = FALSE; + } + else { + pat += strlen(GEONAMES_LATITUDE_PATTERN); + s = lat_buf; + if (*pat == '-') + *s++ = *pat++; + while ((s < (lat_buf + sizeof(lat_buf))) && (pat < (text + len)) && + (g_ascii_isdigit(*pat) || (*pat == '.'))) + *s++ = *pat++; + *s = '\0'; + if ((pat >= (text + len)) || (lat_buf[0] == '\0')) { + more = FALSE; + } + geoname->ll.lat = g_ascii_strtod(lat_buf, NULL); + } + if (!more) { + if (geoname) { + g_free(geoname); + } + } else { - g_sprintf(dst, "%%%02X", *src); - dst += 3; + if (wikipedia_url) { + // Really we should support the GPX URL tag and then put that in there... + geoname->cmt = g_strdup_printf("http://%s", wikipedia_url); + if (thumbnail_url) { + geoname -> desc = g_strdup_printf("", wikipedia_url, thumbnail_url); + } + else { + geoname -> desc = g_strdup_printf("%s", wikipedia_url, geoname->name); + } + } + if (wikipedia_url) { + g_free(wikipedia_url); + wikipedia_url = NULL; + } + if (thumbnail_url) { + g_free(thumbnail_url); + thumbnail_url = NULL; + } + found_places = g_list_prepend(found_places, geoname); } + entry_runner++; + entry = found_entries[entry_runner]; } - *dst = '\0'; - - return(esc_str); + g_strfreev(found_entries); + found_places = g_list_reverse(found_places); + g_mapped_file_unref(mf); + return(found_places); } -static int geonames_search_get_coord(VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord) + +void a_geonames_wikipedia_box ( VikWindow *vw, VikTrwLayer *vtl, struct LatLon maxmin[2] ) { - FILE *tmp_file; - int tmp_fd; - gchar *tmpname; gchar *uri; - gchar *escaped_srch_str; - int ret = 0; /* OK */ - struct LatLon ll; - - g_debug("%s: raw search: %s", __FUNCTION__, srch_str); - - escaped_srch_str = uri_escape(srch_str); - - g_debug("%s: escaped search: %s", __FUNCTION__, escaped_srch_str); - - if ((tmp_fd = g_file_open_tmp ("vikgsearch.XXXXXX", &tmpname, NULL)) == -1) { - g_critical(_("couldn't open temp file")); - exit(1); + gchar *tmpname; + GList *wiki_places; + GList *selected; + GList *wp_runner; + VikWaypoint *wiki_wp; + found_geoname *wiki_geoname; + + /* encode doubles in a C locale */ + gchar *north = a_coords_dtostr(maxmin[0].lat); + gchar *south = a_coords_dtostr(maxmin[1].lat); + gchar *east = a_coords_dtostr(maxmin[0].lon); + gchar *west = a_coords_dtostr(maxmin[1].lon); + uri = g_strdup_printf ( GEONAMES_WIKIPEDIA_URL_FMT, north, south, east, west, GEONAMES_LANG, GEONAMES_MAX_ENTRIES ); + g_free(north); north = NULL; + g_free(south); south = NULL; + g_free(east); east = NULL; + g_free(west); west = NULL; + tmpname = a_download_uri_to_tmp_file ( uri, NULL ); + if (!tmpname) { + none_found(vw); + return; } - - tmp_file = fdopen(tmp_fd, "r+"); - //uri = g_strdup_printf(GEONAMES_SEARCH_URL_FMT, srch_str); - uri = g_strdup_printf(GEONAMES_SEARCH_URL_FMT, escaped_srch_str); - - /* TODO: curl may not be available */ - if (curl_download_uri(uri, tmp_file, NULL)) { /* error */ - fclose(tmp_file); - tmp_file = NULL; - ret = -1; - goto done; + wiki_places = get_entries_from_file(tmpname); + if (g_list_length(wiki_places) == 0) { + none_found(vw); + return; } - - fclose(tmp_file); - tmp_file = NULL; - if (!parse_file_for_latlon(tmpname, &ll)) { - ret = -1; - goto done; + selected = a_select_geoname_from_list(VIK_GTK_WINDOW_FROM_WIDGET(vw), wiki_places, TRUE, "Select articles", "Select the articles you want to add."); + wp_runner = selected; + while (wp_runner) { + wiki_geoname = (found_geoname *)wp_runner->data; + wiki_wp = vik_waypoint_new(); + wiki_wp->visible = TRUE; + vik_coord_load_from_latlon(&(wiki_wp->coord), vik_trw_layer_get_coord_mode ( vtl ), &(wiki_geoname->ll)); + wiki_wp->altitude = wiki_geoname->elevation; + vik_waypoint_set_comment(wiki_wp, wiki_geoname->cmt); + vik_waypoint_set_description(wiki_wp, wiki_geoname->desc); + // Use the featue type to generate a suitable waypoint icon + // http://www.geonames.org/wikipedia/wikipedia_features.html + // Only a few values supported as only a few symbols make sense + if ( wiki_geoname->feature ) { + if ( !strcmp (wiki_geoname->feature, "city") ) + vik_waypoint_set_symbol(wiki_wp, "city (medium)"); + if ( !strcmp (wiki_geoname->feature, "edu") ) + vik_waypoint_set_symbol(wiki_wp, "school"); + if ( !strcmp (wiki_geoname->feature, "airport") ) + vik_waypoint_set_symbol(wiki_wp, "airport"); + if ( !strcmp (wiki_geoname->feature, "mountain") ) + vik_waypoint_set_symbol(wiki_wp, "summit"); + if ( !strcmp (wiki_geoname->feature, "forest") ) + vik_waypoint_set_symbol(wiki_wp, "forest"); + } + vik_trw_layer_filein_add_waypoint ( vtl, wiki_geoname->name, wiki_wp ); + wp_runner = g_list_next(wp_runner); } - - vik_coord_load_from_latlon ( coord, vik_viewport_get_coord_mode(vvp), &ll ); - - if (last_coord) - g_free(last_coord); - last_coord = g_malloc(sizeof(VikCoord)); - *last_coord = *coord; - if (last_successful_search_str) - g_free(last_successful_search_str); - last_successful_search_str = g_strdup(last_search_str); - -done: - g_free(escaped_srch_str); + free_geoname_list(wiki_places); + free_geoname_list(selected); g_free(uri); - g_remove(tmpname); - g_free(tmpname); - return ret; -} - -void a_geonames_search(VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp) -{ - VikCoord new_center; - gchar *s_str; - gboolean more = TRUE; - - do { - s_str = a_prompt_for_search_string(vw); - if ((!s_str) || (s_str[0] == 0)) { - more = FALSE; - } - - else if (!geonames_search_get_coord(vw, vvp, s_str, &new_center)) { - vik_viewport_set_center_coord(vvp, &new_center); - vik_layers_panel_emit_update(vlp); - more = FALSE; - } - else if (!prompt_try_again(vw)) - more = FALSE; - g_free(s_str); - } while (more); + if (tmpname) { + g_remove(tmpname); + g_free(tmpname); + } } -