From 53a362eba109e0a100c95df33686b0706aff432e Mon Sep 17 00:00:00 2001 From: anonymous <> Date: Sat, 30 Aug 2008 15:45:54 +0000 Subject: [PATCH 1/1] Patch #2009666: OpenAerialMap A small Patches that can download areal photos form OpenAerialMap.org. Submitted by anonymous --- src/osm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/osm.c b/src/osm.c index b666f3a7..d636388c 100644 --- a/src/osm.c +++ b/src/osm.c @@ -37,6 +37,7 @@ static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn ); static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn ); static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn ); static int bluemarble_download ( MapCoord *src, const gchar *dest_fn ); +static int openarealmap_download ( MapCoord *src, const gchar *dest_fn ); static DownloadOptions osm_options = { NULL, 0, a_check_map_file }; @@ -46,12 +47,15 @@ void osm_init () { VikMapsLayer_MapType mapnik_type = { 13, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_mapnik_download }; VikMapsLayer_MapType maplint_type = { 14, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_maplint_download }; VikMapsLayer_MapType bluemarble_type = { 15, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, bluemarble_download }; + + VikMapsLayer_MapType openarealmap_type = { 20, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, openarealmap_download }; maps_layer_register_type("OpenStreetMap (Osmarender)", 12, &osmarender_type); maps_layer_register_type("OpenStreetMap (Mapnik)", 13, &mapnik_type); maps_layer_register_type("OpenStreetMap (Maplint)", 14, &maplint_type); maps_layer_register_type("BlueMarble", 15, &bluemarble_type); + maps_layer_register_type("openarealmap", 20, &openarealmap_type); } /* 1 << (x) is like a 2**(x) */ @@ -133,6 +137,17 @@ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn ) gchar *uri = g_strdup_printf ( "/com.modestmaps.bluemarble/%d-r%d-c%d.jpg", 17-src->scale, src->y, src->x ); res = a_http_download_get_url ( "s3.amazonaws.com", uri, dest_fn, &osm_options ); + g_free ( uri ); + return res; + +} + +static int openarealmap_download ( MapCoord *src, const gchar *dest_fn ) +{ + int res = -1; + gchar *uri = g_strdup_printf ( "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg", 17-src->scale, src->x, src->y ); + res = a_http_download_get_url ( "tile.openaerialmap.org", uri, dest_fn, &osm_options ); + g_free ( uri ); return res; } -- 2.39.5