*
* 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
*
* 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
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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 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 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);
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_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->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->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;
g_type_class_add_private (klass, sizeof (VikMapTypePrivate));
object_class->finalize = vik_map_type_finalize;
}
g_type_class_add_private (klass, sizeof (VikMapTypePrivate));
object_class->finalize = vik_map_type_finalize;
}
- return (priv->map_type.mapcoord_to_center_coord)(src, dest);
+ (priv->map_type.mapcoord_to_center_coord)(src, dest);
+}
+
+static DownloadResult_t
+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);
{
VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
g_return_val_if_fail (priv != NULL, 0);
{
VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
g_return_val_if_fail (priv != NULL, 0);
+static void
+map_type_download_handle_cleanup (VikMapSource * self, void * handle)
+{
+ VikMapTypePrivate *priv = VIK_MAP_TYPE_PRIVATE(self);
+ g_return_if_fail ( priv != NULL );
+
+ (priv->map_type.download_handle_cleanup)(handle);
+}