Set 'OK' default for goto dialogs.

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

diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c
index 9a8e0755aef5c5d188e308c88d83b4b3cd015940..a9c5a6ece1234763b3fcb077d6b870d561075bf6 100644 (file)
--- a/src/vikdemlayer.c
+++ b/src/vikdemlayer.c
@@ -165,7 +165,7 @@ static const guint DEM_N_HEIGHT_COLORS = sizeof(dem_height_colors)/sizeof(dem_he
 */
 
 static gchar *dem_gradient_colors[] = {
 */
 
 static gchar *dem_gradient_colors[] = {

-"#AAAAAA"
+"#AAAAAA",

 "#000000", "#000011", "#000022", "#000033", "#000044", "#00004c", "#000055", "#00005d", "#000066", "#00006e",
 "#000077", "#00007f", "#000088", "#000090", "#000099", "#0000a1", "#0000aa", "#0000b2", "#0000bb", "#0000c3",
 "#0000cc", "#0000d4", "#0000dd", "#0000e5", "#0000ee", "#0000f6", "#0000ff", "#0008f7", "#0011ee", "#0019e6",
 "#000000", "#000011", "#000022", "#000033", "#000044", "#00004c", "#000055", "#00005d", "#000066", "#00006e",
 "#000077", "#00007f", "#000088", "#000090", "#000099", "#0000a1", "#0000aa", "#0000b2", "#0000bb", "#0000c3",
 "#0000cc", "#0000d4", "#0000dd", "#0000e5", "#0000ee", "#0000f6", "#0000ff", "#0008f7", "#0011ee", "#0019e6",


@@ -297,7 +297,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData d
       /* Convert to store internally
          NB file operation always in internal units (metres) */
       if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )
       /* Convert to store internally
          NB file operation always in internal units (metres) */
       if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )

-        vdl->min_elev = data.d / VIK_FEET_IN_METER;
+        vdl->min_elev = VIK_FEET_TO_METERS(data.d);

       else
         vdl->min_elev = data.d;
       break;
       else
         vdl->min_elev = data.d;
       break;


@@ -305,7 +305,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData d
       /* Convert to store internally
          NB file operation always in internal units (metres) */
       if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )
       /* Convert to store internally
          NB file operation always in internal units (metres) */
       if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )

-         vdl->max_elev = data.d / VIK_FEET_IN_METER;
+        vdl->max_elev = VIK_FEET_TO_METERS(data.d);

       else
         vdl->max_elev = data.d;
       break;
       else
         vdl->max_elev = data.d;
       break;


@@ -818,7 +818,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata
                (intlon >= 0) ? 'E' : 'W',
                ABS(intlon) );
 
                (intlon >= 0) ? 'E' : 'W',
                ABS(intlon) );
 

-  static DownloadOptions options = { 0, NULL, 0, a_check_map_file };
+  static DownloadMapOptions options = { FALSE, FALSE, NULL, 0, a_check_map_file };

   a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options, NULL );
   g_free ( src_fn );
 }
   a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options, NULL );
   g_free ( src_fn );
 }


@@ -1080,6 +1080,8 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e
     a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vdl), tmp,
                (vik_thr_func) dem_download_thread, p,
                (vik_thr_free_func) free_dem_download_params, NULL, 1 );
     a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vdl), tmp,
                (vik_thr_func) dem_download_thread, p,
                (vik_thr_free_func) free_dem_download_params, NULL, 1 );

+
+    g_free ( tmp );

   }
 
   g_free ( dem_file );
   }
 
   g_free ( dem_file );