]> Pileus Git - aweather/blobdiff - src/plugins/radar.c
Add check when loading Conus pixbuf
[aweather] / src / plugins / radar.c
index 3b566a5a78f3f7f77685ce32d2b4b5b4be71f0c6..73d275985ab9a13202d3bdfcd0df950afea70e61 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #define _XOPEN_SOURCE
-#include <time.h>
+#include <sys/time.h>
 #include <config.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "level2.h"
 #include "../aweather-location.h"
 
+GtkWidget *_gtk_check_label_new(const gchar *text, gboolean state,
+               GCallback on_clicked, gpointer user_data)
+{
+       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;
+}
+
 void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
 {
        GtkWidget *old = gtk_bin_get_child(bin);
@@ -44,14 +59,13 @@ void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
 static gchar *_find_nearest(time_t time, GList *files,
                gsize offset, gchar *format)
 {
-       g_debug("GisPluginRadar: _find_nearest");
+       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;
-               g_message("file=%s", file);
                strptime(file+offset, format, &tm);
                if (ABS(time - mktime(&tm)) <
                    ABS(time - nearest_time)) {
@@ -78,10 +92,9 @@ typedef enum {
 } RadarSiteStatus;
 struct _RadarSite {
        /* Information */
-       gchar     *code;   // Site name. e.g. KLSX
-       gchar     *name;   // Site name. e.g. St. Louis
-       GisPoint   pos;    // LLE positions of antena 
-       GisMarker *marker; // Map marker for libgis
+       city_t    *city;
+       GisMarker *marker;     // Map marker for libgis
+       gpointer  *marker_ref; // Reference to maker
 
        /* Stuff from the parents */
        GisViewer     *viewer;
@@ -90,6 +103,7 @@ struct _RadarSite {
        GtkWidget     *pconfig;
 
        /* When loaded */
+       gboolean        hidden;
        RadarSiteStatus status;     // Loading status for the site
        GtkWidget      *config;
        AWeatherLevel2 *level2;     // The Level2 structure for the current volume
@@ -132,27 +146,19 @@ gboolean _site_update_end(gpointer _site)
 gpointer _site_update_thread(gpointer _site)
 {
        RadarSite *site = _site;
-       g_debug("GisPluginRadar: _update - %s", site->code);
-       site->status = STATUS_LOADING;
+       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);
 
-       /* Remove old volume */
-       g_debug("GisPluginRadar: _update - remove - %s", site->code);
-       if (site->level2_ref) {
-               gis_viewer_remove(site->viewer, site->level2_ref);
-               site->level2_ref = NULL;
-       }
-
        /* Find nearest volume (temporally) */
-       g_debug("GisPluginRadar: _update - find nearest - %s", site->code);
-       gchar *dir_list = g_strconcat(nexrad_url, "/", site->code,
+       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->code,
+                       "^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");
@@ -164,12 +170,14 @@ gpointer _site_update_thread(gpointer _site)
        }
 
        /* Fetch new volume */
-       g_debug("GisPluginRadar: _update - fetch");
-       gchar *local = g_strconcat(site->code, "/", nearest, NULL);
+       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) {
@@ -178,13 +186,15 @@ gpointer _site_update_thread(gpointer _site)
        }
 
        /* Load and add new volume */
-       g_debug("GisPluginRadar: _update - load - %s", site->code);
+       g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
        site->level2 = aweather_level2_new_from_file(
-                       site->viewer, colormaps, file, site->code);
+                       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);
 
@@ -194,15 +204,26 @@ out:
 }
 void _site_update(RadarSite *site)
 {
+       if (site->status == STATUS_LOADING)
+               return;
+       site->status = STATUS_LOADING;
+
        site->time = gis_viewer_get_time(site->viewer);
-       g_debug("GisPluginRadar: _on_time_changed %s - %d",
-                       site->code, (gint)site->time);
+       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;
+       }
+
        /* Fork loading right away so updating the
         * list of times doesn't take too long */
        g_thread_create(_site_update_thread, site, FALSE, NULL);
@@ -211,16 +232,19 @@ void _site_update(RadarSite *site)
 /* RadarSite methods */
 void radar_site_unload(RadarSite *site)
 {
-       g_debug("GisPluginRadar: radar_site_unload %s", site->code);
-
-       if (site->status == STATUS_LOADING)
+       if (site->status != STATUS_LOADED)
                return; // Abort if it's still loading
 
-       g_signal_handler_disconnect(site->viewer, site->time_id);
-       g_signal_handler_disconnect(site->viewer, site->refresh_id);
+       g_debug("GisPluginRadar: radar_site_unload %s", site->city->code);
+
+       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);
 
        /* Remove tab */
-       gtk_widget_destroy(site->config);
+       if (site->config)
+               gtk_widget_destroy(site->config);
 
        /* Remove radar */
        if (site->level2_ref) {
@@ -231,28 +255,25 @@ void radar_site_unload(RadarSite *site)
        site->status = STATUS_UNLOADED;
 }
 
+void radar_site_toggle(RadarSite *site)
+{
+       site->hidden = !site->hidden;
+       if (site->level2) {
+               GIS_OBJECT(site->level2)->hidden = site->hidden;
+               gtk_widget_queue_draw(GTK_WIDGET(site->viewer));
+       }
+}
+
 void radar_site_load(RadarSite *site)
 {
-       g_debug("GisPluginRadar: radar_site_load %s", site->code);
-       site->status = STATUS_LOADING;
+       g_debug("GisPluginRadar: radar_site_load %s", site->city->code);
 
        /* Add tab page */
        site->config = gtk_alignment_new(0, 0, 1, 1);
-       GtkWidget *tab   = gtk_hbox_new(FALSE, 0);
-       GtkWidget *close = gtk_button_new();
-       GtkWidget *label = gtk_label_new(site->name);
-       gtk_container_add(GTK_CONTAINER(close),
-                       gtk_image_new_from_stock(GTK_STOCK_CLOSE,
-                               GTK_ICON_SIZE_MENU));
-       gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
-       g_signal_connect_swapped(close, "clicked",
-                       G_CALLBACK(radar_site_unload), site);
-       gtk_box_pack_start(GTK_BOX(tab), label, TRUE, TRUE, 0);
-       gtk_box_pack_end(GTK_BOX(tab), close, FALSE, FALSE, 0);
-       gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig),
-                       site->config, tab);
+       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);
-       gtk_widget_show_all(tab);
 
        /* Set up radar loading */
        site->time_id = g_signal_connect_swapped(site->viewer, "time-changed",
@@ -272,7 +293,7 @@ void _site_on_location_changed(GisViewer *viewer,
        /* 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->pos.lat, site->pos.lon, site->pos.elev,
+       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);
 
@@ -283,28 +304,33 @@ void _site_on_location_changed(GisViewer *viewer,
                radar_site_unload(site);
 }
 
+gboolean _site_add_marker(gpointer _site)
+{
+       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->code    = g_strdup(city->code);
-       site->name    = g_strdup(city->name);
-       site->pos     = city->pos;
+       //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 */
-       site->marker = gis_marker_new(city->name);
-       GIS_OBJECT(site->marker)->center = site->pos;
-       GIS_OBJECT(site->marker)->lod    = EARTH_R*city->lod;
-       gis_viewer_add(site->viewer, GIS_OBJECT(site->marker),
-                       GIS_LEVEL_OVERLAY, FALSE);
+       g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL);
+
 
        /* Connect signals */
-       site->location_id  =
-               g_signal_connect(viewer, "location-changed",
+       site->location_id  = g_signal_connect(viewer, "location-changed",
                        G_CALLBACK(_site_on_location_changed), site);
        return site;
 }
@@ -312,13 +338,285 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 void radar_site_free(RadarSite *site)
 {
        radar_site_unload(site);
-       /* Stuff? */
+       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_free(site->code);
+       g_object_unref(site->prefs);
        g_free(site);
 }
 
 
+/**************
+ * 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);
+       }
+
+       guint *tex = tile->data;
+       glBindTexture(GL_TEXTURE_2D, *tex);
+
+       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 {
+                       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];
+               }
+       }
+}
+
+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;
+       }
+
+       /* 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;
+       }
+
+       /* 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;
+}
+
+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;
+       }
+
+       /* 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;
+}
+
+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 *
  ******************/
@@ -361,7 +659,10 @@ GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
 
        /* Load HUD */
        GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
-       gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE);
+       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++) {
@@ -397,7 +698,9 @@ static void gis_plugin_radar_init(GisPluginRadar *self)
        g_debug("GisPluginRadar: class_init");
        /* Set defaults */
        self->sites_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
-       self->sites      = g_hash_table_new(g_str_hash, g_str_equal);
+       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);
 }
@@ -405,6 +708,8 @@ static void gis_plugin_radar_dispose(GObject *gobject)
 {
        g_debug("GisPluginRadar: dispose");
        GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+       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);
 }
@@ -413,6 +718,7 @@ 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);
@@ -426,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;
 }
-