Remove background env tile

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 57813abdb63980cd8a253279d4cdbdc70bd39c25..342bc4bde0067eaaadce959df5ad39915024c98c 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2011 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
@@ -26,13 +26,12 @@
  */
 
 #include <glib/gstdio.h>
-#include <GL/gl.h>
 
 #include <grits.h>
 
 #include "elev.h"
 
-#define MAX_RESOLUTION 500
+#define MAX_RESOLUTION 50
 #define TILE_WIDTH     1024
 #define TILE_HEIGHT    512
 #define TILE_SIZE      (TILE_WIDTH*TILE_HEIGHT*sizeof(guint16))
@@ -113,8 +112,8 @@ static guint16 *_load_bil(gchar *path)
        g_file_get_contents(path, &data, &len, NULL);
        g_debug("GritsPluginElev: load_bil %p", data);
        if (len != TILE_SIZE) {
-               g_warning("GritsPluginElev: _load_bil - unexpected tile size %d, != %d",
-                               len, TILE_SIZE);
+               g_warning("GritsPluginElev: _load_bil - unexpected tile size %ld, != %ld",
+                               (glong)len, (glong)TILE_SIZE);
                g_free(data);
                return NULL;
        }
@@ -204,6 +203,7 @@ static void _load_tile(GritsTile *tile, gpointer _elev)
 
        struct _LoadTileData *load = g_new0(struct _LoadTileData, 1);
        load->path = grits_wms_fetch(elev->wms, tile, GRITS_ONCE, NULL, NULL);
+       if (!load->path) return; // Canceled/error
        g_debug("GritsPluginElev: _load_tile: %s", load->path);
        load->elev = elev;
        load->tile = tile;
@@ -300,7 +300,7 @@ GritsPluginElev *grits_plugin_elev_new(GritsViewer *viewer)
 
        /* Add renderers */
        if (LOAD_OPENGL)
-               grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, 0);
+               grits_viewer_add(viewer, GRITS_OBJECT(elev->tiles), GRITS_LEVEL_WORLD, FALSE);
 
        return elev;
 }
@@ -327,7 +327,7 @@ static void grits_plugin_elev_init(GritsPluginElev *elev)
        elev->mutex = g_mutex_new();
        elev->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        elev->wms   = grits_wms_new(
-               "http://www.nasa.network.com/elev", "srtm30", "application/bil",
+               "http://www.nasa.network.com/elev", "mergedSrtm", "application/bil",
                "srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
 }
 static void grits_plugin_elev_dispose(GObject *gobject)
@@ -339,7 +339,7 @@ static void grits_plugin_elev_dispose(GObject *gobject)
                if (LOAD_BIL)
                        grits_viewer_clear_height_func(elev->viewer);
                if (LOAD_OPENGL)
-                       grits_viewer_remove(elev->viewer, elev->tiles);
+                       grits_viewer_remove(elev->viewer, GRITS_OBJECT(elev->tiles));
                g_signal_handler_disconnect(elev->viewer, elev->sigid);
                g_object_unref(elev->viewer);
                elev->viewer = NULL;