X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/fc589d03c2e24cca56c03eed0864a2641ece788d..c562f8f0fa459970696c9bc2110066e8ebf3bdf2:/src/vikmapslayer.h?ds=inline

diff --git a/src/vikmapslayer.h b/src/vikmapslayer.h
index a52c6039..3dbfeaee 100644
--- a/src/vikmapslayer.h
+++ b/src/vikmapslayer.h
@@ -29,6 +29,8 @@
 #include "mapcoord.h"
 #include "vikmapslayer_compat.h"
 
+G_BEGIN_DECLS
+
 #define VIK_MAPS_LAYER_TYPE            (vik_maps_layer_get_type ())
 #define VIK_MAPS_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_MAPS_LAYER_TYPE, VikMapsLayer))
 #define VIK_MAPS_LAYER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_MAPS_LAYER_TYPE, VikMapsLayerClass))
@@ -45,11 +47,29 @@ GType vik_maps_layer_get_type ();
 
 typedef struct _VikMapsLayer VikMapsLayer;
 
+typedef enum {
+  VIK_MAPS_CACHE_LAYOUT_VIKING=0, // CacheDir/t<MapId>s<VikingZoom>z0/X/Y (NB no file extension) - Legacy default layout
+  VIK_MAPS_CACHE_LAYOUT_OSM,      // CacheDir/<OptionalMapName>/OSMZoomLevel/X/Y.ext (Default ext=png)
+  VIK_MAPS_CACHE_LAYOUT_NUM       // Last enum
+} VikMapsCacheLayout;
+
+// OSM definition is a TMS derivative, (Global Mercator profile with Flipped Y)
+//  http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
+//  http://wiki.openstreetmap.org/wiki/TMS
+//  http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification
+
+void maps_layer_init ();
+void maps_layer_set_autodownload_default ( gboolean autodownload );
+void maps_layer_set_cache_default ( VikMapsCacheLayout layout );
+guint vik_maps_layer_get_default_map_type ();
 void maps_layer_register_map_source ( VikMapSource *map );
-void maps_layer_download_section_without_redraw ( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom);
-gint vik_maps_layer_get_map_type(VikMapsLayer *vml);
+void vik_maps_layer_download_section ( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom );
+guint vik_maps_layer_get_map_type(VikMapsLayer *vml);
+void vik_maps_layer_set_map_type(VikMapsLayer *vml, guint map_type);
 gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml);
 gchar *maps_layer_default_dir ();
+void vik_maps_layer_download ( VikMapsLayer *vml, VikViewport *vvp, gboolean only_new );
 
+G_END_DECLS
 
 #endif