X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/fc589d03c2e24cca56c03eed0864a2641ece788d..13bdea80abe87aa1ce7f285e014f9b93513ed59e:/src/vikslippymapsource.c diff --git a/src/vikslippymapsource.c b/src/vikslippymapsource.c index 6736e72c..2c878047 100644 --- a/src/vikslippymapsource.c +++ b/src/vikslippymapsource.c @@ -29,20 +29,21 @@ 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 int _download ( VikMapSource *self, MapCoord *src, const gchar *dest_fn, void *handle ); +static void * _download_handle_init ( VikMapSource *self); +static void _download_handle_cleanup ( VikMapSource *self, void *handle); +static gboolean _supports_if_modified_since (VikMapSource *self ); static gchar *_get_uri( VikSlippyMapSource *self, MapCoord *src ); static gchar *_get_hostname( VikSlippyMapSource *self ); static DownloadOptions *_get_download_options( VikSlippyMapSource *self ); -/* FIXME Huge gruik */ -static DownloadOptions slippy_options = { NULL, 0, a_check_map_file }; - typedef struct _VikSlippyMapSourcePrivate VikSlippyMapSourcePrivate; struct _VikSlippyMapSourcePrivate { gchar *hostname; gchar *url; + DownloadOptions options; }; #define VIK_SLIPPY_MAP_SOURCE_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VIK_TYPE_SLIPPY_MAP_SOURCE, VikSlippyMapSourcePrivate)) @@ -54,6 +55,9 @@ enum PROP_HOSTNAME, PROP_URL, + PROP_REFERER, + PROP_FOLLOW_LOCATION, + PROP_CHECK_FILE_SERVER_TIME, }; G_DEFINE_TYPE_EXTENDED (VikSlippyMapSource, vik_slippy_map_source, VIK_TYPE_MAP_SOURCE_DEFAULT, (GTypeFlags)0,); @@ -66,6 +70,10 @@ vik_slippy_map_source_init (VikSlippyMapSource *self) priv->hostname = NULL; priv->url = NULL; + priv->options.referer = NULL; + priv->options.follow_location = 0; + priv->options.check_file = a_check_map_file; + priv->options.check_file_server_time = FALSE; g_object_set (G_OBJECT (self), "tilesize-x", 256, @@ -84,6 +92,8 @@ vik_slippy_map_source_finalize (GObject *object) priv->hostname = NULL; g_free (priv->url); priv->url = NULL; + g_free (priv->options.referer); + priv->options.referer = NULL; G_OBJECT_CLASS (vik_slippy_map_source_parent_class)->finalize (object); } @@ -109,6 +119,19 @@ vik_slippy_map_source_set_property (GObject *object, priv->url = g_value_dup_string (value); break; + case PROP_REFERER: + g_free (priv->options.referer); + priv->options.referer = g_value_dup_string (value); + break; + + case PROP_FOLLOW_LOCATION: + priv->options.follow_location = g_value_get_long (value); + break; + + case PROP_CHECK_FILE_SERVER_TIME: + priv->options.check_file_server_time = g_value_get_boolean (value); + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -135,6 +158,18 @@ vik_slippy_map_source_get_property (GObject *object, g_value_set_string (value, priv->url); break; + case PROP_REFERER: + g_value_set_string (value, priv->options.referer); + break; + + case PROP_FOLLOW_LOCATION: + g_value_set_long (value, priv->options.follow_location); + break; + + case PROP_CHECK_FILE_SERVER_TIME: + g_value_set_boolean (value, priv->options.check_file_server_time); + break; + default: /* We don't have any other property... */ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -156,6 +191,9 @@ vik_slippy_map_source_class_init (VikSlippyMapSourceClass *klass) parent_class->coord_to_mapcoord = _coord_to_mapcoord; parent_class->mapcoord_to_center_coord = _mapcoord_to_center_coord; parent_class->download = _download; + parent_class->download_handle_init = _download_handle_init; + parent_class->download_handle_cleanup = _download_handle_cleanup; + parent_class->supports_if_modified_since = _supports_if_modified_since; /* Default implementation of methods */ klass->get_uri = _get_uri; @@ -175,7 +213,30 @@ vik_slippy_map_source_class_init (VikSlippyMapSourceClass *klass) "" /* default value */, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_URL, pspec); + + pspec = g_param_spec_string ("referer", + "Referer", + "The REFERER string to use in HTTP request", + NULL /* default value */, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + g_object_class_install_property (object_class, PROP_REFERER, pspec); + + pspec = g_param_spec_long ("follow-location", + "Follow location", + "Specifies the number of retries to follow a redirect while downloading a page", + 0 /* minimum value */, + G_MAXLONG /* maximum value */, + 0 /* default value */, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + g_object_class_install_property (object_class, PROP_FOLLOW_LOCATION, pspec); + pspec = g_param_spec_boolean ("check-file-server-time", + "Check file server time", + "Age of current cache before redownloading tile", + FALSE /* default value */, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); + g_object_class_install_property (object_class, PROP_CHECK_FILE_SERVER_TIME, pspec); + g_type_class_add_private (klass, sizeof (VikSlippyMapSourcePrivate)); object_class->finalize = vik_slippy_map_source_finalize; @@ -238,6 +299,15 @@ vik_slippy_map_source_get_download_options( VikSlippyMapSource *self ) return (*klass->get_download_options)(self); } +gboolean +_supports_if_modified_since (VikMapSource *self) +{ + g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE(self), FALSE); + + VikSlippyMapSourcePrivate *priv = VIK_SLIPPY_MAP_SOURCE_PRIVATE(self); + + return priv->options.check_file_server_time; +} static gboolean _coord_to_mapcoord ( VikMapSource *self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest ) { @@ -267,18 +337,31 @@ _mapcoord_to_center_coord ( VikMapSource *self, MapCoord *src, VikCoord *dest ) } static int -_download ( VikMapSource *self, MapCoord *src, const gchar *dest_fn ) +_download ( VikMapSource *self, MapCoord *src, const gchar *dest_fn, void *handle ) { int res; 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 ); + res = a_http_download_get_url ( host, uri, dest_fn, options, handle ); g_free ( uri ); g_free ( host ); return res; } +static void * +_download_handle_init ( VikMapSource *self ) +{ + return a_download_handle_init (); +} + + +static void +_download_handle_cleanup ( VikMapSource *self, void *handle ) +{ + return a_download_handle_cleanup ( handle ); +} + static gchar * _get_uri( VikSlippyMapSource *self, MapCoord *src ) { @@ -303,7 +386,8 @@ _get_download_options( VikSlippyMapSource *self ) { g_return_val_if_fail (VIK_IS_SLIPPY_MAP_SOURCE(self), NULL); - return &slippy_options; + VikSlippyMapSourcePrivate *priv = VIK_SLIPPY_MAP_SOURCE_PRIVATE(self); + return &(priv->options); } VikSlippyMapSource * @@ -311,4 +395,4 @@ vik_slippy_map_source_new_with_id (guint8 id, const gchar *label, const gchar *h { return g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, "id", id, "label", label, "hostname", hostname, "url", url, NULL); -} \ No newline at end of file +}