QA: cleanning unused stuff

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

diff --git a/src/google.c b/src/google.c
index 4bc5ce5e4bd03e1b7fa199f0ced5ca302a891b6d..062a6e08b48b492404192888c6fe864eb2646b1e 100644 (file)
--- a/src/google.c
+++ b/src/google.c
@@ -18,7 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
  * 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>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <string.h>


@@ -26,22 +33,28 @@
 #include "vikcoord.h"
 #include "mapcoord.h"
 #include "download.h"
 #include "vikcoord.h"
 #include "mapcoord.h"
 #include "download.h"

+#include "curl_download.h"

 #include "globals.h"
 #include "google.h"
 #include "globals.h"
 #include "google.h"

+#include "google-map-type.h"

 #include "vikmapslayer.h"
 
 #include "vikmapslayer.h"
 

-#define GOOGLE_VERSION "w2.43"
-#define GOOGLE_TRANS_VERSION "w2t.40"
-#define GOOGLE_KH_VERSION "17"
+
+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 () {
 
 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 };
+  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_4 = VIK_MAP_TYPE(google_map_type_new_with_id(16, TYPE_GOOGLE_TERRAIN));

 
 

-  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) */
 }
 
 /* 1 << (x) is like a 2**(x) */


@@ -53,7 +66,7 @@ static const gdouble scale_mpps[] = { GZ(0), GZ(1), GZ(2), GZ(3), GZ(4), GZ(5),
 static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
 
 #define ERROR_MARGIN 0.01
 static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
 
 #define ERROR_MARGIN 0.01

-guint8 google_zoom ( gdouble mpp ) {
+static guint8 google_zoom ( gdouble mpp ) {

   gint i;
   for ( i = 0; i < num_scales; i++ ) {
     if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN )
   gint i;
   for ( i = 0; i < num_scales; i++ ) {
     if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN )


@@ -62,6 +75,128 @@ guint8 google_zoom ( gdouble mpp ) {
   return 255;
 }
 
   return 255;
 }
 

+static gchar *parse_version_number(gchar *text)
+{
+  int i;
+  gchar *vers;
+  gchar *s = text;
+
+  for (i = 0; (s[i] != '\\') && (i < 8); i++)
+    ;
+  if (s[i] != '\\') {
+    return NULL;
+  }
+
+  return vers = g_strndup(s, i);
+}
+
+static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_type)
+{
+  static gboolean first = TRUE;
+  static char *vers[] = { "w2.80", "w2t.80", "30", "w2p.81"};
+  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, *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 *gvers_pat = "http://mt0.google.com/mt";
+  static const char *kvers_pat = "http://khm0.google.com/kh?v\\x3d";
+
+  g_assert(google_type < TYPE_GOOGLE_NUM);
+
+  if (!first)
+    return (vers[google_type]);
+
+
+  first = FALSE;
+  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"), tmpname);
+    exit(1);
+  } 
+
+  google_mapcoord_to_center_coord(mapcoord, &coord);
+  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"), tmpname);
+  } else {
+    if ((mf = g_mapped_file_new(tmpname, FALSE, NULL)) == NULL) {
+      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)"));
+      goto failed;
+    }
+
+    pat = beg;
+    while (!gvers || !tvers ||!terrvers) {
+      if ((pat = g_strstr_len(pat, &text[len] - pat, gvers_pat)) != NULL) {
+        pat += strlen(gvers_pat);
+       if ((pat[0] != '/' && pat[0] != '?') ||
+            pat[1] != 'v' || pat[2] != '\\' ||
+            pat[3] != 'x' || pat[4] != '3' || pat[5] != 'd')
+          continue;
+        pat += 6;
+        if ((tmpvers = parse_version_number(pat)) != NULL) {
+          if (strstr(tmpvers, "t."))
+            tvers = tmpvers;
+          else if (strstr(tmpvers, "p."))
+            terrvers = tmpvers;
+          else
+            gvers = tmpvers;
+        }
+      }
+      else
+        break;
+    }
+
+    if ((pat = g_strstr_len(beg, &text[len] - beg, kvers_pat)) != NULL)
+        kvers = parse_version_number(pat + strlen(kvers_pat));
+
+    if (gvers && tvers && kvers) {
+      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"));
+
+    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);
+
+failed:
+    g_mapped_file_free(mf);
+  }
+
+  fclose(tmp_file);
+  tmp_file = NULL;
+  g_free(tmpname);
+  g_free (uri);
+  return (vers[google_type]);
+}
+

 gboolean google_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {
   g_assert ( src->mode == VIK_COORD_LATLON );
 gboolean google_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
 {
   g_assert ( src->mode == VIK_COORD_LATLON );


@@ -80,7 +215,7 @@ gboolean google_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble
   return TRUE;
 }
 
   return TRUE;
 }
 

-void google_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )
+static void google_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )

 {
   gdouble socalled_mpp = GZ(src->scale);
   dest->mode = VIK_COORD_LATLON;
 {
   gdouble socalled_mpp = GZ(src->scale);
   dest->mode = VIK_COORD_LATLON;


@@ -88,23 +223,6 @@ void google_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )
   dest->north_south = DEMERCLAT(180 - ((src->y+0.5) / GZ(17) * socalled_mpp * 360));
 }
 
   dest->north_south = DEMERCLAT(180 - ((src->y+0.5) / GZ(17) * socalled_mpp * 360));
 }
 

-static void real_google_download ( MapCoord *src, const gchar *dest_fn, const char *verstr )
-{
-   gchar *uri = g_strdup_printf ( "/mt?v=%s&x=%d&y=%d&zoom=%d", verstr, src->x, src->y, src->scale );
-   a_http_download_get_url ( "mt.google.com", uri, dest_fn );
-   g_free ( uri );
-}
-
-void google_download ( MapCoord *src, const gchar *dest_fn )
-{
-   real_google_download ( src, dest_fn, GOOGLE_VERSION );
-}
-
-void google_trans_download ( MapCoord *src, const gchar *dest_fn )
-{
-   real_google_download ( src, dest_fn, GOOGLE_TRANS_VERSION );
-}
-

 static char *kh_encode(guint32 x, guint32 y, guint8 scale)
 {
   gchar *buf = g_malloc ( (20-scale)*sizeof(gchar) );
 static char *kh_encode(guint32 x, guint32 y, guint8 scale)
 {
   gchar *buf = g_malloc ( (20-scale)*sizeof(gchar) );


@@ -146,11 +264,14 @@ static char *kh_encode(guint32 x, guint32 y, guint8 scale)
   return buf;
 }
 
   return buf;
 }
 

-void google_kh_download ( MapCoord *src, const gchar *dest_fn )
+static int google_kh_download ( MapCoord *src, const gchar *dest_fn )

 {
 {

+   int res;

    gchar *khenc = kh_encode( src->x, src->y, src->scale );
    gchar *khenc = kh_encode( src->x, src->y, src->scale );

-   gchar *uri = g_strdup_printf ( "/kh?v=%s&t=%s", GOOGLE_KH_VERSION, khenc );
+   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 );
    g_free ( khenc );

-   a_http_download_get_url ( "kh.google.com", uri, dest_fn );
+   res = a_http_download_get_url ( "khm.google.com", uri, dest_fn, &google_options );

    g_free ( uri );
    g_free ( uri );

+   return(res);

 }
 }