libgis -> grits: Fix build after rename

[grits] / src / plugins / elev.c

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 6599964cbc1c23aa2a272171138637db824d95ab..f59238d1e66c0b62f617fde3c25fe20d21b4405f 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -29,7 +29,7 @@
 #include <glib/gstdio.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "elev.h"
 
@@ -188,7 +188,7 @@ static gboolean _load_tile_cb(gpointer _load)
        /* Do necessasairy processing */
        /* TODO: Lock this and move to thread, can remove elev from _load then */
        if (LOAD_BIL)
-               gis_viewer_set_height_func(elev->viewer, tile, _height_func, elev, TRUE);
+               gis_viewer_set_height_func(elev->viewer, &tile->edge, _height_func, elev, TRUE);
 
        /* Cleanup unneeded things */
        if (!LOAD_BIL)
@@ -237,7 +237,6 @@ static gboolean _free_tile_cb(gpointer _data)
 }
 static void _free_tile(GisTile *tile, gpointer _elev)
 {
-       GisPluginElev *elev = _elev;
        g_debug("GisPluginElev: _free_tile: %p", tile->data);
        if (tile->data)
                g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
@@ -246,12 +245,12 @@ static void _free_tile(GisTile *tile, gpointer _elev)
 static gpointer _update_tiles(gpointer _elev)
 {
        GisPluginElev *elev = _elev;
-       g_mutex_lock(elev->mutex);
-       gdouble lat, lon, elevation;
-       gis_viewer_get_location(elev->viewer, &lat, &lon, &elevation);
-       gis_tile_update(elev->tiles,
+       if (!g_mutex_trylock(elev->mutex))
+               return NULL;
+       GisPoint eye;
+       gis_viewer_get_location(elev->viewer, &eye.lat, &eye.lon, &eye.elev);
+       gis_tile_update(elev->tiles, &eye,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
-                       lat, lon, elevation,
                        _load_tile, elev);
        gis_tile_gc(elev->tiles, time(NULL)-10,
                        _free_tile, elev);