From 8eb12ac67c415355a5539d7d6597241b3b4c17c7 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Tue, 14 Jul 2009 19:07:34 +0200 Subject: [PATCH] Merge vikslippymapsourceabstract and slippy-map-type --- src/Makefile.am | 6 +- src/bluemarble.c | 4 +- src/openaerial.c | 4 +- src/osm.c | 10 +- src/slippy-map-type.gob | 79 ------------ ...psourceabstract.c => vikslippymapsource.c} | 112 ++++++++++++++---- src/vikslippymapsource.h | 64 ++++++++++ src/vikslippymapsourceabstract.h | 62 ---------- 8 files changed, 162 insertions(+), 179 deletions(-) delete mode 100644 src/slippy-map-type.gob rename src/{vikslippymapsourceabstract.c => vikslippymapsource.c} (51%) create mode 100644 src/vikslippymapsource.h delete mode 100644 src/vikslippymapsourceabstract.h diff --git a/src/Makefile.am b/src/Makefile.am index c630b259..949d1f77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,8 +60,7 @@ libviking_a_SOURCES = \ vikmapslayer.c vikmapslayer.h \ vikmapslayer_compat.c vikmapslayer_compat.h \ vikmaptype.c vikmaptype.h \ - vikslippymapsourceabstract.c vikslippymapsourceabstract.h \ - slippy-map-type.c slippy-map-type.h \ + vikslippymapsource.c vikslippymapsource.h \ gpx.c gpx.h \ garminsymbols.c garminsymbols.h \ acquire.c acquire.h \ @@ -82,9 +81,6 @@ libviking_a_SOURCES = \ print.c print.h \ preferences.c preferences.h -BUILT_SOURCES += \ - slippy-map-type.c slippy-map-type.h - if GOOGLE libviking_a_SOURCES += \ google.c google.h diff --git a/src/bluemarble.c b/src/bluemarble.c index 5e45a9dc..faa399f9 100644 --- a/src/bluemarble.c +++ b/src/bluemarble.c @@ -22,11 +22,11 @@ #include "bluemarble.h" #include "vikmapslayer.h" -#include "slippy-map-type.h" +#include "vikslippymapsource.h" /* initialisation */ void bluemarble_init () { - VikMapSource *bluemarble_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id( 15, "s3.amazonaws.com", "/com.modestmaps.bluemarble/%d-r%3$d-c%2$d.jpg" )); + VikMapSource *bluemarble_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 15, "s3.amazonaws.com", "/com.modestmaps.bluemarble/%d-r%3$d-c%2$d.jpg" )); maps_layer_register_map_source ("BlueMarble", bluemarble_type); } diff --git a/src/openaerial.c b/src/openaerial.c index 54127ca4..c45e6516 100644 --- a/src/openaerial.c +++ b/src/openaerial.c @@ -22,11 +22,11 @@ #include "openaerial.h" #include "vikmapslayer.h" -#include "slippy-map-type.h" +#include "vikslippymapsource.h" /* initialisation */ void openaerial_init () { - VikMapSource *openaerialmap_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id( 20, "tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg" )); + VikMapSource *openaerialmap_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 20, "tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg" )); maps_layer_register_map_source ("OpenAerialMap", openaerialmap_type); } diff --git a/src/osm.c b/src/osm.c index fbcb3bea..f8586f3f 100644 --- a/src/osm.c +++ b/src/osm.c @@ -21,14 +21,14 @@ #include "osm.h" #include "vikmapslayer.h" -#include "slippy-map-type.h" +#include "vikslippymapsource.h" /* initialisation */ void osm_init () { - VikMapSource *osmarender_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id(12, "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png")); - VikMapSource *mapnik_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id( 13, "tile.openstreetmap.org", "/%d/%d/%d.png")); - VikMapSource *maplint_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id( 14, "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png")); - VikMapSource *cycle_type = VIK_MAP_SOURCE(slippy_map_type_new_with_id( 17, "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" )); + VikMapSource *osmarender_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id(12, "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png")); + VikMapSource *mapnik_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 13, "tile.openstreetmap.org", "/%d/%d/%d.png")); + VikMapSource *maplint_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 14, "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png")); + VikMapSource *cycle_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 17, "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" )); maps_layer_register_map_source ("OpenStreetMap (Osmarender)", osmarender_type); maps_layer_register_map_source ("OpenStreetMap (Mapnik)", mapnik_type); diff --git a/src/slippy-map-type.gob b/src/slippy-map-type.gob deleted file mode 100644 index c15b7af9..00000000 --- a/src/slippy-map-type.gob +++ /dev/null @@ -1,79 +0,0 @@ -%headertop{ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "vikcoord.h" -#include "mapcoord.h" -#include "vikslippymapsourceabstract.h" -%} - -%{ - -#include -#include -#include -#include -#include -#include -#include -#include "coords.h" -#include "vikcoord.h" -#include "mapcoord.h" -#include "download.h" -#include "curl_download.h" -#include "globals.h" -#include "vikmapslayer.h" -%} - -%h{ - -%} - -%{ - -static DownloadOptions slippy_options = { NULL, 0, a_check_map_file }; - -%} - -class Slippy:Map:Type from Vik:Slippy:Map:Source:Abstract { - private gchar *hostname; - - private gchar *url; - - init (self) { - /* initialize the object here */ - // FIXME VIK_MAP_SOURCE_DEFAULT(self)->tilesize_x = 256; - // FIXME VIK_MAP_SOURCE_DEFAULT(self)->tilesize_y = 256; - // FIXME VIK_MAP_SOURCE_DEFAULT(self)->drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR; - } - - public GObject * - new_with_id (guint8 id, const gchar *hostname, const gchar *url) { - SlippyMapType *ret = GET_NEW; - // FIXME VIK_MAP_SOURCE_DEFAULT(ret)->uniq_id = id; - ret->_priv->hostname = g_strdup(hostname); - ret->_priv->url = g_strdup(url); - return G_OBJECT (ret); - } - - override (Vik:Slippy:Map:Source:Abstract) gchar * - get_uri( Vik:Slippy:Map:Source:Abstract *self, MapCoord *src ) - { - gchar *uri = g_strdup_printf ( SLIPPY_MAP_TYPE(self)->_priv->url, - 17 - src->scale, src->x, src->y ); - return uri; - } - - override (Vik:Slippy:Map:Source:Abstract) gchar * - get_hostname( Vik:Slippy:Map:Source:Abstract *self ) - { - return g_strdup( SLIPPY_MAP_TYPE(self)->_priv->hostname ); - } - - override (Vik:Slippy:Map:Source:Abstract) DownloadOptions * - get_download_options( Vik:Slippy:Map:Source:Abstract *self ) - { - return &slippy_options; - } -} diff --git a/src/vikslippymapsourceabstract.c b/src/vikslippymapsource.c similarity index 51% rename from src/vikslippymapsourceabstract.c rename to src/vikslippymapsource.c index a697aaf7..6511ad2d 100644 --- a/src/vikslippymapsourceabstract.c +++ b/src/vikslippymapsource.c @@ -25,31 +25,49 @@ #endif #include "globals.h" -#include "vikslippymapsourceabstract.h" +#include "vikslippymapsource.h" static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest ); static void _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest ); static int _download ( VikMapSource *self, MapCoord *src, const gchar *dest_fn ); +static gchar *_get_uri( VikSlippyMapSource *self, MapCoord *src ); +static gchar *_get_hostname( VikSlippyMapSource *self ); +static DownloadOptions *_get_download_options( VikSlippyMapSource *self ); -G_DEFINE_TYPE_EXTENDED (VikSlippyMapSourceAbstract, vik_slippy_map_source_abstract, VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT, (GTypeFlags)G_TYPE_FLAG_ABSTRACT,); +/* FIXME Huge gruik */ +static DownloadOptions slippy_options = { NULL, 0, a_check_map_file }; + +typedef struct _VikSlippyMapSourcePrivate VikSlippyMapSourcePrivate; +struct _VikSlippyMapSourcePrivate +{ + gchar *hostname; + gchar *url; +}; + +#define VIK_SLIPPY_MAP_SOURCE_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VIK_TYPE_SLIPPY_MAP_SOURCE, VikSlippyMapSourcePrivate)) + +G_DEFINE_TYPE_EXTENDED (VikSlippyMapSource, vik_slippy_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT, (GTypeFlags)0,); static void -vik_slippy_map_source_abstract_init (VikSlippyMapSourceAbstract *object) +vik_slippy_map_source_init (VikSlippyMapSource *object) { - /* TODO: Add initialization code here */ + /* initialize the object here */ + // FIXME VIK_MAP_SOURCE_DEFAULT(self)->tilesize_x = 256; + // FIXME VIK_MAP_SOURCE_DEFAULT(self)->tilesize_y = 256; + // FIXME VIK_MAP_SOURCE_DEFAULT(self)->drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR; } static void -vik_slippy_map_source_abstract_finalize (GObject *object) +vik_slippy_map_source_finalize (GObject *object) { /* TODO: Add deinitalization code here */ - G_OBJECT_CLASS (vik_slippy_map_source_abstract_parent_class)->finalize (object); + G_OBJECT_CLASS (vik_slippy_map_source_parent_class)->finalize (object); } static void -vik_slippy_map_source_abstract_class_init (VikSlippyMapSourceAbstractClass *klass) +vik_slippy_map_source_class_init (VikSlippyMapSourceClass *klass) { GObjectClass* object_class = G_OBJECT_CLASS (klass); VikMapSourceClass* parent_class = VIK_MAP_SOURCE_CLASS (klass); @@ -58,8 +76,15 @@ vik_slippy_map_source_abstract_class_init (VikSlippyMapSourceAbstractClass *klas parent_class->coord_to_mapcoord = _coord_to_mapcoord; parent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord; parent_class->download = _download; - - object_class->finalize = vik_slippy_map_source_abstract_finalize; + + /* Default implementation of methods */ + klass->get_uri = _get_uri; + klass->get_hostname = _get_hostname; + klass->get_download_options = _get_download_options; + + g_type_class_add_private (klass, sizeof (VikSlippyMapSourcePrivate)); + + object_class->finalize = vik_slippy_map_source_finalize; } /* 1 << (x) is like a 2**(x) */ @@ -81,12 +106,12 @@ static guint8 slippy_zoom ( gdouble mpp ) { } gchar * -vik_slippy_map_source_abstract_get_uri( VikSlippyMapSourceAbstract *self, MapCoord *src ) +vik_slippy_map_source_get_uri( VikSlippyMapSource *self, MapCoord *src ) { - VikSlippyMapSourceAbstractClass *klass; + VikSlippyMapSourceClass *klass; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE_ABSTRACT (self), 0); - klass = VIK_SLIPPY_MAP_SOURCE_ABSTRACT_GET_CLASS(self); + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE (self), 0); + klass = VIK_SLIPPY_MAP_SOURCE_GET_CLASS(self); g_return_val_if_fail (klass->get_uri != NULL, 0); @@ -94,12 +119,12 @@ vik_slippy_map_source_abstract_get_uri( VikSlippyMapSourceAbstract *self, MapCoo } gchar * -vik_slippy_map_source_abstract_get_hostname( VikSlippyMapSourceAbstract *self ) +vik_slippy_map_source_get_hostname( VikSlippyMapSource *self ) { - VikSlippyMapSourceAbstractClass *klass; + VikSlippyMapSourceClass *klass; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE_ABSTRACT (self), 0); - klass = VIK_SLIPPY_MAP_SOURCE_ABSTRACT_GET_CLASS(self); + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE (self), 0); + klass = VIK_SLIPPY_MAP_SOURCE_GET_CLASS(self); g_return_val_if_fail (klass->get_hostname != NULL, 0); @@ -107,12 +132,12 @@ vik_slippy_map_source_abstract_get_hostname( VikSlippyMapSourceAbstract *self ) } DownloadOptions * -vik_slippy_map_source_abstract_get_download_options( VikSlippyMapSourceAbstract *self ) +vik_slippy_map_source_get_download_options( VikSlippyMapSource *self ) { - VikSlippyMapSourceAbstractClass *klass; + VikSlippyMapSourceClass *klass; g_return_val_if_fail (self != NULL, 0); - g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE_ABSTRACT (self), 0); - klass = VIK_SLIPPY_MAP_SOURCE_ABSTRACT_GET_CLASS(self); + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE (self), 0); + klass = VIK_SLIPPY_MAP_SOURCE_GET_CLASS(self); g_return_val_if_fail (klass->get_download_options != NULL, 0); @@ -151,11 +176,50 @@ static int _download ( VikMapSource *self, MapCoord *src, const gchar *dest_fn ) { int res; - gchar *uri = vik_slippy_map_source_abstract_get_uri(VIK_SLIPPY_MAP_SOURCE_ABSTRACT(self), src); - gchar *host = vik_slippy_map_source_abstract_get_hostname(VIK_SLIPPY_MAP_SOURCE_ABSTRACT(self)); - DownloadOptions *options = vik_slippy_map_source_abstract_get_download_options(VIK_SLIPPY_MAP_SOURCE_ABSTRACT(self)); + gchar *uri = vik_slippy_map_source_get_uri(VIK_SLIPPY_MAP_SOURCE(self), src); + gchar *host = vik_slippy_map_source_get_hostname(VIK_SLIPPY_MAP_SOURCE(self)); + DownloadOptions *options = vik_slippy_map_source_get_download_options(VIK_SLIPPY_MAP_SOURCE(self)); res = a_http_download_get_url ( host, uri, dest_fn, options ); g_free ( uri ); g_free ( host ); return res; } + +static gchar * +_get_uri( VikSlippyMapSource *self, MapCoord *src ) +{ + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE(self), NULL); + + VikSlippyMapSourcePrivate *priv = VIK_SLIPPY_MAP_SOURCE_PRIVATE(self); + gchar *uri = g_strdup_printf (priv->url, 17 - src->scale, src->x, src->y); + return uri; +} + +static gchar * +_get_hostname( VikSlippyMapSource *self ) +{ + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE(self), NULL); + + VikSlippyMapSourcePrivate *priv = VIK_SLIPPY_MAP_SOURCE_PRIVATE(self); + return g_strdup( priv->hostname ); +} + +static DownloadOptions * +_get_download_options( VikSlippyMapSource *self ) +{ + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE(self), NULL); + + return &slippy_options; +} + +VikSlippyMapSource * +vik_slippy_map_source_new_with_id (guint8 id, const gchar *hostname, const gchar *url) +{ + VikSlippyMapSource *ret = g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, NULL); + + VikSlippyMapSourcePrivate *priv = VIK_SLIPPY_MAP_SOURCE_PRIVATE(ret); + // FIXME VIK_MAP_SOURCE_DEFAULT(ret)->uniq_id = id; + priv->hostname = g_strdup(hostname); + priv->url = g_strdup(url); + return ret; +} \ No newline at end of file diff --git a/src/vikslippymapsource.h b/src/vikslippymapsource.h new file mode 100644 index 00000000..3561b764 --- /dev/null +++ b/src/vikslippymapsource.h @@ -0,0 +1,64 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* + * viking + * Copyright (C) Guilhem Bonnefille 2009 + * + * 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 + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * viking is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef _VIK_SLIPPY_MAP_SOURCE_H +#define _VIK_SLIPPY_MAP_SOURCE_H + +#include "vikcoord.h" +#include "mapcoord.h" +#include "vikmapsourcedefault.h" +#include "download.h" + +G_BEGIN_DECLS + +#define VIK_TYPE_SLIPPY_MAP_SOURCE (vik_slippy_map_source_get_type ()) +#define VIK_SLIPPY_MAP_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE, VikSlippyMapSource)) +#define VIK_SLIPPY_MAP_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_TYPE_SLIPPY_MAP_SOURCE, VikSlippyMapSourceClass)) +#define VIK_IS_SLIPPY_MAP_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE)) +#define VIK_IS_SLIPPY_MAP_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_TYPE_SLIPPY_MAP_SOURCE)) +#define VIK_SLIPPY_MAP_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE, VikSlippyMapSourceClass)) + +typedef struct _VikSlippyMapSourceClass VikSlippyMapSourceClass; +typedef struct _VikSlippyMapSource VikSlippyMapSource; + +struct _VikSlippyMapSourceClass +{ + VikMapSourceDefaultClass parent_class; + + gchar * (*get_uri) ( VikSlippyMapSource *self, MapCoord *src ); + gchar * (*get_hostname) ( VikSlippyMapSource *self ); + DownloadOptions * (*get_download_options) ( VikSlippyMapSource *self ); +}; + +struct _VikSlippyMapSource +{ + VikMapSourceDefault parent_instance; +}; + +GType vik_slippy_map_source_get_type (void) G_GNUC_CONST; + +VikSlippyMapSource * vik_slippy_map_source_new_with_id (guint8 id, const gchar *hostname, const gchar *url); + +gchar * vik_slippy_map_source_get_uri( VikSlippyMapSource *self, MapCoord *src ); +gchar * vik_slippy_map_source_get_hostname( VikSlippyMapSource *self ); +DownloadOptions * vik_slippy_map_source_get_download_options( VikSlippyMapSource *self ); + +G_END_DECLS + +#endif /* _VIK_SLIPPY_MAP_SOURCE_H_ */ diff --git a/src/vikslippymapsourceabstract.h b/src/vikslippymapsourceabstract.h deleted file mode 100644 index b933a6eb..00000000 --- a/src/vikslippymapsourceabstract.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ -/* - * viking - * Copyright (C) Guilhem Bonnefille 2009 - * - * 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 - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * viking is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef _VIK_SLIPPY_MAP_SOURCE_ABSTRACT_H -#define _VIK_SLIPPY_MAP_SOURCE_ABSTRACT_H - -#include "vikcoord.h" -#include "mapcoord.h" -#include "vikmapsourcedefault.h" -#include "download.h" - -G_BEGIN_DECLS - -#define VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT (vik_slippy_map_source_abstract_get_type ()) -#define VIK_SLIPPY_MAP_SOURCE_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT, VikSlippyMapSourceAbstract)) -#define VIK_SLIPPY_MAP_SOURCE_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT, VikSlippyMapSourceAbstractClass)) -#define VIK_IS_SLIPPY_MAP_SOURCE_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT)) -#define VIK_IS_SLIPPY_MAP_SOURCE_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT)) -#define VIK_SLIPPY_MAP_SOURCE_ABSTRACT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VIK_TYPE_SLIPPY_MAP_SOURCE_ABSTRACT, VikSlippyMapSourceAbstractClass)) - -typedef struct _VikSlippyMapSourceAbstractClass VikSlippyMapSourceAbstractClass; -typedef struct _VikSlippyMapSourceAbstract VikSlippyMapSourceAbstract; - -struct _VikSlippyMapSourceAbstractClass -{ - VikMapSourceDefaultClass parent_class; - - gchar * (*get_uri) ( VikSlippyMapSourceAbstract *self, MapCoord *src ); - gchar * (*get_hostname) ( VikSlippyMapSourceAbstract *self ); - DownloadOptions * (*get_download_options) ( VikSlippyMapSourceAbstract *self ); -}; - -struct _VikSlippyMapSourceAbstract -{ - VikMapSourceDefault parent_instance; -}; - -GType vik_slippy_map_source_abstract_get_type (void) G_GNUC_CONST; - -gchar * vik_slippy_map_source_abstract_get_uri( VikSlippyMapSourceAbstract *self, MapCoord *src ); -gchar * vik_slippy_map_source_abstract_get_hostname( VikSlippyMapSourceAbstract *self ); -DownloadOptions * vik_slippy_map_source_abstract_get_download_options( VikSlippyMapSourceAbstract *self ); - -G_END_DECLS - -#endif /* _VIK_SLIPPY_MAP_SOURCE_ABSTRACT_H_ */ -- 2.39.5