--- trunk/src/main.c	2009/07/25 10:29:30	31
+++ trunk/src/main.c	2009/07/28 13:21:22	32
@@ -1509,6 +1509,13 @@
   garmin_export(appdata);
 }
 
+#ifdef ENABLE_OSM_GPS_MAP
+static void 
+cb_menu_map(GtkWidget *window, gpointer data) {
+  map((appdata_t *)data);
+}
+#endif
+
 static void 
 cb_menu_geomath(GtkWidget *window, gpointer data) {
   geomath_dialog((appdata_t *)data);
@@ -1630,6 +1637,10 @@
 }
 
 static const menu_entry_t submenu_tools_entries[] = {
+#ifdef ENABLE_OSM_GPS_MAP
+  { "Map",              "Display an interactive world map", 
+    G_CALLBACK(cb_menu_map) },
+#endif
   { "Geomath",          "Geocoordinate calculation", 
     G_CALLBACK(cb_menu_geomath) },
   { "Geotext",          "Text analysis",             
@@ -1813,6 +1824,13 @@
   submenu = gtk_menu_new();
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 
+#ifdef ENABLE_OSM_GPS_MAP
+  item = gtk_menu_item_new_with_label( _("Map") );
+  gtk_menu_append(GTK_MENU_SHELL(submenu), item);
+  g_signal_connect(item, "activate", 
+		   GTK_SIGNAL_FUNC(cb_menu_map), appdata);
+#endif
+
   item = gtk_menu_item_new_with_label( _("Geomath") );
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);
   g_signal_connect(item, "activate",