#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);
struct _VikMapTypePrivate
{
gchar *label;
+ gchar *name;
VikMapsLayer_MapType map_type;
};
{
VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(object);
priv->label = NULL;
+ priv->name = NULL;
}
VikMapType *
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;
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;
}
(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);
(priv->map_type.download_handle_cleanup)(handle);
}
-