X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Ftile_test.c;h=d67e14f3b028b96c0adb1b3ffd26563d6bcbbe79;hp=dd27cc7c9428378ce4b68a0a3737e856c0cebf7e;hb=c31e18dad24a2fcf9e9624347906c9c020154f12;hpb=245c56e1dd2e0f05fffcebcc5b5a32aea25ef60e

diff --git a/src/tile_test.c b/src/tile_test.c
index dd27cc7..d67e14f 100644
--- a/src/tile_test.c
+++ b/src/tile_test.c
@@ -29,32 +29,58 @@ void chunk_callback(gsize cur, gsize total, gpointer _state)
 		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(state->progress), (gdouble)cur/total);
 }
 
-gpointer do_cache(gpointer _image)
+gpointer do_bmng_cache(gpointer _image)
 {
 	GtkImage *image = _image;
-	g_message("Creating tile");
+	g_message("Creating bmng tile");
 	GisTile *tile = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
 	tile->children[0][1] = gis_tile_new(tile, NORTH, 0, 0, WEST);
 	tile = tile->children[0][1];
 
-	g_message("Fetching image");
+	g_message("Fetching bmng image");
 	GisWms *bmng_wms = gis_wms_new(
 		"http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",
 		"bmng_test/", "jpg", 512, 256);
 	const char *path = gis_wms_make_local(bmng_wms, tile);
 
-	g_message("Loading image: [%s]", path);
+	g_message("Loading bmng image: [%s]", path);
 	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
 	gdk_threads_enter();
 	gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
 	gdk_threads_leave();
 
-	g_message("Cleaning up");
+	g_message("Cleaning bmng up");
 	gis_wms_free(bmng_wms);
 	gis_tile_free(tile, NULL, NULL);
 	return NULL;
 }
 
+gpointer do_osm_cache(gpointer _image)
+{
+	GtkImage *image = _image;
+	g_message("Creating osm tile");
+	GisTile *tile = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+	tile->children[0][1] = gis_tile_new(tile, NORTH, 0, 0, WEST);
+	tile = tile->children[0][1];
+
+	g_message("Fetching osm image");
+	GisWms *osm_wms = gis_wms_new(
+		"http://labs.metacarta.com/wms/vmap0", "basic", "image/png",
+		"osm_test/", "png", 512, 256);
+	const char *path = gis_wms_make_local(osm_wms, tile);
+
+	g_message("Loading osm image: [%s]", path);
+	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
+	gdk_threads_enter();
+	gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
+	gdk_threads_leave();
+
+	g_message("Cleaning osm up");
+	gis_wms_free(osm_wms);
+	gis_tile_free(tile, NULL, NULL);
+	return NULL;
+}
+
 gboolean key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
 	if (event->keyval == GDK_q)
@@ -75,18 +101,21 @@ int main(int argc, char **argv)
 	GtkWidget *scroll     = gtk_scrolled_window_new(NULL, NULL);
 	GtkWidget *bmng_image = gtk_image_new();
 	GtkWidget *srtm_image = gtk_image_new();
+	GtkWidget *osm_image  = gtk_image_new();
 	gtk_container_add(GTK_CONTAINER(win), vbox1);
 	gtk_box_pack_start(GTK_BOX(vbox1), scroll, TRUE, TRUE, 0);
 	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox2);
 	gtk_box_pack_start(GTK_BOX(vbox2), bmng_image, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox2), srtm_image, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox2), osm_image,  TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox1), status, FALSE, FALSE, 0);
 	g_signal_connect(win, "key-press-event", G_CALLBACK(key_press_cb), NULL);
 	g_signal_connect(win, "destroy", gtk_main_quit, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
 			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-	g_thread_create(do_cache, bmng_image, FALSE, NULL);
+	g_thread_create(do_bmng_cache, bmng_image, FALSE, NULL);
+	g_thread_create(do_osm_cache,  osm_image,  FALSE, NULL);
 
 	gtk_widget_show_all(win);
 	gtk_main();