X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7a5b9f809c909ae047526032bbd2407499f17592..6d0927b1b61b1f2f9ec5d048d85d8a4cad24f649:/src/googlesearch.c

diff --git a/src/googlesearch.c b/src/googlesearch.c
index 9488c2f2..bf98f64a 100644
--- a/src/googlesearch.c
+++ b/src/googlesearch.c
@@ -36,25 +36,23 @@
 
 #include "googlesearch.h"
 
-#define GOOGLE_SEARCH_URL_FMT "http://maps.google.com/maps?q=%s&output=js"
-#define GOOGLE_SEARCH_PATTERN_1 "{center:{lat:"
-#define GOOGLE_SEARCH_PATTERN_2 ",lng:"
-#define GOOGLE_SEARCH_NOT_FOUND "not understand the location"
+#define GOOGLE_GOTO_URL_FMT "http://maps.google.com/maps?q=%s&output=js"
+#define GOOGLE_GOTO_PATTERN_1 "{center:{lat:"
+#define GOOGLE_GOTO_PATTERN_2 ",lng:"
+#define GOOGLE_GOTO_NOT_FOUND "not understand the location"
 
-static gchar *last_search_str = NULL;
-static VikCoord *last_coord = NULL;
-static gchar *last_successful_search_str = NULL;
+static DownloadOptions googlesearch_options = { 0, "http://maps.google.com/", 0, a_check_map_file };
 
-static DownloadOptions googlesearch_options = { "http://maps.google.com/", 0, a_check_map_file };
+static void google_goto_tool_class_init ( GoogleGotoToolClass *klass );
+static void google_goto_tool_init ( GoogleGotoTool *vwd );
 
-static void google_search_tool_class_init ( GoogleSearchToolClass *klass );
-static void google_search_tool_init ( GoogleSearchTool *vwd );
+static void google_goto_tool_finalize ( GObject *gob );
 
-static void google_search_tool_finalize ( GObject *gob );
+static gchar *google_goto_tool_get_url_format ( VikGotoTool *self );
+static DownloadOptions *google_goto_tool_get_download_options ( VikGotoTool *self );
+static gboolean google_goto_tool_parse_file_for_latlon(VikGotoTool *self, gchar *filename, struct LatLon *ll);
 
-static int google_search_tool_get_coord ( VikSearchTool *self, VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord );
-
-GType google_search_tool_get_type()
+GType google_goto_tool_get_type()
 {
   static GType w_type = 0;
 
@@ -62,51 +60,53 @@ GType google_search_tool_get_type()
   {
     static const GTypeInfo w_info = 
     {
-      sizeof (GoogleSearchToolClass),
+      sizeof (GoogleGotoToolClass),
       NULL, /* base_init */
       NULL, /* base_finalize */
-      (GClassInitFunc) google_search_tool_class_init,
+      (GClassInitFunc) google_goto_tool_class_init,
       NULL, /* class_finalize */
       NULL, /* class_data */
-      sizeof (GoogleSearchTool),
+      sizeof (GoogleGotoTool),
       0,
-      (GInstanceInitFunc) google_search_tool_init,
+      (GInstanceInitFunc) google_goto_tool_init,
     };
-    w_type = g_type_register_static ( VIK_SEARCH_TOOL_TYPE, "GoogleSearchTool", &w_info, 0 );
+    w_type = g_type_register_static ( VIK_GOTO_TOOL_TYPE, "GoogleGotoTool", &w_info, 0 );
   }
 
   return w_type;
 }
 
-static void google_search_tool_class_init ( GoogleSearchToolClass *klass )
+static void google_goto_tool_class_init ( GoogleGotoToolClass *klass )
 {
   GObjectClass *object_class;
-  VikSearchToolClass *parent_class;
+  VikGotoToolClass *parent_class;
 
   object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = google_search_tool_finalize;
+  object_class->finalize = google_goto_tool_finalize;
 
-  parent_class = VIK_SEARCH_TOOL_CLASS (klass);
+  parent_class = VIK_GOTO_TOOL_CLASS (klass);
 
-  parent_class->get_coord = google_search_tool_get_coord;
+  parent_class->get_url_format = google_goto_tool_get_url_format;
+  parent_class->get_download_options = google_goto_tool_get_download_options;
+  parent_class->parse_file_for_latlon = google_goto_tool_parse_file_for_latlon;
 }
 
-GoogleSearchTool *google_search_tool_new ()
+GoogleGotoTool *google_goto_tool_new ()
 {
-  return GOOGLE_SEARCH_TOOL ( g_object_new ( GOOGLE_SEARCH_TOOL_TYPE, "label", "Google", NULL ) );
+  return GOOGLE_GOTO_TOOL ( g_object_new ( GOOGLE_GOTO_TOOL_TYPE, "label", "Google", NULL ) );
 }
 
-static void google_search_tool_init ( GoogleSearchTool *vlp )
+static void google_goto_tool_init ( GoogleGotoTool *vlp )
 {
 }
 
-static void google_search_tool_finalize ( GObject *gob )
+static void google_goto_tool_finalize ( GObject *gob )
 {
   G_OBJECT_GET_CLASS(gob)->finalize(gob);
 }
 
-static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll)
+static gboolean google_goto_tool_parse_file_for_latlon(VikGotoTool *self, gchar *file_name, struct LatLon *ll)
 {
   gchar *text, *pat;
   GMappedFile *mf;
@@ -124,16 +124,16 @@ static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll)
   len = g_mapped_file_get_length(mf);
   text = g_mapped_file_get_contents(mf);
 
-  if (g_strstr_len(text, len, GOOGLE_SEARCH_NOT_FOUND) != NULL) {
+  if (g_strstr_len(text, len, GOOGLE_GOTO_NOT_FOUND) != NULL) {
     found = FALSE;
     goto done;
   }
 
-  if ((pat = g_strstr_len(text, len, GOOGLE_SEARCH_PATTERN_1)) == NULL) {
+  if ((pat = g_strstr_len(text, len, GOOGLE_GOTO_PATTERN_1)) == NULL) {
     found = FALSE;
     goto done;
   }
-  pat += strlen(GOOGLE_SEARCH_PATTERN_1);
+  pat += strlen(GOOGLE_GOTO_PATTERN_1);
   s = lat_buf;
   if (*pat == '-')
     *s++ = *pat++;
@@ -146,12 +146,12 @@ static gboolean parse_file_for_latlon(gchar *file_name, struct LatLon *ll)
     goto done;
   }
 
-  if (strncmp(pat, GOOGLE_SEARCH_PATTERN_2, strlen(GOOGLE_SEARCH_PATTERN_2))) {
+  if (strncmp(pat, GOOGLE_GOTO_PATTERN_2, strlen(GOOGLE_GOTO_PATTERN_2))) {
       found = FALSE;
       goto done;
   }
 
-  pat += strlen(GOOGLE_SEARCH_PATTERN_2);
+  pat += strlen(GOOGLE_GOTO_PATTERN_2);
   s = lon_buf;
 
   if (*pat == '-')
@@ -174,60 +174,12 @@ done:
 
 }
 
-static int google_search_tool_get_coord ( VikSearchTool *self, VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord )
+static gchar *google_goto_tool_get_url_format ( VikGotoTool *self )
 {
-  FILE *tmp_file;
-  int tmp_fd;
-  gchar *tmpname;
-  gchar *uri;
-  gchar *escaped_srch_str;
-  int ret = 0;  /* OK */
-  struct LatLon ll;
-
-  g_debug("%s: raw search: %s", __FUNCTION__, srch_str);
-
-  escaped_srch_str = uri_escape(srch_str);
-
-  g_debug("%s: escaped search: %s", __FUNCTION__, escaped_srch_str);
-
-  if ((tmp_fd = g_file_open_tmp ("vikgsearch.XXXXXX", &tmpname, NULL)) == -1) {
-    g_critical(_("couldn't open temp file"));
-    exit(1);
-  }
-
-  tmp_file = fdopen(tmp_fd, "r+");
-  //uri = g_strdup_printf(GOOGLE_SEARCH_URL_FMT, srch_str);
-  uri = g_strdup_printf(GOOGLE_SEARCH_URL_FMT, escaped_srch_str);
-
-  /* TODO: curl may not be available */
-  if (curl_download_uri(uri, tmp_file, &googlesearch_options)) {  /* error */
-    fclose(tmp_file);
-    tmp_file = NULL;
-    ret = -1;
-    goto done;
-  }
-
-  fclose(tmp_file);
-  tmp_file = NULL;
-  if (!parse_file_for_latlon(tmpname, &ll)) {
-    ret = -1;
-    goto done;
-  }
-
-  vik_coord_load_from_latlon ( coord, vik_viewport_get_coord_mode(vvp), &ll );
-
-  if (last_coord)
-    g_free(last_coord);
-  last_coord = g_malloc(sizeof(VikCoord));
-  *last_coord = *coord;
-  if (last_successful_search_str)
-    g_free(last_successful_search_str);
-  last_successful_search_str = g_strdup(last_search_str);
+  return GOOGLE_GOTO_URL_FMT;
+}
 
-done:
-  g_free(escaped_srch_str);
-  g_free(uri);
-  g_remove(tmpname);
-  g_free(tmpname);
-  return ret;
+DownloadOptions *google_goto_tool_get_download_options ( VikGotoTool *self )
+{
+  return &googlesearch_options;
 }