]> Pileus Git - aweather/blobdiff - src/plugins/radar.c
Libgis updates
[aweather] / src / plugins / radar.c
index 26403eaecce57bfd76bddc0426e3e34ebbeba5fc..62d6dc02e8af26a1bad550a6c811b8af299eacbf 100644 (file)
@@ -1,21 +1,22 @@
 /*
- * 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
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <gio/gio.h>
 #include <math.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
+#include <gis.h>
 
 #include "radar.h"
-#include "marching.h"
+#include "level2.h"
+#include "../aweather-location.h"
 
-/****************
- * GObject code *
- ****************/
-/* Plugin init */
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
-static void gis_plugin_radar_expose(GisPlugin *_radar);
-static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self);
-G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
-               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
-                       gis_plugin_radar_plugin_init));
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
-{
-       g_debug("GisPluginRadar: plugin_init");
-       /* Add methods to the interface */
-       iface->expose     = gis_plugin_radar_expose;
-       iface->get_config = gis_plugin_radar_get_config;
-}
-/* Class/Object init */
-static void gis_plugin_radar_init(GisPluginRadar *self)
+/* Drawing functions */
+static void _draw_hud(GisCallback *callback, gpointer _self)
 {
-       g_debug("GisPluginRadar: class_init");
-       /* Set defaults */
-       self->soup          = NULL;
-       self->cur_triangles = NULL;
-       self->cur_num_triangles = 0;
+       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       if (!self->colormap)
+               return;
 
-       self->config_body = gtk_alignment_new(0, 0, 1, 1);
-       gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
-       gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
-}
-static void gis_plugin_radar_dispose(GObject *gobject)
-{
-       g_debug("GisPluginRadar: dispose");
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
-       g_signal_handler_disconnect(self->view, self->time_changed_id);
-       /* Drop references */
-       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+       g_debug("GisPluginRadar: _draw_hud");
+       /* Print the color table */
+       glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
+       glMatrixMode(GL_PROJECTION); glLoadIdentity();
+       glDisable(GL_TEXTURE_2D);
+       glDisable(GL_ALPHA_TEST);
+       glDisable(GL_CULL_FACE);
+       glDisable(GL_LIGHTING);
+       glEnable(GL_COLOR_MATERIAL);
+       glBegin(GL_QUADS);
+       int i;
+       for (i = 0; i < 256; i++) {
+               glColor4ubv(self->colormap->data[i]);
+               glVertex3f(-1.0, (float)((i  ) - 256/2)/(256/2), 0.0); // bot left
+               glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
+               glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
+               glVertex3f(-0.9, (float)((i  ) - 256/2)/(256/2), 0.0); // bot right
+       }
+       glEnd();
 }
-static void gis_plugin_radar_finalize(GObject *gobject)
-{
-       g_debug("GisPluginRadar: finalize");
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
-       /* Free data */
-       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
 
-}
-static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+
+/***************
+ * GUI loading *
+ ***************/
+/* Clear the config area */ 
+static void _load_gui_clear(GisPluginRadar *self)
 {
-       g_debug("GisPluginRadar: class_init");
-       GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_radar_dispose;
-       gobject_class->finalize = gis_plugin_radar_finalize;
+       GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
+       if (child)
+               gtk_widget_destroy(child);
 }
 
-/**************************
- * Data loading functions *
- **************************/
-/* Convert a sweep to an 2d array of data points */
-static void bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap,
-               guint8 **data, int *width, int *height)
+/* Setup a loading screen in the tab */
+static void _load_gui_pre(GisPluginRadar *self)
 {
-       /* Calculate max number of bins */
-       int max_bins = 0;
-       for (int i = 0; i < sweep->h.nrays; i++)
-               max_bins = MAX(max_bins, sweep->ray[i]->h.nbins);
-
-       /* Allocate buffer using max number of bins for each ray */
-       guint8 *buf = g_malloc0(sweep->h.nrays * max_bins * 4);
-
-       /* Fill the data */
-       for (int ri = 0; ri < sweep->h.nrays; ri++) {
-               Ray *ray  = sweep->ray[ri];
-               for (int bi = 0; bi < ray->h.nbins; bi++) {
-                       /* copy RGBA into buffer */
-                       //guint val   = dz_f(ray->range[bi]);
-                       guint8 val   = (guint8)ray->h.f(ray->range[bi]);
-                       guint  buf_i = (ri*max_bins+bi)*4;
-                       buf[buf_i+0] = colormap->data[val][0];
-                       buf[buf_i+1] = colormap->data[val][1];
-                       buf[buf_i+2] = colormap->data[val][2];
-                       buf[buf_i+3] = colormap->data[val][3]; // TESTING
-                       if (val == BADVAL     || val == RFVAL      || val == APFLAG ||
-                           val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO) {
-                               buf[buf_i+3] = 0x00; // transparent
-                       }
-               }
-       }
+       g_debug("GisPluginRadar: _load_gui_pre");
 
-       /* set output */
-       *width  = max_bins;
-       *height = sweep->h.nrays;
-       *data   = buf;
+       /* Set up progress bar */
+       _load_gui_clear(self);
+       GtkWidget *vbox = gtk_vbox_new(FALSE, 10);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+       self->progress_bar   = gtk_progress_bar_new();
+       self->progress_label = gtk_label_new("Loading radar...");
+       gtk_box_pack_start(GTK_BOX(vbox), self->progress_bar,   FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), self->progress_label, FALSE, FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(self->config_body), vbox);
+       gtk_widget_show_all(self->config_body);
 }
 
-/* Load a sweep as the active texture */
-static void load_sweep(GisPluginRadar *self, Sweep *sweep)
+/* Update pogress bar of loading screen */
+static void _load_gui_update(char *path, goffset cur, goffset total, gpointer _self)
 {
-       GisOpenGL *opengl = self->opengl;
-       gis_opengl_begin(opengl);
-       self->cur_sweep = sweep;
-       int height, width;
-       guint8 *data;
-       bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height);
-       glDeleteTextures(1, &self->cur_sweep_tex);
-       glGenTextures(1, &self->cur_sweep_tex);
-       glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
-       glPixelStorei(GL_PACK_ALIGNMENT, 1);
-       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
-                       GL_RGBA, GL_UNSIGNED_BYTE, data);
-       g_free(data);
-       gis_opengl_redraw(opengl);
-       gis_opengl_end(opengl);
+       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       double percent = (double)cur/total;
+
+       //g_debug("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
+       //              cur, total, percent*100);
+
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0));
+
+       gchar *msg = g_strdup_printf("Loading radar... %5.1f%% (%.2f/%.2f MB)",
+                       percent*100, (double)cur/1000000, (double)total/1000000);
+       gtk_label_set_text(GTK_LABEL(self->progress_label), msg);
+       g_free(msg);
 }
 
-static void load_colormap(GisPluginRadar *self, gchar *table)
+/* Update pogress bar of loading screen */
+static void _load_gui_error(GisPluginRadar *self, gchar *error)
 {
-       /* Set colormap so we can draw it on expose */
-       for (int i = 0; colormaps[i].name; i++)
-               if (g_str_equal(colormaps[i].name, table))
-                       self->cur_colormap = &colormaps[i];
+       gchar *msg = g_strdup_printf(
+                       "GisPluginRadar: error loading radar - %s", error);
+       g_warning("%s", msg);
+       _load_gui_clear(self);
+       gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new(msg));
+       gtk_widget_show_all(self->config_body);
+       g_free(msg);
 }
 
-/* Add selectors to the config area for the sweeps */
-static void on_sweep_clicked(GtkRadioButton *button, gpointer _self);
-static void load_radar_gui(GisPluginRadar *self, Radar *radar)
+/* Clear loading screen and add sweep selectors */
+static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self);
+static void _load_gui_success(GisPluginRadar *self, AWeatherLevel2 *level2)
 {
+       Radar *radar = level2->radar;
+       g_debug("GisPluginRadar: _load_gui_success - %p", radar);
        /* Clear existing items */
-       GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
-       if (child)
-               gtk_widget_destroy(child);
+       _load_gui_clear(self);
 
        gdouble elev;
        guint rows = 1, cols = 1, cur_cols;
@@ -215,299 +178,168 @@ static void load_radar_gui(GisPluginRadar *self, Radar *radar)
                        g_object_set(button, "draw-indicator", FALSE, NULL);
                        gtk_box_pack_end(GTK_BOX(elev_box), button, TRUE, TRUE, 0);
 
-                       g_object_set_data(G_OBJECT(button), "type",  vol->h.type_str);
-                       g_object_set_data(G_OBJECT(button), "sweep", sweep);
-                       g_signal_connect(button, "clicked", G_CALLBACK(on_sweep_clicked), self);
+                       g_object_set_data(G_OBJECT(button), "level2", (gpointer)level2);
+                       g_object_set_data(G_OBJECT(button), "type",   (gpointer)vi);
+                       g_object_set_data(G_OBJECT(button), "elev",   (gpointer)(int)(elev*100));
+                       g_signal_connect(button, "clicked", G_CALLBACK(_on_sweep_clicked), self);
                }
        }
        gtk_container_add(GTK_CONTAINER(self->config_body), table);
        gtk_widget_show_all(table);
 }
 
-static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
+static gchar *_download_radar(GisPluginRadar *self, const gchar *site, const gchar *time)
 {
-       Range range = ray->range[bi];
-
-       double angle = d2r(ray->h.azimuth);
-       double tilt  = d2r(ray->h.elev);
-
-       double lx    = sin(angle);
-       double ly    = cos(angle);
-       double lz    = sin(tilt);
-
-       double dist   = bi*ray->h.gate_size + ray->h.range_bin1;
-               
-       grid->p[gi].x = lx*dist;
-       grid->p[gi].y = ly*dist;
-       grid->p[gi].z = lz*dist;
-
-       guint8 val = (guint8)ray->h.f(ray->range[bi]);
-       if (val == BADVAL     || val == RFVAL      || val == APFLAG ||
-           val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO ||
-           val > 80)
-               val = 0;
-       grid->val[gi] = (float)val;
-       //g_debug("(%.2f,%.2f,%.2f) - (%.0f,%.0f,%.0f) = %d", 
-       //      angle, tilt, dist,
-       //      grid->p[gi].x,
-       //      grid->p[gi].y,
-       //      grid->p[gi].z,
-       //      val);
+       g_debug("GisPluginRadar: _download_radar - %s, %s", site, time);
+
+       /* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
+       gchar *base  = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
+       gchar *local = g_strdup_printf("%s/%s_%s", site, site, time);
+       gchar *uri   = g_strconcat(base, "/", local, NULL);
+       GisCacheType mode = gis_viewer_get_offline(self->viewer) ? GIS_LOCAL : GIS_UPDATE;
+       gchar *file  =  gis_http_fetch(self->http, uri, local, mode, _load_gui_update, self);
+       g_free(base);
+       g_free(local);
+       g_free(uri);
+       return file;
 }
 
-/* Load a radar from a decompressed file */
-static void load_radar(GisPluginRadar *self, gchar *radar_file)
+struct SetRadarData {
+       GisPluginRadar *self;
+       gchar *site;
+       gchar *time;
+};
+static gpointer _set_radar_cb(gpointer _data)
 {
-       char *dir  = g_path_get_dirname(radar_file);
-       char *site = g_path_get_basename(dir);
-       g_free(dir);
-       g_debug("GisPluginRadar: load_radar - Loading new radar");
-       RSL_read_these_sweeps("all", NULL);
-       Radar *radar = self->cur_radar = RSL_wsr88d_to_radar(radar_file, site);
-       if (radar == NULL) {
-               g_warning("fail to load radar: path=%s, site=%s", radar_file, site);
-               g_free(site);
-               return;
+       g_debug("GisPluginRadar: _set_radar_cb");
+       struct SetRadarData *data = _data;
+       GisPluginRadar *self = data->self;
+
+       gdk_threads_enter();
+       _load_gui_pre(self);
+       if (self->radar) {
+               gis_viewer_remove(self->viewer, self->radar);
+               self->radar = NULL;
        }
-       g_free(site);
-
-#ifdef MARCHING
-       /* Load the surface */
-       if (self->cur_triangles) {
-               g_free(self->cur_triangles);
-               self->cur_triangles = NULL;
+       gchar *file = _download_radar(self, data->site, data->time);
+       if (!file) {
+               _load_gui_error(self, "Download failed");
+               goto out;
        }
-       self->cur_num_triangles = 0;
-       int x = 1;
-       for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
-               if (radar->v[vi] == NULL) continue;
-
-               for (guint si = 0; si+1 < radar->v[vi]->h.nsweeps; si++) {
-                       Sweep *sweep0 = radar->v[vi]->sweep[si+0];
-                       Sweep *sweep1 = radar->v[vi]->sweep[si+1];
-
-                       //g_debug("_gis_plugin_radar_expose: sweep[%3d-%3d] -- nrays = %d, %d",
-                       //      si, si+1,sweep0->h.nrays, sweep1->h.nrays);
-
-                       /* Skip super->regular resolution switch for now */
-                       if (sweep0 == NULL || sweep0->h.elev == 0 ||
-                           sweep1 == NULL || sweep1->h.elev == 0 ||
-                           sweep0->h.nrays != sweep1->h.nrays)
-                               continue;
-
-                       /* We repack the arrays so that raysX[0] is always north, etc */
-                       Ray **rays0 = g_malloc0(sizeof(Ray*)*sweep0->h.nrays);
-                       Ray **rays1 = g_malloc0(sizeof(Ray*)*sweep1->h.nrays);
-
-                       for (guint ri = 0; ri < sweep0->h.nrays; ri++)
-                               rays0[(guint)(sweep0->ray[ri]->h.azimuth * sweep0->h.nrays / 360)] =
-                                       sweep0->ray[ri];
-                       for (guint ri = 0; ri < sweep1->h.nrays; ri++)
-                               rays1[(guint)(sweep1->ray[ri]->h.azimuth * sweep1->h.nrays / 360)] =
-                                       sweep1->ray[ri];
-
-                       for (guint ri = 0; ri+x < sweep0->h.nrays; ri+=x) {
-                               //g_debug("_gis_plugin_radar_expose: ray[%3d-%3d] -- nbins = %d, %d, %d, %d",
-                               //      ri, ri+x,
-                               //      rays0[ri  ]->h.nbins, 
-                               //      rays0[ri+1]->h.nbins, 
-                               //      rays1[ri  ]->h.nbins, 
-                               //      rays1[ri+1]->h.nbins);
-
-                               for (guint bi = 0; bi+x < rays1[ri]->h.nbins; bi+=x) {
-                                       GRIDCELL grid = {};
-                                       _gis_plugin_radar_grid_set(&grid, 7, rays0[(ri  )%sweep0->h.nrays], bi+x);
-                                       _gis_plugin_radar_grid_set(&grid, 6, rays0[(ri+x)%sweep0->h.nrays], bi+x);
-                                       _gis_plugin_radar_grid_set(&grid, 5, rays0[(ri+x)%sweep0->h.nrays], bi  );
-                                       _gis_plugin_radar_grid_set(&grid, 4, rays0[(ri  )%sweep0->h.nrays], bi  );
-                                       _gis_plugin_radar_grid_set(&grid, 3, rays1[(ri  )%sweep0->h.nrays], bi+x);
-                                       _gis_plugin_radar_grid_set(&grid, 2, rays1[(ri+x)%sweep0->h.nrays], bi+x);
-                                       _gis_plugin_radar_grid_set(&grid, 1, rays1[(ri+x)%sweep0->h.nrays], bi  );
-                                       _gis_plugin_radar_grid_set(&grid, 0, rays1[(ri  )%sweep0->h.nrays], bi  );
-                                       
-                                       TRIANGLE tris[10];
-                                       int n = march_one_cube(grid, 40, tris);
-
-                                       self->cur_triangles = g_realloc(self->cur_triangles,
-                                               (self->cur_num_triangles+n)*sizeof(TRIANGLE));
-                                       for (int i = 0; i < n; i++) {
-                                               //g_debug("triangle: ");
-                                               //g_debug("\t(%f,%f,%f)", tris[i].p[0].x, tris[i].p[0].y, tris[i].p[0].z);
-                                               //g_debug("\t(%f,%f,%f)", tris[i].p[1].x, tris[i].p[1].y, tris[i].p[1].z);
-                                               //g_debug("\t(%f,%f,%f)", tris[i].p[2].x, tris[i].p[2].y, tris[i].p[2].z);
-                                               self->cur_triangles[self->cur_num_triangles+i] = tris[i];
-                                       }
-                                       self->cur_num_triangles += n;
-                                       //g_debug(" ");
-                               }
-                       }
-               }
-               break; // Exit after first volume (reflectivity)
+       AWeatherLevel2 *level2 = aweather_level2_new_from_file(
+                       self->viewer, colormaps, file, data->site);
+       if (!level2) {
+               _load_gui_error(self, "Loading radar failed");
+               //g_remove(file);
+               goto out;
        }
-#endif
-
-       /* Load the first sweep by default */
-       if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) {
-               g_warning("No sweeps found\n");
-       } else {
-               /* load first available sweep */
-               for (int vi = 0; vi < radar->h.nvolumes; vi++) {
-                       if (radar->v[vi]== NULL) continue;
-                       for (int si = 0; si < radar->v[vi]->h.nsweeps; si++) {
-                               if (radar->v[vi]->sweep[si]== NULL) continue;
-                               load_colormap(self, radar->v[vi]->h.type_str);
-                               load_sweep(self, radar->v[vi]->sweep[si]);
-                               break;
-                       }
-                       break;
-               }
-       }
-
-       load_radar_gui(self, radar);
-}
-
-/*****************
- * ASync helpers *
- *****************/
-typedef struct {
-       GisPluginRadar *self;
-       gchar *radar_file;
-} decompressed_t;
-
-static void decompressed_cb(GPid pid, gint status, gpointer _udata)
-{
-       g_debug("GisPluginRadar: decompressed_cb");
-       decompressed_t *udata = _udata;
-       if (status != 0) {
-               g_warning("wsr88ddec exited with status %d", status);
-               return;
-       }
-       load_radar(udata->self, udata->radar_file);
-       g_spawn_close_pid(pid);
-       g_free(udata->radar_file);
-       g_free(udata);
-}
-
-static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self)
-{
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       double percent = (double)cur/total;
-
-       //g_message("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
-       //              cur, total, percent*100);
-
-       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0));
-
-       gchar *msg = g_strdup_printf("Loading radar... %5.1f%% (%.2f/%.2f MB)",
-                       percent*100, (double)cur/1000000, (double)total/1000000);
-       gtk_label_set_text(GTK_LABEL(self->progress_label), msg);
-       g_free(msg);
+       self->colormap = level2->sweep_colors;
+       self->radar = gis_viewer_add(self->viewer, GIS_OBJECT(level2), GIS_LEVEL_WORLD, TRUE);
+       _load_gui_success(self, level2);
+
+out:
+       gdk_threads_leave();
+       g_free(file);
+       g_free(data->site);
+       g_free(data->time);
+       g_free(data);
+       return NULL;
 }
-
-static void cache_done_cb(char *path, gboolean updated, gpointer _self)
+static void _set_radar(GisPluginRadar *self, const gchar *site, const gchar *time)
 {
-       g_debug("GisPluginRadar: cache_done_cb - updated = %d", updated);
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       char *decompressed = g_strconcat(path, ".raw", NULL);
-       if (!updated && g_file_test(decompressed, G_FILE_TEST_EXISTS)) {
-               load_radar(self, decompressed);
+       if (!site || !time)
                return;
-       }
-
-       decompressed_t *udata = g_malloc(sizeof(decompressed_t));
-       udata->self       = self;
-       udata->radar_file = decompressed;
-       g_debug("GisPluginRadar: cache_done_cb - File updated, decompressing..");
-       char *argv[] = {"wsr88ddec", path, decompressed, NULL};
-       GPid pid;
-       GError *error = NULL;
-       g_spawn_async(
-               NULL,    // const gchar *working_directory,
-               argv,    // gchar **argv,
-               NULL,    // gchar **envp,
-               G_SPAWN_SEARCH_PATH|
-               G_SPAWN_DO_NOT_REAP_CHILD, 
-                        // GSpawnFlags flags,
-               NULL,    // GSpawnChildSetupFunc child_setup,
-               NULL,    // gpointer user_data,
-               &pid,    // GPid *child_pid,
-               &error); // GError **error
-       if (error) {
-               g_warning("failed to decompress WSR88D data: %s",
-                               error->message);
-               g_error_free(error);
-       }
-       g_child_watch_add(pid, decompressed_cb, udata);
-       self->soup = NULL;
+       //soup_session_abort(self->http->soup);
+       //g_mutex_lock(self->load_mutex);
+       struct SetRadarData *data = g_new(struct SetRadarData, 1);
+       data->self = self;
+       data->site = g_strdup(site);
+       data->time = g_strdup(time);
+       g_thread_create(_set_radar_cb, data, FALSE, NULL);
 }
 
 /*************
  * Callbacks *
  *************/
-static void on_sweep_clicked(GtkRadioButton *button, gpointer _self)
+static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self)
 {
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       load_colormap(self, g_object_get_data(G_OBJECT(button), "type" ));
-       load_sweep   (self, g_object_get_data(G_OBJECT(button), "sweep"));
+       GisPluginRadar *self   = GIS_PLUGIN_RADAR(_self);
+       AWeatherLevel2 *level2 = g_object_get_data(G_OBJECT(button), "level2");
+       gint type = (gint)g_object_get_data(G_OBJECT(button), "type");
+       gint elev = (gint)g_object_get_data(G_OBJECT(button), "elev");
+       aweather_level2_set_sweep(level2, type, (float)elev/100);
+       self->colormap = level2->sweep_colors;
 }
 
-static void on_time_changed(GisView *view, const char *time, gpointer _self)
+static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self)
 {
+       g_debug("GisPluginRadar: _on_time_changed");
        GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       g_debug("GisPluginRadar: on_time_changed - setting time=%s", time);
-       // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
-       char *site = gis_view_get_site(view);
-       char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time);
-
-       /* Set up progress bar */
-       GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
-       if (child) gtk_widget_destroy(child);
-
-       GtkWidget *vbox = gtk_vbox_new(FALSE, 10);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
-       self->progress_bar   = gtk_progress_bar_new();
-       self->progress_label = gtk_label_new("Loading radar...");
-       gtk_box_pack_start(GTK_BOX(vbox), self->progress_bar,   FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), self->progress_label, FALSE, FALSE, 0);
-       gtk_container_add(GTK_CONTAINER(self->config_body), vbox);
-       gtk_widget_show_all(self->config_body);
+       self->cur_time = g_strdup(time);
+       _set_radar(self, self->cur_site, self->cur_time);
+}
 
-       /* Clear radar */
-       if (self->cur_radar)
-               RSL_free_radar(self->cur_radar);
-       self->cur_radar = NULL;
-       self->cur_sweep = NULL;
-       gis_opengl_redraw(self->opengl);
-
-       /* Start loading the new radar */
-       if (self->soup) {
-               soup_session_abort(self->soup);
-               self->soup = NULL;
+static void _on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev,
+               gpointer _self)
+{
+       g_debug("GisPluginRadar: _on_location_changed");
+       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       gdouble min_dist = EARTH_R / 5;
+       city_t *city, *min_city = NULL;
+       for (city = cities; city->type; city++) {
+               if (city->type != LOCATION_CITY)
+                       continue;
+               gdouble city_loc[3] = {};
+               gdouble eye_loc[3]  = {lat, lon, elev};
+               lle2xyz(city->lat, city->lon, city->elev,
+                               &city_loc[0], &city_loc[1], &city_loc[2]);
+               lle2xyz(lat, lon, elev,
+                               &eye_loc[0], &eye_loc[1], &eye_loc[2]);
+               gdouble dist = distd(city_loc, eye_loc);
+               if (dist < min_dist) {
+                       min_dist = dist;
+                       min_city = city;
+               }
+       }
+       static city_t *last_city = NULL;
+       if (min_city && min_city != last_city){
+               self->cur_site = min_city->code;
+               _set_radar(self, self->cur_site, self->cur_time);
        }
-       gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url");
-       if (gis_world_get_offline(self->world)) 
-               self->soup = cache_file(base, path, GIS_ONCE,
-                               cache_chunk_cb, cache_done_cb, self);
-       else 
-               self->soup = cache_file(base, path, GIS_UPDATE,
-                               cache_chunk_cb, cache_done_cb, self);
-       g_free(path);
+       last_city = min_city;
 }
 
+
 /***********
  * Methods *
  ***********/
-GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs)
+GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
 {
        /* TODO: move to constructor if possible */
        g_debug("GisPluginRadar: new");
        GisPluginRadar *self = g_object_new(GIS_TYPE_PLUGIN_RADAR, NULL);
-       self->world  = world;
-       self->view   = view;
-       self->opengl = opengl;
+       self->viewer = viewer;
        self->prefs  = prefs;
-       self->time_changed_id = g_signal_connect(view, "time-changed",
-                       G_CALLBACK(on_time_changed), self);
+       self->time_changed_id = g_signal_connect(viewer, "time-changed",
+                       G_CALLBACK(_on_time_changed), self);
+       self->location_changed_id = g_signal_connect(viewer, "location-changed",
+                       G_CALLBACK(_on_location_changed), self);
+
+       for (city_t *city = cities; city->type; city++) {
+               if (city->type != LOCATION_CITY)
+                       continue;
+               g_debug("Adding marker for %s %s", city->code, city->label);
+               GisMarker *marker = gis_marker_new(city->label);
+               gis_point_set_lle(gis_object_center(GIS_OBJECT(marker)),
+                               city->lat, city->lon, city->elev);
+               GIS_OBJECT(marker)->lod = EARTH_R/2;
+               gis_viewer_add(self->viewer, GIS_OBJECT(marker), GIS_LEVEL_OVERLAY, FALSE);
+       }
+
+       GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
+       gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE);
+
        return self;
 }
 
@@ -517,115 +349,55 @@ static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self)
        return self->config_body;
 }
 
-static void gis_plugin_radar_expose(GisPlugin *_self)
-{
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       g_debug("GisPluginRadar: expose");
-       if (self->cur_sweep == NULL)
-               return;
-       Sweep *sweep = self->cur_sweep;
-
-#ifdef MARCHING
-       /* Draw the surface */
-       glMatrixMode(GL_MODELVIEW);
-       glPushMatrix();
-       glDisable(GL_TEXTURE_2D);
-       float light_ambient[]  = {0.1f, 0.1f, 0.0f};
-       float light_diffuse[]  = {0.9f, 0.9f, 0.9f};
-       float light_position[] = {-300000.0f, 500000.0f, 400000.0f, 1.0f};
-       glLightfv(GL_LIGHT0, GL_AMBIENT,  light_ambient);
-       glLightfv(GL_LIGHT0, GL_DIFFUSE,  light_diffuse);
-       glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-       glEnable(GL_LIGHT0);
-       glEnable(GL_LIGHTING);
-       glEnable(GL_COLOR_MATERIAL);
-       glColor4f(1,1,1,0.75);
-       g_debug("ntri=%d", self->cur_num_triangles);
-       glBegin(GL_TRIANGLES);
-       for (int i = 0; i < self->cur_num_triangles; i++) {
-               TRIANGLE t = self->cur_triangles[i];
-               do_normal(t.p[0].x, t.p[0].y, t.p[0].z,
-                         t.p[1].x, t.p[1].y, t.p[1].z,
-                         t.p[2].x, t.p[2].y, t.p[2].z);
-               glVertex3f(t.p[0].x, t.p[0].y, t.p[0].z);
-               glVertex3f(t.p[1].x, t.p[1].y, t.p[1].z);
-               glVertex3f(t.p[2].x, t.p[2].y, t.p[2].z);
-       }
-       glEnd();
-       glPopMatrix();
-#endif
-
-       /* Draw the rays */
-       glDisable(GL_LIGHTING);
-       glDisable(GL_COLOR_MATERIAL);
-       glMatrixMode(GL_MODELVIEW);
-       glPushMatrix();
-       glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
-       glEnable(GL_TEXTURE_2D);
-       glDisable(GL_ALPHA_TEST);
-       glColor4f(1,1,1,1);
-       glBegin(GL_QUAD_STRIP);
-       for (int ri = 0; ri <= sweep->h.nrays; ri++) {
-               Ray  *ray = NULL;
-               double angle = 0;
-               if (ri < sweep->h.nrays) {
-                       ray = sweep->ray[ri];
-                       angle = d2r(ray->h.azimuth - ((double)ray->h.beam_width/2.));
-               } else {
-                       /* Do the right side of the last sweep */
-                       ray = sweep->ray[ri-1];
-                       angle = d2r(ray->h.azimuth + ((double)ray->h.beam_width/2.));
-               }
-
-               double lx = sin(angle);
-               double ly = cos(angle);
-
-               double near_dist = ray->h.range_bin1;
-               double far_dist  = ray->h.nbins*ray->h.gate_size + ray->h.range_bin1;
-
-               /* (find middle of bin) / scale for opengl */
-               // near left
-               glTexCoord2f(0.0, (double)ri/sweep->h.nrays-0.01);
-               glVertex3f(lx*near_dist, ly*near_dist, 2.0);
-
-               // far  left
-               // todo: correct range-height function
-               double height = sin(d2r(ray->h.elev)) * far_dist;
-               glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
-               glVertex3f(lx*far_dist,  ly*far_dist, height);
-       }
-       //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
-       glEnd();
-       glPopMatrix();
 
-       /* Texture debug */
-       //glBegin(GL_QUADS);
-       //glTexCoord2d( 0.,  0.); glVertex3f(-500.,   0., 0.); // bot left
-       //glTexCoord2d( 0.,  1.); glVertex3f(-500., 500., 0.); // top left
-       //glTexCoord2d( 1.,  1.); glVertex3f( 0.,   500., 3.); // top right
-       //glTexCoord2d( 1.,  0.); glVertex3f( 0.,     0., 3.); // bot right
-       //glEnd();
+/****************
+ * GObject code *
+ ****************/
+/* Plugin init */
+static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
+               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
+                       gis_plugin_radar_plugin_init));
+static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
+{
+       g_debug("GisPluginRadar: plugin_init");
+       /* Add methods to the interface */
+       iface->get_config = gis_plugin_radar_get_config;
+}
+/* Class/Object init */
+static void gis_plugin_radar_init(GisPluginRadar *self)
+{
+       g_debug("GisPluginRadar: class_init");
+       /* Set defaults */
+       self->http = gis_http_new("/nexrad/level2/");
+       self->config_body = gtk_alignment_new(0, 0, 1, 1);
+       //self->load_mutex = g_mutex_new();
+       gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
+       gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
+}
+static void gis_plugin_radar_dispose(GObject *gobject)
+{
+       g_debug("GisPluginRadar: dispose");
+       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+       g_signal_handler_disconnect(self->viewer, self->time_changed_id);
+       /* Drop references */
+       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+}
+static void gis_plugin_radar_finalize(GObject *gobject)
+{
+       g_debug("GisPluginRadar: finalize");
+       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+       /* Free data */
+       gis_http_free(self->http);
+       //g_mutex_free(self->load_mutex);
+       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
 
-       /* Print the color table */
-       glDisable(GL_TEXTURE_2D);
-       glDisable(GL_DEPTH_TEST);
-       glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
-       glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
-       glBegin(GL_QUADS);
-       int i;
-       for (i = 0; i < 256; i++) {
-               glColor4ub(self->cur_colormap->data[i][0],
-                          self->cur_colormap->data[i][1],
-                          self->cur_colormap->data[i][2],
-                          self->cur_colormap->data[i][3]);
-               glVertex3f(-1.0, (float)((i  ) - 256/2)/(256/2), 0.0); // bot left
-               glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
-               glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
-               glVertex3f(-0.9, (float)((i  ) - 256/2)/(256/2), 0.0); // bot right
-       }
-       glEnd();
-       glEnable(GL_DEPTH_TEST);
-       glEnable(GL_ALPHA_TEST);
-        glMatrixMode(GL_PROJECTION); glPopMatrix(); 
-       glMatrixMode(GL_MODELVIEW ); glPopMatrix();
 }
+static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+{
+       g_debug("GisPluginRadar: class_init");
+       GObjectClass *gobject_class = (GObjectClass*)klass;
+       gobject_class->dispose  = gis_plugin_radar_dispose;
+       gobject_class->finalize = gis_plugin_radar_finalize;
+}
+