]> git.street.me.uk Git - andy/viking.git/commitdiff
Fix SRTM Server change
authorHerm <hermk@users.sourceforge.net>
Sat, 25 Jul 2009 20:54:10 +0000 (22:54 +0200)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Sat, 25 Jul 2009 20:54:10 +0000 (22:54 +0200)
The SRTM server recently changed it's address:
ftp://e0srp01u.ecs.nasa.gov/srtm/README

Now it is only available via HTTP.

Tested-by: Alexander Poddey <alexander.poddey@gmx.net>
Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
src/vikdemlayer.c

index a932ccf8da76e7e3e434d41ac1a029fcb447665a..c9806282fe11efc9e1e90da52cc4ccfe62903671 100644 (file)
@@ -62,8 +62,8 @@
 #define MAPS_CACHE_DIR maps_layer_default_dir()
 
 #define SRTM_CACHE_TEMPLATE "%ssrtm3-%s%s%c%02d%c%03d.hgt.zip"
-#define SRTM_FTP_SITE "e0srp01u.ecs.nasa.gov"
-#define SRTM_FTP_URI  "/srtm/version2/SRTM3/"
+#define SRTM_HTTP_SITE "dds.cr.usgs.gov"
+#define SRTM_HTTP_URI  "/srtm/version2/SRTM3/"
 
 #ifdef VIK_CONFIG_DEM24K
 #define DEM24K_DOWNLOAD_SCRIPT "dem24k.pl"
@@ -756,7 +756,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata
   }
 
   gchar *src_fn = g_strdup_printf("%s%s/%c%02d%c%03d.hgt.zip",
-                SRTM_FTP_URI,
+                SRTM_HTTP_URI,
                 continent_dir,
                (intlat >= 0) ? 'N' : 'S',
                ABS(intlat),
@@ -764,7 +764,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata
                ABS(intlon) );
 
   static DownloadOptions options = { NULL, 0, a_check_map_file };
-  a_ftp_download_get_url ( SRTM_FTP_SITE, src_fn, p->dest, &options );
+  a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options );
   g_free ( src_fn );
 }