X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/4c77d5e0aec3c7aab32965ca4e02abb17bb6108f..3750ef3eb2b6b1383d7ffdee837327dbf33c1509:/src/vikdemlayer.c

diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c
index 5a2b07ae..bfe51ab2 100644
--- a/src/vikdemlayer.c
+++ b/src/vikdemlayer.c
@@ -42,8 +42,6 @@
 #include "vikaggregatelayer.h"
 #include "viklayerspanel.h"
 #include "vikdemlayer.h"
-#include "vikdemlayer_pixmap.h"
-#include "vikmapslayer.h"
 #include "dialog.h"
 
 #include "dem.h"
@@ -115,7 +113,7 @@ static gboolean dem_layer_download_click ( VikDEMLayer *vdl, GdkEventButton *eve
 static VikToolInterface dem_tools[] = {
   { N_("DEM Download/Import"), (VikToolConstructorFunc) dem_layer_download_create, NULL, NULL, NULL,
     (VikToolMouseFunc) dem_layer_download_click, NULL,  (VikToolMouseFunc) dem_layer_download_release,
-    (VikToolKeyFunc) NULL, &cursor_demdl },
+    (VikToolKeyFunc) NULL, GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf },
 };
 
 
@@ -233,7 +231,7 @@ static const guint DEM_N_COLORS = sizeof(dem_colors)/sizeof(dem_colors[0]);
 
 VikLayerInterface vik_dem_layer_interface = {
   "DEM",
-  &demlayer_pixbuf,
+  &vikdemlayer_pixbuf,
 
   dem_tools,
   sizeof(dem_tools) / sizeof(dem_tools[0]),
@@ -636,7 +634,7 @@ static const gchar *srtm_continent_dir ( gint lat, gint lon )
     while (*s != (gchar *)-1) {
       continent = *s++;
       while (*s) {
-        g_hash_table_insert(srtm_continent, *s, continent);
+        g_hash_table_insert(srtm_continent, (gpointer) *s, (gpointer) continent);
         s++;
       }
       s++;
@@ -743,7 +741,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata
   continent_dir = srtm_continent_dir(intlat, intlon);
 
   if (!continent_dir) {
-    g_warning(N_("No SRTM data available for %f, %f\n"), p->lat, p->lon);
+    g_warning(N_("No SRTM data available for %f, %f"), p->lat, p->lon);
     return;
   }
 
@@ -756,7 +754,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata
 		(intlon >= 0) ? 'E' : 'W',
 		ABS(intlon) );
 
-  DownloadOptions options = { NULL, 0 };
+  static DownloadOptions options = { NULL, 0, a_check_map_file };
   a_ftp_download_get_url ( SRTM_FTP_SITE, src_fn, p->dest, &options );
   g_free ( src_fn );
 }
@@ -805,7 +803,7 @@ static void srtm_draw_existence ( VikViewport *vp )
 		ABS(i),
 		(j >= 0) ? 'E' : 'W',
 		ABS(j) );
-      if ( access(buf, F_OK ) == 0 ) {
+      if ( g_file_test(buf, G_FILE_TEST_EXISTS ) == TRUE ) {
         VikCoord ne, sw;
         gint x1, y1, x2, y2;
         sw.north_south = i;
@@ -866,7 +864,7 @@ static void dem24k_draw_existence ( VikViewport *vp )
     g_snprintf(buf, sizeof(buf), "%sdem24k/%d/",
         MAPS_CACHE_DIR,
 	(gint) i );
-    if ( access(buf, F_OK) != 0 )
+    if ( g_file_test(buf, G_FILE_TEST_EXISTS) == FALSE )
       continue;
     for (j = floor(min_lon*8)/8; j <= floor(max_lon*8)/8; j+=0.125) {
       /* check lon dir first -- faster */
@@ -874,7 +872,7 @@ static void dem24k_draw_existence ( VikViewport *vp )
         MAPS_CACHE_DIR,
 	(gint) i,
         (gint) j );
-      if ( access(buf, F_OK) != 0 )
+      if ( g_file_test(buf, G_FILE_TEST_EXISTS) == FALSE )
         continue;
       g_snprintf(buf, sizeof(buf), "%sdem24k/%d/%d/%.03f,%.03f.dem",
 	        MAPS_CACHE_DIR,
@@ -882,7 +880,7 @@ static void dem24k_draw_existence ( VikViewport *vp )
 		(gint) j,
 		floor(i*8)/8,
 		floor(j*8)/8 );
-      if ( access(buf, F_OK ) == 0 ) {
+      if ( g_file_test(buf, G_FILE_TEST_EXISTS ) == TRUE ) {
         VikCoord ne, sw;
         gint x1, y1, x2, y2;
         sw.north_south = i;
@@ -922,15 +920,15 @@ static void weak_ref_cb ( gpointer ptr, GObject * dead_vdl )
  */
 static gboolean dem_layer_add_file ( VikDEMLayer *vdl, const gchar *full_path )
 {
-  if ( access(full_path, F_OK ) == 0 ) {
-    /* only load if file size is not 0 (not in progress */
+  if ( g_file_test(full_path, G_FILE_TEST_EXISTS ) == TRUE ) {
+    /* only load if file size is not 0 (not in progress) */
     struct stat sb;
     stat (full_path, &sb);
     if ( sb.st_size ) {
       gchar *duped_path = g_strdup(full_path);
       vdl->files = g_list_prepend ( vdl->files, duped_path );
       a_dems_load ( duped_path );
-      g_warning(duped_path);
+      g_debug("%s: %s", __FUNCTION__, duped_path);
       vik_layer_emit_update ( VIK_LAYER(vdl) );
     }
     return TRUE;
@@ -1000,7 +998,7 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e
 
   full_path = g_strdup_printf("%s%s", MAPS_CACHE_DIR, dem_file );
 
-  g_warning(full_path);
+  g_debug("%s: %s", __FUNCTION__, full_path);
 
   // TODO: check if already in filelist