X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/08b251ecfe7ae7a2330073967ba0316758b56c78..51c15f41e0c686a58c8e8e082f7485e3102199db:/src/gpx.c?ds=sidebyside diff --git a/src/gpx.c b/src/gpx.c index f030d6c0..53c08b88 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -29,6 +29,8 @@ #include "viking.h" #include #include +#include +#include #define GPX_TIME_FORMAT "%Y-%m-%dT%H:%M:%SZ" @@ -240,7 +242,8 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) case tt_wpt: if ( ! c_wp_name ) c_wp_name = g_strdup_printf("VIKING_WP%d", unnamed_waypoints++); - g_hash_table_insert ( vik_trw_layer_get_waypoints ( vtl ), c_wp_name, c_wp ); + vik_trw_layer_filein_add_waypoint ( vtl, c_wp_name, c_wp ); + g_free ( c_wp_name ); c_wp = NULL; c_wp_name = NULL; break; @@ -248,7 +251,8 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) case tt_trk: if ( ! c_tr_name ) c_tr_name = g_strdup_printf("VIKING_TR%d", unnamed_waypoints++); - g_hash_table_insert ( vik_trw_layer_get_tracks ( vtl ), c_tr_name, c_tr ); + vik_trw_layer_filein_add_track ( vtl, c_tr_name, c_tr ); + g_free ( c_tr_name ); c_tr = NULL; c_tr_name = NULL; break; @@ -288,10 +292,13 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) g_string_erase ( c_cdata, 0, -1 ); break; - case tt_wpt_sym: - vik_waypoint_set_symbol ( c_wp, c_cdata->str ); + case tt_wpt_sym: { + gchar *tmp_lower = g_utf8_strdown(c_cdata->str, -1); /* for things like Geocache */ + vik_waypoint_set_symbol ( c_wp, tmp_lower ); + g_free ( tmp_lower ); g_string_erase ( c_cdata, 0, -1 ); break; + } case tt_trk_desc: vik_track_set_comment ( c_tr, c_cdata->str ); @@ -299,6 +306,7 @@ static void gpx_end(VikTrwLayer *vtl, const char *el) break; case tt_trk_trkseg_trkpt_time: + if ( strptime(c_cdata->str, GPX_TIME_FORMAT, &tm) != c_cdata->str ) { /* it read at least one char */ c_tp->timestamp = mktime(&tm); c_tp->has_timestamp = TRUE; @@ -531,20 +539,30 @@ entitize(const char * str) /**** end GPSBabel code ****/ /* export GPX */ + static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, FILE *f ) { static struct LatLon ll; + gchar *s_lat,*s_lon; gchar *tmp; vik_coord_to_latlon ( &(wp->coord), &ll ); - fprintf ( f, "\n", - ll.lat, ll.lon, wp->visible ? "" : " hidden=\"hidden\"" ); + s_lat = a_coords_dtostr( ll.lat ); + s_lon = a_coords_dtostr( ll.lon ); + fprintf ( f, "\n", + s_lat, s_lon, wp->visible ? "" : " hidden=\"hidden\"" ); + g_free ( s_lat ); + g_free ( s_lon ); tmp = entitize ( name ); fprintf ( f, " %s\n", tmp ); g_free ( tmp); if ( wp->altitude != VIK_DEFAULT_ALTITUDE ) - fprintf ( f, " %f\n", wp->altitude ); + { + tmp = a_coords_dtostr ( wp->altitude ); + fprintf ( f, " %s\n", tmp ); + g_free ( tmp ); + } if ( wp->comment ) { tmp = entitize(wp->comment); @@ -570,16 +588,25 @@ static void gpx_write_waypoint ( const gchar *name, VikWaypoint *wp, FILE *f ) static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f ) { static struct LatLon ll; + gchar *s_lat,*s_lon, *s_alt; static gchar time_buf[30]; vik_coord_to_latlon ( &(tp->coord), &ll ); if ( tp->newsegment ) fprintf ( f, " \n \n" ); - fprintf ( f, " \n", ll.lat, ll.lon ); + s_lat = a_coords_dtostr( ll.lat ); + s_lon = a_coords_dtostr( ll.lon ); + fprintf ( f, " \n", s_lat, s_lon ); + g_free ( s_lat ); + g_free ( s_lon ); if ( tp->altitude != VIK_DEFAULT_ALTITUDE ) - fprintf ( f, " %f\n", tp->altitude ); + { + s_alt = a_coords_dtostr ( tp->altitude ); + fprintf ( f, " %s\n", s_alt ); + g_free ( s_alt ); + } if ( tp->has_timestamp ) { time_buf [ strftime ( time_buf, sizeof(time_buf)-1, GPX_TIME_FORMAT, localtime(&(tp->timestamp)) ) ] = '\0'; fprintf ( f, " \n", time_buf ); @@ -591,7 +618,7 @@ static void gpx_write_trackpoint ( VikTrackpoint *tp, FILE *f ) static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f ) { gchar *tmp; - gboolean first_tp_is_newsegment; /* must temporarily make it not so, but we want to restore state. not that it matters. */ + gboolean first_tp_is_newsegment = FALSE; /* must temporarily make it not so, but we want to restore state. not that it matters. */ tmp = entitize ( name ); fprintf ( f, "\n %s\n", t->visible ? "" : " hidden=\"hidden\"", tmp ); @@ -609,24 +636,38 @@ static void gpx_write_track ( const gchar *name, VikTrack *t, FILE *f ) if ( t->trackpoints && t->trackpoints->data ) { first_tp_is_newsegment = VIK_TRACKPOINT(t->trackpoints->data)->newsegment; VIK_TRACKPOINT(t->trackpoints->data)->newsegment = FALSE; /* so we won't write already */ - } - g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f ); - if ( t->trackpoints && t->trackpoints->data ) + g_list_foreach ( t->trackpoints, (GFunc) gpx_write_trackpoint, f ); VIK_TRACKPOINT(t->trackpoints->data)->newsegment = first_tp_is_newsegment; /* restore state */ + } fprintf ( f, "\n\n" ); } -void a_gpx_write_file( VikTrwLayer *vtl, FILE *f ) +static void gpx_write_header( FILE *f ) { fprintf(f, "\n" "\n"); - g_hash_table_foreach ( vik_trw_layer_get_waypoints ( vtl ), (GHFunc) gpx_write_waypoint, f ); - g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, f ); +} + +static void gpx_write_footer( FILE *f ) +{ fprintf(f, "\n"); +} +void a_gpx_write_file( VikTrwLayer *vtl, FILE *f ) +{ + gpx_write_header ( f ); + g_hash_table_foreach ( vik_trw_layer_get_waypoints ( vtl ), (GHFunc) gpx_write_waypoint, f ); + g_hash_table_foreach ( vik_trw_layer_get_tracks ( vtl ), (GHFunc) gpx_write_track, f ); + gpx_write_footer ( f ); +} +void a_gpx_write_track_file ( const gchar *name, VikTrack *t, FILE *f ) +{ + gpx_write_header ( f ); + gpx_write_track ( name, t, f ); + gpx_write_footer ( f ); }