Update copyright and email address

[grits] / src / gis-wms.c

diff --git a/src/gis-wms.c b/src/gis-wms.c
index bd4704ddc4322f1b842db670318c7f4465980f9f..defedb3cd7b516dad3f440c37940df77fdbec004 100644 (file)
--- a/src/gis-wms.c
+++ b/src/gis-wms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Metacarte
+ * ---------
+ * http://labs.metacarta.com/wms/vmap0?
+ * LAYERS=basic&
+ * SERVICE=WMS&
+ * VERSION=1.1.1&
+ * REQUEST=GetMap&
+ * STYLES=&
+ * EXCEPTIONS=application/vnd.ogc.se_inimage&
+ * FORMAT=image/jpeg&
+ * SRS=EPSG:4326&
+ * BBOX=0,-90,180,90&
+ * WIDTH=256&
+ * HEIGHT=256
+ */
+
 /**
  * http://www.nasa.network.com/elev?
  * SERVICE=WMS&
@@ -72,11 +89,13 @@ static gchar *_make_uri(GisWms *wms, GisTile *tile)
                tile->edge.n);
 }
 
-void gis_wms_soup_chunk_cb(SoupMessage *message, SoupBuffer *chunk, gpointer _file)
+static void _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");
@@ -104,10 +123,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);
+       g_signal_connect(message, "got-chunk", G_CALLBACK(_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 */