Markers as individual textures

[grits] / src / gis-wms.c

diff --git a/src/gis-wms.c b/src/gis-wms.c
index 0c15e874d00a71e110cfe1090a2c66c8e04ce166..d2e0766966c14fefae031f55ba413fd3ec728bbc 100644 (file)
--- a/src/gis-wms.c
+++ b/src/gis-wms.c
@@ -75,8 +75,10 @@ static gchar *_make_uri(GisWms *wms, GisTile *tile)
 void gis_wms_soup_chunk_cb(SoupMessage *message, SoupBuffer *chunk, gpointer _file)
 {
        FILE *file = _file;
-       if (!SOUP_STATUS_IS_SUCCESSFUL(message->status_code))
+       if (!SOUP_STATUS_IS_SUCCESSFUL(message->status_code)) {
+               g_warning("GisWms: soup_chunk_cb - soup failed with %d", message->status_code);
                return;
+       }
        goffset total = soup_message_headers_get_content_length(message->response_headers);
        if (fwrite(chunk->data, chunk->length, 1, file) != 1)
                g_warning("GisWms: soup_chunk_cb - eror writing data");
@@ -86,11 +88,9 @@ char *gis_wms_make_local(GisWms *self, GisTile *tile)
 {
        /* Get file path */
        gchar *tile_path = gis_tile_get_path(tile);
-       gchar *path = g_strdup_printf("%s/wms/%s%s%s",
-               g_get_user_cache_dir(),
-               self->cache_prefix,
-               tile_path,
-               self->cache_ext);
+       gchar *path = g_strdup_printf("%s/%s/%s%s%s",
+               g_get_user_cache_dir(), PACKAGE,
+               self->cache_prefix, tile_path, self->cache_ext);
        g_free(tile_path);
 
        /* Return if it already exists */
@@ -106,10 +106,13 @@ char *gis_wms_make_local(GisWms *self, GisTile *tile)
 
        /* Download file */
        gchar *uri = _make_uri(self, tile);
+       g_debug("GisWms: make_local - fetching %s", uri);
        SoupMessage *message = soup_message_new("GET", uri);
        g_signal_connect(message, "got-chunk", G_CALLBACK(gis_wms_soup_chunk_cb), file);
        soup_message_headers_set_range(message->request_headers, ftell(file), -1);
        int status = soup_session_send_message(self->soup, message);
+       if (!SOUP_STATUS_IS_SUCCESSFUL(message->status_code))
+               g_warning("GisWms: make_local - soup failed with %d", message->status_code);
        g_free(uri);
 
        /* Clean up */