/*
- * Copyright (C) 2009-201
0 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-201
1 Andy Spencer <andy753421@gmail.com>
*
* 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
#include <time.h>
#include <glib/gstdio.h>
-#include <GL/gl.h>
#include <grits.h>
#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 {
- GritsPluginMap *map;
- GritsTile *tile;
- guint8 *pixels;
- gboolean alpha;
- gint width;
- gint height;
-};
-static gboolean _load_tile_cb(gpointer _data)
+static void _load_tile_thread(gpointer _tile, gpointer _map)
{
- struct _LoadTileData *data = _data;
- g_debug("GritsPluginMap: _load_tile_cb start");
-
- guint *tex = g_new0(guint, 1);
- glGenTextures(1, tex);
- glBindTexture(GL_TEXTURE_2D, *tex);
+ GritsTile *tile = _tile;
+ GritsPluginMap *map = _map;
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- glPixelStorei(GL_PACK_ALIGNMENT, 1);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, data->width, data->height, 0,
- (data->alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, data->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);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
- glFlush();
-
- data->tile->data = tex;
- gtk_widget_queue_draw(GTK_WIDGET(data->map->viewer));
- g_free(data->pixels);
- g_free(data);
- return FALSE;
-}
-
-static void _load_tile(GritsTile *tile, gpointer _map)
-{
- GritsPluginMap *map = _map;
- g_debug("GritsPluginMap: _load_tile start %p", g_thread_self());
+ g_debug("GritsPluginMap: _load_tile_thread start %p - tile=%p",
+ g_thread_self(), tile);
if (map->aborted) {
- g_debug("GritsPluginMap: _load_tile - aborted");
+ g_debug("GritsPluginMap: _load_tile_thread - aborted");
return;
}
/* Download tile */
- gchar *path = grits_wms_fetch(map->wms, tile, GRITS_ONCE, NULL, NULL);
+ 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 - Error loading pixbuf %s", path);
+ g_warning("GritsPluginMap: _load_tile_thread - Error loading pixbuf %s", path);
g_remove(path);
g_free(path);
return;
}
g_free(path);
- /* Copy pixbuf data for callback */
- struct _LoadTileData *data = g_new0(struct _LoadTileData, 1);
- data->map = map;
- data->tile = tile;
- data->pixels = gdk_pixbuf_get_pixels(pixbuf);
- data->alpha = gdk_pixbuf_get_has_alpha(pixbuf);
- data->width = gdk_pixbuf_get_width(pixbuf);
- data->height = gdk_pixbuf_get_height(pixbuf);
- data->pixels = g_memdup(data->pixels,
- data->width * data->height * (data->alpha ? 4 : 3));
- g_object_unref(pixbuf);
-
+#ifdef MAP_MAP_COLORS
/* Map texture colors, if needed */
- for (int i = 0; i < data->width * data->height; i++) {
+ 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 (data->pixels[i*4+0] == colormap[j][0][0] &&
- data->pixels[i*4+1] == colormap[j][0][1] &&
- data->pixels[i*4+2] == colormap[j][0][2]) {
- data->pixels[i*4+0] = colormap[j][1][0];
- data->pixels[i*4+1] = colormap[j][1][1];
- data->pixels[i*4+2] = colormap[j][1][2];
- data->pixels[i*4+3] = colormap[j][1][3];
+ if (pixels[i*4+0] == colormap[j][0][0] &&
+ pixels[i*4+1] == colormap[j][0][1] &&
+ pixels[i*4+2] == colormap[j][0][2]) {
+ pixels[i*4+0] = colormap[j][1][0];
+ pixels[i*4+1] = colormap[j][1][1];
+ pixels[i*4+2] = colormap[j][1][2];
+ pixels[i*4+3] = colormap[j][1][3];
break;
}
}
}
+#endif
/* Load the GL texture from the main thread */
- g_idle_add_full(G_PRIORITY_LOW, _load_tile_cb, data, NULL);
- g_debug("GritsPluginMap: _load_tile end %p", g_thread_self());
+ grits_tile_load_pixbuf(tile, pixbuf);
+ g_debug("GritsPluginMap: _load_tile_thread end %p", g_thread_self());
}
-static gboolean _free_tile_cb(gpointer data)
+static void _load_tile_func(GritsTile *tile, gpointer _map)
{
- glDeleteTextures(1, data);
- g_free(data);
- return FALSE;
-}
-static void _free_tile(GritsTile *tile, gpointer _map)
-{
- g_debug("GritsPluginMap: _free_tile: %p", tile->data);
- if (tile->data)
- g_idle_add_full(G_PRIORITY_LOW, _free_tile_cb, tile->data, NULL);
-}
-
-static void _update_tiles(gpointer _, gpointer _map)
-{
- g_debug("GritsPluginMap: _update_tiles");
+ g_debug("GritsPluginMap: _load_tile_func - tile=%p", tile);
GritsPluginMap *map = _map;
- GritsPoint eye;
- grits_viewer_get_location(map->viewer, &eye.lat, &eye.lon, &eye.elev);
- grits_tile_update(map->tiles, &eye,
- MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
- _load_tile, map);
- grits_tile_gc(map->tiles, time(NULL)-10,
- _free_tile, map);
+ g_thread_pool_push(map->threads, tile, NULL);
}
/*************
static void _on_location_changed(GritsViewer *viewer,
gdouble lat, gdouble lon, gdouble elev, GritsPluginMap *map)
{
- g_thread_pool_push(map->threads, NULL+1, 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);
}
/***********
map->viewer = g_object_ref(viewer);
/* Load initial tiles */
- _load_tile(map->tiles, map);
- _update_tiles(NULL, map);
+ 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 */
- grits_viewer_add(viewer, GRITS_OBJECT(map->tiles), GRITS_LEVEL_OVERLAY-1, 0);
+ grits_viewer_add(viewer, GRITS_OBJECT(map->tiles), GRITS_LEVEL_WORLD, FALSE);
return map;
}
{
g_debug("GritsPluginMap: init");
/* Set defaults */
- map->threads = g_thread_pool_new(_update_tiles, map, 1, FALSE, NULL);
- map->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
- map->wms = grits_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 grits_plugin_map_dispose(GObject *gobject)
map->aborted = TRUE;
/* Drop references */
if (map->viewer) {
- g_signal_handler_disconnect(map->viewer, map->sigid);
- grits_viewer_remove(map->viewer, map->tiles);
- soup_session_abort(map->wms->http->soup);
+ GritsViewer *viewer = map->viewer;
+ g_signal_handler_disconnect(viewer, map->sigid);
+ soup_session_abort(map->tms->http->soup);
+ //soup_session_abort(map->wms->http->soup);
g_thread_pool_free(map->threads, TRUE, TRUE);
- while (gtk_events_pending())
- gtk_main_iteration();
- g_object_unref(map->viewer);
map->viewer = NULL;
+ grits_viewer_remove(viewer, GRITS_OBJECT(map->tiles));
+ g_object_unref(map->tiles);
+ g_object_unref(viewer);
}
G_OBJECT_CLASS(grits_plugin_map_parent_class)->dispose(gobject);
}
g_debug("GritsPluginMap: finalize");
GritsPluginMap *map = GRITS_PLUGIN_MAP(gobject);
/* Free data */
- grits_wms_free(map->wms);
- grits_tile_free(map->tiles, _free_tile, map);
+ 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);
}
projects / grits / blobdiff