+2008-12-17
+Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ * Remove old Google stuff
+
2008-09-03
Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
* QA: cleanning old stuff
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],
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"
src/dialog.c
src/expedia.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
google.c google.h
endif
-if OLDGOOGLE
-libviking_a_SOURCES += \
- khmaps.c khmaps.h \
- googlemaps.c googlemaps.h \
- google-maps.c google-maps.h \
-BUILT_SOURCES += \
- google-maps.c google-maps.h
-endif
-
if TERRASERVER
libviking_a_SOURCES += \
terraserver-map-type.c terraserver-map-type.h \
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
#endif
#include <glib.h>
#include <glib/gstdio.h>
+#include <glib/gi18n.h>
/* Relax some dependencies */
#if ! GLIB_CHECK_VERSION(2,12,0)
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);
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 )
+++ /dev/null
-/*
- * 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;
-}
+++ /dev/null
-/*
- * 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
" <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/>"
#include "modules.h"
#include "google.h"
-#include "googlemaps.h"
#include "terraserver.h"
#include "khmaps.h"
#include "expedia.h"
void modules_init()
{
-#ifdef VIK_CONFIG_OLD_GOOGLE
- googlemaps_init();
- khmaps_init();
-#endif
#ifdef VIK_CONFIG_GOOGLE
google_init();
#endif
/* for ALTI_TO_MPP */
#include "globals.h"
-#include "googlemaps.h"
-#include "khmaps.h"
static gdouble EASTING_OFFSET = 500000.0;
static GObjectClass *parent_class;
-static void viewport_google_rezoom ( VikViewport *vvp );
-
struct _VikViewport {
GtkDrawingArea drawing_area;
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 */
vvp->xmpp /= 2;
vvp->ympp /= 2;
- if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
- viewport_google_rezoom ( vvp );
-
viewport_utm_zone_check(vvp);
}
}
vvp->xmpp *= 2;
vvp->ympp *= 2;
- if ( vvp->drawmode == VIK_VIEWPORT_DRAWMODE_GOOGLE )
- viewport_google_rezoom ( vvp );
-
viewport_utm_zone_check(vvp);
}
}
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 );
}
}
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 );
}
}
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)) );
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;
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 );
}
}
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 )
{
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;
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";
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;
}
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 }
};
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