X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=52d94c92d0ed1411c67abb3bafd8a4d255863609;hp=cbdf12c431a7f4fda4d82d0742dd0af8a10aea5d;hb=8addcb17f030c9d9330f125f6160eedbccddf63d;hpb=fdf053eed53292298065821b9f77c62bcd13286b

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index cbdf12c..52d94c9 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -141,7 +141,7 @@ gpointer _site_update_thread(gpointer _site)
 	gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code,
 			"/", "dir.list", NULL);
 	GList *files = grits_http_available(site->http,
-			"^K\\w{3}_\\d{8}_\\d{4}$", site->city->code,
+			"^\\w{4}_\\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");
@@ -179,7 +179,7 @@ gpointer _site_update_thread(gpointer _site)
 	}
 	grits_object_hide(GRITS_OBJECT(site->level2), site->hidden);
 	grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2),
-			GRITS_LEVEL_WORLD, TRUE);
+			GRITS_LEVEL_WORLD+1, TRUE);
 
 out:
 	g_idle_add(_site_update_end, site);
@@ -203,7 +203,7 @@ void _site_update(RadarSite *site)
 	/* Remove old volume */
 	g_debug("RadarSite: update - remove - %s", site->city->code);
 	if (site->level2) {
-		grits_viewer_remove(site->viewer, site->level2);
+		grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
 		site->level2 = NULL;
 	}
 
@@ -231,7 +231,7 @@ void radar_site_unload(RadarSite *site)
 
 	/* Remove radar */
 	if (site->level2) {
-		grits_viewer_remove(site->viewer, site->level2);
+		grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
 		site->level2 = NULL;
 	}
 
@@ -301,6 +301,11 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 	site->city    = city;
 	site->pconfig = pconfig;
 
+	/* Set initial location */
+	gdouble lat, lon, elev;
+	grits_viewer_get_location(viewer, &lat, &lon, &elev);
+	_site_on_location_changed(viewer, lat, lon, elev, site);
+
 	/* Add marker */
 	g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL);
 
@@ -313,7 +318,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 void radar_site_free(RadarSite *site)
 {
 	radar_site_unload(site);
-	grits_viewer_remove(site->viewer, site->marker);
+	grits_viewer_remove(site->viewer, GRITS_OBJECT(site->marker));
 	if (site->location_id)
 		g_signal_handler_disconnect(site->viewer, site->location_id);
 	grits_http_free(site->http);
@@ -490,7 +495,7 @@ gpointer _conus_update_thread(gpointer _conus)
 		 * the index pages get cached and out of date */
 		struct tm tm;
 		gmtime_r(&conus->time, &tm);
-		time_t onthe8 = conus->time - 60*((tm.tm_min+2)%10);
+		time_t onthe8 = conus->time - 60*((tm.tm_min+1)%10+1);
 		gmtime_r(&onthe8, &tm);
 		nearest = g_strdup_printf("Conus_%04d%02d%02d_%02d%02d_N0Ronly.gif",
 				tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
@@ -585,7 +590,7 @@ void radar_conus_free(RadarConus *conus)
 			glDeleteTextures(1, tile->data);
 			g_free(tile->data);
 		}
-		grits_viewer_remove(conus->viewer, tile);
+		grits_viewer_remove(conus->viewer, GRITS_OBJECT(tile));
 	}
 
 	g_object_unref(conus->viewer);
@@ -636,14 +641,14 @@ static void _draw_hud(GritsCallback *callback, GritsOpenGL *opengl, gpointer _se
 static void _load_colormap(gchar *filename, AWeatherColormap *cm)
 {
 	g_debug("GritsPluginRadar: _load_colormap - %s", filename);
-	FILE *file = g_fopen(filename, "r");
+	FILE *file = fopen(filename, "r");
 	if (!file)
 		g_error("GritsPluginRadar: open failed");
 	guint8 color[4];
 	GArray *array = g_array_sized_new(FALSE, TRUE, sizeof(color), 256);
-	fgets(cm->name, sizeof(cm->name), file);
-	fscanf(file, "%f\n", &cm->scale);
-	fscanf(file, "%f\n", &cm->shift);
+	if (!fgets(cm->name, sizeof(cm->name), file)) goto out;
+	if (!fscanf(file, "%f\n", &cm->scale))        goto out;
+	if (!fscanf(file, "%f\n", &cm->shift))        goto out;
 	int r, g, b, a;
 	while (fscanf(file, "%d %d %d %d\n", &r, &g, &b, &a) == 4) {
 		color[0] = r;
@@ -654,7 +659,9 @@ static void _load_colormap(gchar *filename, AWeatherColormap *cm)
 	}
 	cm->len  = (gint )array->len;
 	cm->data = (void*)array->data;
+out:
 	g_array_free(array, FALSE);
+	fclose(file);
 }
 
 static void _update_hidden(GtkNotebook *notebook,
@@ -763,7 +770,7 @@ static void grits_plugin_radar_dispose(GObject *gobject)
 	g_debug("GritsPluginRadar: dispose");
 	GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
 	g_signal_handler_disconnect(self->config, self->tab_id);
-	grits_viewer_remove(self->viewer, self->hud);
+	grits_viewer_remove(self->viewer, GRITS_OBJECT(self->hud));
 	radar_conus_free(self->conus);
 	/* Drop references */
 	G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);