X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fmap.c;h=23e8b248fa5729b473bb87229a7286da1a725e3e;hp=7395ef7792c7598d4220f356090550be70ecade5;hb=fde5359a826dadb68cfe3f62f0f3c9e0c25f3438;hpb=7aefe194719b37d7e03dbbb89e70b95a4455e446 diff --git a/src/plugins/map.c b/src/plugins/map.c index 7395ef7..23e8b24 100644 --- a/src/plugins/map.c +++ b/src/plugins/map.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andy Spencer + * Copyright (C) 2009-2011 Andy Spencer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,52 +19,66 @@ * SECTION:map * @short_description: Map plugin * - * #GisPluginMap provides map overlays. Much of this data is obtained from the + * #GritsPluginMap provides map overlays. Much of this data is obtained from the * OpenStreetMap project. */ #include -#include #include -#include -#include +#include #include "map.h" -#define MAX_RESOLUTION 500 -#define TILE_WIDTH 1024 -#define TILE_HEIGHT 512 +#define MAX_RESOLUTION 1 +#define TILE_WIDTH 256 +#define TILE_HEIGHT 256 + +//#define MAX_RESOLUTION 100 +//#define TILE_WIDTH 1024 +//#define TILE_HEIGHT 512 static const guchar colormap[][2][4] = { - {{0x73, 0x91, 0xad}, {0x73, 0x91, 0xad, 0x20}}, // Oceans + {{0x73, 0x91, 0xad}, {0x73, 0x91, 0xad, 0x00}}, // Oceans {{0xf6, 0xee, 0xee}, {0xf6, 0xee, 0xee, 0x00}}, // Ground {{0xff, 0xff, 0xff}, {0xff, 0xff, 0xff, 0xff}}, // Borders {{0x73, 0x93, 0xad}, {0x73, 0x93, 0xad, 0x40}}, // Lakes {{0xff, 0xe1, 0x80}, {0xff, 0xe1, 0x80, 0x60}}, // Cities }; -struct _LoadTileData { - GisPluginMap *map; - GisTile *tile; - GdkPixbuf *pixbuf; -}; -static gboolean _load_tile_cb(gpointer _data) +static void _load_tile_thread(gpointer _tile, gpointer _map) { - struct _LoadTileData *data = _data; - GisPluginMap *map = data->map; - GisTile *tile = data->tile; - GdkPixbuf *pixbuf = data->pixbuf; - g_free(data); - - /* Create Texture */ - g_debug("GisPluginMap: _load_tile_cb start"); - guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); - gboolean alpha = gdk_pixbuf_get_has_alpha(pixbuf); - gint width = gdk_pixbuf_get_width(pixbuf); - gint height = gdk_pixbuf_get_height(pixbuf); - - for (int i = 0; i < width*height; i++) { + GritsTile *tile = _tile; + GritsPluginMap *map = _map; + + g_debug("GritsPluginMap: _load_tile_thread start %p - tile=%p", + g_thread_self(), tile); + if (map->aborted) { + g_debug("GritsPluginMap: _load_tile_thread - aborted"); + return; + } + + /* Download tile */ + gchar *path = grits_tms_fetch(map->tms, tile, GRITS_ONCE, NULL, NULL); + //gchar *path = grits_wms_fetch(map->wms, tile, GRITS_ONCE, NULL, NULL); + if (!path) return; // Canceled/error + + /* Load pixbuf */ + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL); + if (!pixbuf) { + g_warning("GritsPluginMap: _load_tile_thread - Error loading pixbuf %s", path); + g_remove(path); + g_free(path); + return; + } + g_free(path); + +#ifdef MAP_MAP_COLORS + /* Map texture colors, if needed */ + gint width = gdk_pixbuf_get_width(pixbuf); + gint height = gdk_pixbuf_get_height(pixbuf); + guchar *pixels = gdk_pixbuf_get_pixels(pixbuf); + for (int i = 0; i < width * height; i++) { for (int j = 0; j < G_N_ELEMENTS(colormap); j++) { if (pixels[i*4+0] == colormap[j][0][0] && pixels[i*4+1] == colormap[j][0][1] && @@ -77,112 +91,61 @@ static gboolean _load_tile_cb(gpointer _data) } } } +#endif - guint *tex = g_new0(guint, 1); - glGenTextures(1, tex); - glBindTexture(GL_TEXTURE_2D, *tex); - - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glPixelStorei(GL_PACK_ALIGNMENT, 1); - glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0, - (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); - glFlush(); - - tile->data = tex; - gtk_widget_queue_draw(GTK_WIDGET(map->viewer)); - g_object_unref(pixbuf); - return FALSE; -} - -static void _load_tile(GisTile *tile, gpointer _map) -{ - GisPluginMap *map = _map; - g_debug("GisPluginMap: _load_tile start %p", g_thread_self()); - char *path = gis_wms_fetch(map->wms, tile, GIS_ONCE, NULL, NULL); - struct _LoadTileData *data = g_new0(struct _LoadTileData, 1); - data->map = map; - data->tile = tile; - data->pixbuf = gdk_pixbuf_new_from_file(path, NULL); - if (data->pixbuf) { - g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL); - } else { - g_warning("GisPluginMap: _load_tile - Error loading pixbuf %s", path); - g_remove(path); - } - g_free(path); - g_debug("GisPluginMap: _load_tile end %p", g_thread_self()); -} - -static gboolean _free_tile_cb(gpointer data) -{ - glDeleteTextures(1, data); - g_free(data); - return FALSE; -} -static void _free_tile(GisTile *tile, gpointer _map) -{ - GisPluginMap *map = _map; - g_debug("GisPluginMap: _free_tile: %p", tile->data); - g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL); + /* Load the GL texture from the main thread */ + grits_tile_load_pixbuf(tile, pixbuf); + g_debug("GritsPluginMap: _load_tile_thread end %p", g_thread_self()); } -static gpointer _update_tiles(gpointer _map) +static void _load_tile_func(GritsTile *tile, gpointer _map) { - g_debug("GisPluginMap: _update_tiles"); - GisPluginMap *map = _map; - g_mutex_lock(map->mutex); - gdouble lat, lon, elev; - gis_viewer_get_location(map->viewer, &lat, &lon, &elev); - gis_tile_update(map->tiles, - MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, - lat, lon, elev, - _load_tile, map); - gis_tile_gc(map->tiles, time(NULL)-10, - _free_tile, map); - g_mutex_unlock(map->mutex); - return NULL; + g_debug("GritsPluginMap: _load_tile_func - tile=%p", tile); + GritsPluginMap *map = _map; + g_thread_pool_push(map->threads, tile, NULL); } /************* * Callbacks * *************/ -static void _on_location_changed(GisViewer *viewer, - gdouble lat, gdouble lon, gdouble elev, GisPluginMap *map) +static void _on_location_changed(GritsViewer *viewer, + gdouble lat, gdouble lon, gdouble elev, GritsPluginMap *map) { - g_thread_create(_update_tiles, map, FALSE, NULL); + GritsPoint eye = {lat, lon, elev}; + grits_tile_update(map->tiles, &eye, + MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH, + _load_tile_func, map); + grits_tile_gc(map->tiles, time(NULL)-10, NULL, map); } /*********** * Methods * ***********/ /** - * gis_plugin_map_new: - * @viewer: the #GisViewer to use for drawing + * grits_plugin_map_new: + * @viewer: the #GritsViewer to use for drawing * * Create a new instance of the map plugin. * - * Returns: the new #GisPluginMap + * Returns: the new #GritsPluginMap */ -GisPluginMap *gis_plugin_map_new(GisViewer *viewer) +GritsPluginMap *grits_plugin_map_new(GritsViewer *viewer) { - g_debug("GisPluginMap: new"); - GisPluginMap *map = g_object_new(GIS_TYPE_PLUGIN_MAP, NULL); + g_debug("GritsPluginMap: new"); + GritsPluginMap *map = g_object_new(GRITS_TYPE_PLUGIN_MAP, NULL); map->viewer = g_object_ref(viewer); /* Load initial tiles */ - _load_tile(map->tiles, map); - g_thread_create(_update_tiles, map, FALSE, NULL); + gdouble lat, lon, elev; + grits_viewer_get_location(viewer, &lat, &lon, &elev); + _on_location_changed(viewer, lat, lon, elev, map); /* Connect signals */ map->sigid = g_signal_connect(map->viewer, "location-changed", G_CALLBACK(_on_location_changed), map); /* Add renderers */ - gis_viewer_add(viewer, GIS_OBJECT(map->tiles), GIS_LEVEL_OVERLAY, 0); + grits_viewer_add(viewer, GRITS_OBJECT(map->tiles), GRITS_LEVEL_WORLD, FALSE); return map; } @@ -192,53 +155,66 @@ GisPluginMap *gis_plugin_map_new(GisViewer *viewer) * GObject code * ****************/ /* Plugin init */ -static void gis_plugin_map_plugin_init(GisPluginInterface *iface); -G_DEFINE_TYPE_WITH_CODE(GisPluginMap, gis_plugin_map, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN, - gis_plugin_map_plugin_init)); -static void gis_plugin_map_plugin_init(GisPluginInterface *iface) +static void grits_plugin_map_plugin_init(GritsPluginInterface *iface); +G_DEFINE_TYPE_WITH_CODE(GritsPluginMap, grits_plugin_map, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN, + grits_plugin_map_plugin_init)); +static void grits_plugin_map_plugin_init(GritsPluginInterface *iface) { - g_debug("GisPluginMap: plugin_init"); + g_debug("GritsPluginMap: plugin_init"); /* Add methods to the interface */ } /* Class/Object init */ -static void gis_plugin_map_init(GisPluginMap *map) +static void grits_plugin_map_init(GritsPluginMap *map) { - g_debug("GisPluginMap: init"); + g_debug("GritsPluginMap: init"); /* Set defaults */ - map->mutex = g_mutex_new(); - map->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST); - map->wms = gis_wms_new( - "http://labs.metacarta.com/wms/vmap0", "basic", "image/png", - "osm/", "png", TILE_WIDTH, TILE_HEIGHT); + map->threads = g_thread_pool_new(_load_tile_thread, map, 1, FALSE, NULL); + map->tiles = grits_tile_new(NULL, 85.0511, -85.0511, EAST, WEST); + map->tms = grits_tms_new("http://tile.openstreetmap.org", + "osmtile/", "png"); + map->tiles->proj = GRITS_PROJ_MERCATOR; + //map->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST); + //map->wms = grits_wms_new( + // "http://vmap0.tiles.osgeo.org/wms/vmap0", + // "basic,priroad,secroad,depthcontour,clabel,statelabel", + // "image/png", "osm/", "png", TILE_WIDTH, TILE_HEIGHT); + g_object_ref(map->tiles); } -static void gis_plugin_map_dispose(GObject *gobject) +static void grits_plugin_map_dispose(GObject *gobject) { - g_debug("GisPluginMap: dispose"); - GisPluginMap *map = GIS_PLUGIN_MAP(gobject); + g_debug("GritsPluginMap: dispose"); + GritsPluginMap *map = GRITS_PLUGIN_MAP(gobject); + map->aborted = TRUE; /* Drop references */ if (map->viewer) { - g_signal_handler_disconnect(map->viewer, map->sigid); - g_object_unref(map->viewer); + GritsViewer *viewer = map->viewer; + g_signal_handler_disconnect(viewer, map->sigid); + grits_http_abort(map->tms->http); + //grits_http_abort(map->wms->http); + g_thread_pool_free(map->threads, TRUE, TRUE); map->viewer = NULL; + grits_viewer_remove(viewer, GRITS_OBJECT(map->tiles)); + g_object_unref(map->tiles); + g_object_unref(viewer); } - G_OBJECT_CLASS(gis_plugin_map_parent_class)->dispose(gobject); + G_OBJECT_CLASS(grits_plugin_map_parent_class)->dispose(gobject); } -static void gis_plugin_map_finalize(GObject *gobject) +static void grits_plugin_map_finalize(GObject *gobject) { - g_debug("GisPluginMap: finalize"); - GisPluginMap *map = GIS_PLUGIN_MAP(gobject); + g_debug("GritsPluginMap: finalize"); + GritsPluginMap *map = GRITS_PLUGIN_MAP(gobject); /* Free data */ - gis_tile_free(map->tiles, _free_tile, map); - gis_wms_free(map->wms); - g_mutex_free(map->mutex); - G_OBJECT_CLASS(gis_plugin_map_parent_class)->finalize(gobject); + grits_tms_free(map->tms); + //grits_wms_free(map->wms); + grits_tile_free(map->tiles, NULL, map); + G_OBJECT_CLASS(grits_plugin_map_parent_class)->finalize(gobject); } -static void gis_plugin_map_class_init(GisPluginMapClass *klass) +static void grits_plugin_map_class_init(GritsPluginMapClass *klass) { - g_debug("GisPluginMap: class_init"); + g_debug("GritsPluginMap: class_init"); GObjectClass *gobject_class = (GObjectClass*)klass; - gobject_class->dispose = gis_plugin_map_dispose; - gobject_class->finalize = gis_plugin_map_finalize; + gobject_class->dispose = grits_plugin_map_dispose; + gobject_class->finalize = grits_plugin_map_finalize; }