{ 0, 255, 3, 0 }, /* alpha */
};
-static VikLayerParamData mode_default ( void ) { return VIK_LPD_UINT ( 19 ); } // OSM MapQuest maps
+static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( 19 ); } // OSM MapQuest maps
static VikLayerParamData directory_default ( void )
{
VikLayerParamData data;
static VikLayerParamData alpha_default ( void ) { return VIK_LPD_UINT ( 255 ); }
static VikLayerParamData mapzoom_default ( void ) { return VIK_LPD_UINT ( 0 ); }
+static gchar *cache_types[] = { "Viking", N_("OSM"), NULL };
+static VikMapsCacheLayout cache_layout_default_value = VIK_MAPS_CACHE_LAYOUT_VIKING;
+static VikLayerParamData cache_layout_default ( void ) { return VIK_LPD_UINT ( cache_layout_default_value ); }
+
VikLayerParam maps_layer_params[] = {
- { VIK_LAYER_MAPS, "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL, NULL, mode_default, NULL, NULL },
+ // NB mode => id - But can't break file format just to rename something better
+ { VIK_LAYER_MAPS, "mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map Type:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL, NULL, id_default, NULL, NULL },
{ VIK_LAYER_MAPS, "directory", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Maps Directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL, NULL, directory_default, NULL, NULL },
+ { VIK_LAYER_MAPS, "cache_type", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Cache Layout:"), VIK_LAYER_WIDGET_COMBOBOX, cache_types, NULL,
+ N_("This determines the tile storage layout on disk"), cache_layout_default, NULL, NULL },
{ VIK_LAYER_MAPS, "mapfile", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Map File:"), VIK_LAYER_WIDGET_FILEENTRY, GINT_TO_POINTER(VF_FILTER_MBTILES), NULL,
N_("An MBTiles file. Only applies when the map type method is 'MBTiles'"), file_default, NULL, NULL },
{ VIK_LAYER_MAPS, "alpha", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Alpha:"), VIK_LAYER_WIDGET_HSCALE, params_scales, NULL,
enum {
PARAM_MAPTYPE=0,
PARAM_CACHE_DIR,
+ PARAM_CACHE_LAYOUT,
PARAM_FILE,
PARAM_ALPHA,
PARAM_AUTODOWNLOAD,
maps_layer_params[PARAM_AUTODOWNLOAD].default_value = vik_lpd_false_default;
}
+void maps_layer_set_cache_default ( VikMapsCacheLayout layout )
+{
+ // Override default value returned by the default param function
+ cache_layout_default_value = layout;
+}
+
static VikToolInterface maps_tools[] = {
{ { "MapsDownload", "vik-icon-Maps Download", N_("_Maps Download"), NULL, N_("Maps Download"), 0 },
(VikToolConstructorFunc) maps_layer_download_create,
VikLayer vl;
guint maptype;
gchar *cache_dir;
+ VikMapsCacheLayout cache_layout;
guint8 alpha;
guint mapzoom_id;
gdouble xmapzoom, ymapzoom;
/******** MAPS LAYER TYPES **************/
/****************************************/
-void _add_map_source ( guint id, const char *label, VikMapSource *map )
+void _add_map_source ( guint16 id, const char *label, VikMapSource *map )
{
gsize len = 0;
if (params_maptypes)
{
g_assert(map != NULL);
- guint id = vik_map_source_get_uniq_id(map);
+ guint16 id = vik_map_source_get_uniq_id(map);
const char *label = vik_map_source_get_label(map);
g_assert(label != NULL);
/****************************************/
#define DIRECTDIRACCESS "%s%d" G_DIR_SEPARATOR_S "%d" G_DIR_SEPARATOR_S "%d%s"
+#define DIRECTDIRACCESS_WITH_NAME "%s%s" G_DIR_SEPARATOR_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()
switch ( id )
{
case PARAM_CACHE_DIR: maps_layer_set_cache_dir ( vml, data.s ); break;
+ case PARAM_CACHE_LAYOUT: if ( data.u < VIK_MAPS_CACHE_LAYOUT_NUM ) vml->cache_layout = data.u; break;
case PARAM_FILE: maps_layer_set_file ( vml, data.s ); break;
case PARAM_MAPTYPE: {
gint maptype = map_uniq_id_to_index(data.u);
rv.s = vml->cache_dir ? vml->cache_dir : "";
break;
}
+ case PARAM_CACHE_LAYOUT: rv.u = vml->cache_layout; break;
case PARAM_FILE: rv.s = vml->filename; break;
case PARAM_MAPTYPE: rv.u = map_index_to_uniq_id ( vml->maptype ); break;
case PARAM_ALPHA: rv.u = vml->alpha; break;
if ( w3 ) gtk_widget_set_sensitive ( w3, sensitive );
if ( w4 ) gtk_widget_set_sensitive ( w4, sensitive );
+ // Cache type not applicable either
+ GtkWidget *w9 = ww1[PARAM_CACHE_LAYOUT];
+ GtkWidget *w10 = ww2[PARAM_CACHE_LAYOUT];
+ if ( w9 ) gtk_widget_set_sensitive ( w9, sensitive );
+ if ( w10 ) gtk_widget_set_sensitive ( w10, sensitive );
+
// File only applicable for MBTiles type
// Directory for all other types
sensitive = ( 23 == vlpd.u);
return pixbuf;
}
-static GdkPixbuf *get_pixbuf( VikMapsLayer *vml, gint mode, MapCoord *mapcoord, gchar *filename_buf, gint buf_len, gdouble xshrinkfactor, gdouble yshrinkfactor )
+static void get_filename ( const gchar *cache_dir,
+ VikMapsCacheLayout cl,
+ guint16 id,
+ const gchar *name,
+ gint scale,
+ gint z,
+ gint x,
+ gint y,
+ gchar *filename_buf,
+ gint buf_len )
+{
+ switch ( cl ) {
+ case VIK_MAPS_CACHE_LAYOUT_OSM:
+ if ( name ) {
+ if ( g_strcmp0 ( cache_dir, MAPS_CACHE_DIR ) )
+ // Cache dir not the default - assume it's been directed somewhere specific
+ g_snprintf ( filename_buf, buf_len, DIRECTDIRACCESS, cache_dir, (17 - scale), x, y, ".png" );
+ else
+ // Using default cache - so use the map name in the directory path
+ g_snprintf ( filename_buf, buf_len, DIRECTDIRACCESS_WITH_NAME, cache_dir, name, (17 - scale), x, y, ".png" );
+ }
+ else
+ g_snprintf ( filename_buf, buf_len, DIRECTDIRACCESS, cache_dir, (17 - scale), x, y, ".png" );
+ break;
+ default:
+ g_snprintf ( filename_buf, buf_len, DIRSTRUCTURE, cache_dir, id, scale, z, x, y );
+ break;
+ }
+}
+
+static GdkPixbuf *get_pixbuf( VikMapsLayer *vml, guint16 id, const gchar* mapname, MapCoord *mapcoord, gchar *filename_buf, gint buf_len, gdouble xshrinkfactor, gdouble yshrinkfactor )
{
GdkPixbuf *pixbuf;
/* get the thing */
pixbuf = a_mapcache_get ( mapcoord->x, mapcoord->y, mapcoord->z,
- mode, mapcoord->scale, vml->alpha, xshrinkfactor, yshrinkfactor, vml->filename );
+ id, mapcoord->scale, vml->alpha, xshrinkfactor, yshrinkfactor, vml->filename );
if ( ! pixbuf ) {
if ( vik_map_source_is_direct_file_access (MAPS_LAYER_NTH_TYPE(vml->maptype)) ) {
return pixbuf;
}
else
- g_snprintf ( filename_buf, buf_len, DIRECTDIRACCESS,
- vml->cache_dir, (17 - mapcoord->scale), mapcoord->x, mapcoord->y, ".png" );
+ get_filename ( vml->cache_dir, VIK_MAPS_CACHE_LAYOUT_OSM, id, NULL,
+ mapcoord->scale, mapcoord->z, mapcoord->x, mapcoord->y, filename_buf, buf_len );
}
else
- g_snprintf ( filename_buf, buf_len, DIRSTRUCTURE,
- vml->cache_dir, mode,
- mapcoord->scale, mapcoord->z, mapcoord->x, mapcoord->y );
+ get_filename ( vml->cache_dir, vml->cache_layout, id, mapname,
+ mapcoord->scale, mapcoord->z, mapcoord->x, mapcoord->y, filename_buf, buf_len );
if ( g_file_test ( filename_buf, G_FILE_TEST_EXISTS ) == TRUE)
{
/* 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
+ // Don't attempt to download unsupported zoom levels
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) )
+ VikMapSource *map = MAPS_LAYER_NTH_TYPE(vml->maptype);
+ guint8 zl = map_utils_mpp_to_zoom_level ( xzoom );
+ if ( zl < vik_map_source_get_zoom_min(map) || zl > vik_map_source_get_zoom_max(map) )
return FALSE;
if (vml->last_center == NULL) {
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_source_get_uniq_id(map);
+ guint16 id = vik_map_source_get_uniq_id(map);
+ const gchar *mapname = vik_map_source_get_name(map);
VikCoord coord;
gint xx, yy, width, height;
for ( y = ymin; y <= ymax; y++ ) {
ulm.x = x;
ulm.y = y;
- pixbuf = get_pixbuf ( vml, mode, &ulm, path_buf, max_path_len, xshrinkfactor, yshrinkfactor );
+ pixbuf = get_pixbuf ( vml, id, mapname, &ulm, path_buf, max_path_len, xshrinkfactor, yshrinkfactor );
if ( pixbuf ) {
width = gdk_pixbuf_get_width ( pixbuf );
height = gdk_pixbuf_get_height ( pixbuf );
ulm.y = y;
if ( existence_only ) {
- 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 ( vik_map_source_is_direct_file_access (MAPS_LAYER_NTH_TYPE(vml->maptype)) )
+ get_filename ( vml->cache_dir, VIK_MAPS_CACHE_LAYOUT_OSM, id, vik_map_source_get_name(map),
+ ulm.scale, ulm.z, ulm.x, ulm.y, path_buf, max_path_len );
+ else
+ get_filename ( vml->cache_dir, vml->cache_layout, id, vik_map_source_get_name(map),
+ ulm.scale, ulm.z, ulm.x, ulm.y, path_buf, max_path_len );
+
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 );
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 );
+ pixbuf = get_pixbuf ( vml, id, mapname, &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;
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 );
+ pixbuf = get_pixbuf ( vml, id, mapname, &ulm3, path_buf, max_path_len, xshrinkfactor / scale_factor, yshrinkfactor / scale_factor );
if ( pixbuf ) {
gint src_x = 0;
gint src_y = 0;
typedef struct {
gchar *cache_dir;
gchar *filename_buf;
+ VikMapsCacheLayout cache_layout;
gint x0, y0, xf, yf;
MapCoord mapcoord;
gint maptype;
{
gboolean remove_mem_cache = FALSE;
gboolean need_download = FALSE;
- g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE,
- mdi->cache_dir, vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)),
- mdi->mapcoord.scale, mdi->mapcoord.z, x, y );
+
+ get_filename ( mdi->cache_dir, mdi->cache_layout,
+ vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)),
+ vik_map_source_get_name(MAPS_LAYER_NTH_TYPE(mdi->maptype)),
+ mdi->mapcoord.scale, mdi->mapcoord.z, x, y, mdi->filename_buf, mdi->maxlen );
donemaps++;
int res = a_background_thread_progress ( threaddata, ((gdouble)donemaps) / mdi->mapstoget ); /* this also calls testcancel */
{
if ( mdi->mapcoord.x || mdi->mapcoord.y )
{
- g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE,
- 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 );
+ get_filename ( mdi->cache_dir, mdi->cache_layout,
+ vik_map_source_get_uniq_id(MAPS_LAYER_NTH_TYPE(mdi->maptype)),
+ vik_map_source_get_name(MAPS_LAYER_NTH_TYPE(mdi->maptype)),
+ mdi->mapcoord.scale, mdi->mapcoord.z, mdi->mapcoord.x, mdi->mapcoord.y, mdi->filename_buf, mdi->maxlen );
if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == TRUE)
{
g_remove ( mdi->filename_buf );
mdi->cache_dir = g_strdup ( vml->cache_dir );
mdi->maxlen = strlen ( vml->cache_dir ) + 40;
mdi->filename_buf = g_malloc ( mdi->maxlen * sizeof(gchar) );
+ mdi->cache_layout = vml->cache_layout;
mdi->maptype = vml->maptype;
mdi->mapcoord = ulm;
{
for ( b = mdi->y0; b <= mdi->yf; b++ )
{
- g_snprintf ( mdi->filename_buf, mdi->maxlen, DIRSTRUCTURE,
- vml->cache_dir, vik_map_source_get_uniq_id(map), ulm.scale,
- ulm.z, a, b );
+ get_filename ( mdi->cache_dir, mdi->cache_layout,
+ vik_map_source_get_uniq_id(map),
+ vik_map_source_get_name(map),
+ ulm.scale, ulm.z, a, b, mdi->filename_buf, mdi->maxlen );
if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE )
mdi->mapstoget++;
}
mdi->maxlen = strlen ( vml->cache_dir ) + 40;
mdi->filename_buf = g_malloc ( mdi->maxlen * sizeof(gchar) );
mdi->maptype = vml->maptype;
+ mdi->cache_layout = vml->cache_layout;
mdi->mapcoord = ulm;
mdi->redownload = download_method;
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_source_get_uniq_id(map), ulm.scale,
- ulm.z, i, j );
+ get_filename ( mdi->cache_dir, mdi->cache_layout,
+ vik_map_source_get_uniq_id(map),
+ vik_map_source_get_name(map),
+ ulm.scale, ulm.z, i, j, mdi->filename_buf, mdi->maxlen );
if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE )
mdi->mapstoget++;
}
#endif
}
else {
- filename = g_strdup_printf ( DIRECTDIRACCESS, vml->cache_dir, ulm.scale, ulm.x, ulm.y, ".png" );
+ guint max_path_len = strlen(vml->cache_dir) + 40;
+ filename = g_malloc ( max_path_len * sizeof(char) );
+ get_filename ( vml->cache_dir, VIK_MAPS_CACHE_LAYOUT_OSM,
+ vik_map_source_get_uniq_id(map),
+ NULL,
+ ulm.scale, ulm.z, ulm.x, ulm.y, filename, max_path_len );
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 );
+ guint max_path_len = strlen(vml->cache_dir) + 40;
+ filename = g_malloc ( max_path_len * sizeof(char) );
+ get_filename ( vml->cache_dir, vml->cache_layout,
+ vik_map_source_get_uniq_id(map),
+ vik_map_source_get_name(map),
+ ulm.scale, ulm.z, ulm.x, ulm.y, filename, max_path_len );
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 ) );
mdi->maxlen = strlen ( vml->cache_dir ) + 40;
mdi->filename_buf = g_malloc ( mdi->maxlen * sizeof(gchar) );
mdi->maptype = vml->maptype;
+ mdi->cache_layout = vml->cache_layout;
mdi->mapcoord = ulm;
mdi->redownload = redownload;
/* calculate how many we need */
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_source_get_uniq_id(map), ulm.scale,
- ulm.z, i, j );
+ get_filename ( mdi->cache_dir, mdi->cache_layout,
+ vik_map_source_get_uniq_id(map),
+ vik_map_source_get_name(map),
+ ulm.scale, ulm.z, i, j, mdi->filename_buf, mdi->maxlen );
if ( mdi->redownload == REDOWNLOAD_NEW ) {
// Assume the worst - always a new file
// Absolute value would requires server lookup - but that is too slow
mdi->mapstoget++;
- }
+ }
else {
if ( g_file_test ( mdi->filename_buf, G_FILE_TEST_EXISTS ) == FALSE ) {
// Missing
projects / andy / viking.git / blobdiff