Remove old Google stuff

A really agressive removing: try to avoid dead code.

diff --git a/ChangeLog b/ChangeLog
index 8652e8f7731b0362e22ae7bdcc3cae5d717ec270..2176f698442fe0c0a6e1f63ab97875fd698b7dc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-17
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+       * Remove old Google stuff
+
 2008-12-13
 Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
        * Add external tools framework

diff --git a/configure.ac b/configure.ac
index 26dd74d55511a17512d64eee555cda9a61d56985..a76d9890cc951454d810ea19a06332af78941c73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,19 +83,6 @@ case $ac_cv_enable_google in
 esac
 AM_CONDITIONAL([GOOGLE], [test x$ac_cv_enable_google = xyes])
 
-AC_ARG_ENABLE(oldgoogle, AC_HELP_STRING([--enable-old-google],
-              [enable old Google stuff (default is disable)]),
-              [ac_cv_enable_old_google=$enableval],
-              [ac_cv_enable_old_google=no])
-AC_CACHE_CHECK([whether to enable Old Google stuff],
-               [ac_cv_enable_old_google], [ac_cv_enable_old_google=yes])
-case $ac_cv_enable_old_google in
-  yes)
-    AC_DEFINE(VIK_CONFIG_OLD_GOOGLE, [], [OLD GOOGLE STUFF])
-    ;;
-esac
-AM_CONDITIONAL([OLDGOOGLE], [test x$ac_cv_enable_old_google = xyes])
-
 AC_ARG_ENABLE(terraserver, AC_HELP_STRING([--enable-terraserver],
               [enable Terraserver stuff (default is enable)]),
               [ac_cv_enable_terraserver=$enableval],
@@ -250,7 +237,6 @@ echo "$PACKAGE $VERSION"
 echo "-------------------------------------------"
 echo "Alphabetized track & waypoints   : $ac_cv_enable_alpha_trw"
 echo "Google Maps                      : $ac_cv_enable_google"
-#echo "Old Google Maps                  : $ac_cv_enable_old_google"
 echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
 #echo "Expedia Maps                     : $ac_cv_enable_expedia"
 echo "Open Street Map                  : $ac_cv_enable_openstreetmap"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65db7b9b26646651150a2fec5e3c4fb49f4e23ff..0fa12e38b22cff0b538126e6e9be0b255da47289 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,13 +6,13 @@ src/dialog.c
 src/expedia.c
 src/globals.c
 src/google.c
-src/googlemaps.c
 src/googlesearch.c
 src/datasource_gc.c
 src/datasource_google.c
 src/datasource_gps.c
 src/dem.c
 src/download.c
+src/file.c
 src/osm-traces.c
 src/print.c
 src/util.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 81b12805afcf7e4e99b74349101d0b071d419b85..0190d416abb311a1c139611ab5e55e234b50886c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,11 +85,6 @@ libviking_a_SOURCES += \
        google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-       googlemaps.c googlemaps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
        terraserver.c terraserver.h

diff --git a/src/Makefile_windows b/src/Makefile_windows
index ba3899456fc6634184e2bad3cfb3b8fe4cb31b79..63ff1dd0628430b6276dffe25f0d1d49cc318290 100644 (file)
--- a/src/Makefile_windows
+++ b/src/Makefile_windows
@@ -7,7 +7,7 @@ EXE = .exe
 endif
 
 TARGET=viking$(EXE)
-OBJECTS=viktrack.o vikwaypoint.o clipboard.o coords.o gpsmapper.o gpspoint.o file.o main.o dialog.o http.o viktreeview.o viktrwlayer.o viklayer.o viklayerspanel.o vikcoordlayer.o vikstatus.o vikwindow.o vikviewport.o vikaggregatelayer.o vikgeoreflayer.o vikfileentry.o viktrwlayer_tpwin.o viktrwlayer_propwin.o thumbnails.o background.o vikradiogroup.o vikcoord.o expedia.o mapcache.o vikmapslayer.o terraserver.o googlemaps.o gtkcellrendererprogress.o
+OBJECTS=viktrack.o vikwaypoint.o clipboard.o coords.o gpsmapper.o gpspoint.o file.o main.o dialog.o http.o viktreeview.o viktrwlayer.o viklayer.o viklayerspanel.o vikcoordlayer.o vikstatus.o vikwindow.o vikviewport.o vikaggregatelayer.o vikgeoreflayer.o vikfileentry.o viktrwlayer_tpwin.o viktrwlayer_propwin.o thumbnails.o background.o vikradiogroup.o vikcoord.o expedia.o mapcache.o vikmapslayer.o terraserver.o gtkcellrendererprogress.o
 
 CCFLAGS = -DWINDOWS -mms-bitfields -Wall -g
 LINKFLAGS = -lwsock32

diff --git a/src/file.c b/src/file.c
index 5379c0ee52df1dc33d0424ededbe92d0f6f5cf0c..3c30c30f218c7a794923bd6e0f9edb2f3b7e36fa 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -34,6 +34,7 @@
 #endif
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /* Relax some dependencies */
 #if ! GLIB_CHECK_VERSION(2,12,0)
@@ -186,8 +187,6 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   switch ( mode ) {
     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
-    case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break;
-    case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
     case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
     default:
       g_critical("Houston, we've had a problem. mode=%d", mode);
@@ -423,9 +422,13 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)
-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_GOOGLE );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "google" );
+      }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)
-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH );
+      {
+        g_warning ( _("Draw mode '%s' no more supported"), "kh" );
+      }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )

diff --git a/src/googlemaps.c b/src/googlemaps.c
deleted file mode 100644 (file)
index 308fe92..0000000
--- a/src/googlemaps.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
- *
- * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * 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>
-
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-
-#include "viking.h"
-#include "coords.h"
-#include "vikcoord.h"
-#include "mapcoord.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]));
-
-#define ERROR_MARGIN 0.01
-static guint8 googlemaps_zoom ( gdouble mpp ) {
-  gint i;
-  for ( i = 0; i < num_scales; i++ ) {
-    if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN )
-      return i;
-  }
-  return 255;
-}
-
-gboolean googlemaps_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
-{
-  g_assert ( src->mode == VIK_COORD_LATLON );
-
-  if ( xzoom != yzoom )
-    return FALSE;
-
-  dest->scale = googlemaps_zoom ( xzoom );
-  if ( dest->scale == 255 )
-    return FALSE;
-
-  dest->x = (gint) floor ( floor ((src->east_west + 98.35) * (131072 >> dest->scale) * 0.77162458338772) / 128);
-  dest->y = (gint) floor ( floor ((39.5 - src->north_south) * (131072 >> dest->scale)) / 128);
-  dest->z = 0;
-  return TRUE;
-}
-
-void googlemaps_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )
-{
-  dest->mode = VIK_COORD_LATLON;
-  dest->north_south = 39.5 - (1.0/(131072 >> src->scale) * (src->y+0.5) * 128);
-  dest->east_west = 1.0 / (131072 >> src->scale) * (src->x+0.5) / 0.77162458338772 * 128 - 98.35;
-}
-
-int googlemaps_download ( MapCoord *src, const gchar *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;
-}

diff --git a/src/googlemaps.h b/src/googlemaps.h
deleted file mode 100644 (file)
index 0c424d5..0000000
--- a/src/googlemaps.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
- *
- * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef __VIKING_GOOGLEMAPS_H
-#define __VIKING_GOOGLEMAPS_H
-
-#include <glib.h>
-
-#include "vikcoord.h"
-#include "mapcoord.h"
-
-void googlemaps_init ();
-
-/* a bit misleading, this is the "mpp" (really just set zoom level, very
- * roughly equivalent so you can easily switch between maps) of
- * google maps 1, the second google maps level (1st is 0). */
-#define GOOGLEMAPS_ZOOM_ONE_MPP 2.0
-
-gboolean googlemaps_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
-void googlemaps_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
-int googlemaps_download ( MapCoord *src, const gchar *dest_fn );
-
-#endif

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 035632c53e45c39b3fd106e5e4db26fea4c9a211..2d5481ff94de02c54c629aaeb661deda03dbc372 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -41,10 +41,6 @@ static const char *menu_xml =
        "      <menuitem action='ModeUTM'/>"
 #ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"
-#endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
-       "      <menuitem action='ModeGoogle'/>"
-       "      <menuitem action='ModeKH'/>"
 #endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"

diff --git a/src/modules.c b/src/modules.c
index 0320ad7deb6712618a55abf50ef0167134934e03..f71cbfa625b7d182bee2a5264bb3dd4ad919d783 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -26,7 +26,6 @@
 #include "modules.h"
 
 #include "google.h"
-#include "googlemaps.h"
 #include "terraserver.h"
 #include "expedia.h"
 #include "osm.h"
@@ -34,9 +33,6 @@
 
 void modules_init()
 {
-#ifdef VIK_CONFIG_OLD_GOOGLE 
-  googlemaps_init();
-#endif
 #ifdef VIK_CONFIG_GOOGLE 
   google_init();
 #endif

diff --git a/src/vikviewport.c b/src/vikviewport.c
index 8955f33de7c3567490cf0ce360ab0bc53b5ae156..58dd31183a47ef68da51f2276a3be9636a1623c6 100644 (file)
--- a/src/vikviewport.c
+++ b/src/vikviewport.c
@@ -43,7 +43,6 @@
 
 /* for ALTI_TO_MPP */
 #include "globals.h"
-#include "googlemaps.h"
 
 static gdouble EASTING_OFFSET = 500000.0;
 
@@ -61,8 +60,6 @@ static void viewport_init_ra();
 
 static GObjectClass *parent_class;
 
-static void viewport_google_rezoom ( VikViewport *vvp );
-
 
 struct _VikViewport {
   GtkDrawingArea drawing_area;
@@ -492,8 +489,6 @@ void vik_viewport_set_zoom ( VikViewport *vvp, gdouble xympp )
 
   if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM )
     viewport_utm_zone_check(vvp);
-  else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-    viewport_google_rezoom ( vvp );
 }
 
 /* or could do factor */
@@ -505,9 +500,6 @@ void vik_viewport_zoom_in ( VikViewport *vvp )
     vvp->xmpp /= 2;
     vvp->ympp /= 2;
 
-    if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-      viewport_google_rezoom ( vvp );
-
     viewport_utm_zone_check(vvp);
   }
 }
@@ -520,9 +512,6 @@ void vik_viewport_zoom_out ( VikViewport *vvp )
     vvp->xmpp *= 2;
     vvp->ympp *= 2;
 
-    if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-      viewport_google_rezoom ( vvp );
-
     viewport_utm_zone_check(vvp);
   }
 }
@@ -550,8 +539,6 @@ void vik_viewport_set_xmpp ( VikViewport *vvp, gdouble xmpp )
     vvp->xmpp = xmpp;
     if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM )
       viewport_utm_zone_check(vvp);
-    if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-      viewport_google_rezoom ( vvp );
   }
 }
 
@@ -561,8 +548,6 @@ void vik_viewport_set_ympp ( VikViewport *vvp, gdouble ympp )
     vvp->ympp = ympp;
     if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_UTM )
       viewport_utm_zone_check(vvp);
-    if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-      viewport_google_rezoom ( vvp );
   }
 }
 
@@ -706,14 +691,7 @@ void vik_viewport_screen_to_coord ( VikViewport *vvp, int x, int y, VikCoord *co
     coord->mode = VIK_COORD_LATLON;
     if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_EXPEDIA )
       calcxy_rev(&(coord->east_west), &(coord->north_south), x, y, vvp->center.east_west, vvp->center.north_south, vvp->xmpp * ALTI_TO_MPP, vvp->ympp * ALTI_TO_MPP, vvp->width/2, vvp->height/2);
-    else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) {
-      /* google */
-      coord->east_west = (x - (vvp->width/2)) * vvp->google_calcx_rev_fact + vvp->center.east_west;
-      coord->north_south = ((vvp->height/2) - y) * vvp->google_calcy_rev_fact + vvp->center.north_south;
-    } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_KH ) {
-      coord->east_west = vvp->center.east_west + (180.0 * vvp->xmpp / 65536 / 256 * (x - vvp->width/2));
-      coord->north_south = vvp->center.north_south + (180.0 * vvp->ympp / 65536 / 256 * (vvp->height/2 - y));
-    } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) {
+    else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) {
       /* FIXMERCATOR */
       coord->east_west = vvp->center.east_west + (180.0 * vvp->xmpp / 65536 / 256 * (x - vvp->width/2));
       coord->north_south = DEMERCLAT ( MERCLAT(vvp->center.north_south) + (180.0 * vvp->ympp / 65536 / 256 * (vvp->height/2 - y)) );
@@ -760,14 +738,6 @@ void vik_viewport_coord_to_screen ( VikViewport *vvp, const VikCoord *coord, int
     if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_EXPEDIA ) {
       calcxy ( &xx, &yy, center->lon, center->lat, ll->lon, ll->lat, vvp->xmpp * ALTI_TO_MPP, vvp->ympp * ALTI_TO_MPP, vvp->width / 2, vvp->height / 2 );
       *x = xx; *y = yy;
-    } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE ) {
-      /* google */
-      *x = vvp->google_calcx_fact * (ll->lon - center->lon) + (vvp->width/2);
-      *y = vvp->google_calcy_fact * (center->lat - ll->lat) + (vvp->height/2);
-    } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_KH ) {
-      /* subtract, convert to KH coords; blow it up by 256 */
-      *x = vvp->width/2 + (65536.0 / 180 / vvp->xmpp * (ll->lon - center->lon))*256.0;
-      *y = vvp->height/2 + (65536.0 / 180 / vvp->ympp * (center->lat - ll->lat))*256.0;
     } else if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_MERCATOR ) {
       /* FIXMERCATOR: Optimize */
       *x = vvp->width/2 + (65536.0 / 180 / vvp->xmpp * (ll->lon - center->lon))*256.0;
@@ -1021,8 +991,6 @@ void vik_viewport_set_drawmode ( VikViewport *vvp, VikViewportDrawMode drawmode
     viewport_set_coord_mode ( vvp, VIK_COORD_UTM );
   else {
     viewport_set_coord_mode ( vvp, VIK_COORD_LATLON );
-    if ( drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
-      viewport_google_rezoom ( vvp );
   }
 }
 
@@ -1031,14 +999,6 @@ VikViewportDrawMode vik_viewport_get_drawmode ( VikViewport *vvp )
   return vvp->drawmode;
 }
 
-static void viewport_google_rezoom ( VikViewport *vvp )
-{
-  vvp->google_calcx_fact = (GOOGLEMAPS_ZOOM_ONE_MPP * 65536.0 * 0.7716245833877 / vvp->xmpp);
-  vvp->google_calcy_fact = (GOOGLEMAPS_ZOOM_ONE_MPP * 65536.0 / vvp->ympp);
-  vvp->google_calcx_rev_fact = 1 / vvp->google_calcx_fact;
-  vvp->google_calcy_rev_fact = 1 / vvp->google_calcy_fact;
-}
-
 /******** triggering *******/
 void vik_viewport_set_trigger ( VikViewport *vp, gpointer trigger )
 {

diff --git a/src/vikviewport.h b/src/vikviewport.h
index 878ec8184e21d4d1c121927c7bd90c52902ba6ec..0135b17758fdfe96c9dd2a636d91b242f0e77273 100644 (file)
--- a/src/vikviewport.h
+++ b/src/vikviewport.h
@@ -97,8 +97,6 @@ void vik_viewport_get_min_max_lat_lon ( VikViewport *vp, gdouble *min_lat, gdoub
 typedef enum {
   VIK_VIEWPORT_DRAWMODE_UTM=0,
   VIK_VIEWPORT_DRAWMODE_EXPEDIA,
-  VIK_VIEWPORT_DRAWMODE_GOOGLE,
-  VIK_VIEWPORT_DRAWMODE_KH,
   VIK_VIEWPORT_DRAWMODE_MERCATOR,
   VIK_VIEWPORT_NUM_DRAWMODES
 } VikViewportDrawMode;

diff --git a/src/vikwindow.c b/src/vikwindow.c
index 34b57ad7576cb4abdcbe839eb26a6ae8f3977420..760f3b441f94e27b587c31ed6a28e0cb40ca9b64 100644 (file)
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -1325,10 +1325,6 @@ GtkWidget *vik_window_get_drawmode_button ( VikWindow *vw, VikViewportDrawMode m
   switch ( mode ) {
 #ifdef VIK_CONFIG_EXPEDIA
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: buttonname = "/ui/MainMenu/View/ModeExpedia"; break;
-#endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
-    case VIK_VIEWPORT_DRAWMODE_GOOGLE: buttonname = "/ui/MainMenu/View/ModeGoogle"; break;
-    case VIK_VIEWPORT_DRAWMODE_KH: buttonname = "/ui/MainMenu/View/ModeKH"; break;
 #endif
     case VIK_VIEWPORT_DRAWMODE_MERCATOR: buttonname = "/ui/MainMenu/View/ModeMercator"; break;
     default: buttonname = "/ui/MainMenu/View/ModeUTM";
@@ -1865,12 +1861,6 @@ static void window_change_coord_mode_cb ( GtkAction *old_a, GtkAction *a, VikWin
   else if (!strcmp(gtk_action_get_name(a), "ModeExpedia")) {
     drawmode = VIK_VIEWPORT_DRAWMODE_EXPEDIA;
   }
-  else if (!strcmp(gtk_action_get_name(a), "ModeGoogle")) {
-    drawmode = VIK_VIEWPORT_DRAWMODE_GOOGLE;
-  }
-  else if (!strcmp(gtk_action_get_name(a), "ModeKH")) {
-    drawmode = VIK_VIEWPORT_DRAWMODE_KH;
-  }
   else if (!strcmp(gtk_action_get_name(a), "ModeMercator")) {
     drawmode = VIK_VIEWPORT_DRAWMODE_MERCATOR;
   }
@@ -2006,8 +1996,6 @@ static GtkActionEntry entries[] = {
 static GtkRadioActionEntry mode_entries[] = {
   { "ModeUTM",         NULL,         N_("_UTM Mode"),               "<control>u", NULL, 0 },
   { "ModeExpedia",     NULL,         N_("_Expedia Mode"),           "<control>e", NULL, 1 },
-  { "ModeGoogle",      NULL,         N_("_Old Google Mode"),        "<control>o", NULL, 2 },
-  { "ModeKH",          NULL,         N_("Old _KH Mode"),            "<control>k", NULL, 3 },
   { "ModeMercator",    NULL,         N_("_Google Mode"),            "<control>g", NULL, 4 }
 };
 

diff --git a/win32/makeall.bat b/win32/makeall.bat
index 27392c386353d5f13360f7496fcb990822678970..1db7c6dbd4a190cae4159f8fd0cfa57c2af3e7ba 100644 (file)
--- a/win32/makeall.bat
+++ b/win32/makeall.bat
@@ -4,7 +4,6 @@ call make coords.c
 call make dialog.c
 call make expedia.c
 call make file.c
-call make googlemaps.c
 call make gpsmapper.c
 call make gpspoint.c
 call make gtkcellrendererprogress.c