X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1f78e182e7eaf305c3a10d2e145dbcc994d5e862..e8bab170981ff0e1cd572107ca4de122d4aafe8c:/src/vikmaptype.c

diff --git a/src/vikmaptype.c b/src/vikmaptype.c
index 7f321a26..ae3b8894 100644
--- a/src/vikmaptype.c
+++ b/src/vikmaptype.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * viking
- * Copyright (C) Guilhem Bonnefille 2009 <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2009, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
  * 
  * viking is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,21 +16,32 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+ /**
+  * SECTION:vikmaptype
+  * @short_description: the adapter class to support old map source declaration
+  * 
+  * The #VikMapType class handles is an adapter to allow to reuse
+  * old map source (see #VikMapsLayer_MapType).
+  */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "vikmaptype.h"
 #include "vikmapslayer_compat.h"
+#include "download.h"
 
-static guint8 map_type_get_uniq_id (VikMapSource *self);
+static const gchar *map_type_get_name (VikMapSource *self);
+static guint16 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, void * handle);
+static DownloadResult_t 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);
 
@@ -38,6 +49,7 @@ typedef struct _VikMapTypePrivate VikMapTypePrivate;
 struct _VikMapTypePrivate
 {
 	gchar *label;
+	gchar *name;
 	VikMapsLayer_MapType map_type;
 };
 
@@ -51,6 +63,7 @@ vik_map_type_init (VikMapType *object)
 {
 	VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(object);
 	priv->label = NULL;
+	priv->name = NULL;
 }
 
 VikMapType *
@@ -80,6 +93,7 @@ vik_map_type_class_init (VikMapTypeClass *klass)
 	VikMapSourceClass* parent_class = VIK_MAP_SOURCE_CLASS (klass);
 
 	/* Overiding methods */
+	parent_class->get_name =                 map_type_get_name;
 	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;
@@ -96,11 +110,20 @@ vik_map_type_class_init (VikMapTypeClass *klass)
 	object_class->finalize = vik_map_type_finalize;
 }
 
-static guint8
+static const gchar *
+map_type_get_name (VikMapSource *self)
+{
+	VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+	g_return_val_if_fail (priv != NULL, NULL);
+
+	return priv->name;
+}
+
+static guint16
 map_type_get_uniq_id (VikMapSource *self)
 {
     VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
-	g_return_val_if_fail (priv != NULL, (guint8)0);
+	g_return_val_if_fail (priv != NULL, (guint16)0);
 
 	return priv->map_type.uniq_id;
 }
@@ -156,10 +179,10 @@ map_type_mapcoord_to_center_coord (VikMapSource *self, MapCoord *src, VikCoord *
     VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
 	g_return_if_fail (self != NULL);
 
-	return (priv->map_type.mapcoord_to_center_coord)(src, dest);
+	(priv->map_type.mapcoord_to_center_coord)(src, dest);
 }
 
-static int
+static DownloadResult_t
 map_type_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn, void * handle)
 {
     VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
@@ -181,8 +204,7 @@ 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);
+	g_return_if_fail ( priv != NULL );
 
-	return (priv->map_type.download_handle_cleanup)(handle);
+	(priv->map_type.download_handle_cleanup)(handle);
 }
-