SF#356778: Download Map Tiles using F5

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

diff --git a/src/file.c b/src/file.c
index c376c012436919fb52fa5f12439e05910748907b..f185a4671b387593bc91765ec82abd32d6f0f91a 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>

+ * Copyright (C) 2012, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -19,12 +20,29 @@
  *
  */
 
  *
  */
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 #include "viking.h"
 
 #include "gpx.h"
 #include "viking.h"
 
 #include "gpx.h"

+#include "babel.h"

 
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>

+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+
+/* Relax some dependencies */
+#if ! GLIB_CHECK_VERSION(2,12,0)
+static gboolean return_true (gpointer a, gpointer b, gpointer c) { return TRUE; }
+static g_hash_table_remove_all (GHashTable *ght) { g_hash_table_foreach_remove ( ght, (GHRFunc) return_true, FALSE ); }
+#endif

 
 #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
 #define VIK_MAGIC "#VIK"
 
 #define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
 #define VIK_MAGIC "#VIK"


@@ -87,6 +105,40 @@ static guint16 layer_type_from_string ( const gchar *str )
   return -1;
 }
 
   return -1;
 }
 

+void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data ) {
+      /* string lists are handled differently. We get a GList (that shouldn't
+       * be freed) back for get_param and if it is null we shouldn't write
+       * anything at all (otherwise we'd read in a list with an empty string,
+       * not an empty string list.
+       */
+      if ( type == VIK_LAYER_PARAM_STRING_LIST ) {
+        if ( data.sl ) {
+          GList *iter = (GList *)data.sl;
+          while ( iter ) {
+            fprintf ( f, "%s=", name );
+            fprintf ( f, "%s\n", (gchar *)(iter->data) );
+            iter = iter->next;
+          }
+        }
+      } else {
+        fprintf ( f, "%s=", name );
+        switch ( type )
+        {
+          case VIK_LAYER_PARAM_DOUBLE: {
+  //          char buf[15]; /* locale independent */
+  //          fprintf ( f, "%s\n", (char *) g_dtostr (data.d, buf, sizeof (buf)) ); break;
+              fprintf ( f, "%f\n", data.d );
+              break;
+         }
+          case VIK_LAYER_PARAM_UINT: fprintf ( f, "%d\n", data.u ); break;
+          case VIK_LAYER_PARAM_INT: fprintf ( f, "%d\n", data.i ); break;
+          case VIK_LAYER_PARAM_BOOLEAN: fprintf ( f, "%c\n", data.b ? 't' : 'f' ); break;
+          case VIK_LAYER_PARAM_STRING: fprintf ( f, "%s\n", data.s ); break;
+          case VIK_LAYER_PARAM_COLOR: fprintf ( f, "#%.2x%.2x%.2x\n", (int)(data.c.red/256),(int)(data.c.green/256),(int)(data.c.blue/256)); break;
+        }
+      }
+}
+

 static void write_layer_params_and_data ( VikLayer *l, FILE *f )
 {
   VikLayerParam *params = vik_layer_get_interface(l->type)->params;
 static void write_layer_params_and_data ( VikLayer *l, FILE *f )
 {
   VikLayerParam *params = vik_layer_get_interface(l->type)->params;


@@ -102,17 +154,8 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f )
     guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {
     guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {

-      data = get_param(l,i);
-      fprintf ( f, "%s=", params[i].name );
-      switch ( params[i].type )
-      {
-        case VIK_LAYER_PARAM_DOUBLE: fprintf ( f, "%f\n", data.d ); break;
-        case VIK_LAYER_PARAM_UINT: fprintf ( f, "%d\n", data.u ); break;
-        case VIK_LAYER_PARAM_INT: fprintf ( f, "%d\n", data.i ); break;
-        case VIK_LAYER_PARAM_BOOLEAN: fprintf ( f, "%c\n", data.b ? 't' : 'f' ); break;
-        case VIK_LAYER_PARAM_STRING: fprintf ( f, "%s\n", data.s ); break;
-        case VIK_LAYER_PARAM_COLOR: fprintf ( f, "#%.2x%.2x%.2x\n", (int)(data.c.red/256),(int)(data.c.green/256),(int)(data.c.blue/256)); break;
-      }
+      data = get_param(l, i, TRUE);
+      file_write_layer_param(f, params[i].name, params[i].type, data);

     }
   }
   if ( vik_layer_get_interface(l->type)->write_file_data )
     }
   }
   if ( vik_layer_get_interface(l->type)->write_file_data )


@@ -132,7 +175,8 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   Stack *stack = NULL;
   VikLayer *current_layer;
   struct LatLon ll;
   Stack *stack = NULL;
   VikLayer *current_layer;
   struct LatLon ll;

-  gchar *modestring;
+  VikViewportDrawMode mode;
+  gchar *modestring = NULL;

 
   push(&stack);
   stack->data = (gpointer) vik_aggregate_layer_get_children(VIK_AGGREGATE_LAYER(top));
 
   push(&stack);
   stack->data = (gpointer) vik_aggregate_layer_get_children(VIK_AGGREGATE_LAYER(top));


@@ -141,17 +185,23 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
   /* crazhy CRAZHY */
   vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
 
   /* crazhy CRAZHY */
   vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
 

-  switch ( vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ) ) {
+  mode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) );
+  switch ( mode ) {

     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;

-    case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break;
-    case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
-    default: modestring = "mercator";
+    case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+    case VIK_VIEWPORT_DRAWMODE_LATLON: modestring = "latlon"; break;
+    default:
+      g_critical("Houston, we've had a problem. mode=%d", mode);

   }
 
   }
 

-  fprintf ( f, "#VIKING GPS Data file http://gpsmaps.org/viking/\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\n",
+  fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\nhighlightcolor=%s\ndrawscale=%s\ndrawcentermark=%s\ndrawhighlight=%s\n",

       vik_viewport_get_xmpp ( VIK_VIEWPORT(vp) ), vik_viewport_get_ympp ( VIK_VIEWPORT(vp) ), ll.lat, ll.lon,
       vik_viewport_get_xmpp ( VIK_VIEWPORT(vp) ), vik_viewport_get_ympp ( VIK_VIEWPORT(vp) ), ll.lat, ll.lon,

-      modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)) );
+      modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)),
+      vik_viewport_get_highlight_color(VIK_VIEWPORT(vp)),
+      vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f",
+      vik_viewport_get_draw_centermark(VIK_VIEWPORT(vp)) ? "t" : "f",
+      vik_viewport_get_draw_highlight(VIK_VIEWPORT(vp)) ? "t" : "f" );

 
   if ( ! VIK_LAYER(top)->visible )
     fprintf ( f, "visible=f\n" );
 
   if ( ! VIK_LAYER(top)->visible )
     fprintf ( f, "visible=f\n" );


@@ -166,6 +216,11 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
       push(&stack);
       stack->data = (gpointer) vik_aggregate_layer_get_children(VIK_AGGREGATE_LAYER(current_layer));
     }
       push(&stack);
       stack->data = (gpointer) vik_aggregate_layer_get_children(VIK_AGGREGATE_LAYER(current_layer));
     }

+    else if ( current_layer->type == VIK_LAYER_GPS && !vik_gps_layer_is_empty(VIK_GPS_LAYER(current_layer)) )
+    {
+      push(&stack);
+      stack->data = (gpointer) vik_gps_layer_get_children(VIK_GPS_LAYER(current_layer));
+    }

     else
     {
       stack->data = (gpointer) ((GList *)stack->data)->next;
     else
     {
       stack->data = (gpointer) ((GList *)stack->data)->next;


@@ -194,7 +249,33 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
 */
 }
 
 */
 }
 

-static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
+static void string_list_delete ( gpointer key, gpointer l, gpointer user_data )
+{
+  /* 20071021 bugfix */
+  GList *iter = (GList *) l;
+  while ( iter ) {
+    g_free ( iter->data );
+    iter = iter->next;
+  }
+  g_list_free ( (GList *) l );
+}
+
+static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp)
+{
+  VikLayerParamData x;
+  x.sl = list;
+  vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1], TRUE );
+}
+
+/**
+ * Read in a Viking file and return how successful the parsing was
+ * ATM this will always work, in that even if there are parsing problems
+ *  then there will be no new values to override the defaults
+ *
+ * TODO flow up line number(s) / error messages of problems encountered...
+ *
+ */
+static gboolean file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )

 {
   Stack *stack;
   struct LatLon ll = { 0.0, 0.0 };
 {
   Stack *stack;
   struct LatLon ll = { 0.0, 0.0 };


@@ -203,8 +284,12 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
   guint16 len;
   long line_num = 0;
 
   guint16 len;
   long line_num = 0;
 

-  VikLayerParam *params; /* for current layer, so we don't have to keep on looking up interface */
-  guint8 params_count;
+  VikLayerParam *params = NULL; /* for current layer, so we don't have to keep on looking up interface */
+  guint8 params_count = 0;
+
+  GHashTable *string_lists = g_hash_table_new(g_direct_hash,g_direct_equal);
+
+  gboolean successful_read = TRUE;

 
   push(&stack);
   stack->under = NULL;
 
   push(&stack);
   stack->under = NULL;


@@ -239,9 +324,11 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         continue;
       else if ( str_starts_with ( line, "Layer ", 6, TRUE ) )
       {
         continue;
       else if ( str_starts_with ( line, "Layer ", 6, TRUE ) )
       {

-        if ( ( ! stack->data ) || VIK_LAYER(stack->data)->type != VIK_LAYER_AGGREGATE )
+        int parent_type = VIK_LAYER(stack->data)->type;
+        if ( ( ! stack->data ) || ((parent_type != VIK_LAYER_AGGREGATE) && (parent_type != VIK_LAYER_GPS)) )

         {
         {

-          g_warning ( "Line %ld: Layer command inside non-Aggregate Layer", line_num );
+          successful_read = FALSE;
+          g_warning ( "Line %ld: Layer command inside non-Aggregate Layer (type %d)", line_num, parent_type );

           push(&stack); /* inside INVALID layer */
           stack->data = NULL;
           continue;
           push(&stack); /* inside INVALID layer */
           stack->data = NULL;
           continue;


@@ -252,9 +339,16 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
           push(&stack);
           if ( type == -1 )
           {
           push(&stack);
           if ( type == -1 )
           {

-            g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
+            successful_read = FALSE;
+            g_warning ( "Line %ld: Unknown type %s", line_num, line+6 );

             stack->data = NULL;
           }
             stack->data = NULL;
           }

+          else if (parent_type == VIK_LAYER_GPS)
+          {
+            stack->data = (gpointer) vik_gps_layer_get_a_child(VIK_GPS_LAYER(stack->under->data));
+            params = vik_layer_get_interface(type)->params;
+            params_count = vik_layer_get_interface(type)->params_count;
+          }

           else
           {
             stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE );
           else
           {
             stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE );


@@ -265,14 +359,32 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
       }
       else if ( str_starts_with ( line, "EndLayer", 8, FALSE ) )
       {
       }
       else if ( str_starts_with ( line, "EndLayer", 8, FALSE ) )
       {

-        if ( stack->under == NULL )
+        if ( stack->under == NULL ) {
+          successful_read = FALSE;

           g_warning ( "Line %ld: Mismatched ~EndLayer command", line_num );
           g_warning ( "Line %ld: Mismatched ~EndLayer command", line_num );

+        }

         else
         {
         else
         {

+          /* add any string lists we've accumulated */
+          gpointer layer_and_vp[2];
+          layer_and_vp[0] = stack->data;
+          layer_and_vp[1] = vp;
+          g_hash_table_foreach ( string_lists, (GHFunc) string_list_set_param, layer_and_vp );
+          g_hash_table_remove_all ( string_lists );
+

           if ( stack->data && stack->under->data )
           {
           if ( stack->data && stack->under->data )
           {

-            vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
-            vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+            if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_AGGREGATE) {
+              vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
+              vik_layer_post_read ( VIK_LAYER(stack->data), vp, TRUE );
+            }
+            else if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_GPS) {
+              /* TODO: anything else needs to be done here ? */
+            }
+            else {
+              successful_read = FALSE;
+              g_warning ( "Line %ld: EndLayer command inside non-Aggregate Layer (type %d)", line_num, VIK_LAYER(stack->data)->type );
+            }

           }
           pop(&stack);
         }
           }
           pop(&stack);
         }


@@ -280,9 +392,11 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
       else if ( str_starts_with ( line, "LayerData", 9, FALSE ) )
       {
         if ( stack->data && vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data )
       else if ( str_starts_with ( line, "LayerData", 9, FALSE ) )
       {
         if ( stack->data && vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data )

-          vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f );
+        {

           /* must read until hits ~EndLayerData */
           /* must read until hits ~EndLayerData */

-
+          if ( ! vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f ) )
+            successful_read = FALSE;
+        }

         else
         { /* simply skip layer data over */
           while ( fgets ( buffer, 4096, f ) )
         else
         { /* simply skip layer data over */
           while ( fgets ( buffer, 4096, f ) )


@@ -304,6 +418,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
       }
       else
       {
       }
       else
       {

+        successful_read = FALSE;

         g_warning ( "Line %ld: Unknown tilde command", line_num );
       }
     }
         g_warning ( "Line %ld: Unknown tilde command", line_num );
       }
     }


@@ -331,13 +446,29 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "expedia" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_EXPEDIA );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "google" ) == 0)

-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_GOOGLE );
+      {
+        successful_read = FALSE;
+        g_warning ( _("Draw mode '%s' no more supported"), "google" );
+      }

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "kh" ) == 0)

-        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH );
+      {
+        successful_read = FALSE;
+        g_warning ( _("Draw mode '%s' no more supported"), "kh" );
+      }

       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );

+      else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "latlon" ) == 0)
+        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_LATLON );

       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );

+      else if ( stack->under == NULL && eq_pos == 14 && strncasecmp ( line, "highlightcolor", eq_pos ) == 0 )
+        vik_viewport_set_highlight_color ( VIK_VIEWPORT(vp), line+15 );
+      else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
+        vik_viewport_set_draw_scale ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+10) );
+      else if ( stack->under == NULL && eq_pos == 14 && strncasecmp ( line, "drawcentermark", eq_pos ) == 0 )
+        vik_viewport_set_draw_centermark ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+15) );
+      else if ( stack->under == NULL && eq_pos == 13 && strncasecmp ( line, "drawhighlight", eq_pos ) == 0 )
+        vik_viewport_set_draw_highlight ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+14) );

       else if ( stack->under && eq_pos == 4 && strncasecmp ( line, "name", eq_pos ) == 0 )
         vik_layer_rename ( VIK_LAYER(stack->data), line+5 );
       else if ( eq_pos == 7 && strncasecmp ( line, "visible", eq_pos ) == 0 )
       else if ( stack->under && eq_pos == 4 && strncasecmp ( line, "name", eq_pos ) == 0 )
         vik_layer_rename ( VIK_LAYER(stack->data), line+5 );
       else if ( eq_pos == 7 && strncasecmp ( line, "visible", eq_pos ) == 0 )


@@ -345,11 +476,13 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
       else if ( eq_pos != -1 && stack->under )
       {
         gboolean found_match = FALSE;
       else if ( eq_pos != -1 && stack->under )
       {
         gboolean found_match = FALSE;

+

         /* go thru layer params. if len == eq_pos && starts_with jazz, set it. */
         /* also got to check for name and visible. */
 
         if ( ! params )
         {
         /* go thru layer params. if len == eq_pos && starts_with jazz, set it. */
         /* also got to check for name and visible. */
 
         if ( ! params )
         {

+          successful_read = FALSE;

           g_warning ( "Line %ld: No options for this kind of layer", line_num );
           continue;
         }
           g_warning ( "Line %ld: No options for this kind of layer", line_num );
           continue;
         }


@@ -359,25 +492,42 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
           {
             VikLayerParamData x;
             line += eq_pos+1;
           {
             VikLayerParamData x;
             line += eq_pos+1;

-            switch ( params[i].type )
-            {
-              case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break;
-              case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
-              case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
-              case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;
-              case VIK_LAYER_PARAM_COLOR: memset(&(x.c), 0, sizeof(x.c)); /* default: black */
+            if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
+              GList *l = g_list_append ( g_hash_table_lookup ( string_lists, GINT_TO_POINTER ((gint) i) ), 
+                                        g_strdup(line) );
+              g_hash_table_replace ( string_lists, GINT_TO_POINTER ((gint)i), l );
+              /* add the value to a list, possibly making a new list.
+               * this will be passed to the layer when we read an ~EndLayer */
+            } else {
+              switch ( params[i].type )
+              {
+                case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break;
+                case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
+                case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
+               case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;
+                case VIK_LAYER_PARAM_COLOR: memset(&(x.c), 0, sizeof(x.c)); /* default: black */

                                           gdk_color_parse ( line, &(x.c) ); break;
                                           gdk_color_parse ( line, &(x.c) ); break;

-              default: x.s = line;
+                /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */
+                default: x.s = line;
+              }
+              vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp, TRUE );

             }
             }

-            vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp );

             found_match = TRUE;
             break;
           }
             found_match = TRUE;
             break;
           }

-        if ( ! found_match )
-          g_warning ( "Line %ld: Unknown parameter", line_num );
+        if ( ! found_match ) {
+          // ATM don't flow up this issue because at least one internal parameter has changed from version 1.3
+          //   and don't what to worry users about raising such issues
+          // TODO Maybe hold old values here - compare the line value against them and if a match
+          //       generate a different style of message in the GUI...
+          // successful_read = FALSE;
+          g_warning ( "Line %ld: Unknown parameter. Line:\n%s", line_num, line );
+       }

       }
       }

-      else
+      else {
+        successful_read = FALSE;

         g_warning ( "Line %ld: Invalid parameter or parameter outside of layer.", line_num );
         g_warning ( "Line %ld: Invalid parameter or parameter outside of layer.", line_num );

+      }

     }
 /* could be:
 [Layer Type=Bla]
     }
 /* could be:
 [Layer Type=Bla]


@@ -393,7 +543,7 @@ name=this
     if ( stack->under && stack->under->data && stack->data )
     {
       vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
     if ( stack->under && stack->under->data && stack->data )
     {
       vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );

-      vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+      vik_layer_post_read ( VIK_LAYER(stack->data), vp, TRUE );

     }
     pop(&stack);
   }
     }
     pop(&stack);
   }


@@ -403,6 +553,12 @@ name=this
 
   if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized )
     vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); 
 
   if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized )
     vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); 

+
+  /* delete anything we've forgotten about -- should only happen when file ends before an EndLayer */
+  g_hash_table_foreach ( string_lists, string_list_delete, NULL );
+  g_hash_table_destroy ( string_lists );
+
+  return successful_read;

 }
 
 /*
 }
 
 /*


@@ -426,57 +582,109 @@ static FILE *xfopen ( const char *fn, const char *mode )
   if ( strcmp(fn,"-") == 0 )
     return stdin;
   else
   if ( strcmp(fn,"-") == 0 )
     return stdin;
   else

-    return fopen(fn, "r");
+    return g_fopen(fn, "r");

 }
 
 static void xfclose ( FILE *f )
 {
 }
 
 static void xfclose ( FILE *f )
 {

-  if ( f != stdin && f != stdout )
+  if ( f != stdin && f != stdout ) {

     fclose ( f );
     fclose ( f );

+    f = NULL;
+  }

 }
 
 }
 

-/* 0 on failure, 1 on success (vik file) 2 on success (other file) */
-gshort a_file_load ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
+/*
+ * Function to determine if a filename is a 'viking' type file
+ */
+gboolean check_file_magic_vik ( const gchar *filename )

 {
 {

-  FILE *f = xfopen ( filename, "r" );
+  gboolean result = FALSE;
+  FILE *ff = xfopen ( filename, "r" );
+  if ( ff ) {
+    result = check_magic ( ff, VIK_MAGIC );
+    xfclose ( ff );
+  }
+  return result;
+}

 
 

-  g_assert ( vp );
+VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri )
+{
+  g_return_val_if_fail ( vp != NULL, LOAD_TYPE_READ_FAILURE );
+
+  char *filename = (char *)filename_or_uri;
+  if (strncmp(filename, "file://", 7) == 0)
+    filename = filename + 7;
+
+  FILE *f = xfopen ( filename, "r" );

 
   if ( ! f )
 
   if ( ! f )

-    return 0;
+    return LOAD_TYPE_READ_FAILURE;
+
+  VikLoadType_t load_answer = LOAD_TYPE_OTHER_SUCCESS;

 
 

+  // Attempt loading the primary file type first - our internal .vik file:

   if ( check_magic ( f, VIK_MAGIC ) )
   {
   if ( check_magic ( f, VIK_MAGIC ) )
   {

-    file_read ( top, f, vp );
-    if ( f != stdin )
-      xfclose(f);
-    return 1;
+    if ( file_read ( top, f, vp ) )
+      load_answer = LOAD_TYPE_VIK_SUCCESS;
+    else
+      load_answer = LOAD_TYPE_VIK_FAILURE_NON_FATAL;

   }
   else
   {
   }
   else
   {

-    VikCoord new_center;
-    VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
-    vik_layer_rename ( vtl, a_file_basename ( filename ) );
-
-    if ( check_magic ( f, GPX_MAGIC ) )
-      a_gpx_read_file ( VIK_TRW_LAYER(vtl), f );
-    else
-     a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f );
+       // For all other file types which consist of tracks, routes and/or waypoints,
+       //  must be loaded into a new TrackWaypoint layer (hence it be created)
+    gboolean success = TRUE; // Detect load failures - mainly to remove the layer created as it's not required

 
 

-    vik_layer_post_read ( vtl, vp );
+    VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );

 
 

-    vik_aggregate_layer_add_layer ( top, vtl );
+    // In fact both kml & gpx files start the same as they are in xml
+    if ( check_file_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) {
+      // Implicit Conversion
+      if ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL ) ) ) {
+        load_answer = LOAD_TYPE_GPSBABEL_FAILURE;
+      }
+    }
+    // NB use a extension check first, as a GPX file header may have a Byte Order Mark (BOM) in it
+    //    - which currently confuses our check_magic function
+    else if ( check_file_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC ) ) {
+      if ( ! ( success = a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) {
+        load_answer = LOAD_TYPE_GPX_FAILURE;
+      }
+    }
+    else {
+      // Try final supported file type
+      if ( ! ( success = a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) {
+               // Failure here means we don't know how to handle the file
+        load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE;
+         }
+    }

 
 

-    if ( vik_trw_layer_find_center ( VIK_TRW_LAYER(vtl), &new_center ) )
-      vik_viewport_set_center_coord ( VIK_VIEWPORT(vp), &new_center );
-    xfclose(f);
-    return 2;
+    // Clean up when we can't handle the file
+    if ( ! success ) {
+      // free up layer
+      g_object_unref ( vtl );
+    }
+    else {
+      // Complete the setup from the successful load
+      vik_layer_rename ( vtl, a_file_basename ( filename ) );
+      vik_layer_post_read ( vtl, vp, TRUE );
+      vik_aggregate_layer_add_layer ( top, vtl );
+      vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp );
+    }

   }
   }

+  xfclose(f);
+  return load_answer;

 }
 
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
 {
 }
 
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
 {

-  FILE *f = fopen(filename, "w");
+  FILE *f;
+
+  if (strncmp(filename, "file://", 7) == 0)
+    filename = filename + 7;
+
+  f = g_fopen(filename, "w");

 
   if ( ! f )
     return FALSE;
 
   if ( ! f )
     return FALSE;


@@ -484,6 +692,7 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam
   file_write ( top, f, vp );
 
   fclose(f);
   file_write ( top, f, vp );
 
   fclose(f);

+  f = NULL;

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -500,19 +709,72 @@ const gchar *a_file_basename ( const gchar *filename )
   return filename;
 }
 
   return filename;
 }
 

-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type )
+/* example: 
+     gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" );
+*/
+gboolean check_file_ext ( const gchar *filename, const gchar *fileext )
+{
+  g_return_val_if_fail ( filename != NULL, FALSE );
+  g_return_val_if_fail ( fileext && fileext[0]=='.', FALSE );
+  const gchar *basename = a_file_basename(filename);
+  if (!basename)
+    return FALSE;
+
+  const char * dot = strrchr(basename, '.');
+  if (dot && !strcmp(dot, fileext))
+    return TRUE;
+
+  return FALSE;
+}
+
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, VikTrack *trk )

 {
 {

-  FILE *f = fopen ( filename, "w" );
+  FILE *f = g_fopen ( filename, "w" );

   if ( f )
   {
   if ( f )
   {

-    if ( file_type == FILE_TYPE_GPSMAPPER )
-      a_gpsmapper_write_file ( vtl, f );
-    else if ( file_type == FILE_TYPE_GPX )
-      a_gpx_write_file ( vtl, f );
-    else
-      a_gpspoint_write_file ( vtl, f );
+    if ( trk ) {
+      switch ( file_type ) {
+        case FILE_TYPE_GPX:
+          a_gpx_write_track_file ( trk, f );
+          break;
+        default:
+          g_critical("Houston, we've had a problem. file_type=%d", file_type);
+      }
+    } else {
+      switch ( file_type ) {
+        case FILE_TYPE_GPSMAPPER:
+          a_gpsmapper_write_file ( vtl, f );
+          break;
+        case FILE_TYPE_GPX:
+          a_gpx_write_file ( vtl, f );
+          break;
+        case FILE_TYPE_GPSPOINT:
+          a_gpspoint_write_file ( vtl, f );
+          break;
+        case FILE_TYPE_KML:
+         fclose ( f );
+         f = NULL;
+         switch ( a_vik_get_kml_export_units () ) {
+           case VIK_KML_EXPORT_UNITS_STATUTE:
+             return a_babel_convert_to ( vtl, "-o kml", filename, NULL, NULL );
+             break;
+           case VIK_KML_EXPORT_UNITS_NAUTICAL:
+             return a_babel_convert_to ( vtl, "-o kml,units=n", filename, NULL, NULL );
+             break;
+           default:
+             // VIK_KML_EXPORT_UNITS_METRIC:
+             return a_babel_convert_to ( vtl, "-o kml,units=m", filename, NULL, NULL );
+             break;
+         }
+         break;
+        default:
+          g_critical("Houston, we've had a problem. file_type=%d", file_type);
+      }
+    }

     fclose ( f );
     fclose ( f );

+    f = NULL;

     return TRUE;
   }
   return FALSE;
 }
     return TRUE;
   }
   return FALSE;
 }

+