X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/59de083b4da4c6babb5b86e8362cbd490b102c04..a29212b08440e5a50314a40f33f343942fcbcc51:/src/google.c diff --git a/src/google.c b/src/google.c index 062a6e08..e055dc85 100644 --- a/src/google.c +++ b/src/google.c @@ -22,33 +22,18 @@ #include "config.h" #endif -#include -#include -#include #include -#include -#include -#include -#include "coords.h" -#include "vikcoord.h" -#include "mapcoord.h" -#include "download.h" -#include "curl_download.h" -#include "globals.h" + #include "google.h" #include "google-map-type.h" +#include "google-kh-map-type.h" #include "vikmapslayer.h" -static int google_kh_download ( MapCoord *src, const gchar *dest_fn ); -static void google_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest ); - -static DownloadOptions google_options = { "http://maps.google.com/", 0, a_check_map_file }; - void google_init () { VikMapType *google_1 = VIK_MAP_TYPE(google_map_type_new_with_id(7, TYPE_GOOGLE_MAPS)); VikMapType *google_2 = VIK_MAP_TYPE(google_map_type_new_with_id(10, TYPE_GOOGLE_TRANS)); - VikMapType *google_3 = VIK_MAP_TYPE(google_map_type_new_with_id(11, TYPE_GOOGLE_SAT)); + VikMapType *google_3 = VIK_MAP_TYPE(google_kh_map_type_new_with_id(11)); VikMapType *google_4 = VIK_MAP_TYPE(google_map_type_new_with_id(16, TYPE_GOOGLE_TERRAIN)); maps_layer_register_type(_("Google Maps"), 7, google_1); @@ -56,222 +41,3 @@ void google_init () { maps_layer_register_type(_("Google Satellite Images"), 11, google_3); maps_layer_register_type(_("Google Terrain Maps"), 16, google_4); } - -/* 1 << (x) is like a 2**(x) */ -#define GZ(x) ((1<mode == VIK_COORD_LATLON ); - - if ( xzoom != yzoom ) - return FALSE; - - dest->scale = google_zoom ( xzoom ); - if ( dest->scale == 255 ) - return FALSE; - - 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; -} - -static void google_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)); -} - -static char *kh_encode(guint32 x, guint32 y, guint8 scale) -{ - gchar *buf = g_malloc ( (20-scale)*sizeof(gchar) ); - guint32 ya = 1 << (17 - scale); - gint8 i, j; - - if (y < 0 || (ya-1 < y)) { - strcpy(buf,"tqq"); /* BAD */ - return buf; - } - if (x < 0 || ya-1 < x) { - x %= ya; - if (x < 0) - x += ya; - } - - buf[0] = 't'; - for (j = 1, i = 16; i >= scale; i--, j++) { - ya /= 2; - if (y < ya) { - if (x < ya) - buf[j]='q'; - else { - buf[j]='r'; - x -= ya; - } - } else { - if (x < ya) { - buf[j] = 't'; - y -= ya; - } else { - buf[j] = 's'; - x -= ya; - y -= ya; - } - } - } - buf[j] = '\0'; - return buf; -} - -static int google_kh_download ( MapCoord *src, const gchar *dest_fn ) -{ - int res; - gchar *khenc = kh_encode( src->x, src->y, src->scale ); - const gchar *vers_str = google_version_number(src, TYPE_GOOGLE_SAT); - gchar *uri = g_strdup_printf ( "/kh?n=404&v=%s&t=%s", vers_str, khenc ); - g_free ( khenc ); - res = a_http_download_get_url ( "khm.google.com", uri, dest_fn, &google_options ); - g_free ( uri ); - return(res); -}