Add Terraserver

[andy/viking.git] / src / googlemaps.c

diff --git a/src/googlemaps.c b/src/googlemaps.c
index 6e9f9599664dde274c9cfcb8235985ae5cb01d9d..308fe92c785537a368e751a90c223c2e8c294a61 100644 (file)
--- 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"
@@ -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 ) {
+static 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;
   }