X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/6846aafb0e96db37ded043efebf86588a4974a24..e13ab673e45ea48de49661f7838e75925f405514:/src/vikmapslayer.c?ds=inline diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index c229ca6f..a6b2c3c1 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -2,6 +2,7 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2005, Evan Battaglia + * Copyright (C) 2010, Guilhem Bonnefille * UTM multi-zone stuff by Kit Transue * Dynamic map type by Guilhem Bonnefille * @@ -36,8 +37,13 @@ #include #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_MATH_H #include +#endif + #include "globals.h" #include "coords.h" #include "vikcoord.h" @@ -54,6 +60,7 @@ /* only for dialog.h -- ugh */ #include "vikwaypoint.h" #include "dialog.h" +#include "preferences.h" #include "vikstatus.h" #include "background.h" @@ -73,10 +80,10 @@ static GList *__map_types = NULL; #define NUM_MAP_TYPES g_list_length(__map_types) /* List of label for each map type */ -static GList *params_maptypes = NULL; +static gchar **params_maptypes = NULL; /* Corresponding IDS. (Cf. field uniq_id in VikMapsLayer struct) */ -static GList *params_maptypes_ids = NULL; +static guint *params_maptypes_ids = NULL; /******** MAPZOOMS *********/ @@ -103,6 +110,7 @@ static gpointer maps_layer_download_create ( VikWindow *vw, VikViewport *vvp ); static void maps_layer_set_cache_dir ( VikMapsLayer *vml, const gchar *dir ); static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const VikCoord *ul, const VikCoord *br, gint redownload ); static void maps_layer_add_menu_items ( VikMapsLayer *vml, GtkMenu *menu, VikLayersPanel *vlp ); +static guint map_uniq_id_to_index ( guint uniq_id ); static VikLayerParamScale params_scales[] = { @@ -111,11 +119,11 @@ static VikLayerParamScale params_scales[] = { }; VikLayerParam maps_layer_params[] = { - { "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 }, + { "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL }, + { "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory:"), VIK_LAYER_WIDGET_FOLDERENTRY }, { "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 }, + { "mapzoom", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Zoom Level:"), VIK_LAYER_WIDGET_COMBOBOX, params_mapzooms, NULL }, }; enum { PARAM_MAPTYPE=0, PARAM_CACHE_DIR, PARAM_ALPHA, PARAM_AUTODOWNLOAD, PARAM_MAPZOOM, NUM_PARAMS }; @@ -142,7 +150,7 @@ VikLayerInterface vik_maps_layer_interface = { (VikLayerFuncCreate) maps_layer_new, (VikLayerFuncRealize) NULL, - maps_layer_post_read, + (VikLayerFuncPostRead) maps_layer_post_read, (VikLayerFuncFree) maps_layer_free, (VikLayerFuncProperties) NULL, @@ -194,33 +202,61 @@ struct _VikMapsLayer { VikViewport *redownload_vvp; }; -enum { REDOWNLOAD_NONE = 0, REDOWNLOAD_BAD, REDOWNLOAD_ALL, DOWNLOAD_OR_REFRESH }; +enum { REDOWNLOAD_NONE = 0, /* download only missing maps */ + REDOWNLOAD_BAD, /* download missing and bad maps */ + REDOWNLOAD_NEW, /* download missing maps that are newer on server only */ + REDOWNLOAD_ALL, /* download all maps */ + DOWNLOAD_OR_REFRESH }; /* download missing maps and refresh cache */ +static VikLayerParam prefs[] = { + { VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default maplayer directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL }, +}; + +void maps_layer_init () +{ + VikLayerParamData tmp; + tmp.s = maps_layer_default_dir(); + a_preferences_register(prefs, tmp, VIKING_PREFERENCES_GROUP_KEY); +} /****************************************/ /******** MAPS LAYER TYPES **************/ /****************************************/ -void maps_layer_register_map_type ( const char *label, VikMapType *map_type ) +int _get_index_for_id ( guint id ) { - g_assert(label != NULL); - g_assert(map_type != NULL); - - guint id = vik_map_type_get_uniq_id(map_type); + int index = 0 ; + while (params_maptypes_ids[index] != 0) + { + if (params_maptypes_ids[index] == id) + return index; + index++; + } + return -1; +} +void _add_map_source ( guint id, const char *label, VikMapSource *map ) +{ + gsize len = 0; + if (params_maptypes) + len = g_strv_length (params_maptypes); /* Add the label */ - params_maptypes = g_list_append(params_maptypes, g_strdup(label)); + params_maptypes = g_realloc (params_maptypes, (len+2)*sizeof(gchar*)); + params_maptypes[len] = g_strdup (label); + params_maptypes[len+1] = NULL; /* Add the id */ - params_maptypes_ids = g_list_append(params_maptypes_ids, GUINT_TO_POINTER (id)); + params_maptypes_ids = g_realloc (params_maptypes_ids, (len+2)*sizeof(guint)); + params_maptypes_ids[len] = id; + params_maptypes_ids[len+1] = 0; /* We have to clone */ - VikMapType *clone = VIK_MAP_TYPE(g_object_ref(map_type)); + VikMapSource *clone = VIK_MAP_SOURCE(g_object_ref(map)); /* Register the clone in the list */ __map_types = g_list_append(__map_types, clone); /* Hack - We have to ensure the mode LayerParam reference the up-to-date + We have to ensure the mode LayerParam references the up-to-date GLists. */ /* @@ -231,9 +267,38 @@ void maps_layer_register_map_type ( const char *label, VikMapType *map_type ) maps_layer_params[0].extra_widget_data = params_maptypes_ids; } -#define MAPS_LAYER_NTH_LABEL(n) ((gchar*)g_list_nth_data(params_maptypes, (n))) -#define MAPS_LAYER_NTH_ID(n) ((guint)g_list_nth_data(params_maptypes_ids, (n))) -#define MAPS_LAYER_NTH_TYPE(n) (VIK_MAP_TYPE(g_list_nth_data(__map_types, (n)))) +void _update_map_source ( const char *label, VikMapSource *map, int index ) +{ + GList *item = g_list_nth (__map_types, index); + g_object_unref (item->data); + item->data = g_object_ref (map); + /* Change previous data */ + g_free (params_maptypes[index]); + params_maptypes[index] = g_strdup (label); +} + +void maps_layer_register_map_source ( VikMapSource *map ) +{ + g_assert(map != NULL); + + guint id = vik_map_source_get_uniq_id(map); + const char *label = vik_map_source_get_label(map); + g_assert(label != NULL); + + int previous = map_uniq_id_to_index (id); + if (previous != NUM_MAP_TYPES) + { + _update_map_source (label, map, previous); + } + else + { + _add_map_source (id, label, map); + } +} + +#define MAPS_LAYER_NTH_LABEL(n) (params_maptypes[n]) +#define MAPS_LAYER_NTH_ID(n) (params_maptypes_ids[n]) +#define MAPS_LAYER_NTH_TYPE(n) (VIK_MAP_SOURCE(g_list_nth_data(__map_types, (n)))) gint vik_maps_layer_get_map_type(VikMapsLayer *vml) { @@ -310,7 +375,7 @@ static void maps_layer_set_cache_dir ( VikMapsLayer *vml, const gchar *dir ) vml->cache_dir = NULL; if ( dir == NULL || dir[0] == '\0' ) - vml->cache_dir = g_strdup ( MAPS_CACHE_DIR ); + vml->cache_dir = g_strdup ( a_preferences_get(VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir")->s ); else { len = strlen(dir); @@ -362,14 +427,14 @@ GType vik_maps_layer_get_type () static guint map_index_to_uniq_id (guint8 index) { g_assert ( index < NUM_MAP_TYPES ); - return vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(index)); + return vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(index)); } static guint map_uniq_id_to_index ( guint uniq_id ) { gint i; for ( i = 0; i < NUM_MAP_TYPES; i++ ) - if ( vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(i)) == uniq_id ) + if ( vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(i)) == uniq_id ) return i; return NUM_MAP_TYPES; /* no such thing */ } @@ -401,7 +466,7 @@ static VikLayerParamData maps_layer_get_param ( VikMapsLayer *vml, guint16 id ) VikLayerParamData rv; switch ( id ) { - case PARAM_CACHE_DIR: rv.s = (vml->cache_dir && strcmp(vml->cache_dir, MAPS_CACHE_DIR) != 0) ? vml->cache_dir : ""; break; + case PARAM_CACHE_DIR: rv.s = vml->cache_dir ? vml->cache_dir : ""; break; case PARAM_MAPTYPE: rv.u = map_index_to_uniq_id ( vml->maptype ); break; case PARAM_ALPHA: rv.u = vml->alpha; break; case PARAM_AUTODOWNLOAD: rv.u = vml->autodownload; break; @@ -419,7 +484,7 @@ 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 ); - idx = map_uniq_id_to_index(7); /* 7 is id for google maps */ + idx = map_uniq_id_to_index(13); /* 13 is id for OSM Mapnik maps */ vml->maptype = (idx < NUM_MAP_TYPES) ? idx : 0; vml->alpha = 255; vml->mapzoom_id = 0; @@ -454,12 +519,12 @@ static void maps_layer_post_read (VikLayer *vl, VikViewport *vp, gboolean from_f * So, we can check if we have to inform the user about inconsistency */ VikViewportDrawMode vp_drawmode; VikMapsLayer *vml = VIK_MAPS_LAYER(vl); - VikMapType *map_type = NULL; + VikMapSource *map = NULL; vp_drawmode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ); - map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if (vik_map_type_get_drawmode(map_type) != vp_drawmode) { - const gchar *drawmode_name = vik_viewport_get_drawmode_name (VIK_VIEWPORT(vp), vik_map_type_get_drawmode(map_type)); + map = MAPS_LAYER_NTH_TYPE(vml->maptype); + if (vik_map_source_get_drawmode(map) != vp_drawmode) { + const gchar *drawmode_name = vik_viewport_get_drawmode_name (VIK_VIEWPORT(vp), vik_map_source_get_drawmode(map)); 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); @@ -512,7 +577,7 @@ static GdkPixbuf *pixbuf_shrink ( GdkPixbuf *pixbuf, gdouble xshrinkfactor, gdou { GdkPixbuf *tmp; guint16 width = gdk_pixbuf_get_width(pixbuf), height = gdk_pixbuf_get_height(pixbuf); - tmp = gdk_pixbuf_scale_simple(pixbuf, ceil(width * xshrinkfactor), ceil(height * yshrinkfactor), GDK_INTERP_BILINEAR); + tmp = gdk_pixbuf_scale_simple(pixbuf, ceil(width * xshrinkfactor), ceil(height * yshrinkfactor), GDK_INTERP_NEAREST); g_object_unref ( G_OBJECT(pixbuf) ); return tmp; } @@ -529,30 +594,30 @@ 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 ( g_file_test ( filename_buf, G_FILE_TEST_EXISTS ) == TRUE) { + if ( g_file_test ( filename_buf, G_FILE_TEST_EXISTS ) == TRUE) { GError *gx = NULL; pixbuf = gdk_pixbuf_new_from_file ( filename_buf, &gx ); + /* free the pixbuf on error */ 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_error_free ( gx ); - if ( pixbuf ) - g_object_unref ( G_OBJECT(pixbuf) ); - pixbuf = NULL; - } else { + g_error_free ( gx ); + if ( pixbuf ) + g_object_unref ( G_OBJECT(pixbuf) ); + pixbuf = NULL; + } else { if ( vml->alpha < 255 ) pixbuf = pixbuf_set_alpha ( pixbuf, vml->alpha ); if ( xshrinkfactor != 1.0 || yshrinkfactor != 1.0 ) pixbuf = pixbuf_shrink ( pixbuf, xshrinkfactor, yshrinkfactor ); a_mapcache_add ( pixbuf, mapcoord->x, mapcoord->y, - mapcoord->z, vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(vml->maptype)), + mapcoord->z, vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(vml->maptype)), mapcoord->scale, vml->alpha, xshrinkfactor, yshrinkfactor ); - } } } } @@ -609,15 +674,15 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo } /* coord -> ID */ - VikMapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if ( vik_map_type_coord_to_mapcoord ( map_type, ul, xzoom, yzoom, &ulm ) && - vik_map_type_coord_to_mapcoord ( map_type, br, xzoom, yzoom, &brm ) ) { + VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype); + if ( vik_map_source_coord_to_mapcoord ( map, ul, xzoom, yzoom, &ulm ) && + vik_map_source_coord_to_mapcoord ( map, br, xzoom, yzoom, &brm ) ) { /* loop & draw */ gint x, y; gint xmin = MIN(ulm.x, brm.x), xmax = MAX(ulm.x, brm.x); gint ymin = MIN(ulm.y, brm.y), ymax = MAX(ulm.y, brm.y); - gint mode = vik_map_type_get_uniq_id(map_type); + gint mode = vik_map_source_get_uniq_id(map); VikCoord coord; gint xx, yy, width, height; @@ -630,10 +695,15 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo #ifdef DEBUG fputs(stderr, "DEBUG: Starting autodownload\n"); #endif - start_download_thread ( vml, vvp, ul, br, REDOWNLOAD_NONE ); + if ( vik_map_source_supports_if_modified_since (map) ) + // Try to download newer tiles + start_download_thread ( vml, vvp, ul, br, REDOWNLOAD_NEW ); + else + // Download only missing tiles + start_download_thread ( vml, vvp, ul, br, REDOWNLOAD_NONE ); } - if ( vik_map_type_get_tilesize_x(map_type) == 0 && !existence_only ) { + if ( vik_map_source_get_tilesize_x(map) == 0 && !existence_only ) { for ( x = xmin; x <= xmax; x++ ) { for ( y = ymin; y <= ymax; y++ ) { ulm.x = x; @@ -643,7 +713,7 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo width = gdk_pixbuf_get_width ( pixbuf ); height = gdk_pixbuf_get_height ( pixbuf ); - vik_map_type_mapcoord_to_center_coord ( map_type, &ulm, &coord ); + vik_map_source_mapcoord_to_center_coord ( map, &ulm, &coord ); vik_viewport_coord_to_screen ( vvp, &coord, &xx, &yy ); xx -= (width/2); yy -= (height/2); @@ -653,8 +723,8 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo } } } else { /* tilesize is known, don't have to keep converting coords */ - gdouble tilesize_x = vik_map_type_get_tilesize_x(map_type) * xshrinkfactor; - gdouble tilesize_y = vik_map_type_get_tilesize_y(map_type) * yshrinkfactor; + gdouble tilesize_x = vik_map_source_get_tilesize_x(map) * xshrinkfactor; + gdouble tilesize_y = vik_map_source_get_tilesize_y(map) * yshrinkfactor; /* ceiled so tiles will be maximum size in the case of funky shrinkfactor */ gint tilesize_x_ceil = ceil ( tilesize_x ); gint tilesize_y_ceil = ceil ( tilesize_y ); @@ -668,7 +738,7 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo xend = (xinc == 1) ? (xmax+1) : (xmin-1); yend = (yinc == 1) ? (ymax+1) : (ymin-1); - vik_map_type_mapcoord_to_center_coord ( map_type, &ulm, &coord ); + vik_map_source_mapcoord_to_center_coord ( map, &ulm, &coord ); vik_viewport_coord_to_screen ( vvp, &coord, &xx_tmp, &yy_tmp ); xx = xx_tmp; yy = yy_tmp; /* above trick so xx,yy doubles. this is so shrinkfactors aren't rounded off @@ -690,9 +760,52 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo 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 ); + int scale_inc; + for (scale_inc = 0; scale_inc < 4; scale_inc ++) { + /* try with correct then smaller zooms */ + int scale_factor = 1 << scale_inc; /* 2^scale_inc */ + MapCoord ulm2 = ulm; + ulm2.x = ulm.x / scale_factor; + ulm2.y = ulm.y / scale_factor; + ulm2.scale = ulm.scale + scale_inc; + pixbuf = get_pixbuf ( vml, mode, &ulm2, path_buf, max_path_len, xshrinkfactor * scale_factor, yshrinkfactor * scale_factor ); + if ( pixbuf ) { + gint src_x = (ulm.x % scale_factor) * tilesize_x_ceil; + gint src_y = (ulm.y % scale_factor) * tilesize_y_ceil; +#ifdef DEBUG + printf("maps_layer_draw_section - x=%d, y=%d, z=%d, src_x=%d, src_y=%d, xx=%d, yy=%d - %x\n", ulm.x, ulm.y, ulm.scale, src_x, src_y, (int)xx, (int)yy, vvp); +#endif + vik_viewport_draw_pixbuf ( vvp, pixbuf, src_x, src_y, xx, yy, tilesize_x_ceil, tilesize_y_ceil ); + break; + } + } + if ( !pixbuf ) { + /* retry with bigger zooms */ + int scale_dec; + for (scale_dec = 1; scale_dec < 2; scale_dec ++) { + int pict_x, pict_y; + int scale_factor = 1 << scale_dec; /* 2^scale_dec */ + MapCoord ulm2 = ulm; + ulm2.x = ulm.x * scale_factor; + ulm2.y = ulm.y * scale_factor; + ulm2.scale = ulm.scale - scale_dec; + for (pict_x = 0; pict_x < scale_factor; pict_x ++) { + for (pict_y = 0; pict_y < scale_factor; pict_y ++) { + MapCoord ulm3 = ulm2; + ulm3.x += pict_x; + ulm3.y += pict_y; + pixbuf = get_pixbuf ( vml, mode, &ulm3, path_buf, max_path_len, xshrinkfactor / scale_factor, yshrinkfactor / scale_factor ); + if ( pixbuf ) { + gint src_x = 0; + gint src_y = 0; + gint dest_x = xx + pict_x * (tilesize_x_ceil / scale_factor); + gint dest_y = yy + pict_y * (tilesize_y_ceil / scale_factor); + vik_viewport_draw_pixbuf ( vvp, pixbuf, src_x, src_y, dest_x, dest_y, tilesize_x_ceil / scale_factor, tilesize_y_ceil / scale_factor ); + } + } + } + } + } } yy += tilesize_y; @@ -707,7 +820,7 @@ static void maps_layer_draw_section ( VikMapsLayer *vml, VikViewport *vvp, VikCo static void maps_layer_draw ( VikMapsLayer *vml, VikViewport *vvp ) { - if ( vik_map_type_get_drawmode(MAPS_LAYER_NTH_TYPE(vml->maptype)) == vik_viewport_get_drawmode ( vvp ) ) + if ( vik_map_source_get_drawmode(MAPS_LAYER_NTH_TYPE(vml->maptype)) == vik_viewport_get_drawmode ( vvp ) ) { VikCoord ul, br; @@ -770,8 +883,9 @@ static void weak_ref_cb(gpointer ptr, GObject * dead_vml) g_mutex_unlock(mdi->mutex); } -static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) +static int map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) { + void *handle = vik_map_source_download_handle_init(MAPS_LAYER_NTH_TYPE(mdi->maptype)); guint donemaps = 0; gint x, y; for ( x = mdi->x0; x <= mdi->xf; x++ ) @@ -781,11 +895,15 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) gboolean remove_mem_cache = FALSE; gboolean need_download = FALSE; g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, - mdi->cache_dir, vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), + mdi->cache_dir, vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), mdi->mapcoord.scale, mdi->mapcoord.z, x, y ); donemaps++; - a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */ + int res = a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */ + if (res != 0) { + vik_map_source_download_handle_cleanup(MAPS_LAYER_NTH_TYPE(mdi->maptype), handle); + return -1; + } if ( mdi->redownload == REDOWNLOAD_ALL) g_remove ( mdi->filename_buf ); @@ -811,20 +929,23 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) remove_mem_cache = TRUE; } else if ( mdi->redownload == DOWNLOAD_OR_REFRESH ) { remove_mem_cache = TRUE; + } else if ( mdi->redownload == REDOWNLOAD_NEW) { + need_download = TRUE; + remove_mem_cache = TRUE; } else continue; mdi->mapcoord.x = x; mdi->mapcoord.y = y; if (need_download) { - if ( vik_map_type_download( MAPS_LAYER_NTH_TYPE(mdi->maptype), &(mdi->mapcoord), mdi->filename_buf )) + if ( vik_map_source_download( MAPS_LAYER_NTH_TYPE(mdi->maptype), &(mdi->mapcoord), mdi->filename_buf, handle)) continue; } gdk_threads_enter(); g_mutex_lock(mdi->mutex); if (remove_mem_cache) - a_mapcache_remove_all_shrinkfactors ( x, y, mdi->mapcoord.z, vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), mdi->mapcoord.scale ); + a_mapcache_remove_all_shrinkfactors ( x, y, mdi->mapcoord.z, vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), mdi->mapcoord.scale ); if (mdi->refresh_display && mdi->map_layer_alive) { /* TODO: check if it's on visible area */ vik_layer_emit_update ( VIK_LAYER(mdi->vml) ); @@ -835,10 +956,12 @@ static void map_download_thread ( MapDownloadInfo *mdi, gpointer threaddata ) } } + vik_map_source_download_handle_cleanup(MAPS_LAYER_NTH_TYPE(mdi->maptype), handle); g_mutex_lock(mdi->mutex); if (mdi->map_layer_alive) g_object_weak_unref(G_OBJECT(mdi->vml), weak_ref_cb, mdi); g_mutex_unlock(mdi->mutex); + return 0; } static void mdi_cancel_cleanup ( MapDownloadInfo *mdi ) @@ -846,7 +969,7 @@ static void mdi_cancel_cleanup ( MapDownloadInfo *mdi ) if ( mdi->mapcoord.x || mdi->mapcoord.y ) { g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, - mdi->cache_dir, vik_map_type_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), + mdi->cache_dir, vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)), mdi->mapcoord.scale, mdi->mapcoord.z, mdi->mapcoord.x, mdi->mapcoord.y ); if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == TRUE) { @@ -860,9 +983,9 @@ static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const V gdouble xzoom = vml->xmapzoom ? vml->xmapzoom : vik_viewport_get_xmpp ( vvp ); gdouble yzoom = vml->ymapzoom ? vml->ymapzoom : vik_viewport_get_ympp ( vvp ); MapCoord ulm, brm; - VikMapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if ( vik_map_type_coord_to_mapcoord ( map_type, ul, xzoom, yzoom, &ulm ) - && vik_map_type_coord_to_mapcoord ( map_type, br, xzoom, yzoom, &brm ) ) + VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype); + if ( vik_map_source_coord_to_mapcoord ( map, ul, xzoom, yzoom, &ulm ) + && vik_map_source_coord_to_mapcoord ( map, br, xzoom, yzoom, &brm ) ) { MapDownloadInfo *mdi = g_malloc ( sizeof(MapDownloadInfo) ); gint a, b; @@ -899,7 +1022,7 @@ static void start_download_thread ( VikMapsLayer *vml, VikViewport *vvp, const V for ( b = mdi->y0; b <= mdi->yf; b++ ) { g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, - vml->cache_dir, vik_map_type_get_uniq_id(map_type), ulm.scale, + vml->cache_dir, vik_map_source_get_uniq_id(map), ulm.scale, ulm.z, a, b ); if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) mdi->mapstoget++; @@ -946,10 +1069,10 @@ 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) { MapCoord ulm, brm; - VikMapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); + VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype); - if (!vik_map_type_coord_to_mapcoord(map_type, ul, zoom, zoom, &ulm) - || !vik_map_type_coord_to_mapcoord(map_type, br, zoom, zoom, &brm)) { + if (!vik_map_source_coord_to_mapcoord(map, ul, zoom, zoom, &ulm) + || !vik_map_source_coord_to_mapcoord(map, br, zoom, zoom, &brm)) { g_warning("%s() coord_to_mapcoord() failed", __PRETTY_FUNCTION__); return; } @@ -982,7 +1105,7 @@ void maps_layer_download_section_without_redraw( VikMapsLayer *vml, VikViewport for (i = mdi->x0; i <= mdi->xf; i++) { for (j = mdi->y0; j <= mdi->yf; j++) { g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE, - vml->cache_dir, vik_map_type_get_uniq_id(map_type), ulm.scale, + vml->cache_dir, vik_map_source_get_uniq_id(map), ulm.scale, ulm.z, i, j ); if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) mdi->mapstoget++; @@ -1018,11 +1141,17 @@ static void maps_layer_redownload_bad ( VikMapsLayer *vml ) { start_download_thread ( vml, vml->redownload_vvp, &(vml->redownload_ul), &(vml->redownload_br), REDOWNLOAD_BAD ); } + static void maps_layer_redownload_all ( VikMapsLayer *vml ) { start_download_thread ( vml, vml->redownload_vvp, &(vml->redownload_ul), &(vml->redownload_br), REDOWNLOAD_ALL ); } +static void maps_layer_redownload_new ( VikMapsLayer *vml ) +{ + start_download_thread ( vml, vml->redownload_vvp, &(vml->redownload_ul), &(vml->redownload_br), REDOWNLOAD_NEW ); +} + static gboolean maps_layer_download_release ( VikMapsLayer *vml, GdkEventButton *event, VikViewport *vvp ) { if (!vml || vml->vl.type != VIK_LAYER_MAPS) @@ -1055,6 +1184,10 @@ static gboolean maps_layer_download_release ( VikMapsLayer *vml, GdkEventButton 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 new map(s)") ); + g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_redownload_new), 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)") ); 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 ); @@ -1077,9 +1210,9 @@ static gboolean maps_layer_download_click ( VikMapsLayer *vml, GdkEventButton *e MapCoord tmp; if (!vml || vml->vl.type != VIK_LAYER_MAPS) return FALSE; - VikMapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if ( vik_map_type_get_drawmode(map_type) == vik_viewport_get_drawmode ( vvp ) && - vik_map_type_coord_to_mapcoord ( map_type, vik_viewport_get_center ( vvp ), + VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype); + if ( vik_map_source_get_drawmode(map) == vik_viewport_get_drawmode ( vvp ) && + vik_map_source_coord_to_mapcoord ( map, vik_viewport_get_center ( vvp ), vml->xmapzoom ? vml->xmapzoom : vik_viewport_get_xmpp ( vvp ), vml->ymapzoom ? vml->ymapzoom : vik_viewport_get_ympp ( vvp ), &tmp ) ) { @@ -1128,13 +1261,13 @@ static void download_onscreen_maps ( gpointer vml_vvp[2], gint redownload ) vik_viewport_screen_to_coord ( vvp, 0, 0, &ul ); vik_viewport_screen_to_coord ( vvp, vik_viewport_get_width(vvp), vik_viewport_get_height(vvp), &br ); - VikMapType *map_type = MAPS_LAYER_NTH_TYPE(vml->maptype); - if ( vik_map_type_get_drawmode(map_type) == vp_drawmode && - vik_map_type_coord_to_mapcoord ( map_type, &ul, xzoom, yzoom, &ulm ) && - vik_map_type_coord_to_mapcoord ( map_type, &br, xzoom, yzoom, &brm ) ) + VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype); + if ( vik_map_source_get_drawmode(map) == vp_drawmode && + vik_map_source_coord_to_mapcoord ( map, &ul, xzoom, yzoom, &ulm ) && + vik_map_source_coord_to_mapcoord ( map, &br, xzoom, yzoom, &brm ) ) start_download_thread ( vml, vvp, &ul, &br, redownload ); - else if (vik_map_type_get_drawmode(map_type) != vp_drawmode) { - const gchar *drawmode_name = vik_viewport_get_drawmode_name (vvp, vik_map_type_get_drawmode(map_type)); + else if (vik_map_source_get_drawmode(map) != vp_drawmode) { + const gchar *drawmode_name = vik_viewport_get_drawmode_name (vvp, vik_map_source_get_drawmode(map)); 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); @@ -1144,11 +1277,16 @@ static void download_onscreen_maps ( gpointer vml_vvp[2], gint redownload ) } -static void maps_layer_download_onscreen_maps ( gpointer vml_vvp[2] ) +static void maps_layer_download_missing_onscreen_maps ( gpointer vml_vvp[2] ) { download_onscreen_maps( vml_vvp, REDOWNLOAD_NONE); } +static void maps_layer_download_new_onscreen_maps ( gpointer vml_vvp[2] ) +{ + download_onscreen_maps( vml_vvp, REDOWNLOAD_NEW); +} + static void maps_layer_redownload_all_onscreen_maps ( gpointer vml_vvp[2] ) { download_onscreen_maps( vml_vvp, REDOWNLOAD_ALL); @@ -1165,11 +1303,19 @@ 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") ); - g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_download_onscreen_maps), pass_along ); + item = gtk_menu_item_new_with_label ( _("Download missing Onscreen Maps") ); + g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_download_missing_onscreen_maps), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); + if ( vik_map_source_supports_if_modified_since (MAPS_LAYER_NTH_TYPE(vml->maptype)) ) { + item = gtk_menu_item_new_with_label ( _("Download new Onscreen Maps from server") ); + g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_download_new_onscreen_maps), pass_along ); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show ( item ); + } + + /* TODO Add GTK_STOCK_REFRESH icon */ 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);