X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0faf6aeb05f0e8edc64da7a52eac05be62e049d9..3e9ca23e1344df0bd26ba826048f41bf136ddc1f:/src/osm.c?ds=sidebyside diff --git a/src/osm.c b/src/osm.c index 4da5f0a3..6294e39e 100644 --- a/src/osm.c +++ b/src/osm.c @@ -18,136 +18,42 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include -#include -#include "viking.h" -#include "coords.h" -#include "vikcoord.h" -#include "mapcoord.h" -#include "vikmapslayer.h" +#include #include "osm.h" - -static guint8 osm_zoom ( gdouble mpp ); - -static gboolean osm_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest ); -static void osm_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest ); -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 }; +#include "vikmapslayer.h" +#include "vikslippymapsource.h" +#include "vikwebtoolcenter.h" +#include "vikexttools.h" /* initialisation */ void osm_init () { - VikMapsLayer_MapType osmarender_type = { 12, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_osmarender_download }; - 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("OpenAerialMap", 20, &openarealmap_type); -} - -/* 1 << (x) is like a 2**(x) */ -#define GZ(x) (1<<(x)) - -static const gdouble scale_mpps[] = { GZ(0), GZ(1), GZ(2), GZ(3), GZ(4), GZ(5), GZ(6), GZ(7), GZ(8), GZ(9), - GZ(10), GZ(11), GZ(12), GZ(13), GZ(14), GZ(15), GZ(16), GZ(17) }; - -static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0])); - -#define ERROR_MARGIN 0.01 -guint8 osm_zoom ( gdouble mpp ) { - gint i; - for ( i = 0; i < num_scales; i++ ) { - if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN ) - return i; - } - return 255; -} + VikMapSource *osmarender_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id(12, "OpenStreetMap (Osmarender)", "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png")); + VikMapSource *mapnik_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 13, "OpenStreetMap (Mapnik)", "tile.openstreetmap.org", "/%d/%d/%d.png")); + VikMapSource *maplint_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 14, "OpenStreetMap (Maplint)", "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png")); + VikMapSource *cycle_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 17, "OpenStreetMap (Cycle)", "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" )); -static gboolean osm_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest ) -{ - g_assert ( src->mode == VIK_COORD_LATLON ); + maps_layer_register_map_source (osmarender_type); + maps_layer_register_map_source (mapnik_type); + maps_layer_register_map_source (maplint_type); + maps_layer_register_map_source (cycle_type); - if ( xzoom != yzoom ) - return FALSE; + // Webtools + VikWebtoolCenter *webtool = NULL; + webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d&layers=B000FTF" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); - dest->scale = osm_zoom ( xzoom ); - if ( dest->scale == 255 ) - return FALSE; + webtool = vik_webtool_center_new_with_members ( _("OSM (edit)"), "http://www.openstreetmap.org/edit?lat=%s&lon=%s&zoom=%d" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); - dest->x = (src->east_west + 180) / 360 * GZ(17) / xzoom; - dest->y = (180 - MERCLAT(src->north_south)) / 360 * GZ(17) / xzoom; - dest->z = 0; - return TRUE; + webtool = vik_webtool_center_new_with_members ( _("OSM (render)"), "http://www.informationfreeway.org/?lat=%s&lon=%s&zoom=%d&layers=B0000F000F" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); } -static void osm_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest ) -{ - gdouble socalled_mpp = GZ(src->scale); - dest->mode = VIK_COORD_LATLON; - dest->east_west = ((src->x+0.5) / GZ(17) * socalled_mpp * 360) - 180; - dest->north_south = DEMERCLAT(180 - ((src->y+0.5) / GZ(17) * socalled_mpp * 360)); -} - -/* Maplint tiles - * Ex: http://dev.openstreetmap.org/~ojw/Tiles/maplint.php/10/517/375.png - */ -static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn ) -{ - int res = -1; - gchar *uri = g_strdup_printf ( "/Tiles/maplint.php/%d/%d/%d.png", 17-src->scale, src->x, src->y ); - res = a_http_download_get_url ( "tah.openstreetmap.org", uri, dest_fn, &osm_options ); - g_free ( uri ); - return res; -} - -static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn ) -{ - int res = -1; - gchar *uri = g_strdup_printf ( "/%d/%d/%d.png", 17-src->scale, src->x, src->y ); - res = a_http_download_get_url ( "tile.openstreetmap.org", uri, dest_fn, &osm_options ); - g_free ( uri ); - return res; -} - -static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn ) -{ - int res = -1; - gchar *uri = g_strdup_printf ( "/Tiles/tile/%d/%d/%d.png", 17-src->scale, src->x, src->y ); - res = a_http_download_get_url ( "tah.openstreetmap.org", uri, dest_fn, &osm_options ); - g_free ( uri ); - return res; -} - -static int bluemarble_download ( MapCoord *src, const gchar *dest_fn ) -{ - int res = -1; - 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; -}