X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fmap.c;h=aa4d0f27d51d3454e1ae9acdb97de45af94babab;hb=fe727bbe62d293878e0a75a9cf9f420c0eae03cb;hp=0e8a656eca7a10a344a232ba03276a4f8e16daa2;hpb=ce0016070b1fe7db3bd208d6148a776efd3f7d6e;p=grits

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 0e8a656..aa4d0f2 100644
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -35,7 +35,7 @@
 #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
@@ -86,6 +86,7 @@ static void _load_tile(GritsTile *tile, gpointer _map)
 	}
 
 	/* 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
 
@@ -217,6 +218,9 @@ static void grits_plugin_map_init(GritsPluginMap *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, 85.0511, -85.0511, EAST, WEST);
+	//map->wms   = grits_tms_new("http://tile.openstreetmap.org",
+	//	"osm/", "png");
 	map->tiles = grits_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
 	map->wms   = grits_wms_new(
 		"http://vmap0.tiles.osgeo.org/wms/vmap0",
@@ -247,6 +251,7 @@ static void grits_plugin_map_finalize(GObject *gobject)
 	g_debug("GritsPluginMap: finalize");
 	GritsPluginMap *map = GRITS_PLUGIN_MAP(gobject);
 	/* Free data */
+	//grits_wms_free(map->tms);
 	grits_wms_free(map->wms);
 	grits_tile_free(map->tiles, _free_tile, map);
 	G_OBJECT_CLASS(grits_plugin_map_parent_class)->finalize(gobject);