X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Ftile-test.c;h=e4b237923f7d3e7b92d85b92005c28036b0ee263;hp=a800b9c750117212d580785ad0512f422d0ddcf4;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=f383c18c9f85a1b439c6bfb2a27d652278ed019a

diff --git a/src/tile-test.c b/src/tile-test.c
index a800b9c..e4b2379 100644
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -20,19 +20,26 @@
 
 #include "grits-util.h"
 #include "data/grits-wms.h"
+#include "data/grits-tms.h"
 #include "objects/grits-tile.h"
 
+#include "compat.h"
+
 struct CacheState {
 	GtkWidget *image;
 	GtkWidget *status;
 	GtkWidget *progress;
 };
 
+struct LoadData {
+	GtkImage  *image;
+	GdkPixbuf *pixbuf;
+};
 
 void chunk_callback(gsize cur, gsize total, gpointer _state)
 {
 	struct CacheState *state = _state;
-	g_message("chunk_callback: %d/%d", cur, total);
+	g_message("chunk_callback: %ld/%ld", (glong)cur, (glong)total);
 
 	if (state->progress == NULL) {
 		state->progress = gtk_progress_bar_new();
@@ -46,6 +53,22 @@ void chunk_callback(gsize cur, gsize total, gpointer _state)
 		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(state->progress), (gdouble)cur/total);
 }
 
+gboolean load_callback(gpointer _data)
+{
+	struct LoadData *data = _data;
+	gtk_image_set_from_pixbuf(GTK_IMAGE(data->image), data->pixbuf);
+	g_free(data);
+	return FALSE;
+}
+
+void load_image(GtkImage *image, GdkPixbuf *pixbuf)
+{
+	struct LoadData *data = g_new0(struct LoadData, 1);
+	data->image  = image;
+	data->pixbuf = pixbuf;
+	g_idle_add(load_callback, data);
+}
+
 gpointer do_bmng_cache(gpointer _image)
 {
 	GtkImage *image = _image;
@@ -62,9 +85,7 @@ gpointer do_bmng_cache(gpointer _image)
 
 	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();
+	load_image(GTK_IMAGE(image), pixbuf);
 
 	g_message("Cleaning bmng up");
 	grits_wms_free(bmng_wms);
@@ -88,9 +109,7 @@ gpointer do_osm_cache(gpointer _image)
 
 	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();
+	load_image(GTK_IMAGE(image), pixbuf);
 
 	g_message("Cleaning osm up");
 	grits_wms_free(osm_wms);
@@ -98,41 +117,66 @@ gpointer do_osm_cache(gpointer _image)
 	return NULL;
 }
 
+gpointer do_osm2_cache(gpointer _image)
+{
+	GtkImage *image = _image;
+	g_message("Creating osm2 tile");
+	GritsTile *tile = grits_tile_new(NULL, 85.0511, -85.0511, EAST, WEST);
+	tile->children[0][1] = grits_tile_new(tile, 85.0511, 0, 0, WEST);
+	tile = tile->children[0][1];
+
+	g_message("Fetching osm2 image");
+	GritsTms *osm2_tms = grits_tms_new("http://tile.openstreetmap.org",
+			"tms_test/", "png");
+	const char *path = grits_tms_fetch(osm2_tms, tile, GRITS_ONCE, NULL, NULL);
+
+	g_message("Loading osm2 image: [%s]", path);
+	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
+	load_image(GTK_IMAGE(image), pixbuf);
+
+	g_message("Cleaning osm2 up");
+	grits_tms_free(osm2_tms);
+	grits_tile_free(tile, NULL, NULL);
+	return NULL;
+}
+
+
 gboolean key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
-	if (event->keyval == GDK_q)
+	if (event->keyval == GDK_KEY_q)
 		gtk_main_quit();
 	return TRUE;
 }
 
 int main(int argc, char **argv)
 {
-	g_thread_init(NULL);
-	gdk_threads_init();
 	gtk_init(&argc, &argv);
 
 	GtkWidget *win        = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	GtkWidget *vbox1      = gtk_vbox_new(FALSE, 0);
-	GtkWidget *vbox2      = gtk_vbox_new(FALSE, 0);
+	GtkWidget *vbox1      = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+	GtkWidget *vbox2      = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	GtkWidget *status     = gtk_statusbar_new();
 	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();
+	GtkWidget *osm2_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(vbox2), osm2_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_bmng_cache, bmng_image, FALSE, NULL);
-	g_thread_create(do_osm_cache,  osm_image,  FALSE, NULL);
+	g_thread_new("bmng-thread", do_bmng_cache, bmng_image);
+	g_thread_new("osm-thread",  do_osm_cache,  osm_image);
+	g_thread_new("osm2-thread", do_osm2_cache, osm2_image);
 
 	gtk_widget_show_all(win);
 	gtk_main();