X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Fmap.c;h=0ae8ef6c411fadf497d7fa426547c8114a2f781b;hp=7edc1ce64cc951d7b3ab909486bfb21c11e79a96;hb=5350256efff1c97426e0db60e404bfd8a6cb08be;hpb=bd716715f1d13a8df514fcfa53fd82aebdfda770
diff --git a/src/plugins/map.c b/src/plugins/map.c
index 7edc1ce..0ae8ef6 100644
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -15,7 +15,16 @@
* along with this program. If not, see .
*/
+/**
+ * SECTION:map
+ * @short_description: Map plugin
+ *
+ * #GisPluginMap provides map overlays. Much of this data is obtained from the
+ * OpenStreetMap project.
+ */
+
#include
+#include
#include
#include
@@ -27,7 +36,7 @@
#define TILE_WIDTH 1024
#define TILE_HEIGHT 512
-const guchar colormap[][2][4] = {
+static const guchar colormap[][2][4] = {
{{0x73, 0x91, 0xad}, {0x73, 0x91, 0xad, 0x20}}, // Oceans
{{0xf6, 0xee, 0xee}, {0xf6, 0xee, 0xee, 0x00}}, // Ground
{{0xff, 0xff, 0xff}, {0xff, 0xff, 0xff, 0xff}}, // Borders
@@ -40,7 +49,6 @@ struct _LoadTileData {
GisTile *tile;
GdkPixbuf *pixbuf;
};
-#include
static gboolean _load_tile_cb(gpointer _data)
{
struct _LoadTileData *data = _data;
@@ -80,8 +88,8 @@ static gboolean _load_tile_cb(gpointer _data)
(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);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glFlush();
tile->data = tex;
@@ -126,12 +134,12 @@ static gpointer _update_tiles(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,
+ if (!g_mutex_trylock(map->mutex))
+ return NULL;
+ GisPoint eye;
+ gis_viewer_get_location(map->viewer, &eye.lat, &eye.lon, &eye.elev);
+ gis_tile_update(map->tiles, &eye,
MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
- lat, lon, elev,
_load_tile, map);
gis_tile_gc(map->tiles, time(NULL)-10,
_free_tile, map);
@@ -148,9 +156,24 @@ static void _on_location_changed(GisViewer *viewer,
g_thread_create(_update_tiles, map, FALSE, NULL);
}
+static gpointer _threaded_init(GisPluginMap *map)
+{
+ _load_tile(map->tiles, map);
+ _update_tiles(map);
+ return NULL;
+}
+
/***********
* Methods *
***********/
+/**
+ * gis_plugin_map_new:
+ * @viewer: the #GisViewer to use for drawing
+ *
+ * Create a new instance of the map plugin.
+ *
+ * Returns: the new #GisPluginMap
+ */
GisPluginMap *gis_plugin_map_new(GisViewer *viewer)
{
g_debug("GisPluginMap: new");
@@ -158,8 +181,7 @@ GisPluginMap *gis_plugin_map_new(GisViewer *viewer)
map->viewer = g_object_ref(viewer);
/* Load initial tiles */
- _load_tile(map->tiles, map);
- g_thread_create(_update_tiles, map, FALSE, NULL);
+ g_thread_create((GThreadFunc)_threaded_init, map, FALSE, NULL);
/* Connect signals */
map->sigid = g_signal_connect(map->viewer, "location-changed",