QA: homogeneous way of doing stuff

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

diff --git a/src/googlemaps.c b/src/googlemaps.c
index f99142ccb25871b9c63ce7403653eba753ffb65e..9dc5e5838213b0bbb0c90a59e74d6659c3c23c57 100644 (file)
--- a/src/googlemaps.c
+++ b/src/googlemaps.c
@@ -18,28 +18,42 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
+#include "viking.h"
 #include "coords.h"
 #include "vikcoord.h"
 #include "mapcoord.h"
-#include "http.h"
+#include "download.h"
+#include "vikmapslayer.h"
 
 #include "googlemaps.h"
 
+static DownloadOptions googlemaps_options = { "http://maps.google.com/", 0, a_check_map_file };
+
+/* initialisation */
+void googlemaps_init () {
+  VikMapsLayer_MapType map_type = { 9, 128, 128, VIK_VIEWPORT_DRAWMODE_GOOGLE, googlemaps_coord_to_mapcoord, googlemaps_mapcoord_to_center_coord, googlemaps_download };
+  maps_layer_register_type(_("Old Google Maps"), 9, &map_type);
+}
+
 /* 1 << (x-1) is like a 2**(x-1) */
 #define GZ(x) ((1<<(x-1))*GOOGLEMAPS_ZOOM_ONE_MPP)
 
 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;
   }
@@ -70,9 +84,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?v=.3&x=%d&y=%d&zoom=%d", src->x, src->y, src->scale );
-   a_http_download_get_url ( "mt.google.com", uri, 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;
 }