*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "viking.h"
#include "gpx.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"
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;
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: {
-// 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;
- }
+ file_write_layer_param(f, params[i].name, params[i].type, data);
}
}
if ( vik_layer_get_interface(l->type)->write_file_data )
Stack *stack = NULL;
VikLayer *current_layer;
struct LatLon ll;
+ VikViewportDrawMode mode;
gchar *modestring;
push(&stack);
/* 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_GOOGLE: modestring = "google"; break;
- case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
- default: modestring = "mercator";
+ case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+ default:
+ g_critical("Houston, we've had a problem. mode=%d", mode);
}
- fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%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\ndrawcentermark=%s",
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)),
- vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f" );
+ vik_viewport_get_draw_scale(VIK_VIEWPORT(vp)) ? "t" : "f",
+ vik_viewport_get_draw_centermark(VIK_VIEWPORT(vp)) ? "t" : "f" );
if ( ! VIK_LAYER(top)->visible )
fprintf ( f, "visible=f\n" );
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;
*/
}
-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] );
+}
+
+static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
{
Stack *stack;
struct LatLon ll = { 0.0, 0.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);
push(&stack);
stack->under = NULL;
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);
if ( type == -1 )
{
- g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
+ g_warning ( "Line %ld: Unknown type %s", 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 );
g_warning ( "Line %ld: Mismatched ~EndLayer command", line_num );
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 )
{
- 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
+ g_warning ( "Line %ld: EndLayer command inside non-Aggregate Layer (type %d)", line_num, VIK_LAYER(stack->data)->type );
}
pop(&stack);
}
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 );
+ {
+ 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)
- vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_KH );
+ {
+ 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 == 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 == 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 && 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 ( 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. */
{
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;
- 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 );
}
- vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp );
found_match = TRUE;
break;
}
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);
}
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 );
}
/*
if ( strcmp(fn,"-") == 0 )
return stdin;
else
- return fopen(fn, "r");
+ return g_fopen(fn, "r");
}
static void xfclose ( FILE *f )
{
- if ( f != stdin && f != stdout )
+ if ( f != stdin && f != stdout ) {
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 )
+gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename )
{
FILE *f = xfopen ( filename, "r" );
else
a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f );
- vik_layer_post_read ( vtl, vp );
+ vik_layer_post_read ( vtl, vp, TRUE );
vik_aggregate_layer_add_layer ( top, vtl );
gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
{
- FILE *f = fopen(filename, "w");
+ FILE *f = g_fopen(filename, "w");
if ( ! f )
return FALSE;
file_write ( top, f, vp );
fclose(f);
+ f = NULL;
return TRUE;
}
gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type )
{
- FILE *f = fopen ( filename, "w" );
+ FILE *f = g_fopen ( filename, "w" );
if ( f )
{
if ( file_type == FILE_TYPE_GPSMAPPER )
else
a_gpspoint_write_file ( vtl, f );
fclose ( f );
+ f = NULL;
return TRUE;
}
return FALSE;
}
+
+const gchar *a_get_viking_dir()
+{
+ static gchar *viking_dir = NULL;
+
+ // TODO: use g_get_user_config_dir ?
+
+ if (!viking_dir) {
+ const gchar *home = g_getenv("HOME");
+ if (!home || g_access(home, W_OK))
+ home = g_get_home_dir ();
+#ifdef HAVE_MKDTEMP
+ if (!home || g_access(home, W_OK))
+ {
+ static gchar temp[] = {"/tmp/vikXXXXXX"};
+ home = mkdtemp(temp);
+ }
+#endif
+ if (!home || g_access(home, W_OK))
+ /* Fatal error */
+ g_critical("Unable to find a base directory");
+
+ /* Build the name of the directory */
+ viking_dir = g_build_filename(home, ".viking", NULL);
+ if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE)
+ g_mkdir(viking_dir, 0755);
+ }
+
+ return viking_dir;
+}
projects / andy / viking.git / blobdiff