X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/e270cd3d8aa62bca2630191b41958be0d0cbd430..e13ab673e45ea48de49661f7838e75925f405514:/src/vikmaptype.c

diff --git a/src/vikmaptype.c b/src/vikmaptype.c
index cf7cb3ab..7f321a26 100644
--- a/src/vikmaptype.c
+++ b/src/vikmaptype.c
@@ -23,13 +23,21 @@
 #include "vikmaptype.h"
 #include "vikmapslayer_compat.h"
 
+static guint8 map_type_get_uniq_id (VikMapSource *self);
+static const gchar *map_type_get_label (VikMapSource *self);
+static guint16 map_type_get_tilesize_x (VikMapSource *self);
+static guint16 map_type_get_tilesize_y (VikMapSource *self);
+static VikViewportDrawMode map_type_get_drawmode (VikMapSource *self);
 static gboolean map_type_coord_to_mapcoord (VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 static void map_type_mapcoord_to_center_coord (VikMapSource *self, MapCoord *src, VikCoord *dest);
-static int map_type_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn);
+static int map_type_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn, void * handle);
+static void * map_type_download_handle_init (VikMapSource * self);
+static void map_type_download_handle_cleanup (VikMapSource * self, void * handle);
 
 typedef struct _VikMapTypePrivate VikMapTypePrivate;
 struct _VikMapTypePrivate
 {
+	gchar *label;
 	VikMapsLayer_MapType map_type;
 };
 
@@ -41,22 +49,26 @@ G_DEFINE_TYPE (VikMapType, vik_map_type, VIK_TYPE_MAP_SOURCE);
 static void
 vik_map_type_init (VikMapType *object)
 {
-	/* TODO: Add initialization code here */
+	VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(object);
+	priv->label = NULL;
 }
 
 VikMapType *
-vik_map_type_new_with_id (VikMapsLayer_MapType map_type)
+vik_map_type_new_with_id (VikMapsLayer_MapType map_type, const char *label)
 {
 	VikMapType *ret = (VikMapType *)g_object_new(vik_map_type_get_type(), NULL);
 	VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(ret);
 	priv->map_type = map_type;
+	priv->label = g_strdup (label);
 	return ret;
 }
 
 static void
 vik_map_type_finalize (GObject *object)
 {
-	/* TODO: Add deinitalization code here */
+	VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(object);
+	g_free (priv->label);
+	priv->label = NULL;
 
 	G_OBJECT_CLASS (vik_map_type_parent_class)->finalize (object);
 }
@@ -68,15 +80,67 @@ vik_map_type_class_init (VikMapTypeClass *klass)
 	VikMapSourceClass* parent_class = VIK_MAP_SOURCE_CLASS (klass);
 
 	/* Overiding methods */
+	parent_class->get_uniq_id =              map_type_get_uniq_id;
+	parent_class->get_label =                map_type_get_label;
+	parent_class->get_tilesize_x =           map_type_get_tilesize_x;
+	parent_class->get_tilesize_y =           map_type_get_tilesize_y;
+	parent_class->get_drawmode =             map_type_get_drawmode;
 	parent_class->coord_to_mapcoord =        map_type_coord_to_mapcoord;
 	parent_class->mapcoord_to_center_coord = map_type_mapcoord_to_center_coord;
 	parent_class->download =                 map_type_download;
+	parent_class->download_handle_init =    map_type_download_handle_init;
+	parent_class->download_handle_cleanup =     map_type_download_handle_cleanup;
 
 	g_type_class_add_private (klass, sizeof (VikMapTypePrivate));
 
 	object_class->finalize = vik_map_type_finalize;
 }
 
+static guint8
+map_type_get_uniq_id (VikMapSource *self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, (guint8)0);
+
+	return priv->map_type.uniq_id;
+}
+
+static const gchar *
+map_type_get_label (VikMapSource *self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, FALSE);
+
+	return priv->label;
+}
+
+static guint16
+map_type_get_tilesize_x (VikMapSource *self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, (guint16)0);
+
+	return priv->map_type.tilesize_x;
+}
+
+static guint16
+map_type_get_tilesize_y (VikMapSource *self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, (guint16)0);
+
+	return priv->map_type.tilesize_y;
+}
+
+static VikViewportDrawMode
+map_type_get_drawmode (VikMapSource *self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, (VikViewportDrawMode)0);
+
+	return priv->map_type.drawmode;
+}
+
 static gboolean
 map_type_coord_to_mapcoord (VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {
@@ -96,11 +160,29 @@ map_type_mapcoord_to_center_coord (VikMapSource *self, MapCoord *src, VikCoord *
 }
 
 static int
-map_type_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn)
+map_type_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn, void * handle)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, 0);
+
+	return (priv->map_type.download)(src, dest_fn, handle);
+}
+
+static void *
+map_type_download_handle_init (VikMapSource * self)
+{
+    VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, 0);
+
+	return (priv->map_type.download_handle_init)();
+}
+
+static void
+map_type_download_handle_cleanup (VikMapSource * self, void * handle)
 {
     VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
 	g_return_val_if_fail (priv != NULL, 0);
 
-	return (priv->map_type.download)(src, dest_fn);
+	return (priv->map_type.download_handle_cleanup)(handle);
 }