Fix intermittent problem of map redraw.

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

diff --git a/src/file.c b/src/file.c
index 6848fa398f45b4e117e15e67b969b0c1583f5fbf..2e8542d00db23fbf642e5afdf4502feff52d01ad 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -110,6 +110,7 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f )
 //          char buf[15]; /* locale independent */
 //          fprintf ( f, "%s\n", (char *) g_dtostr (data.d, buf, sizeof (buf)) ); break;
             fprintf ( f, "%f\n", data.d );
 //          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_UINT: fprintf ( f, "%d\n", data.u ); break;
         case VIK_LAYER_PARAM_INT: fprintf ( f, "%d\n", data.i ); break;


@@ -153,9 +154,10 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
     default: modestring = "mercator";
   }
 
     default: modestring = "mercator";
   }
 

-  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\ndrawscale=%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_draw_scale(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" );


@@ -170,6 +172,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;


@@ -243,9 +250,10 @@ 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 );
+          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;


@@ -259,6 +267,12 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
             g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
             stack->data = NULL;
           }
             g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
             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 );


@@ -275,8 +289,15 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         {
           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 );
+            }
+            else if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_GPS) {
+              /* TODO: anything else needs to be done here ? */
+            }
+            else
+              g_warning ( "Line %ld: EndLayer command inside non-Aggregate Layer (type %d)", line_num, VIK_LAYER(stack->data)->type );

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


@@ -342,6 +363,8 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
       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 == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
+        vik_viewport_set_draw_scale ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+10) );

       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 )


@@ -378,7 +401,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
             break;
           }
         if ( ! found_match )
             break;
           }
         if ( ! found_match )

-          g_warning ( "Line %ld: Unknown parameter", line_num );
+          g_warning ( "Line %ld: Unknown parameter. Line:\n%s", line_num, line );

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