Fix holes in the earth

[grits] / src / plugins / srtm.c

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index d0e474041e5079ef4adb5c54176c087646ac9caf..70be7d9617f6593cc259b7919263c233d519eb86 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -159,6 +159,8 @@ static gboolean _load_tile_cb(gpointer _load)
        if (LOAD_OPENGL)
                data->opengl = _load_opengl(pixbuf);
 
+       tile->data = data;
+
        /* Do necessasairy processing */
        /* TODO: Lock this and move to thread, can remove self from _load then */
        if (LOAD_BIL)
@@ -170,7 +172,6 @@ static gboolean _load_tile_cb(gpointer _load)
        if (LOAD_OPENGL)
                g_object_unref(pixbuf);
 
-       tile->data = data;
        return FALSE;
 }
 static void _load_tile(GisTile *tile, gpointer _self)
@@ -234,6 +235,16 @@ static void _on_location_changed(GisViewer *viewer,
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
 
+static gpointer _expose(GisCallback *callback, gpointer _self)
+{
+       GisPluginSrtm *self = GIS_PLUGIN_SRTM(_self);
+       g_debug("GisPluginSrtm: expose tiles=%p data=%p",
+               self->tiles, self->tiles->data);
+       if (LOAD_OPENGL)
+               gis_viewer_render_tiles(self->viewer, self->tiles);
+       return NULL;
+}
+
 /***********
  * Methods *
  ***********/
@@ -251,16 +262,11 @@ GisPluginSrtm *gis_plugin_srtm_new(GisViewer *viewer)
        self->sigid = g_signal_connect(self->viewer, "location-changed",
                        G_CALLBACK(_on_location_changed), self);
 
-       return self;
-}
+       /* Add renderers */
+       GisCallback *callback = gis_callback_new(_expose, self);
+       gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, 0);
 
-static void gis_plugin_srtm_expose(GisPlugin *_self)
-{
-       GisPluginSrtm *self = GIS_PLUGIN_SRTM(_self);
-       g_debug("GisPluginSrtm: expose tiles=%p data=%p",
-               self->tiles, self->tiles->data);
-       if (LOAD_OPENGL)
-               gis_viewer_render_tiles(self->viewer, self->tiles);
+       return self;
 }
 
 
@@ -276,7 +282,6 @@ static void gis_plugin_srtm_plugin_init(GisPluginInterface *iface)
 {
        g_debug("GisPluginSrtm: plugin_init");
        /* Add methods to the interface */
-       iface->expose = gis_plugin_srtm_expose;
 }
 /* Class/Object init */
 static void gis_plugin_srtm_init(GisPluginSrtm *self)