X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/e270cd3d8aa62bca2630191b41958be0d0cbd430..95894e5db329064fbcc5d52820793c7ca9ded2a5:/src/vikmapsource.c?ds=sidebyside

diff --git a/src/vikmapsource.c b/src/vikmapsource.c
index 05897360..48b0fcad 100644
--- a/src/vikmapsource.c
+++ b/src/vikmapsource.c
@@ -30,34 +30,9 @@ static void vik_map_source_init (VikMapSource *object);
 static void vik_map_source_finalize (GObject *object);
 static void vik_map_source_class_init (VikMapSourceClass *klass);
 
-G_DEFINE_TYPE_EXTENDED (VikMapSource, vik_map_source, G_TYPE_OBJECT, (GTypeFlags)G_TYPE_FLAG_ABSTRACT,);
+static void _supports_if_modified_since (VikMapSource *object);
 
-/*
-GType
-vik_map_source_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (VikMapSourceClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) vik_map_source_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL /* class_data * /,
-			sizeof (VikMapSource),
-			0 /* n_preallocs * /,
-			(GInstanceInitFunc) vik_map_source_init,
-			NULL
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT, "VikMapSource", &info, (GTypeFlags)G_TYPE_FLAG_ABSTRACT);
-	}
-
-	return type;
-}
-*/
+G_DEFINE_TYPE_EXTENDED (VikMapSource, vik_map_source, G_TYPE_OBJECT, (GTypeFlags)G_TYPE_FLAG_ABSTRACT,);
 
 static void
 vik_map_source_init (VikMapSource *object)
@@ -79,16 +54,26 @@ vik_map_source_class_init (VikMapSourceClass *klass)
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
 
 	klass->get_uniq_id = NULL;
+	klass->get_label = NULL;
 	klass->get_tilesize_x = NULL;
 	klass->get_tilesize_y = NULL;
 	klass->get_drawmode = NULL;
+	klass->supports_if_modified_since = _supports_if_modified_since;
 	klass->coord_to_mapcoord = NULL;
 	klass->mapcoord_to_center_coord = NULL;
 	klass->download = NULL;
+	klass->download_handle_init = NULL;
+	klass->download_handle_cleanup = NULL;
 	
 	object_class->finalize = vik_map_source_finalize;
 }
 
+void
+_supports_if_modified_since (VikMapSource *self)
+{
+	// Default feature: does not support
+	return FALSE;
+}
 
 guint8
 vik_map_source_get_uniq_id (VikMapSource *self)
@@ -103,6 +88,19 @@ vik_map_source_get_uniq_id (VikMapSource *self)
 	return (*klass->get_uniq_id)(self);
 }
 
+const gchar *
+vik_map_source_get_label (VikMapSource *self)
+{
+	VikMapSourceClass *klass;
+	g_return_val_if_fail (self != NULL, NULL);
+	g_return_val_if_fail (VIK_IS_MAP_SOURCE (self), NULL);
+	klass = VIK_MAP_SOURCE_GET_CLASS(self);
+
+	g_return_val_if_fail (klass->get_label != NULL, NULL);
+
+	return (*klass->get_label)(self);
+}
+
 guint16
 vik_map_source_get_tilesize_x (VikMapSource *self)
 {
@@ -142,6 +140,19 @@ vik_map_source_get_drawmode (VikMapSource *self)
 	return (*klass->get_drawmode)(self);
 }
 
+gboolean
+vik_map_source_supports_if_modified_since (VikMapSource * self)
+{
+	VikMapSourceClass *klass;
+	g_return_val_if_fail (self != NULL, 0);
+	g_return_val_if_fail (VIK_IS_MAP_SOURCE (self), 0);
+	klass = VIK_MAP_SOURCE_GET_CLASS(self);
+
+	g_return_val_if_fail (klass->supports_if_modified_since != NULL, 0);
+
+	return (*klass->supports_if_modified_since)(self);
+}
+
 gboolean
 vik_map_source_coord_to_mapcoord (VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {
@@ -169,7 +180,7 @@ vik_map_source_mapcoord_to_center_coord (VikMapSource *self, MapCoord *src, VikC
 }
 
 int
-vik_map_source_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn)
+vik_map_source_download (VikMapSource * self, MapCoord * src, const gchar * dest_fn, void *handle)
 {
 	VikMapSourceClass *klass;
 	g_return_val_if_fail (self != NULL, 0);
@@ -178,5 +189,31 @@ vik_map_source_download (VikMapSource * self, MapCoord * src, const gchar * dest
 
 	g_return_val_if_fail (klass->download != NULL, 0);
 
-	return (*klass->download)(self, src, dest_fn);
+	return (*klass->download)(self, src, dest_fn, handle);
+}
+
+void *
+vik_map_source_download_handle_init (VikMapSource *self)
+{
+	VikMapSourceClass *klass;
+	g_return_val_if_fail (self != NULL, 0);
+	g_return_val_if_fail (VIK_IS_MAP_SOURCE (self), 0);
+	klass = VIK_MAP_SOURCE_GET_CLASS(self);
+
+	g_return_val_if_fail (klass->download_handle_init != NULL, 0);
+
+	return (*klass->download_handle_init)(self);
+}
+
+void
+vik_map_source_download_handle_cleanup (VikMapSource * self, void * handle)
+{
+	VikMapSourceClass *klass;
+	g_return_val_if_fail (self != NULL, 0);
+	g_return_val_if_fail (VIK_IS_MAP_SOURCE (self), 0);
+	klass = VIK_MAP_SOURCE_GET_CLASS(self);
+
+	g_return_val_if_fail (klass->download_handle_cleanup != NULL, 0);
+
+	return (*klass->download_handle_cleanup)(self, handle);
 }