X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/7c1cf1b5c0ab18a068681e51d9d679543c140912..e1e2f2c685820111fb9733422544d1847dea2a59:/src/file.c?ds=inline diff --git a/src/file.c b/src/file.c index 0d72bf6f..a5f01427 100644 --- a/src/file.c +++ b/src/file.c @@ -154,9 +154,10 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) 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, - 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" ); @@ -343,6 +344,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 ); + 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 ) @@ -379,7 +382,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp ) 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 );