Relocate current data field

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

diff --git a/src/osm.c b/src/osm.c
index f76a384737e8e7b7290082f155890ff3388ce171..b666f3a769255d87ddbca045d0a2fcc6dd8b5c0b 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -38,7 +38,7 @@ static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn );
 static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn );
 static int bluemarble_download ( MapCoord *src, const gchar *dest_fn );
 
-static DownloadOptions osm_options = { NULL, 0 };
+static DownloadOptions osm_options = { NULL, 0, a_check_map_file };
 
 /* initialisation */
 void osm_init () {
@@ -103,8 +103,8 @@ static void osm_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest )
 static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn )
 {
    int res = -1;
-   gchar *uri = g_strdup_printf ( "/~ojw/Tiles/maplint.php/%d/%d/%d.png", 17-src->scale, src->x, src->y );
-   res = a_http_download_get_url ( "dev.openstreetmap.org", uri, dest_fn, &osm_options );
+   gchar *uri = g_strdup_printf ( "/Tiles/maplint.php/%d/%d/%d.png", 17-src->scale, src->x, src->y );
+   res = a_http_download_get_url ( "tah.openstreetmap.org", uri, dest_fn, &osm_options );
    g_free ( uri );
    return res;
 }
@@ -112,7 +112,7 @@ static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn )
 static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn )
 {
    int res = -1;
-   gchar *uri = g_strdup_printf ( "/osamrender/%d/%d/%d.png", 17-src->scale, src->x, src->y );
+   gchar *uri = g_strdup_printf ( "/%d/%d/%d.png", 17-src->scale, src->x, src->y );
    res = a_http_download_get_url ( "tile.openstreetmap.org", uri, dest_fn, &osm_options );
    g_free ( uri );
    return res;
@@ -131,7 +131,6 @@ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn )
 {
    int res = -1;
    gchar *uri = g_strdup_printf ( "/com.modestmaps.bluemarble/%d-r%d-c%d.jpg", 17-src->scale, src->y, src->x );
-   g_print("s3.amazonaws.com/%s\n", uri);
    res = a_http_download_get_url ( "s3.amazonaws.com", uri, dest_fn, &osm_options );
 
    g_free ( uri );