X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/944931149d95399a6c9aad8b9c1f4de68676370e..af2341f318ad676de4945c1dd471c6a6ed2d313b:/src/vikmapslayer.h?ds=sidebyside

diff --git a/src/vikmapslayer.h b/src/vikmapslayer.h
index 298d3565..d205c9cb 100644
--- a/src/vikmapslayer.h
+++ b/src/vikmapslayer.h
@@ -25,7 +25,9 @@
 #include "vikcoord.h"
 #include "viklayer.h"
 #include "vikviewport.h"
+#include "vikmapsource.h"
 #include "mapcoord.h"
+#include "vikmapslayer_compat.h"
 
 #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))
@@ -43,17 +45,12 @@ GType vik_maps_layer_get_type ();
 
 typedef struct _VikMapsLayer VikMapsLayer;
 
-typedef struct {
-  guint8 uniq_id;
-  guint16 tilesize_x;
-  guint16 tilesize_y;
-  guint drawmode;
-  gboolean (*coord_to_mapcoord) ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
-  void (*mapcoord_to_center_coord) ( MapCoord *src, VikCoord *dest );
-  int (*download) ( MapCoord *src, const gchar *dest_fn );
-  /* TODO: constant size (yay!) */
-} VikMapsLayer_MapType;
-
-void maps_layer_register_type ( const char *label, guint id, VikMapsLayer_MapType *map_type );
+void maps_layer_init ();
+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);
+gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml);
+gchar *maps_layer_default_dir ();
+
 
 #endif