X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/4c77d5e0aec3c7aab32965ca4e02abb17bb6108f..8ad10bcbc56db831de11fe283b947814ed613e3d:/src/googlemaps.c

diff --git a/src/googlemaps.c b/src/googlemaps.c
index f7cb707f..313a468c 100644
--- a/src/googlemaps.c
+++ b/src/googlemaps.c
@@ -24,7 +24,11 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+
+#ifdef HAVE_MATH_H
 #include <math.h>
+#endif
+
 #include "viking.h"
 #include "coords.h"
 #include "vikcoord.h"
@@ -34,7 +38,7 @@
 
 #include "googlemaps.h"
 
-static DownloadOptions googlemaps_options = { "http://maps.google.com/", 0 };
+static DownloadOptions googlemaps_options = { "http://maps.google.com/", 0, a_check_map_file };
 
 /* initialisation */
 void googlemaps_init () {
@@ -48,12 +52,12 @@ void googlemaps_init () {
 static const gdouble scale_mpps[] = { GZ(1)/2, 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) };
 
-static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0])) - 1;
+static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
 
 #define ERROR_MARGIN 0.01
 guint8 googlemaps_zoom ( gdouble mpp ) {
   gint i;
-  for ( i = 0; i <= num_scales; i++ ) {
+  for ( i = 0; i < num_scales; i++ ) {
     if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN )
       return i;
   }
@@ -84,9 +88,10 @@ void googlemaps_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )
   dest->east_west = 1.0 / (131072 >> src->scale) * (src->x+0.5) / 0.77162458338772 * 128 - 98.35;
 }
 
-void googlemaps_download ( MapCoord *src, const gchar *dest_fn )
+int googlemaps_download ( MapCoord *src, const gchar *dest_fn )
 {
    gchar *uri = g_strdup_printf ( "/mt?&x=%d&y=%d&zoom=%d", src->x, src->y, src->scale );
    a_http_download_get_url ( "mt.google.com", uri, dest_fn, &googlemaps_options );
    g_free ( uri );
+   return 1;
 }