#include "config.h"
#endif
+// TODO: Make these configurable
+#define MAX_TILES 1000
+
#define MAX_SHRINKFACTOR 8.0000001 /* zoom 1 viewing 8-tiles */
#define MIN_SHRINKFACTOR 0.0312499 /* zoom 32 viewing 1-tiles */
#include <math.h>
#endif
-#include "globals.h"
-#include "util.h"
-#include "coords.h"
-#include "vikcoord.h"
-#include "viktreeview.h"
-#include "vikviewport.h"
-#include "viklayer.h"
-#include "vikmapslayer.h"
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include "viking.h"
+#include "vikmapsourcedefault.h"
+#include "maputils.h"
#include "mapcache.h"
-/* only for dialog.h -- ugh */
-#include "vikwaypoint.h"
-#include "dialog.h"
-#include "preferences.h"
-
-#include "vikstatus.h"
#include "background.h"
-
-#include "vikaggregatelayer.h"
-#include "viklayerspanel.h"
-
-#include "mapcoord.h"
-#include "terraserver.h"
-
+#include "preferences.h"
+#include "vikmapslayer.h"
#include "icons/icons.h"
/****** MAP TYPES ******/
/******** MAPZOOMS *********/
-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 };
+static gchar *params_mapzooms[] = { N_("Use Viking Zoom Level"), "0.25", "0.5", "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, 0.5, 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, 0.5, 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 };
#define NUM_MAPZOOMS (sizeof(params_mapzooms)/sizeof(params_mapzooms[0]) - 1)
{ 0, 255, 3, 0 }, /* alpha */
};
+static VikLayerParamData mode_default ( void ) { return VIK_LPD_UINT ( 19 ); } // OSM MapQuest maps
+static VikLayerParamData directory_default ( void )
+{
+ VikLayerParamData data;
+ data.s = g_strdup ( a_preferences_get(VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir")->s );
+ return data;
+}
+static VikLayerParamData alpha_default ( void ) { return VIK_LPD_UINT ( 255 ); }
+static VikLayerParamData mapzoom_default ( void ) { return VIK_LPD_UINT ( 0 ); }
+
VikLayerParam maps_layer_params[] = {
- { "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, NULL },
+ { VIK_LAYER_MAPS, "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL, NULL, mode_default },
+ { VIK_LAYER_MAPS, "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL, NULL, directory_default },
+ { VIK_LAYER_MAPS, "alpha", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Alpha:"), VIK_LAYER_WIDGET_HSCALE, params_scales, NULL,
+ N_("Control the Alpha value for transparency effects"), alpha_default },
+ { VIK_LAYER_MAPS, "autodownload", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Autodownload maps:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, vik_lpd_true_default },
+ { VIK_LAYER_MAPS, "adlonlymissing", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Autodownload Only Gets Missing Maps:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL,
+ N_("Using this option avoids attempting to update already acquired tiles. This can be useful if you want to restrict the network usage, without having to resort to manual control. Only applies when 'Autodownload Maps' is on."), vik_lpd_false_default },
+ { VIK_LAYER_MAPS, "mapzoom", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Zoom Level:"), VIK_LAYER_WIDGET_COMBOBOX, params_mapzooms, NULL,
+ N_("Determines the method of displaying map tiles for the current zoom level. 'Viking Zoom Level' uses the best matching level, otherwise setting a fixed value will always use map tiles of the specified value regardless of the actual zoom level."),
+ mapzoom_default },
};
-enum { PARAM_MAPTYPE=0, PARAM_CACHE_DIR, PARAM_ALPHA, PARAM_AUTODOWNLOAD, PARAM_MAPZOOM, NUM_PARAMS };
+enum {
+ PARAM_MAPTYPE=0,
+ PARAM_CACHE_DIR,
+ PARAM_ALPHA,
+ PARAM_AUTODOWNLOAD,
+ PARAM_ONLYMISSING,
+ PARAM_MAPZOOM,
+ NUM_PARAMS
+};
static VikToolInterface maps_tools[] = {
- { 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 },
+ { { "MapsDownload", "vik-icon-Maps Download", N_("_Maps Download"), NULL, N_("Maps Download"), 0 },
+ (VikToolConstructorFunc) maps_layer_download_create,
+ NULL,
+ NULL,
+ NULL,
+ (VikToolMouseFunc) maps_layer_download_click,
+ NULL,
+ (VikToolMouseFunc) maps_layer_download_release,
+ NULL,
+ FALSE,
+ GDK_CURSOR_IS_PIXMAP, &cursor_mapdl_pixbuf },
};
VikLayerInterface vik_maps_layer_interface = {
+ "Map",
N_("Map"),
+ "<control><shift>M",
&vikmapslayer_pixbuf,
maps_tools,
(VikLayerFuncSublayerToggleVisible) NULL,
(VikLayerFuncSublayerTooltip) NULL,
(VikLayerFuncLayerTooltip) maps_layer_tooltip,
+ (VikLayerFuncLayerSelected) NULL,
(VikLayerFuncMarshall) maps_layer_marshall,
(VikLayerFuncUnmarshall) maps_layer_unmarshall,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
(VikLayerFuncDragDropRequest) NULL,
+
+ (VikLayerFuncSelectClick) NULL,
+ (VikLayerFuncSelectMove) NULL,
+ (VikLayerFuncSelectRelease) NULL,
+ (VikLayerFuncSelectedViewportMenu) NULL,
};
struct _VikMapsLayer {
gdouble xmapzoom, ymapzoom;
gboolean autodownload;
+ gboolean adl_only_missing;
VikCoord *last_center;
gdouble last_xmpp;
gdouble last_ympp;
GtkMenu *dl_right_click_menu;
VikCoord redownload_ul, redownload_br; /* right click menu only */
VikViewport *redownload_vvp;
+
+ gboolean license_notice_shown; // FALSE for new maps only, otherwise
+ // TRUE for saved maps & other layer changes as we don't need to show it again
};
enum { REDOWNLOAD_NONE = 0, /* download only missing 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 },
+ { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default map layer directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL, N_("Choose a directory to store cached Map tiles for this layer") },
};
void maps_layer_init ()
params_maptypes[index] = g_strdup (label);
}
+/**
+ * maps_layer_register_map_source:
+ * @map: the new VikMapSource
+ *
+ * Register a new VikMapSource.
+ * Override existing one (equality of id).
+ */
void maps_layer_register_map_source ( VikMapSource *map )
{
g_assert(map != NULL);
/******** CACHE DIR STUFF ***************/
/****************************************/
+#define DIRECTDIRACCESS "%s%d" G_DIR_SEPARATOR_S "%d" G_DIR_SEPARATOR_S "%d%s"
#define DIRSTRUCTURE "%st%ds%dz%d" G_DIR_SEPARATOR_S "%d" G_DIR_SEPARATOR_S "%d"
#define MAPS_CACHE_DIR maps_layer_default_dir()
#include <io.h>
#define GLOBAL_MAPS_DIR "C:\\VIKING-MAPS\\"
#define LOCAL_MAPS_DIR "VIKING-MAPS"
+#elif defined __APPLE__
+#include <stdlib.h>
+#define GLOBAL_MAPS_DIR "/Library/cache/Viking/maps/"
+#define LOCAL_MAPS_DIR "/Library/Application Support/Viking/viking-maps"
#else /* POSIX */
#include <stdlib.h>
#define GLOBAL_MAPS_DIR "/var/cache/maps/"
static gboolean maps_layer_set_param ( VikMapsLayer *vml, guint16 id, VikLayerParamData data, VikViewport *vvp, gboolean is_file_operation )
{
+ // When loading from a file don't need the license reminder
+ if ( is_file_operation )
+ vml->license_notice_shown = TRUE;
+
switch ( id )
{
case PARAM_CACHE_DIR: maps_layer_set_cache_dir ( vml, data.s ); break;
}
case PARAM_ALPHA: if ( data.u <= 255 ) vml->alpha = data.u; break;
case PARAM_AUTODOWNLOAD: vml->autodownload = data.b; break;
+ case PARAM_ONLYMISSING: vml->adl_only_missing = data.b; break;
case PARAM_MAPZOOM: if ( data.u < NUM_MAPZOOMS ) {
vml->mapzoom_id = data.u;
vml->xmapzoom = __mapzooms_x [data.u];
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;
+ case PARAM_ONLYMISSING: rv.u = vml->adl_only_missing; break;
case PARAM_MAPZOOM: rv.u = vml->mapzoom_id; break;
}
return rv;
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(13); /* 13 is id for OSM Mapnik maps */
- vml->maptype = (idx < NUM_MAP_TYPES) ? idx : 0;
- vml->alpha = 255;
- vml->mapzoom_id = 0;
+ vik_layer_set_type ( VIK_LAYER(vml), VIK_LAYER_MAPS );
+
+ vik_layer_set_defaults ( VIK_LAYER(vml), vvp );
+
vml->dl_tool_x = vml->dl_tool_y = -1;
- maps_layer_set_cache_dir ( vml, NULL );
- vml->autodownload = FALSE;
vml->last_center = NULL;
vml->last_xmpp = 0.0;
vml->last_ympp = 0.0;
vml->dl_right_click_menu = NULL;
+ vml->license_notice_shown = FALSE;
return vml;
}
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) );
+ g_object_ref_sink ( G_OBJECT(vml->dl_right_click_menu) );
g_free(vml->last_center);
vml->last_center = NULL;
}
VikMapsLayer *vml = VIK_MAPS_LAYER(vl);
VikMapSource *map = NULL;
- vp_drawmode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) );
+ vp_drawmode = vik_viewport_get_drawmode ( vp );
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));
+ const gchar *drawmode_name = vik_viewport_get_drawmode_name (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_WIDGET(vp), msg );
g_free(msg);
}
if (vik_map_source_get_license (map) != NULL) {
- a_dialog_license (VIK_GTK_WINDOW_FROM_WIDGET(vp), vik_map_source_get_label (map),
- vik_map_source_get_license (map), vik_map_source_get_license_url (map) );
+ if ( ! vml->license_notice_shown ) {
+ a_dialog_license (VIK_GTK_WINDOW_FROM_WIDGET(vp), vik_map_source_get_label (map),
+ vik_map_source_get_license (map), vik_map_source_get_license_url (map) );
+ vml->license_notice_shown = TRUE;
+ }
}
}
}
{
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_NEAREST);
+ tmp = gdk_pixbuf_scale_simple(pixbuf, ceil(width * xshrinkfactor), ceil(height * yshrinkfactor), GDK_INTERP_BILINEAR);
g_object_unref ( G_OBJECT(pixbuf) );
return tmp;
}
mode, mapcoord->scale, vml->alpha, xshrinkfactor, yshrinkfactor );
if ( ! pixbuf ) {
- g_snprintf ( filename_buf, buf_len, DIRSTRUCTURE,
- vml->cache_dir, mode,
- mapcoord->scale, mapcoord->z, mapcoord->x, mapcoord->y );
+ if ( vik_map_source_is_direct_file_access (MAPS_LAYER_NTH_TYPE(vml->maptype)) )
+ g_snprintf ( filename_buf, buf_len, DIRECTDIRACCESS,
+ vml->cache_dir, (17 - mapcoord->scale), mapcoord->x, mapcoord->y, ".png" );
+ else
+ 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)
{
GError *gx = NULL;
return pixbuf;
}
-gboolean should_start_autodownload(VikMapsLayer *vml, VikViewport *vvp)
+static gboolean should_start_autodownload(VikMapsLayer *vml, VikViewport *vvp)
{
const VikCoord *center = vik_viewport_get_center ( vvp );
/* D'n'D pan in action: do not download */
return FALSE;
+ // TEMPORARY HACK
+ // Prevent requests for downloading tiles at Zoom Level 19 and above for most map types
+ // Allow MapQuest Zoom Level up to 19
+ // TODO: This should be made a property of the map source and then use that value
+ gdouble xzoom = vik_viewport_get_xmpp ( vvp );
+ if ( (vml->maptype != 19 && map_utils_mpp_to_scale (xzoom) < -1) || (vml->maptype == 19 && map_utils_mpp_to_scale (xzoom) < -2) )
+ return FALSE;
+
if (vml->last_center == NULL) {
VikCoord *new_center = g_malloc(sizeof(VikCoord));
*new_center = *center;
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;
+ gboolean existence_only = FALSE;
if ( vml->xmapzoom && (vml->xmapzoom != xzoom || vml->ymapzoom != yzoom) ) {
xshrinkfactor = vml->xmapzoom / xzoom;
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 )
+ if ( xshrinkfactor > REAL_MIN_SHRINKFACTOR && yshrinkfactor > REAL_MIN_SHRINKFACTOR ) {
+ g_debug ( "%s: existence_only due to SHRINKFACTORS", __FUNCTION__ );
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;
gint xx, yy, width, height;
GdkPixbuf *pixbuf;
+ // Prevent the program grinding to a halt if trying to deal with thousands of tiles
+ // which can happen when using a small fixed zoom level and viewing large areas.
+ // Also prevents very large number of tile download requests
+ gint tiles = (xmax-xmin) * (ymax-ymin);
+ if ( tiles > MAX_TILES ) {
+ g_debug ( "%s: existence_only due to wanting too many tiles (%d)", __FUNCTION__, tiles );
+ existence_only = TRUE;
+ }
+
guint max_path_len = strlen(vml->cache_dir) + 40;
gchar *path_buf = g_malloc ( max_path_len * sizeof(char) );
if ( (!existence_only) && vml->autodownload && should_start_autodownload(vml, vvp)) {
g_debug("%s: Starting autodownload", __FUNCTION__);
- if ( vik_map_source_supports_download_only_new (map) )
+ if ( !vml->adl_only_missing && vik_map_source_supports_download_only_new (map) )
// Try to download newer tiles
start_download_thread ( vml, vvp, ul, br, REDOWNLOAD_NEW );
else
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);
ulm.y = y;
if ( existence_only ) {
- g_snprintf ( path_buf, max_path_len, DIRSTRUCTURE,
- vml->cache_dir, mode,
- ulm.scale, ulm.z, ulm.x, ulm.y );
+ if ( vik_map_source_is_direct_file_access (MAPS_LAYER_NTH_TYPE(vml->maptype)) )
+ g_snprintf ( path_buf, max_path_len, DIRECTDIRACCESS,
+ vml->cache_dir, (17 - ulm.scale), ulm.x, ulm.y, ".png" );
+ else
+ 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 ) {
+ GdkGC *black_gc = gtk_widget_get_style(GTK_WIDGET(vvp))->black_gc;
vik_viewport_draw_line ( vvp, black_gc, xx+tilesize_x_ceil, yy, xx, yy+tilesize_y_ceil );
}
} else {
VikCoord ul, br;
/* Copyright */
- const gchar *copyright = vik_map_source_get_copyright ( MAPS_LAYER_NTH_TYPE(vml->maptype) );
- vik_viewport_add_copyright ( vvp, copyright );
+ gdouble level = vik_viewport_get_zoom ( vvp );
+ LatLonBBox bbox;
+ vik_viewport_get_min_max_lat_lon ( vvp, &bbox.south, &bbox.north, &bbox.west, &bbox.east );
+ vik_map_source_get_copyright ( MAPS_LAYER_NTH_TYPE(vml->maptype), bbox, level, vik_viewport_add_copyright, vvp );
+
+ /* Logo */
+ const GdkPixbuf *logo = vik_map_source_get_logo ( MAPS_LAYER_NTH_TYPE(vml->maptype) );
+ vik_viewport_add_logo ( vvp, logo );
/* get corner coords */
if ( vik_viewport_get_coord_mode ( vvp ) == VIK_COORD_UTM && ! vik_viewport_is_one_zone ( vvp ) ) {
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_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) );
+ vik_layer_emit_update ( VIK_LAYER(mdi->vml) ); // NB update display from background
}
g_mutex_unlock(mdi->mutex);
- gdk_threads_leave();
mdi->mapcoord.x = mdi->mapcoord.y = 0; /* we're temporarily between downloads */
}
gdouble yzoom = vml->ymapzoom ? vml->ymapzoom : vik_viewport_get_ympp ( vvp );
MapCoord ulm, brm;
VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype);
+
+ // Don't ever attempt download on direct access
+ if ( vik_map_source_is_direct_file_access ( map ) )
+ return;
+
if ( vik_map_source_coord_to_mapcoord ( map, ul, xzoom, yzoom, &ulm )
&& vik_map_source_coord_to_mapcoord ( map, br, xzoom, yzoom, &brm ) )
{
}
}
-void maps_layer_download_section_without_redraw( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom)
+void maps_layer_download_section ( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom)
{
MapCoord ulm, brm;
VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype);
+ // Don't ever attempt download on direct access
+ if ( vik_map_source_is_direct_file_access ( map ) )
+ return;
+
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__);
mdi->vvp = vvp;
mdi->map_layer_alive = TRUE;
mdi->mutex = g_mutex_new();
- mdi->refresh_display = FALSE;
+ mdi->refresh_display = TRUE;
mdi->cache_dir = g_strdup ( vml->cache_dir );
mdi->maxlen = strlen ( vml->cache_dir ) + 40;
start_download_thread ( vml, vml->redownload_vvp, &(vml->redownload_ul), &(vml->redownload_br), REDOWNLOAD_NEW );
}
+/**
+ * Display a simple dialog with information about this particular map tile
+ */
+static void maps_layer_tile_info ( VikMapsLayer *vml )
+{
+ VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype);
+
+ gdouble xzoom = vml->xmapzoom ? vml->xmapzoom : vik_viewport_get_xmpp ( vml->redownload_vvp );
+ gdouble yzoom = vml->ymapzoom ? vml->ymapzoom : vik_viewport_get_ympp ( vml->redownload_vvp );
+ MapCoord ulm;
+
+ if ( !vik_map_source_coord_to_mapcoord ( map, &(vml->redownload_ul), xzoom, yzoom, &ulm ) )
+ return;
+
+ gchar *filename = NULL;
+ gchar *message = NULL;
+ gchar *source = NULL;
+
+ if ( vik_map_source_is_direct_file_access ( map ) ) {
+ filename = g_strdup_printf ( DIRECTDIRACCESS, vml->cache_dir, ulm.scale, ulm.x, ulm.y, ".png" );
+ source = g_strconcat ( "file://", filename, NULL );
+ }
+ else {
+ filename = g_strdup_printf ( DIRSTRUCTURE, vml->cache_dir, vik_map_source_get_uniq_id(map), ulm.scale, ulm.z, ulm.x, ulm.y );
+ source = g_strdup_printf ( "http://%s%s",
+ vik_map_source_default_get_hostname ( VIK_MAP_SOURCE_DEFAULT(map) ),
+ vik_map_source_default_get_uri ( VIK_MAP_SOURCE_DEFAULT(map), &ulm ) );
+ }
+
+ if ( g_file_test ( filename, G_FILE_TEST_EXISTS ) ) {
+
+ // Get some timestamp information of the tile
+ struct stat stat_buf;
+ if ( g_stat ( filename, &stat_buf ) == 0 ) {
+ time_t file_time = stat_buf.st_mtime;
+#if GLIB_CHECK_VERSION(2,26,0)
+ GDateTime* gdt = g_date_time_new_from_unix_utc ( file_time );
+ gchar *time = g_date_time_format ( gdt, "%c" );
+#else
+ GDate* gdate = g_date_new ();
+ g_date_set_time_t ( gdate, file_time );
+ char time[32];
+ g_date_strftime ( time, sizeof(time), "%c", gdate );
+ g_date_free ( gdate );
+#endif
+ message = g_strdup_printf ( _("\nSource: %s\n\nTile File: %s\nTile File Timestamp: %s"), source, filename, time );
+
+#if GLIB_CHECK_VERSION(2,26,0)
+ g_free ( time );
+ g_date_time_unref ( gdt);
+#endif
+ }
+ }
+ else
+ message = g_strdup_printf ( _("Source: %s\n\nNo Tile File!"), source );
+
+ // Show the info
+ a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_LAYER(vml), message );
+
+ g_free ( message );
+ g_free ( source );
+ g_free ( filename );
+}
+
static gboolean maps_layer_download_release ( VikMapsLayer *vml, GdkEventButton *event, VikViewport *vvp )
{
if (!vml || vml->vl.type != VIK_LAYER_MAPS)
item = gtk_menu_item_new_with_mnemonic ( _("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 );
+
+ item = gtk_image_menu_item_new_with_mnemonic ( _("_Show Tile Information") );
+ gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU) );
+ g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(maps_layer_tile_info), vml );
+ gtk_menu_shell_append (GTK_MENU_SHELL(vml->dl_right_click_menu), item);
}
gtk_menu_popup ( vml->dl_right_click_menu, NULL, NULL, NULL, NULL, event->button, event->time );
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show ( item );
}
+
+/**
+ * Enable downloading maps of the current screen area either 'new' or 'everything'
+ */
+void vik_maps_layer_download ( VikMapsLayer *vml, VikViewport *vvp, gboolean only_new )
+{
+ if ( !vml ) return;
+ if ( !vvp ) return;
+
+ static gpointer pass_along[2];
+ pass_along[0] = vml;
+ pass_along[1] = vvp;
+
+ if ( only_new )
+ // Get only new maps
+ maps_layer_download_new_onscreen_maps ( pass_along );
+ else
+ // Redownload everything
+ maps_layer_redownload_all_onscreen_maps ( pass_along );
+}
projects / andy / viking.git / blobdiff