X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7114e87955b0a009e3fcc406dbe97c88e67eaf8a..de2fc9aa9e8db8e0258c8328161c6b5eda176a0a:/src/vikmapslayer.c diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index d1beed9a..901b7f66 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -21,12 +21,21 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #define MAX_SHRINKFACTOR 8.0000001 /* zoom 1 viewing 8-tiles */ #define MIN_SHRINKFACTOR 0.0312499 /* zoom 32 viewing 1-tiles */ +#define REAL_MIN_SHRINKFACTOR 0.0039062499 /* if shrinkfactor is between MAX and REAL_MAX, will only check for existence */ + #include #include -#include +#include +#include +#include + #include #include #include "globals.h" @@ -36,11 +45,10 @@ #include "vikviewport.h" #include "viklayer.h" #include "vikmapslayer.h" -#include "vikmapslayer_pixmap.h" +#ifdef HAVE_UNISTD_H #include -#include -#include +#endif #include "mapcache.h" /* only for dialog.h -- ugh */ @@ -56,6 +64,8 @@ #include "mapcoord.h" #include "terraserver.h" +#include "icons/icons.h" + /****** MAP TYPES ******/ static GList *__map_types = NULL; @@ -70,7 +80,7 @@ static GList *params_maptypes_ids = NULL; /******** MAPZOOMS *********/ -static gchar *params_mapzooms[] = { "Use Viking Zoom Level", "0.25", "1", "2", "4", "8", "16", "32", "64", "128", "256", "512", "1024", "USGS 10k", "USGS 24k", "USGS 25k", "USGS 50k", "USGS 100k", "USGS 200k", "USGS 250k", NULL }; +static gchar *params_mapzooms[] = { N_("Use Viking Zoom Level"), "0.25", "1", "2", "4", "8", "16", "32", "64", "128", "256", "512", "1024", "USGS 10k", "USGS 24k", "USGS 25k", "USGS 50k", "USGS 100k", "USGS 200k", "USGS 250k", NULL }; static gdouble __mapzooms_x[] = { 0.0, 0.25, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0, 512.0, 1024.0, 1.016, 2.4384, 2.54, 5.08, 10.16, 20.32, 25.4 }; static gdouble __mapzooms_y[] = { 0.0, 0.25, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0, 512.0, 1024.0, 1.016, 2.4384, 2.54, 5.08, 10.16, 20.32, 25.4 }; @@ -79,7 +89,7 @@ static gdouble __mapzooms_y[] = { 0.0, 0.25, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64. /**************************/ -static VikMapsLayer *maps_layer_copy ( VikMapsLayer *vml, VikViewport *vvp ); +static void maps_layer_post_read (VikLayer *vl, VikViewport *vp, gboolean from_file); static void maps_layer_marshall( VikMapsLayer *vml, guint8 **data, gint *len ); static VikMapsLayer *maps_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerParamData data, VikViewport *vvp ); @@ -101,23 +111,24 @@ static VikLayerParamScale params_scales[] = { }; VikLayerParam maps_layer_params[] = { - { "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Map Type:", VIK_LAYER_WIDGET_RADIOGROUP, NULL, NULL }, - { "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, "Maps Directory (Optional):", VIK_LAYER_WIDGET_FILEENTRY }, - { "alpha", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Alpha:", VIK_LAYER_WIDGET_HSCALE, params_scales }, - { "autodownload", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, "Autodownload maps:", VIK_LAYER_WIDGET_CHECKBUTTON }, - { "mapzoom", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Zoom Level:", VIK_LAYER_WIDGET_COMBOBOX, params_mapzooms }, + { "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_RADIOGROUP, NULL, NULL }, + { "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory (Optional):"), VIK_LAYER_WIDGET_FILEENTRY }, + { "alpha", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Alpha:"), VIK_LAYER_WIDGET_HSCALE, params_scales }, + { "autodownload", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Autodownload maps:"), VIK_LAYER_WIDGET_CHECKBUTTON }, + { "mapzoom", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Zoom Level:"), VIK_LAYER_WIDGET_COMBOBOX, params_mapzooms }, }; enum { PARAM_MAPTYPE=0, PARAM_CACHE_DIR, PARAM_ALPHA, PARAM_AUTODOWNLOAD, PARAM_MAPZOOM, NUM_PARAMS }; static VikToolInterface maps_tools[] = { - { "Maps Download", (VikToolConstructorFunc) maps_layer_download_create, NULL, NULL, NULL, - (VikToolMouseFunc) maps_layer_download_click, NULL, (VikToolMouseFunc) maps_layer_download_release }, + { N_("Maps Download"), (VikToolConstructorFunc) maps_layer_download_create, NULL, NULL, NULL, + (VikToolMouseFunc) maps_layer_download_click, NULL, (VikToolMouseFunc) maps_layer_download_release, + (VikToolKeyFunc) NULL, GDK_CURSOR_IS_PIXMAP, &cursor_mapdl_pixbuf }, }; VikLayerInterface vik_maps_layer_interface = { - "Map", - &mapslayer_pixbuf, + N_("Map"), + &vikmapslayer_pixbuf, maps_tools, sizeof(maps_tools) / sizeof(maps_tools[0]), @@ -131,7 +142,7 @@ VikLayerInterface vik_maps_layer_interface = { (VikLayerFuncCreate) maps_layer_new, (VikLayerFuncRealize) NULL, - (VikLayerFuncPostRead) NULL, + maps_layer_post_read, (VikLayerFuncFree) maps_layer_free, (VikLayerFuncProperties) NULL, @@ -147,7 +158,6 @@ VikLayerInterface vik_maps_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, - (VikLayerFuncCopy) maps_layer_copy, (VikLayerFuncMarshall) maps_layer_marshall, (VikLayerFuncUnmarshall) maps_layer_unmarshall, @@ -201,7 +211,7 @@ void maps_layer_register_type ( const char *label, guint id, VikMapsLayer_MapTyp params_maptypes = g_list_append(params_maptypes, g_strdup(label)); /* Add the id */ - params_maptypes_ids = g_list_append(params_maptypes_ids, (gpointer)id); + params_maptypes_ids = g_list_append(params_maptypes_ids, GUINT_TO_POINTER (id)); /* We have to clone */ VikMapsLayer_MapType *clone = g_memdup(map_type, sizeof(VikMapsLayer_MapType)); @@ -238,57 +248,56 @@ gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml) /******** CACHE DIR STUFF ***************/ /****************************************/ +#define DIRSTRUCTURE "%st%ds%dz%d" G_DIR_SEPARATOR_S "%d" G_DIR_SEPARATOR_S "%d" +#define MAPS_CACHE_DIR maps_layer_default_dir() + #ifdef WINDOWS -#define MAPS_CACHE_DIR "C:\\VIKING-MAPS\\" -#define DIRSTRUCTURE "%st%ds%dz%d\\%d\\%d" +#include +#define GLOBAL_MAPS_DIR "C:\\VIKING-MAPS\\" +#define LOCAL_MAPS_DIR "VIKING-MAPS" #else /* POSIX */ - #include - -#define MAPS_CACHE_DIR maps_layer_default_dir() #define GLOBAL_MAPS_DIR "/var/cache/maps/" -#define DIRSTRUCTURE "%st%ds%dz%d/%d/%d" +#define LOCAL_MAPS_DIR ".viking-maps" +#endif -static gchar *maps_layer_default_dir () +gchar *maps_layer_default_dir () { - static gchar defaultdir[512]; - static gboolean already_run = 0; - if ( ! already_run ) + static gchar *defaultdir = NULL; + if ( ! defaultdir ) { /* Thanks to Mike Davison for the $VIKING_MAPS usage */ - gchar *mapdir = getenv("VIKING_MAPS"); - if ( mapdir && strlen(mapdir) < 497 ) { - strcpy ( defaultdir, mapdir ); - } else if ( access ( GLOBAL_MAPS_DIR, W_OK ) == 0 ) { - strcpy ( defaultdir, GLOBAL_MAPS_DIR ); + const gchar *mapdir = g_getenv("VIKING_MAPS"); + if ( mapdir ) { + defaultdir = g_strdup ( mapdir ); + } else if ( g_access ( GLOBAL_MAPS_DIR, W_OK ) == 0 ) { + defaultdir = g_strdup ( GLOBAL_MAPS_DIR ); } else { - gchar *home = getenv("HOME"); - if ( home && strlen(home) < 497 ) - { - strcpy ( defaultdir, home ); - strcat ( defaultdir, "/.viking-maps/" ); - } + const gchar *home = g_get_home_dir(); + if (!home || g_access(home, W_OK)) + home = g_get_home_dir (); + if ( home ) + defaultdir = g_build_filename ( home, LOCAL_MAPS_DIR, NULL ); else - { - strcpy ( defaultdir, ".viking-maps/" ); - } + defaultdir = g_strdup ( LOCAL_MAPS_DIR ); + } + if (defaultdir && (defaultdir[strlen(defaultdir)-1] != G_DIR_SEPARATOR)) + { + /* Add the separator at the end */ + gchar *tmp = defaultdir; + defaultdir = g_strconcat(tmp, G_DIR_SEPARATOR_S, NULL); + g_free(tmp); } - already_run = 1; + g_debug("%s: defaultdir=%s", __FUNCTION__, defaultdir); } return defaultdir; } -#endif - static void maps_layer_mkdir_if_default_dir ( VikMapsLayer *vml ) { - if ( vml->cache_dir && strcmp ( vml->cache_dir, MAPS_CACHE_DIR ) == 0 && access ( vml->cache_dir, F_OK ) != 0 ) + if ( vml->cache_dir && strcmp ( vml->cache_dir, MAPS_CACHE_DIR ) == 0 && g_file_test ( vml->cache_dir, G_FILE_TEST_EXISTS ) == FALSE ) { -#ifdef WINDOWS - mkdir ( vml->cache_dir ); -#else - mkdir ( vml->cache_dir, 0777 ); -#endif + g_mkdir ( vml->cache_dir, 0777 ); } } @@ -296,19 +305,19 @@ static void maps_layer_set_cache_dir ( VikMapsLayer *vml, const gchar *dir ) { guint len; g_assert ( vml != NULL); - if ( vml->cache_dir ) - g_free ( vml->cache_dir ); + g_free ( vml->cache_dir ); + vml->cache_dir = NULL; if ( dir == NULL || dir[0] == '\0' ) vml->cache_dir = g_strdup ( MAPS_CACHE_DIR ); else { len = strlen(dir); - if ( dir[len-1] != VIKING_FILE_SEP ) + if ( dir[len-1] != G_DIR_SEPARATOR ) { vml->cache_dir = g_malloc ( len+2 ); strncpy ( vml->cache_dir, dir, len ); - vml->cache_dir[len] = VIKING_FILE_SEP; + vml->cache_dir[len] = G_DIR_SEPARATOR; vml->cache_dir[len+1] = '\0'; } else @@ -371,7 +380,7 @@ static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerPa case PARAM_CACHE_DIR: maps_layer_set_cache_dir ( vml, data.s ); break; case PARAM_MAPTYPE: { gint maptype = map_uniq_id_to_index(data.u); - if ( maptype == NUM_MAP_TYPES ) g_warning("Unknown map type"); + if ( maptype == NUM_MAP_TYPES ) g_warning(_("Unknown map type")); else vml->maptype = maptype; break; } @@ -381,7 +390,7 @@ static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerPa vml->mapzoom_id = data.u; vml->xmapzoom = __mapzooms_x [data.u]; vml->ymapzoom = __mapzooms_y [data.u]; - }else g_warning ("Unknown Map Zoom"); break; + }else g_warning (_("Unknown Map Zoom")); break; } return TRUE; } @@ -406,9 +415,11 @@ static VikLayerParamData maps_layer_get_param ( VikMapsLayer *vml, guint16 id ) static VikMapsLayer *maps_layer_new ( VikViewport *vvp ) { + int idx; VikMapsLayer *vml = VIK_MAPS_LAYER ( g_object_new ( VIK_MAPS_LAYER_TYPE, NULL ) ); vik_layer_init ( VIK_LAYER(vml), VIK_LAYER_MAPS ); - vml->maptype = 0; + idx = map_uniq_id_to_index(7); /* 7 is id for google maps */ + vml->maptype = (idx < NUM_MAP_TYPES) ? idx : 0; vml->alpha = 255; vml->mapzoom_id = 0; vml->dl_tool_x = vml->dl_tool_y = -1; @@ -425,21 +436,34 @@ static VikMapsLayer *maps_layer_new ( VikViewport *vvp ) static void maps_layer_free ( VikMapsLayer *vml ) { - if ( vml->cache_dir ) - g_free ( vml->cache_dir ); + g_free ( vml->cache_dir ); + vml->cache_dir = NULL; if ( vml->dl_right_click_menu ) gtk_object_sink ( GTK_OBJECT(vml->dl_right_click_menu) ); - if (vml->last_center) - g_free(vml->last_center); + g_free(vml->last_center); + vml->last_center = NULL; } -static VikMapsLayer *maps_layer_copy ( VikMapsLayer *vml, VikViewport *vvp ) +static void maps_layer_post_read (VikLayer *vl, VikViewport *vp, gboolean from_file) { - VikMapsLayer *rv = maps_layer_new ( vvp ); - *rv = *vml; - rv->cache_dir = g_strdup(rv->cache_dir); - VIK_LAYER(rv)->name = NULL; - return rv; + if (from_file != TRUE) + { + /* If this method is not called in file reading context + * it is called in GUI context. + * So, we can check if we have to inform the user about inconsistency */ + VikViewportDrawMode vp_drawmode; + VikMapsLayer *vml = VIK_MAPS_LAYER(vl); + VikMapsLayer_MapType *map_type = NULL; + + vp_drawmode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ); + map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); + if (map_type->drawmode != vp_drawmode) { + const gchar *drawmode_name = vik_viewport_get_drawmode_name (VIK_VIEWPORT(vp), map_type->drawmode); + gchar *msg = g_strdup_printf(_("New map cannot be displayed in the current drawmode.\nSelect \"%s\" from View menu to view it."), drawmode_name); + a_dialog_warning_msg ( VIK_GTK_WINDOW_FROM_LAYER(vml), msg ); + g_free(msg); + } + } } static void maps_layer_marshall( VikMapsLayer *vml, guint8 **data, gint *len ) @@ -504,7 +528,7 @@ static GdkPixbuf *get_pixbuf( VikMapsLayer *vml, gint mode, MapCoord *mapcoord, g_snprintf ( filename_buf, buf_len, DIRSTRUCTURE, vml->cache_dir, mode, mapcoord->scale, mapcoord->z, mapcoord->x, mapcoord->y ); - if ( access ( filename_buf, R_OK ) == 0) { + if ( g_file_test ( filename_buf, G_FILE_TEST_EXISTS ) == TRUE) { { GError *gx = NULL; pixbuf = gdk_pixbuf_new_from_file ( filename_buf, &gx ); @@ -512,7 +536,7 @@ static GdkPixbuf *get_pixbuf( VikMapsLayer *vml, gint mode, MapCoord *mapcoord, if (gx) { if ( gx->domain != GDK_PIXBUF_ERROR || gx->code != GDK_PIXBUF_ERROR_CORRUPT_IMAGE ) - g_warning ( "Couldn't open image file: %s", gx->message ); + g_warning ( _("Couldn't open image file: %s"), gx->message ); g_error_free ( gx ); if ( pixbuf ) @@ -565,16 +589,21 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo gdouble xzoom = vik_viewport_get_xmpp ( vvp ); gdouble yzoom = vik_viewport_get_ympp ( vvp ); gdouble xshrinkfactor = 1.0, yshrinkfactor = 1.0; + gdouble existence_only = FALSE; if ( vml->xmapzoom && (vml->xmapzoom != xzoom || vml->ymapzoom != yzoom) ) { xshrinkfactor = vml->xmapzoom / xzoom; yshrinkfactor = vml->ymapzoom / yzoom; - if ( xshrinkfactor > MIN_SHRINKFACTOR && xshrinkfactor < MAX_SHRINKFACTOR && - yshrinkfactor > MIN_SHRINKFACTOR && yshrinkfactor < MAX_SHRINKFACTOR ) { - xzoom = vml->xmapzoom; - yzoom = vml->xmapzoom; - } else { - g_warning ( "Cowardly refusing to draw tiles at a shrinkfactor more than %.3f (zoomed out) or less than %.3f (zoomed in).", 1/MIN_SHRINKFACTOR, 1/MAX_SHRINKFACTOR ); + xzoom = vml->xmapzoom; + yzoom = vml->xmapzoom; + if ( ! (xshrinkfactor > MIN_SHRINKFACTOR && xshrinkfactor < MAX_SHRINKFACTOR && + yshrinkfactor > MIN_SHRINKFACTOR && yshrinkfactor < MAX_SHRINKFACTOR ) ) { + if ( xshrinkfactor > REAL_MIN_SHRINKFACTOR && yshrinkfactor > REAL_MIN_SHRINKFACTOR ) + existence_only = TRUE; + else { + g_warning ( _("Cowardly refusing to draw tiles or existence of tiles beyond %d zoom out factor"), (int)( 1.0/REAL_MIN_SHRINKFACTOR)); + return; + } } } @@ -596,12 +625,14 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo guint max_path_len = strlen(vml->cache_dir) + 40; gchar *path_buf = g_malloc ( max_path_len * sizeof(char) ); - if ( vml->autodownload && should_start_autodownload(vml, vvp)) { - fprintf(stderr, "DEBUG: Starting autodownload\n"); + if ( (!existence_only) && vml->autodownload && should_start_autodownload(vml, vvp)) { +#ifdef DEBUG + fputs(stderr, "DEBUG: Starting autodownload\n"); +#endif start_download_thread ( vml, vvp, ul, br, REDOWNLOAD_NONE ); } - if ( map_type->tilesize_x == 0 ) { + if ( map_type->tilesize_x == 0 && !existence_only ) { for ( x = xmin; x <= xmax; x++ ) { for ( y = ymin; y <= ymax; y++ ) { ulm.x = x; @@ -630,6 +661,9 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo gint8 yinc = (ulm.y == ymin) ? 1 : -1; gdouble xx, yy; gint xx_tmp, yy_tmp; gint base_yy, xend, yend; + + GdkGC *black_gc = GTK_WIDGET(vvp)->style->black_gc; + xend = (xinc == 1) ? (xmax+1) : (xmin-1); yend = (yinc == 1) ? (ymax+1) : (ymin-1); @@ -646,9 +680,19 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo for ( y = ((yinc == 1) ? ymin : ymax); y != yend; y+=yinc ) { ulm.x = x; ulm.y = y; - pixbuf = get_pixbuf ( vml, mode, &ulm, path_buf, max_path_len, xshrinkfactor, yshrinkfactor ); - if ( pixbuf ) - vik_viewport_draw_pixbuf ( vvp, pixbuf, 0, 0, xx, yy, tilesize_x_ceil, tilesize_y_ceil ); + + if ( existence_only ) { + g_snprintf ( path_buf, max_path_len, DIRSTRUCTURE, + vml->cache_dir, mode, + ulm.scale, ulm.z, ulm.x, ulm.y ); + if ( g_file_test ( path_buf, G_FILE_TEST_EXISTS ) == TRUE ) { + vik_viewport_draw_line ( vvp, black_gc, xx+tilesize_x_ceil, yy, xx, yy+tilesize_y_ceil ); + } + } else { + pixbuf = get_pixbuf ( vml, mode, &ulm, path_buf, max_path_len, xshrinkfactor, yshrinkfactor ); + if ( pixbuf ) + vik_viewport_draw_pixbuf ( vvp, pixbuf, 0, 0, xx, yy, tilesize_x_ceil, tilesize_y_ceil ); + } yy += tilesize_y; } @@ -711,7 +755,9 @@ static void mdi_free ( MapDownloadInfo *mdi ) { g_mutex_free(mdi->mutex); g_free ( mdi->cache_dir ); + mdi->cache_dir = NULL; g_free ( mdi->filename_buf ); + mdi->filename_buf = NULL; g_free ( mdi ); } @@ -741,22 +787,22 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */ if ( mdi->redownload == REDOWNLOAD_ALL) - remove ( mdi->filename_buf ); + g_remove ( mdi->filename_buf ); - else if ( (mdi->redownload == REDOWNLOAD_BAD) && (access ( mdi->filename_buf, F_OK ) == 0) ) + else if ( (mdi->redownload == REDOWNLOAD_BAD) && (g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == TRUE) ) { /* see if this one is bad or what */ GError *gx = NULL; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file ( mdi->filename_buf, &gx ); if (gx || (!pixbuf)) - remove ( mdi->filename_buf ); + g_remove ( mdi->filename_buf ); if ( pixbuf ) g_object_unref ( pixbuf ); if ( gx ) g_error_free ( gx ); } - if ( access ( mdi->filename_buf, F_OK ) != 0 ) + if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) { need_download = TRUE; if (( mdi->redownload != REDOWNLOAD_NONE ) && @@ -801,9 +847,9 @@ static void mdi_cancel_cleanup ( MapDownloadInfo *mdi ) g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, mdi->cache_dir, MAPS_LAYER_NTH_TYPE(mdi->maptype)->uniq_id, mdi->mapcoord.scale, mdi->mapcoord.z, mdi->mapcoord.x, mdi->mapcoord.y ); - if ( access ( mdi->filename_buf, F_OK ) == 0) + if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == TRUE) { - remove ( mdi->filename_buf ); + g_remove ( mdi->filename_buf ); } } } @@ -854,7 +900,7 @@ static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const V g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, vml->cache_dir, map_type->uniq_id, ulm.scale, ulm.z, a, b ); - if ( access ( mdi->filename_buf, F_OK ) != 0) + if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) mdi->mapstoget++; } } @@ -864,8 +910,22 @@ static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const V if ( mdi->mapstoget ) { - gchar *tmp = g_strdup_printf ( "%s %s%d %s %s...", redownload ? "Redownloading" : "Downloading", redownload == REDOWNLOAD_BAD ? "up to " : "", mdi->mapstoget, MAPS_LAYER_NTH_LABEL(vml->maptype), (mdi->mapstoget == 1) ? "map" : "maps" ); + const gchar *tmp_str; + gchar *tmp; + if (redownload) + { + if (redownload == REDOWNLOAD_BAD) + tmp_str = ngettext("Redownloading up to %d %s map...", "Redownloading up to %d %s maps...", mdi->mapstoget); + else + tmp_str = ngettext("Redownloading %d %s map...", "Redownloading %d %s maps...", mdi->mapstoget); + } + else + { + tmp_str = ngettext("Downloading %d %s map...", "Downloading %d %s maps...", mdi->mapstoget); + } + tmp = g_strdup_printf ( tmp_str, mdi->mapstoget, MAPS_LAYER_NTH_LABEL(vml->maptype)); + g_object_weak_ref(G_OBJECT(mdi->vml), weak_ref_cb, mdi); /* launch the thread */ a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vml), /* parent window */ @@ -884,14 +944,12 @@ static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const V void maps_layer_download_section_without_redraw( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom) { - fprintf(stderr, "DEBUG: downloading ul= %f , %f br= %f , %f\n", - ul->north_south, ul->east_west, br->north_south, br->east_west); MapCoord ulm, brm; VikMapsLayer_MapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); if (!map_type->coord_to_mapcoord(ul, zoom, zoom, &ulm) || !map_type->coord_to_mapcoord(br, zoom, zoom, &brm)) { - fprintf(stderr, "%s() coord_to_mapcoord() failed\n", __PRETTY_FUNCTION__); + g_warning("%s() coord_to_mapcoord() failed", __PRETTY_FUNCTION__); return; } @@ -925,7 +983,7 @@ void maps_layer_download_section_without_redraw( VikMapsLayer *vml, VikViewport g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, vml->cache_dir, map_type->uniq_id, ulm.scale, ulm.z, i, j ); - if ( access ( mdi->filename_buf, F_OK ) != 0) + if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) mdi->mapstoget++; } } @@ -933,7 +991,12 @@ void maps_layer_download_section_without_redraw( VikMapsLayer *vml, VikViewport mdi->mapcoord.x = mdi->mapcoord.y = 0; /* for cleanup -- no current map */ if (mdi->mapstoget) { - gchar *tmp = g_strdup_printf ( "%s %d %s %s...", "Downloading", mdi->mapstoget, MAPS_LAYER_NTH_LABEL(vml->maptype), (mdi->mapstoget == 1) ? "map" : "maps" ); + gchar *tmp; + const gchar *fmt; + fmt = ngettext("Downloading %d %s map...", + "Downloading %d %s maps...", + mdi->mapstoget); + tmp = g_strdup_printf ( fmt, mdi->mapstoget, MAPS_LAYER_NTH_LABEL(vml->maptype) ); g_object_weak_ref(G_OBJECT(mdi->vml), weak_ref_cb, mdi); /* launch the thread */ @@ -987,11 +1050,11 @@ static gboolean maps_layer_download_release ( VikMapsLayer *vml, GdkEventButton GtkWidget *item; vml->dl_right_click_menu = GTK_MENU ( gtk_menu_new () ); - item = gtk_menu_item_new_with_label ( "Redownload bad map(s)" ); + item = gtk_menu_item_new_with_label ( _("Redownload bad map(s)") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_redownload_bad), vml ); gtk_menu_shell_append ( GTK_MENU_SHELL(vml->dl_right_click_menu), item ); - item = gtk_menu_item_new_with_label ( "Redownload all map(s)" ); + item = gtk_menu_item_new_with_label ( _("Redownload all map(s)") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_redownload_all), vml ); gtk_menu_shell_append ( GTK_MENU_SHELL(vml->dl_right_click_menu), item ); } @@ -1053,6 +1116,7 @@ static void download_onscreen_maps ( gpointer vml_vvp[2], gint redownload ) { VikMapsLayer *vml = vml_vvp[0]; VikViewport *vvp = vml_vvp[1]; + VikViewportDrawMode vp_drawmode = vik_viewport_get_drawmode ( vvp ); gdouble xzoom = vml->xmapzoom ? vml->xmapzoom : vik_viewport_get_xmpp ( vvp ); gdouble yzoom = vml->ymapzoom ? vml->ymapzoom : vik_viewport_get_ympp ( vvp ); @@ -1064,12 +1128,18 @@ static void download_onscreen_maps ( gpointer vml_vvp[2], gint redownload ) vik_viewport_screen_to_coord ( vvp, vik_viewport_get_width(vvp), vik_viewport_get_height(vvp), &br ); VikMapsLayer_MapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if ( map_type->drawmode == vik_viewport_get_drawmode ( vvp ) && + if ( map_type->drawmode == vp_drawmode && map_type->coord_to_mapcoord ( &ul, xzoom, yzoom, &ulm ) && map_type->coord_to_mapcoord ( &br, xzoom, yzoom, &brm ) ) start_download_thread ( vml, vvp, &ul, &br, redownload ); + else if (map_type->drawmode != vp_drawmode) { + const gchar *drawmode_name = vik_viewport_get_drawmode_name (vvp, map_type->drawmode); + gchar *err = g_strdup_printf(_("Wrong drawmode for this map.\nSelect \"%s\" from View menu and try again."), _(drawmode_name)); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vml), err ); + g_free(err); + } else - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vml), "Wrong drawmode / zoom level for this map." ); + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vml), _("Wrong zoom level for this map.") ); } @@ -1094,12 +1164,12 @@ static void maps_layer_add_menu_items ( VikMapsLayer *vml, GtkMenu *menu, VikLay gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( "Download Onscreen Maps" ); + item = gtk_menu_item_new_with_label ( _("Download Onscreen Maps") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_download_onscreen_maps), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( "Refresh Onscreen Tiles" ); + item = gtk_menu_item_new_with_label ( _("Refresh Onscreen Tiles") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_redownload_all_onscreen_maps), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item );