#define g_mapped_file_unref g_mapped_file_free
#endif
-#define GEONAMES_WIKIPEDIA_URL_FMT "http://ws.geonames.org/wikipediaBoundingBoxJSON?formatted=true&north=%s&south=%s&east=%s&west=%s"
+/**
+ * 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\": \""
gchar *name;
gchar *feature;
struct LatLon ll;
+ gdouble elevation;
gchar *cmt;
gchar *desc;
} found_geoname;
ret->desc = NULL;
ret->ll.lat = 0.0;
ret->ll.lon = 0.0;
- return(ret);
+ ret->elevation = VIK_DEFAULT_ALTITUDE;
+ return ret;
}
static found_geoname *copy_found_geoname(found_geoname *src)
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);
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_widget_show ( label );
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), view, FALSE, FALSE, 0);
- gtk_widget_show ( view );
+ 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));
GMappedFile *mf;
gsize len;
gboolean more = TRUE;
- gchar lat_buf[32], lon_buf[32];
+ gchar lat_buf[32], lon_buf[32], elev_buf[32];
gchar *s;
gint fragment_len;
GList *found_places = NULL;
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"));
+ return NULL;
}
len = g_mapped_file_get_length(mf);
text = g_mapped_file_get_contents(mf);
}
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;
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);
+ 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;
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);
}