Google maps no longer worked due to changes by Google. Problems now fixed.

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

diff --git a/src/google.c b/src/google.c
index 4fa209641ba3753056a43506285ff3613ac5d58d..bb5d3701d36a6b61f0c31b146ae099b028fdf2de 100644 (file)
--- a/src/google.c
+++ b/src/google.c
@@ -18,9 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>
@@ -36,20 +41,23 @@
 
 static int google_download ( MapCoord *src, const gchar *dest_fn );
 static int google_trans_download ( MapCoord *src, const gchar *dest_fn );
+static int google_terrain_download ( MapCoord *src, const gchar *dest_fn );
 static int google_kh_download ( MapCoord *src, const gchar *dest_fn );
 static void google_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
 static gboolean google_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
 
-static DownloadOptions google_options = { "http://maps.google.com/", 0 };
+static DownloadOptions google_options = { "http://maps.google.com/", 0, a_check_map_file };
 
 void google_init () {
   VikMapsLayer_MapType google_1 = { 7, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, google_coord_to_mapcoord, google_mapcoord_to_center_coord, google_download };
   VikMapsLayer_MapType google_2 = { 10, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, google_coord_to_mapcoord, google_mapcoord_to_center_coord, google_trans_download };
   VikMapsLayer_MapType google_3 = { 11, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, google_coord_to_mapcoord, google_mapcoord_to_center_coord, google_kh_download };
+  VikMapsLayer_MapType google_4 = { 16, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, google_coord_to_mapcoord, google_mapcoord_to_center_coord, google_terrain_download };
 
-  maps_layer_register_type("Google Maps", 7, &google_1);
-  maps_layer_register_type("Transparent Google Maps", 10, &google_2);
-  maps_layer_register_type("Google Satellite Images", 11, &google_3);
+  maps_layer_register_type(_("Google Maps"), 7, &google_1);
+  maps_layer_register_type(_("Transparent Google Maps"), 10, &google_2);
+  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) */
@@ -74,6 +82,7 @@ typedef enum {
        TYPE_GOOGLE_MAPS = 0,
        TYPE_GOOGLE_TRANS,
        TYPE_GOOGLE_SAT,
+       TYPE_GOOGLE_TERRAIN,
 
        TYPE_GOOGLE_NUM
 } GoogleType;
@@ -84,9 +93,9 @@ static gchar *parse_version_number(gchar *text)
   gchar *vers;
   gchar *s = text;
 
-  for (i = 0; (s[i] != '&') && (i < 8); i++)
+  for (i = 0; (s[i] != '\\') && (i < 8); i++)
     ;
-  if (s[i] != '&') {
+  if (s[i] != '\\') {
     return NULL;
   }
 
@@ -96,19 +105,20 @@ static gchar *parse_version_number(gchar *text)
 static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_type)
 {
   static gboolean first = TRUE;
-  static char *vers[] = { "w2.60", "w2t.60", "20" };
+  static char *vers[] = { "w2.60", "w2t.60", "20", "w2p.60" };
   FILE *tmp_file;
   int tmp_fd;
   gchar *tmpname;
   gchar *uri;
   VikCoord coord;
+  gchar coord_north_south[G_ASCII_DTOSTR_BUF_SIZE], coord_east_west[G_ASCII_DTOSTR_BUF_SIZE];
   gchar *text, *pat, *beg;
   GMappedFile *mf;
   gsize len;
-  gchar *gvers, *tvers, *kvers, *tmpvers;
-  static DownloadOptions dl_options = { "http://maps.google.com/", 0 };
-  static const char *gvers_pat = "http://mt0.google.com/mt?n=404&v=";
-  static const char *kvers_pat = "http://kh0.google.com/kh?n=404&v=";
+  gchar *gvers, *tvers, *kvers, *terrvers, *tmpvers;
+  static DownloadOptions dl_options = { "http://maps.google.com/", 0, a_check_map_file };
+  static const char *gvers_pat = "http://mt0.google.com/mt?v\\x3d";
+  static const char *kvers_pat = "http://khm0.google.com/kh?v\\x3d";
 
   g_assert(google_type < TYPE_GOOGLE_NUM);
 
@@ -117,38 +127,42 @@ static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_
 
 
   first = FALSE;
-  gvers = tvers = kvers = NULL;
+  gvers = tvers = kvers = terrvers = NULL;
   if ((tmp_fd = g_file_open_tmp ("vikgvers.XXXXXX", &tmpname, NULL)) == -1) {
-    g_critical("couldn't open temp file %s\n", tmpname);
+    g_critical(_("couldn't open temp file %s"), tmpname);
     exit(1);
   } 
 
   google_mapcoord_to_center_coord(mapcoord, &coord);
-  uri = g_strdup_printf("http://maps.google.com/maps?f=q&hl=en&q=%f,%f", coord.north_south, coord.east_west);
+  uri = g_strdup_printf("http://maps.google.com/maps?f=q&hl=en&q=%s,%s",
+                        g_ascii_dtostr (coord_north_south, G_ASCII_DTOSTR_BUF_SIZE, (gdouble) coord.north_south),
+                        g_ascii_dtostr (coord_east_west, G_ASCII_DTOSTR_BUF_SIZE, (gdouble) coord.east_west));
   tmp_file = fdopen(tmp_fd, "r+");
 
   if (curl_download_uri(uri, tmp_file, &dl_options)) {  /* error */
-    g_warning("Failed downloading %s\n", tmpname);
+    g_warning(_("Failed downloading %s"), tmpname);
   } else {
     if ((mf = g_mapped_file_new(tmpname, FALSE, NULL)) == NULL) {
-      g_critical("couldn't map temp file\n");
+      g_critical(_("couldn't map temp file"));
       exit(1);
     }
     len = g_mapped_file_get_length(mf);
     text = g_mapped_file_get_contents(mf);
 
     if ((beg = g_strstr_len(text, len, "GLoadApi")) == NULL) {
-      g_warning("Failed fetching Google numbers (\"GLoadApi\" not found)\n");
+      g_warning(_("Failed fetching Google numbers (\"GLoadApi\" not found)"));
       goto failed;
     }
 
     pat = beg;
-    while (!gvers || !tvers) {
+    while (!gvers || !tvers ||!terrvers) {
       if ((pat = g_strstr_len(pat, &text[len] - pat, gvers_pat)) != NULL) {
         pat += strlen(gvers_pat);
         if ((tmpvers = parse_version_number(pat)) != NULL) {
           if (strstr(tmpvers, "t."))
             tvers = tmpvers;
+          else if (strstr(tmpvers, "p."))
+            terrvers = tmpvers;
           else
             gvers = tmpvers;
         }
@@ -164,14 +178,17 @@ static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_
       vers[TYPE_GOOGLE_MAPS] = gvers;
       vers[TYPE_GOOGLE_TRANS] = tvers;
       vers[TYPE_GOOGLE_SAT] = kvers;
+      vers[TYPE_GOOGLE_TERRAIN] = terrvers;
     }
     else
-      g_warning("Failed getting google version numbers");
+      g_warning(_("Failed getting google version numbers"));
 
     if (gvers)
       fprintf(stderr, "DEBUG gvers=%s\n", gvers);
     if (tvers)
       fprintf(stderr, "DEBUG tvers=%s\n", tvers);
+    if (terrvers)
+      fprintf(stderr, "DEBUG terrvers=%s\n", terrvers);
     if (kvers)
       fprintf(stderr, "DEBUG kvers=%s\n", kvers);
 
@@ -180,7 +197,9 @@ failed:
   }
 
   fclose(tmp_file);
+  tmp_file = NULL;
   g_free(tmpname);
+  g_free (uri);
   return (vers[google_type]);
 }
 
@@ -231,6 +250,12 @@ static int google_trans_download ( MapCoord *src, const gchar *dest_fn )
    return(real_google_download ( src, dest_fn, vers_str ));
 }
 
+static int google_terrain_download ( MapCoord *src, const gchar *dest_fn )
+{
+   const gchar *vers_str = google_version_number(src, TYPE_GOOGLE_TERRAIN);
+   return(real_google_download ( src, dest_fn, vers_str ));
+}
+
 static char *kh_encode(guint32 x, guint32 y, guint8 scale)
 {
   gchar *buf = g_malloc ( (20-scale)*sizeof(gchar) );
@@ -279,7 +304,7 @@ static int google_kh_download ( MapCoord *src, const gchar *dest_fn )
    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 ( "kh.google.com", uri, dest_fn, &google_options );
+   res = a_http_download_get_url ( "khm.google.com", uri, dest_fn, &google_options );
    g_free ( uri );
    return(res);
 }