Fix expedia code to use updated vikmapslayer_compat.h, which was modified for:
'Allow reuse of curl connection objects'
SHA: 825413bac81e7234ed27a8ff3343a8295cc393e2
---
configure.ac | 2 +-
src/expedia.c | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 765688f..6d73de7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,7 +321,7 @@ echo "-------------------------------------------"
echo "Alphabetized track & waypoints : $ac_cv_enable_alpha_trw"
echo "Google Maps : $ac_cv_enable_google"
echo "Terraserver Maps : $ac_cv_enable_terraserver"
-#echo "Expedia Maps : $ac_cv_enable_expedia"
+echo "Expedia Maps : $ac_cv_enable_expedia"
echo "Open Street Map : $ac_cv_enable_openstreetmap"
echo "BlueMarble : $ac_cv_enable_bluemarble"
echo "Geonames : $ac_cv_enable_geonames"
diff --git a/src/expedia.c b/src/expedia.c
index 69e2f1c..6fc0d1f 100644
--- a/src/expedia.c
+++ b/src/expedia.c
@@ -42,12 +42,14 @@
static gboolean expedia_coord_to_mapcoord ( const VikCoord *src, gdouble
xzoom, gdouble yzoom, MapCoord *dest );
static void expedia_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
-static int expedia_download ( MapCoord *src, const gchar *dest_fn );
+static int expedia_download ( MapCoord *src, const gchar *dest_fn, void
*handle );
+static void * expedia_handle_init ( );
+static void expedia_handle_cleanup ( void *handle );
static DownloadMapOptions expedia_options = { FALSE, FALSE, NULL, 2,
a_check_map_file };
void expedia_init() {
- VikMapsLayer_MapType map_type = { 5, 0, 0, VIK_VIEWPORT_DRAWMODE_EXPEDIA,
expedia_coord_to_mapcoord, expedia_mapcoord_to_center_coord, expedia_download,
&expedia_options };
+ VikMapsLayer_MapType map_type = { 5, 0, 0, VIK_VIEWPORT_DRAWMODE_EXPEDIA,
expedia_coord_to_mapcoord, expedia_mapcoord_to_center_coord, expedia_download,
expedia_handle_init, expedia_handle_cleanup };
maps_layer_register_type(_("Expedia Street Maps"), 5, &map_type);
}
@@ -167,7 +169,7 @@ static void expedia_mapcoord_to_center_coord ( MapCoord
*src, VikCoord *dest )
dest->north_south = (((gdouble)src->y) / expedia_altis_freq(src->scale)) -
90;
}
-static int expedia_download ( MapCoord *src, const gchar *dest_fn )
+static int expedia_download ( MapCoord *src, const gchar *dest_fn, void
*handle )
{
gint height, width;
struct LatLon ll;
@@ -191,3 +193,13 @@ static int expedia_download ( MapCoord *src, const gchar
*dest_fn )
return(res);
}
+static void * expedia_handle_init ( )
+{
+ // Not much going on here
+ return 0;
+}
+
+static void expedia_handle_cleanup ( void *handle )
+{
+ // Even less here!
+}
--
1.7.2.3
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
