X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1f78e182e7eaf305c3a10d2e145dbcc994d5e862..23d6216c871ca648a093bd992f25fd9ce18f971d:/src/vikmaptype.c diff --git a/src/vikmaptype.c b/src/vikmaptype.c index 7f321a26..2ca72656 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 + * Copyright (C) 2009, Guilhem Bonnefille * * 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,6 +16,15 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ + + /** + * 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 @@ -23,7 +32,7 @@ #include "vikmaptype.h" #include "vikmapslayer_compat.h" -static guint8 map_type_get_uniq_id (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); @@ -96,11 +105,11 @@ vik_map_type_class_init (VikMapTypeClass *klass) object_class->finalize = vik_map_type_finalize; } -static guint8 +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,7 +165,7 @@ 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 @@ -181,8 +190,8 @@ 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); }