X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1406f28d8811c6ff93337f1fb52f261cd0a11cb9..bd79610697b0875ccb6d1d96fc2f63f955b76ec4:/src/file.c?ds=inline diff --git a/src/file.c b/src/file.c index 3fb200b3..03abf09b 100644 --- a/src/file.c +++ b/src/file.c @@ -2,6 +2,8 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2012, Guilhem Bonnefille + * Copyright (C) 2012-2013, Rob Norris * * 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 @@ -24,8 +26,11 @@ #endif #include "viking.h" +#include "jpg.h" #include "gpx.h" +#include "geojson.h" #include "babel.h" +#include "gpsmapper.h" #include #include @@ -37,28 +42,22 @@ #include #include -/* 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 +#include "file.h" +#include "misc/strtod.h" #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 GPX_MAGIC "name ) == 0 ) - return i; - return -1; -} - -void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data ) { +void file_write_layer_param ( FILE *f, const gchar *name, VikLayerParamType 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, @@ -132,8 +122,9 @@ void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerP 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_STRING: fprintf ( f, "%s\n", data.s ? 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; + default: break; } } } @@ -194,7 +185,9 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) 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\nhighlightcolor=%s\ndrawscale=%s\ndrawcentermark=%s\ndrawhighlight=%s\n", + fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n" ); + fprintf ( f, "FILE_VERSION=%d\n", VIKING_FILE_VERSION ); + fprintf ( f, "\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, modestring, vik_viewport_get_background_color(VIK_VIEWPORT(vp)), vik_viewport_get_highlight_color(VIK_VIEWPORT(vp)), @@ -208,7 +201,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp ) while (stack && stack->data) { current_layer = VIK_LAYER(((GList *)stack->data)->data); - fprintf ( f, "\n~Layer %s\n", vik_layer_get_interface(current_layer->type)->name ); + fprintf ( f, "\n~Layer %s\n", vik_layer_get_interface(current_layer->type)->fixed_layer_name ); write_layer_params_and_data ( current_layer, f ); if ( current_layer->type == VIK_LAYER_AGGREGATE && !vik_aggregate_layer_is_empty(VIK_AGGREGATE_LAYER(current_layer)) ) { @@ -261,14 +254,26 @@ static void string_list_delete ( gpointer key, gpointer l, gpointer user_data ) 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 ); + VikLayerSetParam vlsp; + vlsp.id = i; + vlsp.data.sl = list; + vlsp.vp = layer_and_vp[1]; + vlsp.is_file_operation = TRUE; + + vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), &vlsp ); } -static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) +/** + * 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, const gchar *dirpath, VikViewport *vp ) { - Stack *stack; + Stack *stack = NULL; struct LatLon ll = { 0.0, 0.0 }; gchar buffer[4096]; gchar *line; @@ -280,6 +285,8 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) GHashTable *string_lists = g_hash_table_new(g_direct_hash,g_direct_equal); + gboolean successful_read = TRUE; + push(&stack); stack->under = NULL; stack->data = (gpointer) top; @@ -316,6 +323,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) int parent_type = VIK_LAYER(stack->data)->type; if ( ( ! stack->data ) || ((parent_type != VIK_LAYER_AGGREGATE) && (parent_type != VIK_LAYER_GPS)) ) { + 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; @@ -323,10 +331,11 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { - gint16 type = layer_type_from_string ( line+6 ); + VikLayerTypeEnum type = vik_layer_type_from_string ( line+6 ); push(&stack); - if ( type == -1 ) + if ( type == VIK_LAYER_NUM_TYPES ) { + successful_read = FALSE; g_warning ( "Line %ld: Unknown type %s", line_num, line+6 ); stack->data = NULL; } @@ -338,7 +347,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { - stack->data = (gpointer) vik_layer_create ( type, vp, NULL, FALSE ); + stack->data = (gpointer) vik_layer_create ( type, vp, FALSE ); params = vik_layer_get_interface(type)->params; params_count = vik_layer_get_interface(type)->params_count; } @@ -346,28 +355,33 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } 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 ); + } else { /* add any string lists we've accumulated */ - gpointer layer_and_vp[2]; + gpointer layer_and_vp[3]; layer_and_vp[0] = stack->data; layer_and_vp[1] = vp; + layer_and_vp[2] = (gpointer)dirpath; 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 (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_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data), FALSE ); 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 + 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); } @@ -375,9 +389,11 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *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 ) - vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f ); + { /* must read until hits ~EndLayerData */ - + if ( ! vik_layer_get_interface(VIK_LAYER(stack->data)->type)->read_file_data ( VIK_LAYER(stack->data), f, dirpath ) ) + successful_read = FALSE; + } else { /* simply skip layer data over */ while ( fgets ( buffer, 4096, f ) ) @@ -399,6 +415,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { + successful_read = FALSE; g_warning ( "Line %ld: Unknown tilde command", line_num ); } } @@ -413,24 +430,33 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) if ( line[i] == '=' ) eq_pos = i; - if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "xmpp", eq_pos ) == 0) /* "hard coded" params: global & for all layer-types */ - vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) ); + if ( stack->under == NULL && eq_pos == 12 && strncasecmp ( line, "FILE_VERSION", eq_pos ) == 0) { + gint version = strtol(line+13, NULL, 10); + g_debug ( "%s: reading file version %d", __FUNCTION__, version ); + if ( version > VIKING_FILE_VERSION ) + successful_read = FALSE; + // However we'll still carry and attempt to read whatever we can + } + else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "xmpp", eq_pos ) == 0) /* "hard coded" params: global & for all layer-types */ + vik_viewport_set_xmpp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) ); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "ympp", eq_pos ) == 0) - vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod ( line+5, NULL ) ); + vik_viewport_set_ympp ( VIK_VIEWPORT(vp), strtod_i8n ( line+5, NULL ) ); else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lat", eq_pos ) == 0 ) - ll.lat = strtod ( line+4, NULL ); + ll.lat = strtod_i8n ( line+4, NULL ); else if ( stack->under == NULL && eq_pos == 3 && strncasecmp ( line, "lon", eq_pos ) == 0 ) - ll.lon = strtod ( line+4, NULL ); + ll.lon = strtod_i8n ( line+4, NULL ); else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "utm" ) == 0) vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_UTM); 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) { + 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) { + 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) @@ -460,6 +486,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) if ( ! params ) { + successful_read = FALSE; g_warning ( "Line %ld: No options for this kind of layer", line_num ); continue; } @@ -478,7 +505,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) } else { switch ( params[i].type ) { - case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break; + case VIK_LAYER_PARAM_DOUBLE: x.d = strtod_i8n(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; @@ -487,16 +514,30 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) /* 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 ); + + VikLayerSetParam vlsp; + vlsp.id = i; + vlsp.data = x; + vlsp.vp = vp; + vlsp.is_file_operation = TRUE; + vik_layer_set_param ( VIK_LAYER(stack->data), &vlsp ); } found_match = TRUE; break; } - if ( ! found_match ) + 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 ); + } } /* could be: [Layer Type=Bla] @@ -511,14 +552,14 @@ 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) ); + vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data), FALSE ); vik_layer_post_read ( VIK_LAYER(stack->data), vp, TRUE ); } pop(&stack); } if ( ll.lat != 0.0 || ll.lon != 0.0 ) - vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll ); + vik_viewport_set_center_latlon ( VIK_VIEWPORT(vp), &ll, TRUE ); if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized ) vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE ); @@ -526,6 +567,8 @@ name=this /* 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; } /* @@ -544,7 +587,7 @@ if "[LayerData]" /* ---------------------------------------------------- */ -static FILE *xfopen ( const char *fn, const char *mode ) +static FILE *xfopen ( const char *fn ) { if ( strcmp(fn,"-") == 0 ) return stdin; @@ -566,71 +609,139 @@ static void xfclose ( FILE *f ) gboolean check_file_magic_vik ( const gchar *filename ) { gboolean result = FALSE; - FILE *ff = xfopen ( filename, "r" ); + FILE *ff = xfopen ( filename ); if ( ff ) { - result = check_magic ( ff, VIK_MAGIC ); + result = check_magic ( ff, VIK_MAGIC, VIK_MAGIC_LEN ); xfclose ( ff ); } return result; } -VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri ) +/** + * append_file_ext: + * + * Append a file extension, if not already present. + * + * Returns: a newly allocated string + */ +gchar *append_file_ext ( const gchar *filename, VikFileType_t type ) { - char *filename = (char *)filename_or_uri; - if (strncmp(filename, "file://", 7) == 0) - filename = filename + 7; + gchar *new_name = NULL; + const gchar *ext = NULL; - gboolean is_gpx_file = check_file_ext ( filename, ".gpx" ); - FILE *f = xfopen ( filename, "r" ); + /* Select an extension */ + switch (type) + { + case FILE_TYPE_GPX: + ext = ".gpx"; + break; + case FILE_TYPE_KML: + ext = ".kml"; + break; + case FILE_TYPE_GEOJSON: + ext = ".geojson"; + break; + case FILE_TYPE_GPSMAPPER: + case FILE_TYPE_GPSPOINT: + default: + /* Do nothing, ext already set to NULL */ + break; + } - g_assert ( vp ); + /* Do */ + if ( ext != NULL && ! a_file_check_ext ( filename, ext ) ) + new_name = g_strconcat ( filename, ext, NULL ); + else + /* Simply duplicate */ + new_name = g_strdup ( filename ); + + return new_name; +} + +VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, VikTrwLayer *vtl, 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) { + // Consider replacing this with: + // filename = g_filename_from_uri ( entry, NULL, NULL ); + // Since this doesn't support URIs properly (i.e. will failure if is it has %20 characters in it) + filename = filename + 7; + g_debug ( "Loading file %s from URI %s", filename, filename_or_uri ); + } + FILE *f = xfopen ( filename ); if ( ! f ) return LOAD_TYPE_READ_FAILURE; - if ( !is_gpx_file && check_magic ( f, VIK_MAGIC ) ) + VikLoadType_t load_answer = LOAD_TYPE_OTHER_SUCCESS; + + gchar *dirpath = g_path_get_dirname ( filename ); + // Attempt loading the primary file type first - our internal .vik file: + if ( check_magic ( f, VIK_MAGIC, VIK_MAGIC_LEN ) ) { - file_read ( top, f, vp ); - if ( f != stdin ) - xfclose(f); - return LOAD_TYPE_VIK_SUCCESS; + if ( file_read ( top, f, dirpath, vp ) ) + load_answer = LOAD_TYPE_VIK_SUCCESS; + else + load_answer = LOAD_TYPE_VIK_FAILURE_NON_FATAL; + } + else if ( a_jpg_magic_check ( filename ) ) { + if ( ! a_jpg_load_file ( top, filename, vp ) ) + load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE; } else { - gboolean success = TRUE; - VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ); + // 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 + + // Add to specified layer + gboolean add_new = !IS_VIK_TRW_LAYER(vtl); + if (add_new) { + vtl = VIK_TRW_LAYER (vik_layer_create ( VIK_LAYER_TRW, vp, FALSE )); + vik_layer_rename ( VIK_LAYER(vtl), a_file_basename ( filename ) ); + } // 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 ) ) { + if ( a_file_check_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC, GPX_MAGIC_LEN ) ) { // Implicit Conversion - if ( ! a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL ) ) { - // Probably want to remove the vtl, but I'm not sure how yet... - xfclose(f); - return LOAD_TYPE_GPSBABEL_FAILURE; + ProcessOptions po = { "-i kml", filename, NULL, NULL, NULL, NULL }; + if ( ! ( success = a_babel_convert_from ( vtl, &po, NULL, 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 ( a_file_check_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC, GPX_MAGIC_LEN ) ) { + if ( ! ( success = a_gpx_read_file ( vtl, f ) ) ) { + load_answer = LOAD_TYPE_GPX_FAILURE; } } - else if ( is_gpx_file || check_magic ( f, GPX_MAGIC ) ) { - a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ); + else { + // Try final supported file type + if ( ! ( success = a_gpspoint_read_file ( vtl, f, dirpath ) ) ) { + // Failure here means we don't know how to handle the file + load_answer = LOAD_TYPE_UNSUPPORTED_FAILURE; + } } - else - success = a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f ); - - // Refuse to load file types not supported + // Clean up when we can't handle the file if ( ! success ) { // free up layer g_object_unref ( vtl ); - xfclose(f); - return LOAD_TYPE_UNSUPPORTED_FAILURE; } - - 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_TYPE_OTHER_SUCCESS; + else { + // Complete the setup from the successful load + vik_layer_post_read ( VIK_LAYER(vtl), vp, TRUE ); + if (add_new) { + vik_aggregate_layer_add_layer ( top, VIK_LAYER(vtl), FALSE ); + } + vik_trw_layer_auto_set_view ( vtl, vp ); + } } + g_free ( dirpath ); + xfclose(f); + return load_answer; } gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename ) @@ -645,8 +756,26 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam if ( ! f ) return FALSE; + // Enable relative paths in .vik files to work + gchar *cwd = g_get_current_dir(); + gchar *dir = g_path_get_dirname ( filename ); + if ( dir ) { + if ( g_chdir ( dir ) ) { + g_warning ( "Could not change directory to %s", dir ); + } + g_free (dir); + } + file_write ( top, f, vp ); + // Restore previous working directory + if ( cwd ) { + if ( g_chdir ( cwd ) ) { + g_warning ( "Could not return to directory %s", cwd ); + } + g_free (cwd); + } + fclose(f); f = NULL; @@ -654,25 +783,14 @@ gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filenam } -const gchar *a_file_basename ( const gchar *filename ) -{ - const gchar *t = filename + strlen(filename) - 1; - while ( --t > filename ) - if ( *(t-1) == FILE_SEP ) - break; - if ( t >= filename ) - return t; - return filename; -} - /* example: - gboolean is_gpx = check_file_ext ( "a/b/c.gpx", ".gpx" ); + gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" ); */ -gboolean check_file_ext ( const gchar *filename, const gchar *fileext ) +gboolean a_file_check_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); - g_assert( filename ); - g_assert( fileext && fileext[0]=='.' ); if (!basename) return FALSE; @@ -683,16 +801,31 @@ gboolean check_file_ext ( const gchar *filename, const gchar *fileext ) return FALSE; } -gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname ) +/** + * a_file_export: + * @vtl: The TrackWaypoint to export data from + * @filename: The name of the file to be written + * @file_type: Choose one of the supported file types for the export + * @trk: If specified then only export this track rather than the whole layer + * @write_hidden: Whether to write invisible items + * + * A general export command to convert from Viking TRW layer data to an external supported format. + * The write_hidden option is provided mainly to be able to transfer selected items when uploading to a GPS + */ +gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, VikTrack *trk, gboolean write_hidden ) { + GpxWritingOptions options = { FALSE, FALSE, write_hidden, FALSE }; FILE *f = g_fopen ( filename, "w" ); if ( f ) { - if (trackname) { - VikTrack *vt = vik_trw_layer_get_track ( vtl, trackname ); + gboolean result = TRUE; + + if ( trk ) { switch ( file_type ) { case FILE_TYPE_GPX: - a_gpx_write_track_file ( trackname, vt, f ); + // trk defined so can set the option + options.is_route = trk->is_route; + a_gpx_write_track_file ( trk, f, &options ); break; default: g_critical("Houston, we've had a problem. file_type=%d", file_type); @@ -703,24 +836,26 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t a_gpsmapper_write_file ( vtl, f ); break; case FILE_TYPE_GPX: - a_gpx_write_file ( vtl, f ); + a_gpx_write_file ( vtl, f, &options ); break; case FILE_TYPE_GPSPOINT: a_gpspoint_write_file ( vtl, f ); break; + case FILE_TYPE_GEOJSON: + result = a_geojson_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 ); + return a_babel_convert_to ( vtl, NULL, "-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 ); + return a_babel_convert_to ( vtl, NULL, "-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 ); + return a_babel_convert_to ( vtl, NULL, "-o kml,units=m", filename, NULL, NULL ); break; } break; @@ -729,42 +864,23 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t } } fclose ( f ); - f = NULL; - return TRUE; + return result; } return FALSE; } -const gchar *a_get_viking_dir() +/** + * a_file_export_babel: + */ +gboolean a_file_export_babel ( VikTrwLayer *vtl, const gchar *filename, const gchar *format, + gboolean tracks, gboolean routes, gboolean waypoints ) { - 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 */ -#ifdef __APPLE__ - viking_dir = g_build_filename(home, "/Library/Application Support/Viking", NULL); -#else - viking_dir = g_build_filename(home, ".viking", NULL); -#endif - if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE) - g_mkdir(viking_dir, 0755); - } - - return viking_dir; + gchar *args = g_strdup_printf("%s %s %s -o %s", + tracks ? "-t" : "", + routes ? "-r" : "", + waypoints ? "-w" : "", + format); + gboolean result = a_babel_convert_to ( vtl, NULL, args, filename, NULL, NULL ); + g_free(args); + return result; }