#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "gis-tile.h"
-#include "gis-wms.h"
-#include "gis-util.h"
+#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 *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();
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;
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);
+ GritsTile *tile = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+ tile->children[0][1] = grits_tile_new(tile, NORTH, 0, 0, WEST);
tile = tile->children[0][1];
g_message("Fetching bmng image");
- GisWms *bmng_wms = gis_wms_new(
+ GritsWms *bmng_wms = grits_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);
+ const char *path = grits_wms_fetch(bmng_wms, tile, GRITS_ONCE, NULL, NULL);
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");
- gis_wms_free(bmng_wms);
- gis_tile_free(tile, NULL, NULL);
+ grits_wms_free(bmng_wms);
+ grits_tile_free(tile, NULL, NULL);
return NULL;
}
{
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);
+ GritsTile *tile = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
+ tile->children[0][1] = grits_tile_new(tile, NORTH, 0, 0, WEST);
tile = tile->children[0][1];
g_message("Fetching osm image");
- GisWms *osm_wms = gis_wms_new(
+ GritsWms *osm_wms = grits_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);
+ const char *path = grits_wms_fetch(osm_wms, tile, GRITS_ONCE, NULL, NULL);
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");
- gis_wms_free(osm_wms);
- gis_tile_free(tile, NULL, NULL);
+ grits_wms_free(osm_wms);
+ grits_tile_free(tile, NULL, NULL);
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();
projects / grits / blobdiff