Fix holes in the earth

[grits] / src / plugins / srtm.c

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index 67dd7e09d87a656a58105792ac4a6e786f3ec373..70be7d9617f6593cc259b7919263c233d519eb86 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -159,11 +159,12 @@ 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)
-               gis_opengl_set_height_func(self->opengl, tile,
-                       _height_func, self, TRUE);
+               gis_viewer_set_height_func(self->viewer, tile, _height_func, self, TRUE);
 
        /* Cleanup unneeded things */
        if (!LOAD_BIL)
@@ -171,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)
@@ -215,7 +215,7 @@ static gpointer _update_tiles(gpointer _self)
        GisPluginSrtm *self = _self;
        g_mutex_lock(self->mutex);
        gdouble lat, lon, elev;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
        gis_tile_update(self->tiles,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
                        lat, lon, elev,
@@ -229,39 +229,44 @@ static gpointer _update_tiles(gpointer _self)
 /*************
  * Callbacks *
  *************/
-static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdouble elev,
-               GisPluginSrtm *self)
+static void _on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev, GisPluginSrtm *self)
 {
        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 *
  ***********/
-GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginSrtm *gis_plugin_srtm_new(GisViewer *viewer)
 {
        g_debug("GisPluginSrtm: new");
        GisPluginSrtm *self = g_object_new(GIS_TYPE_PLUGIN_SRTM, NULL);
-       self->view   = view;
-       self->opengl = opengl;
+       self->viewer = viewer;
 
        /* Load initial tiles */
        _load_tile(self->tiles, self);
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
-       g_signal_connect(view, "location-changed", G_CALLBACK(_on_location_changed), self);
+       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_opengl_render_tiles(self->opengl, self->tiles);
+       return self;
 }
 
 
@@ -277,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)
@@ -288,13 +292,16 @@ static void gis_plugin_srtm_init(GisPluginSrtm *self)
        self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        self->wms   = gis_wms_new(
                "http://www.nasa.network.com/elev", "srtm30", "application/bil",
-               "srtm", ".bil", TILE_WIDTH, TILE_HEIGHT);
+               "srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);
 }
 static void gis_plugin_srtm_dispose(GObject *gobject)
 {
        g_debug("GisPluginSrtm: dispose");
        GisPluginSrtm *self = GIS_PLUGIN_SRTM(gobject);
        /* Drop references */
+       g_signal_handler_disconnect(self->viewer, self->sigid);
+       if (LOAD_BIL)
+               gis_viewer_clear_height_func(self->viewer);
        G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);
 }
 static void gis_plugin_srtm_finalize(GObject *gobject)