]> Pileus Git - aweather/blobdiff - src/plugins/radar.c
Add check when loading Conus pixbuf
[aweather] / src / plugins / radar.c
index 4efa6cb57a126a408ed0102d078cb67283340286..73d275985ab9a13202d3bdfcd0df950afea70e61 100644 (file)
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE
+#include <sys/time.h>
 #include <config.h>
+#include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <gio/gio.h>
 #include <gis.h>
 
 #include "radar.h"
-#include "marching.h"
+#include "level2.h"
 #include "../aweather-location.h"
 
-
-/**************************
- * 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)
-{
-       /* 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]*0.75; // TESTING
-                       if (val == BADVAL     || val == RFVAL      || val == APFLAG ||
-                           val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO) {
-                               buf[buf_i+3] = 0x00; // transparent
-                       }
-               }
-       }
-
-       /* set output */
-       *width  = max_bins;
-       *height = sweep->h.nrays;
-       *data   = buf;
-}
-
-/* Load a sweep as the active texture */
-static void _load_sweep(GisPluginRadar *self, Sweep *sweep)
+GtkWidget *_gtk_check_label_new(const gchar *text, gboolean state,
+               GCallback on_clicked, gpointer user_data)
 {
-       GisViewer *viewer = self->viewer;
-       gis_viewer_begin(viewer);
-       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);
-       gtk_widget_queue_draw(GTK_WIDGET(viewer));
-       gis_viewer_end(viewer);
+       GtkWidget *hbox  = gtk_hbox_new(FALSE, 0);
+       GtkWidget *check = gtk_check_button_new();
+       GtkWidget *label = gtk_label_new(text);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), state);
+       g_signal_connect_swapped(check , "clicked",
+                       G_CALLBACK(on_clicked), user_data);
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gtk_box_pack_end(GTK_BOX(hbox), check , FALSE, FALSE, 0);
+       gtk_widget_show_all(hbox);
+       return hbox;
 }
 
-static void _load_colormap(GisPluginRadar *self, gchar *table)
+void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
 {
-       /* 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];
+       GtkWidget *old = gtk_bin_get_child(bin);
+       if (old)
+               gtk_widget_destroy(old);
+       gtk_container_add(GTK_CONTAINER(bin), new);
+       gtk_widget_show_all(new);
 }
 
-/* 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)
+static gchar *_find_nearest(time_t time, GList *files,
+               gsize offset, gchar *format)
 {
-       /* Clear existing items */
-       GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
-       if (child)
-               gtk_widget_destroy(child);
-
-       gdouble elev;
-       guint rows = 1, cols = 1, cur_cols;
-       gchar row_label_str[64], col_label_str[64], button_str[64];
-       GtkWidget *row_label, *col_label, *button = NULL, *elev_box = NULL;
-       GtkWidget *table = gtk_table_new(rows, cols, FALSE);
-
-       for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
-               Volume *vol = radar->v[vi];
-               if (vol == NULL) continue;
-               rows++; cols = 1; elev = 0;
-
-               /* Row label */
-               g_snprintf(row_label_str, 64, "<b>%s:</b>", vol->h.type_str);
-               row_label = gtk_label_new(row_label_str);
-               gtk_label_set_use_markup(GTK_LABEL(row_label), TRUE);
-               gtk_misc_set_alignment(GTK_MISC(row_label), 1, 0.5);
-               gtk_table_attach(GTK_TABLE(table), row_label,
-                               0,1, rows-1,rows, GTK_FILL,GTK_FILL, 5,0);
-
-               for (guint si = 0; si < vol->h.nsweeps; si++) {
-                       Sweep *sweep = vol->sweep[si];
-                       if (sweep == NULL || sweep->h.elev == 0) continue;
-                       if (sweep->h.elev != elev) {
-                               cols++;
-                               elev = sweep->h.elev;
-
-                               /* Column label */
-                               g_object_get(table, "n-columns", &cur_cols, NULL);
-                               if (cols >  cur_cols) {
-                                       g_snprintf(col_label_str, 64, "<b>%.2f°</b>", elev);
-                                       col_label = gtk_label_new(col_label_str);
-                                       gtk_label_set_use_markup(GTK_LABEL(col_label), TRUE);
-                                       gtk_widget_set_size_request(col_label, 50, -1);
-                                       gtk_table_attach(GTK_TABLE(table), col_label,
-                                                       cols-1,cols, 0,1, GTK_FILL,GTK_FILL, 0,0);
-                               }
-
-                               elev_box = gtk_hbox_new(TRUE, 0);
-                               gtk_table_attach(GTK_TABLE(table), elev_box,
-                                               cols-1,cols, rows-1,rows, GTK_FILL,GTK_FILL, 0,0);
-                       }
-
-
-                       /* Button */
-                       g_snprintf(button_str, 64, "%3.2f", elev);
-                       button = gtk_radio_button_new_with_label_from_widget(
-                                       GTK_RADIO_BUTTON(button), button_str);
-                       gtk_widget_set_size_request(button, -1, 26);
-                       //button = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(button));
-                       //gtk_widget_set_size_request(button, -1, 22);
-                       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_debug("GisPluginRadar: _find_nearest ...");
+       time_t  nearest_time = 0;
+       char   *nearest_file = NULL;
+
+       struct tm tm = {};
+       for (GList *cur = files; cur; cur = cur->next) {
+               gchar *file = cur->data;
+               strptime(file+offset, format, &tm);
+               if (ABS(time - mktime(&tm)) <
+                   ABS(time - nearest_time)) {
+                       nearest_file = file;
+                       nearest_time = mktime(&tm);
                }
        }
-       gtk_container_add(GTK_CONTAINER(self->config_body), table);
-       gtk_widget_show_all(table);
+
+       g_debug("GisPluginRadar: _find_nearest = %s", nearest_file);
+       if (nearest_file)
+               return g_strdup(nearest_file);
+       else
+               return NULL;
 }
 
-static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
+
+/**************
+ * RadarSites *
+ **************/
+typedef enum {
+       STATUS_UNLOADED,
+       STATUS_LOADING,
+       STATUS_LOADED,
+} RadarSiteStatus;
+struct _RadarSite {
+       /* Information */
+       city_t    *city;
+       GisMarker *marker;     // Map marker for libgis
+       gpointer  *marker_ref; // Reference to maker
+
+       /* Stuff from the parents */
+       GisViewer     *viewer;
+       GisHttp       *http;
+       GisPrefs      *prefs;
+       GtkWidget     *pconfig;
+
+       /* When loaded */
+       gboolean        hidden;
+       RadarSiteStatus status;     // Loading status for the site
+       GtkWidget      *config;
+       AWeatherLevel2 *level2;     // The Level2 structure for the current volume
+       gpointer        level2_ref; // GisViewer reference to the added radar
+
+       /* Internal data */
+       time_t   time;        // Current timestamp of the level2
+       gchar   *message;     // Error message set while updating
+       guint    time_id;     // "time-changed"     callback ID
+       guint    refresh_id;  // "refresh"          callback ID
+       guint    location_id; // "locaiton-changed" callback ID
+};
+
+/* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
+void _site_update_loading(gchar *file, goffset cur,
+               goffset total, gpointer _site)
 {
-       Range range = ray->range[bi];
-
-       double angle = deg2rad(ray->h.azimuth);
-       double tilt  = deg2rad(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);
+       RadarSite *site = _site;
+       GtkWidget *progress_bar = gtk_bin_get_child(GTK_BIN(site->config));
+       double percent = (double)cur/total;
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), MIN(percent, 1.0));
+       gchar *msg = g_strdup_printf("Loading... %5.1f%% (%.2f/%.2f MB)",
+                       percent*100, (double)cur/1000000, (double)total/1000000);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar), msg);
+       g_free(msg);
 }
-
-/* Load a radar from a decompressed file */
-static void _load_radar(GisPluginRadar *self, gchar *radar_file)
+gboolean _site_update_end(gpointer _site)
 {
-       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;
+       RadarSite *site = _site;
+       if (site->message) {
+               g_warning("GisPluginRadar: _update_end - %s", site->message);
+               _gtk_bin_set_child(GTK_BIN(site->config), gtk_label_new(site->message));
+       } else {
+               _gtk_bin_set_child(GTK_BIN(site->config),
+                               aweather_level2_get_config(site->level2));
        }
-       g_free(site);
-
-#ifdef MARCHING
-       /* Load the surface */
-       if (self->cur_triangles) {
-               g_free(self->cur_triangles);
-               self->cur_triangles = NULL;
+       site->status = STATUS_LOADED;
+       return FALSE;
+}
+gpointer _site_update_thread(gpointer _site)
+{
+       RadarSite *site = _site;
+       g_debug("GisPluginRadar: _site_update_thread - %s", site->city->code);
+       site->message = NULL;
+
+       gboolean offline = gis_viewer_get_offline(site->viewer);
+       gchar *nexrad_url = gis_prefs_get_string(site->prefs,
+                       "aweather/nexrad_url", NULL);
+
+       /* Find nearest volume (temporally) */
+       g_debug("GisPluginRadar: _site_update_thread - find nearest - %s", site->city->code);
+       gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code,
+                       "/", "dir.list", NULL);
+       GList *files = gis_http_available(site->http,
+                       "^K\\w{3}_\\d{8}_\\d{4}$", site->city->code,
+                       "\\d+ (.*)", (offline ? NULL : dir_list));
+       g_free(dir_list);
+       gchar *nearest = _find_nearest(site->time, files, 5, "%Y%m%d_%H%M");
+       g_list_foreach(files, (GFunc)g_free, NULL);
+       g_list_free(files);
+       if (!nearest) {
+               site->message = "No suitable files found";
+               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("GisPluginRadar: load_radar: 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("GisPluginRadar: load_radar - 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)
+
+       /* Fetch new volume */
+       g_debug("GisPluginRadar: _site_update_thread - fetch");
+       gchar *local = g_strconcat(site->city->code, "/", nearest, NULL);
+       gchar *uri   = g_strconcat(nexrad_url, "/", local,   NULL);
+       gchar *file = gis_http_fetch(site->http, uri, local,
+                       offline ? GIS_LOCAL : GIS_UPDATE,
+                       _site_update_loading, site);
+       g_free(nexrad_url);
+       g_free(nearest);
+       g_free(local);
+       g_free(uri);
+       if (!file) {
+               site->message = "Fetch failed";
+               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 and add new volume */
+       g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
+       site->level2 = aweather_level2_new_from_file(
+                       site->viewer, colormaps, file, site->city->code);
+       g_free(file);
+       if (!site->level2) {
+               site->message = "Load failed";
+               goto out;
        }
+       GIS_OBJECT(site->level2)->hidden = site->hidden;
+       site->level2_ref = gis_viewer_add(site->viewer,
+                       GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
 
-       _load_radar_gui(self, radar);
+out:
+       g_idle_add(_site_update_end, site);
+       return NULL;
 }
-
-typedef struct {
-       GisPluginRadar *self;
-       gchar *radar_file;
-} decompressed_t;
-
-static void _decompressed_cb(GPid pid, gint status, gpointer _udata)
+void _site_update(RadarSite *site)
 {
-       g_debug("GisPluginRadar: decompressed_cb");
-       decompressed_t *udata = _udata;
-       if (status != 0) {
-               g_warning("wsr88ddec exited with status %d", status);
+       if (site->status == STATUS_LOADING)
                return;
+       site->status = STATUS_LOADING;
+
+       site->time = gis_viewer_get_time(site->viewer);
+       g_debug("GisPluginRadar: _site_update %s - %d",
+                       site->city->code, (gint)site->time);
+
+       /* Add a progress bar */
+       GtkWidget *progress = gtk_progress_bar_new();
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
+       _gtk_bin_set_child(GTK_BIN(site->config), progress);
+
+       /* Remove old volume */
+       g_debug("GisPluginRadar: _site_update - remove - %s", site->city->code);
+       if (site->level2_ref) {
+               gis_viewer_remove(site->viewer, site->level2_ref);
+               site->level2_ref = NULL;
        }
-       _load_radar(udata->self, udata->radar_file);
-       g_spawn_close_pid(pid);
-       g_free(udata->radar_file);
-       g_free(udata);
+
+       /* Fork loading right away so updating the
+        * list of times doesn't take too long */
+       g_thread_create(_site_update_thread, site, FALSE, NULL);
 }
 
-static void _cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self)
+/* RadarSite methods */
+void radar_site_unload(RadarSite *site)
 {
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       double percent = (double)cur/total;
+       if (site->status != STATUS_LOADED)
+               return; // Abort if it's still loading
 
-       //g_debug("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
-       //              cur, total, percent*100);
+       g_debug("GisPluginRadar: radar_site_unload %s", site->city->code);
 
-       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0));
+       if (site->time_id)
+               g_signal_handler_disconnect(site->viewer, site->time_id);
+       if (site->refresh_id)
+               g_signal_handler_disconnect(site->viewer, site->refresh_id);
 
-       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);
-}
+       /* Remove tab */
+       if (site->config)
+               gtk_widget_destroy(site->config);
 
-static void _cache_done_cb(char *path, gboolean updated, gpointer _self)
-{
-       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);
-               return;
+       /* Remove radar */
+       if (site->level2_ref) {
+               gis_viewer_remove(site->viewer, site->level2_ref);
+               site->level2_ref = NULL;
        }
 
-       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) {
-               gchar *message = g_strdup_printf("Unable to decompress WSR88D data: %s",
-                               error->message);
-               g_warning("%s", message);
-               GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
-               if (child)
-                       gtk_widget_destroy(child);
-               gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new(message));
-               gtk_widget_show_all(self->config_body);
-               g_error_free(error);
-               g_free(message);
-       }
-       g_child_watch_add(pid, _decompressed_cb, udata);
-       self->soup = NULL;
+       site->status = STATUS_UNLOADED;
 }
 
-static void _set_radar(GisPluginRadar *self, const char *site, const char *time)
+void radar_site_toggle(RadarSite *site)
 {
-       if (!site || !time)
-               return;
-       g_debug("GisPluginRadar: set_radar - %s - %s", site, time);
-
-       // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
-       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);
-
-       /* Clear radar */
-       if (self->cur_radar)
-               RSL_free_radar(self->cur_radar);
-       self->cur_radar = NULL;
-       self->cur_sweep = NULL;
-       gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
-
-       /* Start loading the new radar */
-       if (self->soup) {
-               soup_session_abort(self->soup);
-               self->soup = NULL;
+       site->hidden = !site->hidden;
+       if (site->level2) {
+               GIS_OBJECT(site->level2)->hidden = site->hidden;
+               gtk_widget_queue_draw(GTK_WIDGET(site->viewer));
        }
-       gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
-       if (gis_viewer_get_offline(self->viewer))
-               self->soup = cache_file(base, path, GIS_NEVER,
-                               NULL, _cache_done_cb, self);
-       else
-               self->soup = cache_file(base, path, GIS_UPDATE,
-                               _cache_chunk_cb, _cache_done_cb, self);
-       g_free(path);
 }
 
-
-/*************
- * Callbacks *
- *************/
-static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self)
+void radar_site_load(RadarSite *site)
 {
-       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"));
+       g_debug("GisPluginRadar: radar_site_load %s", site->city->code);
+
+       /* Add tab page */
+       site->config = gtk_alignment_new(0, 0, 1, 1);
+       gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig), site->config,
+                       _gtk_check_label_new(site->city->name, !site->hidden,
+                               G_CALLBACK(radar_site_toggle), site));
+       gtk_widget_show_all(site->config);
+
+       /* Set up radar loading */
+       site->time_id = g_signal_connect_swapped(site->viewer, "time-changed",
+                       G_CALLBACK(_site_update), site);
+       site->refresh_id = g_signal_connect_swapped(site->viewer, "refresh",
+                       G_CALLBACK(_site_update), site);
+       _site_update(site);
 }
 
-static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self)
+void _site_on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev,
+               gpointer _site)
 {
-       g_debug("GisPluginRadar: _on_time_changed");
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       g_free(self->cur_time);
-       self->cur_time = g_strdup(time);
-       _set_radar(self, self->cur_site, self->cur_time);
+       static gdouble min_dist = EARTH_R / 20;
+       RadarSite *site = _site;
+
+       /* Calculate distance, could cache xyz values */
+       gdouble eye_xyz[3], site_xyz[3];
+       lle2xyz(lat, lon, elev, &eye_xyz[0], &eye_xyz[1], &eye_xyz[2]);
+       lle2xyz(site->city->pos.lat, site->city->pos.lon, site->city->pos.elev,
+                       &site_xyz[0], &site_xyz[1], &site_xyz[2]);
+       gdouble dist = distd(site_xyz, eye_xyz);
+
+       /* Load or unload the site if necessasairy */
+       if (dist <= min_dist && dist < elev*1.25 && site->status == STATUS_UNLOADED)
+               radar_site_load(site);
+       else if (dist > 2*min_dist &&  site->status != STATUS_UNLOADED)
+               radar_site_unload(site);
 }
 
-static void _on_location_changed(GisViewer *viewer,
-               gdouble lat, gdouble lon, gdouble elev,
-               gpointer _self)
+gboolean _site_add_marker(gpointer _site)
 {
-       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);
-       }
-       last_city = min_city;
+       RadarSite *site = _site;
+       site->marker = gis_marker_new(site->city->name);
+       GIS_OBJECT(site->marker)->center = site->city->pos;
+       GIS_OBJECT(site->marker)->lod    = EARTH_R*site->city->lod;
+       site->marker_ref = gis_viewer_add(site->viewer,
+                       GIS_OBJECT(site->marker), GIS_LEVEL_OVERLAY, FALSE);
+       return FALSE;
+}
+RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
+               GisViewer *viewer, GisPrefs *prefs, GisHttp *http)
+{
+       RadarSite *site = g_new0(RadarSite, 1);
+       site->viewer  = g_object_ref(viewer);
+       site->prefs   = g_object_ref(prefs);
+       //site->http    = http;
+       site->http    = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
+       site->city    = city;
+       site->pconfig = pconfig;
+
+       /* Add marker */
+       g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL);
+
+
+       /* Connect signals */
+       site->location_id  = g_signal_connect(viewer, "location-changed",
+                       G_CALLBACK(_site_on_location_changed), site);
+       return site;
 }
 
-static gpointer _draw_radar(GisCallback *callback, gpointer _self)
+void radar_site_free(RadarSite *site)
 {
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       radar_site_unload(site);
+       gis_viewer_remove(site->viewer, site->marker_ref);
+       if (site->location_id)
+               g_signal_handler_disconnect(site->viewer, site->location_id);
+       gis_http_free(site->http);
+       g_object_unref(site->viewer);
+       g_object_unref(site->prefs);
+       g_free(site);
+}
 
-       /* Draw wsr88d */
-       if (self->cur_sweep == NULL)
-               return NULL;
-       g_debug("GisPluginRadar: _draw_radar");
-       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);
+/**************
+ * RadarConus *
+ **************/
+#define CONUS_NORTH       50.406626367301044
+#define CONUS_WEST       -127.620375523875420
+#define CONUS_WIDTH       3400.0
+#define CONUS_HEIGHT      1600.0
+#define CONUS_DEG_PER_PX  0.017971305190311
+
+struct _RadarConus {
+       GisViewer   *viewer;
+       GisHttp     *http;
+       GtkWidget   *config;
+       time_t       time;
+       const gchar *message;
+       GStaticMutex loading;
+
+       gchar       *path;
+       GisTile     *tile[2];
+       gpointer    *tile_ref[2];
+
+       guint        time_id;     // "time-changed"     callback ID
+       guint        refresh_id;  // "refresh"          callback ID
+};
+
+void _conus_update_loading(gchar *file, goffset cur,
+               goffset total, gpointer _conus)
+{
+       RadarConus *conus = _conus;
+       GtkWidget *progress_bar = gtk_bin_get_child(GTK_BIN(conus->config));
+       double percent = (double)cur/total;
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), MIN(percent, 1.0));
+       gchar *msg = g_strdup_printf("Loading... %5.1f%% (%.2f/%.2f MB)",
+                       percent*100, (double)cur/1000000, (double)total/1000000);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar), msg);
+       g_free(msg);
+}
+
+/* Copy images to graphics memory */
+static void _conus_update_end_copy(GisTile *tile, guchar *pixels)
+{
+       if (!tile->data) {
+               tile->data = g_new0(guint, 1);
+               glGenTextures(1, tile->data);
        }
-       glEnd();
-       glPopMatrix();
-#endif
 
-       g_debug("GisPluginRadar: _draw_radar - setting camera");
-       Radar_header *h = &self->cur_radar->h;
-       gdouble lat  = (double)h->latd + (double)h->latm/60 + (double)h->lats/(60*60);
-       gdouble lon  = (double)h->lond + (double)h->lonm/60 + (double)h->lons/(60*60);
-       gdouble elev = h->height;
-       gis_viewer_center_position(self->viewer, lat, lon, elev);
+       guint *tex = tile->data;
+       glBindTexture(GL_TEXTURE_2D, *tex);
 
-       glDisable(GL_ALPHA_TEST);
-       glDisable(GL_CULL_FACE);
-       glDisable(GL_LIGHTING);
-       glEnable(GL_TEXTURE_2D);
-       glEnable(GL_POLYGON_OFFSET_FILL);
-       glPolygonOffset(1.0, -2.0);
-       glColor4f(1,1,1,1);
-
-       /* Draw the rays */
-       glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
-       g_message("Tex = %d", self->cur_sweep_tex);
-       glBegin(GL_TRIANGLE_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 = deg2rad(ray->h.azimuth - ((double)ray->h.beam_width/2.));
+       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+       glPixelStorei(GL_PACK_ALIGNMENT, 1);
+       glTexImage2D(GL_TEXTURE_2D, 0, 4, 2048, 2048, 0,
+                       GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 1,1, CONUS_WIDTH/2,CONUS_HEIGHT,
+                       GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+       tile->coords.n = 1.0/(CONUS_WIDTH/2);
+       tile->coords.w = 1.0/ CONUS_HEIGHT;
+       tile->coords.s = tile->coords.n +  CONUS_HEIGHT   / 2048.0;
+       tile->coords.e = tile->coords.w + (CONUS_WIDTH/2) / 2048.0;
+       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+       glFlush();
+}
+
+/* Split the pixbuf into east and west halves (with 2K sides)
+ * Also map the pixbuf's alpha values */
+static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
+               gint width, gint height, gint pxsize)
+{
+       g_debug("GisPluginRadar: _conus_update_end_split");
+       guchar *out[] = {west,east};
+       const guchar alphamap[][4] = {
+               {0x04, 0xe9, 0xe7, 0x30},
+               {0x01, 0x9f, 0xf4, 0x60},
+               {0x03, 0x00, 0xf4, 0x90},
+       };
+       for (int y = 0; y < height; y++)
+       for (int x = 0; x < width;  x++) {
+               gint subx = x % (width/2);
+               gint idx  = x / (width/2);
+               guchar *src = &pixels[(y*width+x)*pxsize];
+               guchar *dst = &out[idx][(y*(width/2)+subx)*4];
+               if (src[0] > 0xe0 &&
+                   src[1] > 0xe0 &&
+                   src[2] > 0xe0) {
+                       dst[3] = 0x00;
                } else {
-                       /* Do the right side of the last sweep */
-                       ray = sweep->ray[ri-1];
-                       angle = deg2rad(ray->h.azimuth + ((double)ray->h.beam_width/2.));
+                       dst[0] = src[0];
+                       dst[1] = src[1];
+                       dst[2] = src[2];
+                       dst[3] = 0xff;
+                       for (int j = 0; j < G_N_ELEMENTS(alphamap); j++)
+                               if (src[0] == alphamap[j][0] &&
+                                   src[1] == alphamap[j][1] &&
+                                   src[2] == alphamap[j][2])
+                                       dst[3] = alphamap[j][3];
                }
+       }
+}
 
-               double lx = sin(angle);
-               double ly = cos(angle);
+gboolean _conus_update_end(gpointer _conus)
+{
+       RadarConus *conus = _conus;
+       g_debug("GisPluginRadar: _conus_update_end");
+
+       /* Check error status */
+       if (conus->message) {
+               g_warning("GisPluginRadar: _conus_update_end - %s", conus->message);
+               _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
+               goto out;
+       }
 
-               double near_dist = ray->h.range_bin1;
-               double far_dist  = ray->h.nbins*ray->h.gate_size + ray->h.range_bin1;
+       /* Load and pixbuf */
+       GError *error = NULL;
+       GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->path, &error);
+       if (!pixbuf || error) {
+               g_warning("GisPluginRadar: _conus_update_end - error loading pixbuf");
+               _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf"));
+               g_remove(conus->path);
+               goto out;
+       }
 
-               /* (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);
+       /* Split pixels into east/west parts */
+       guchar *pixels = gdk_pixbuf_get_pixels(pixbuf);
+       gint    width  = gdk_pixbuf_get_width(pixbuf);
+       gint    height = gdk_pixbuf_get_height(pixbuf);
+       gint    pxsize = gdk_pixbuf_get_has_alpha(pixbuf) ? 4 : 3;
+       guchar *pixels_west = g_malloc(4*(width/2)*height);
+       guchar *pixels_east = g_malloc(4*(width/2)*height);
+       _conus_update_end_split(pixels, pixels_west, pixels_east,
+                       width, height, pxsize);
+       g_object_unref(pixbuf);
+
+       /* Copy pixels to graphics memory */
+       _conus_update_end_copy(conus->tile[0], pixels_west);
+       _conus_update_end_copy(conus->tile[1], pixels_east);
+       g_free(pixels_west);
+       g_free(pixels_east);
+
+       /* Update GUI */
+       gchar *label = g_path_get_basename(conus->path);
+       _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(label));
+       gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
+       g_free(label);
+
+out:
+       g_free(conus->path);
+       g_static_mutex_unlock(&conus->loading);
+       return FALSE;
+}
 
-               // far  left
-               // todo: correct range-height function
-               double height = sin(deg2rad(ray->h.elev)) * far_dist;
-               glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
-               glVertex3f(lx*far_dist,  ly*far_dist, height);
+gpointer _conus_update_thread(gpointer _conus)
+{
+       RadarConus *conus = _conus;
+       conus->message = NULL;
+
+       /* Find nearest */
+       g_debug("GisPluginRadar: _conus_update_thread - nearest");
+       gboolean offline = gis_viewer_get_offline(conus->viewer);
+       gchar *conus_url = "http://radar.weather.gov/Conus/RadarImg/";
+       GList *files = gis_http_available(conus->http,
+                       "^Conus_[^\"]*_N0Ronly.gif$", "",
+                       NULL, (offline ? NULL : conus_url));
+       gchar *nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M");
+       g_list_foreach(files, (GFunc)g_free, NULL);
+       g_list_free(files);
+       if (!nearest) {
+               conus->message = "No suitable files";
+               goto out;
        }
-       glEnd();
-       //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
 
-       /* 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();
+       /* Fetch the image */
+       g_debug("GisPluginRadar: _conus_update_thread - fetch");
+       gchar *uri  = g_strconcat(conus_url, nearest, NULL);
+       conus->path = gis_http_fetch(conus->http, uri, nearest, GIS_ONCE,
+                       _conus_update_loading, conus);
+       g_free(nearest);
+       g_free(uri);
+       if (!conus->path) {
+               conus->message = "Fetch failed";
+               goto out;
+       }
 
+out:
+       g_debug("GisPluginRadar: _conus_update_thread - done");
+       g_idle_add(_conus_update_end, conus);
        return NULL;
 }
 
-static gpointer _draw_hud(GisCallback *callback, gpointer _self)
+void _conus_update(RadarConus *conus)
 {
+       if (!g_static_mutex_trylock(&conus->loading))
+               return;
+       conus->time = gis_viewer_get_time(conus->viewer);
+       g_debug("GisPluginRadar: _conus_update - %d",
+                       (gint)conus->time);
+
+       /* Add a progress bar */
+       GtkWidget *progress = gtk_progress_bar_new();
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
+       _gtk_bin_set_child(GTK_BIN(conus->config), progress);
+
+       g_thread_create(_conus_update_thread, conus, FALSE, NULL);
+}
+
+void radar_conus_toggle(RadarConus *conus)
+{
+       GIS_OBJECT(conus->tile[0])->hidden =
+               !GIS_OBJECT(conus->tile[0])->hidden;
+       GIS_OBJECT(conus->tile[1])->hidden =
+               !GIS_OBJECT(conus->tile[1])->hidden;
+       gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
+}
+
+RadarConus *radar_conus_new(GtkWidget *pconfig,
+               GisViewer *viewer, GisHttp *http)
+{
+       RadarConus *conus = g_new0(RadarConus, 1);
+       conus->viewer  = g_object_ref(viewer);
+       conus->http    = http;
+       conus->config  = gtk_alignment_new(0, 0, 1, 1);
+       g_static_mutex_init(&conus->loading);
+
+       gdouble south =  CONUS_NORTH - CONUS_DEG_PER_PX*CONUS_HEIGHT;
+       gdouble east  =  CONUS_WEST  + CONUS_DEG_PER_PX*CONUS_WIDTH;
+       gdouble mid   =  CONUS_WEST  + CONUS_DEG_PER_PX*CONUS_WIDTH/2;
+       conus->tile[0] = gis_tile_new(NULL, CONUS_NORTH, south, mid, CONUS_WEST);
+       conus->tile[1] = gis_tile_new(NULL, CONUS_NORTH, south, east, mid);
+       conus->tile[0]->zindex = 2;
+       conus->tile[1]->zindex = 1;
+       conus->tile_ref[0] = gis_viewer_add(viewer,
+                       GIS_OBJECT(conus->tile[0]), GIS_LEVEL_WORLD, TRUE);
+       conus->tile_ref[1] = gis_viewer_add(viewer,
+                       GIS_OBJECT(conus->tile[1]), GIS_LEVEL_WORLD, TRUE);
+
+       conus->time_id = g_signal_connect_swapped(viewer, "time-changed",
+                       G_CALLBACK(_conus_update), conus);
+       conus->refresh_id = g_signal_connect_swapped(viewer, "refresh",
+                       G_CALLBACK(_conus_update), conus);
+
+       gtk_notebook_append_page(GTK_NOTEBOOK(pconfig), conus->config,
+                       _gtk_check_label_new("Conus", TRUE,
+                               G_CALLBACK(radar_conus_toggle), conus));
+       _conus_update(conus);
+       return conus;
+}
+
+void radar_conus_free(RadarConus *conus)
+{
+       g_signal_handler_disconnect(conus->viewer, conus->time_id);
+       g_signal_handler_disconnect(conus->viewer, conus->refresh_id);
+
+       for (int i = 0; i < 2; i++) {
+               GisTile *tile = conus->tile[i];
+               gpointer ref  = conus->tile_ref[i];
+               if (tile->data) {
+                       glDeleteTextures(1, tile->data);
+                       g_free(tile->data);
+               }
+               gis_viewer_remove(conus->viewer, ref);
+       }
+
+       g_object_unref(conus->viewer);
+       g_free(conus);
+}
+
+
+/******************
+ * GisPluginRadar *
+ ******************/
+static void _draw_hud(GisCallback *callback, gpointer _self)
+{
+       /* TODO */
        GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       if (self->cur_sweep == NULL)
-               return NULL;
-       g_debug("GisPluginRadar: _draw_hud");
+       if (!self->colormap)
+               return;
 
+       g_debug("GisPluginRadar: _draw_hud");
        /* Print the color table */
        glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
        glMatrixMode(GL_PROJECTION); glLoadIdentity();
@@ -608,21 +639,16 @@ static gpointer _draw_hud(GisCallback *callback, gpointer _self)
        glBegin(GL_QUADS);
        int i;
        for (i = 0; i < 256; i++) {
-               glColor4ubv(self->cur_colormap->data[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();
-
-       return NULL;
 }
 
-
-/***********
- * Methods *
- ***********/
+/* Methods */
 GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
 {
        /* TODO: move to constructor if possible */
@@ -630,43 +656,33 @@ GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
        GisPluginRadar *self = g_object_new(GIS_TYPE_PLUGIN_RADAR, NULL);
        self->viewer = viewer;
        self->prefs  = prefs;
-       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);
 
+       /* Load HUD */
+       GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
+       self->hud_ref = gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE);
+
+       /* Load Conus */
+       self->conus = radar_conus_new(self->config, self->viewer, self->conus_http);
+
+       /* Load radar sites */
        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);
+               RadarSite *site = radar_site_new(city, self->config,
+                               self->viewer, self->prefs, self->sites_http);
+               g_hash_table_insert(self->sites, city->code, site);
        }
 
-       /* Add renderers */
-       GisCallback *radar_cb = gis_callback_new(_draw_radar, self);
-       GisCallback *hud_cb   = gis_callback_new(_draw_hud, self);
-
-       gis_viewer_add(viewer, GIS_OBJECT(radar_cb),    GIS_LEVEL_WORLD, TRUE);
-       gis_viewer_add(viewer, GIS_OBJECT(hud_cb),      GIS_LEVEL_HUD,   FALSE);
-
        return self;
 }
 
 static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self)
 {
        GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       return self->config_body;
+       return self->config;
 }
 
-
-/****************
- * GObject code *
- ****************/
-/* Plugin init */
+/* GObject code */
 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,
@@ -677,24 +693,23 @@ static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
        /* 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->soup          = NULL;
-       self->cur_triangles = NULL;
-       self->cur_num_triangles = 0;
-
-       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"));
+       self->sites_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
+       self->conus_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "conus" G_DIR_SEPARATOR_S);
+       self->sites      = g_hash_table_new_full(g_str_hash, g_str_equal,
+                               NULL, (GDestroyNotify)radar_site_free);
+       self->config     = gtk_notebook_new();
+       gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_LEFT);
 }
 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);
+       gis_viewer_remove(self->viewer, self->hud_ref);
+       radar_conus_free(self->conus);
        /* Drop references */
        G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
 }
@@ -703,6 +718,10 @@ static void gis_plugin_radar_finalize(GObject *gobject)
        g_debug("GisPluginRadar: finalize");
        GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
        /* Free data */
+       gis_http_free(self->conus_http);
+       gis_http_free(self->sites_http);
+       g_hash_table_destroy(self->sites);
+       gtk_widget_destroy(self->config);
        G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
 
 }
@@ -713,4 +732,3 @@ static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
        gobject_class->dispose  = gis_plugin_radar_dispose;
        gobject_class->finalize = gis_plugin_radar_finalize;
 }
-