X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/415b0e21cfbd2d8a1e22ac02d7e6ccd2f9743f7c..db771541ff9b86b3ef5e204d5d5d659ccf66e7e6:/src/gpx.c diff --git a/src/gpx.c b/src/gpx.c index b6985050..cc1a932d 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -39,6 +39,8 @@ #include #endif #include +#include +#include #ifdef HAVE_MATH_H #include #endif @@ -1072,38 +1074,42 @@ void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options ) } } - // gather waypoints in a list, then sort - // g_hash_table_get_values: glib 2.14+ - GList *gl = g_hash_table_get_values ( vik_trw_layer_get_waypoints ( vtl ) ); - gl = g_list_sort ( gl, gpx_waypoint_compare ); + if ( vik_trw_layer_get_waypoints_visibility(vtl) || (options && options->hidden) ) { + // gather waypoints in a list, then sort + GList *gl = g_hash_table_get_values ( vik_trw_layer_get_waypoints ( vtl ) ); + gl = g_list_sort ( gl, gpx_waypoint_compare ); - GList *iter; - for (iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { - gpx_write_waypoint ( (VikWaypoint*)iter->data, &context ); + for (GList *iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { + gpx_write_waypoint ( (VikWaypoint*)iter->data, &context ); + } + g_list_free ( gl ); } - g_list_free ( gl ); + GList *gl = NULL; + if ( vik_trw_layer_get_tracks_visibility(vtl) || (options && options->hidden) ) { + //gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) ); + // Forming the list manually seems to produce one that is more likely to be nearer to the creation order + gpointer key, value; + GHashTableIter ght_iter; + g_hash_table_iter_init ( &ght_iter, vik_trw_layer_get_tracks ( vtl ) ); + while ( g_hash_table_iter_next (&ght_iter, &key, &value) ) { + gl = g_list_prepend ( gl ,value ); + } + gl = g_list_reverse ( gl ); - //gl = g_hash_table_get_values ( vik_trw_layer_get_tracks ( vtl ) ); - // Forming the list manually seems to produce one that is more likely to be nearer to the creation order - gl = NULL; - gpointer key, value; - GHashTableIter ght_iter; - g_hash_table_iter_init ( &ght_iter, vik_trw_layer_get_tracks ( vtl ) ); - while ( g_hash_table_iter_next (&ght_iter, &key, &value) ) { - gl = g_list_prepend ( gl ,value ); + // Sort method determined by preference + if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_TIME ) + gl = g_list_sort ( gl, vik_track_compare_timestamp ); + else if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_ALPHA ) + gl = g_list_sort ( gl, gpx_track_compare_name ); } - gl = g_list_reverse ( gl ); - - // Sort method determined by preference - if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_TIME ) - gl = g_list_sort ( gl, vik_track_compare_timestamp ); - else if ( a_vik_get_gpx_export_trk_sort() == VIK_GPX_EXPORT_TRK_SORT_ALPHA ) - gl = g_list_sort ( gl, gpx_track_compare_name ); + GList *glrte = NULL; // Routes sorted by name - GList *glrte = g_hash_table_get_values ( vik_trw_layer_get_routes ( vtl ) ); - glrte = g_list_sort ( glrte, gpx_track_compare_name ); + if ( vik_trw_layer_get_tracks_visibility(vtl) || (options && options->hidden) ) { + glrte = g_hash_table_get_values ( vik_trw_layer_get_routes ( vtl ) ); + glrte = g_list_sort ( glrte, gpx_track_compare_name ); + } // g_list_concat doesn't copy memory properly // so process each list separately @@ -1116,13 +1122,13 @@ void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options ) context_tmp.options->is_route = FALSE; // Loop around each list and write each one - for (iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { + for (GList *iter = g_list_first (gl); iter != NULL; iter = g_list_next (iter)) { gpx_write_track ( (VikTrack*)iter->data, &context_tmp ); } // Routes (to get routepoints) context_tmp.options->is_route = TRUE; - for (iter = g_list_first (glrte); iter != NULL; iter = g_list_next (iter)) { + for (GList *iter = g_list_first (glrte); iter != NULL; iter = g_list_next (iter)) { gpx_write_track ( (VikTrack*)iter->data, &context_tmp ); } @@ -1139,3 +1145,59 @@ void a_gpx_write_track_file ( VikTrack *trk, FILE *f, GpxWritingOptions *options gpx_write_track ( trk, &context ); gpx_write_footer ( f ); } + +/** + * Common write of a temporary GPX file + */ +static gchar* write_tmp_file ( VikTrwLayer *vtl, VikTrack *trk, GpxWritingOptions *options ) +{ + gchar *tmp_filename = NULL; + GError *error = NULL; + // Opening temporary file + int fd = g_file_open_tmp("viking_XXXXXX.gpx", &tmp_filename, &error); + if (fd < 0) { + g_warning ( _("failed to open temporary file: %s"), error->message ); + g_clear_error ( &error ); + return NULL; + } + g_debug ("%s: temporary file = %s", __FUNCTION__, tmp_filename); + + FILE *ff = fdopen (fd, "w"); + + if ( trk ) + a_gpx_write_track_file ( trk, ff, options ); + else + a_gpx_write_file ( vtl, ff, options ); + + fclose (ff); + + return tmp_filename; +} + +/* + * a_gpx_write_tmp_file: + * @vtl: The #VikTrwLayer to write + * @options: Possible ways of writing the file data (can be NULL) + * + * Returns: The name of newly created temporary GPX file + * This file should be removed once used and the string freed. + * If NULL then the process failed. + */ +gchar* a_gpx_write_tmp_file ( VikTrwLayer *vtl, GpxWritingOptions *options ) +{ + return write_tmp_file ( vtl, NULL, options ); +} + +/* + * a_gpx_write_track_tmp_file: + * @trk: The #VikTrack to write + * @options: Possible ways of writing the file data (can be NULL) + * + * Returns: The name of newly created temporary GPX file + * This file should be removed once used and the string freed. + * If NULL then the process failed. + */ +gchar* a_gpx_write_track_tmp_file ( VikTrack *trk, GpxWritingOptions *options ) +{ + return write_tmp_file ( NULL, trk, options ); +}