case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+ case VIK_VIEWPORT_DRAWMODE_LATLON: modestring = "latlon"; break;
default:
g_critical("Houston, we've had a problem. mode=%d", mode);
}
}
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 == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "latlon" ) == 0)
+ vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_LATLON );
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 )
}
else
{
- VikCoord new_center;
VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
vik_layer_rename ( vtl, a_file_basename ( filename ) );
vik_aggregate_layer_add_layer ( top, vtl );
- if ( vik_trw_layer_find_center ( VIK_TRW_LAYER(vtl), &new_center ) )
- vik_viewport_set_center_coord ( VIK_VIEWPORT(vp), &new_center );
+ vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp );
+
xfclose(f);
return 2;
}
return FALSE;
}
-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type, VikTrack *vt, const gchar *trackname )
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname )
{
FILE *f = g_fopen ( filename, "w" );
if ( f )
{
- if ( file_type == FILE_TYPE_GPSMAPPER )
- a_gpsmapper_write_file ( vtl, f );
- else if ( file_type == FILE_TYPE_GPX )
- a_gpx_write_file ( vtl, f );
- else if ( file_type == FILE_TYPE_GPX_TRACK ) {
- a_gpx_write_track_file ( trackname, vt, f );
+ if (trackname) {
+ VikTrack *vt = vik_trw_layer_get_track ( vtl, trackname );
+ switch ( file_type ) {
+ case FILE_TYPE_GPX:
+ a_gpx_write_track_file ( trackname, vt, f );
+ break;
+ default:
+ g_critical("Houston, we've had a problem. file_type=%d", file_type);
+ }
+ } else {
+ switch ( file_type ) {
+ case FILE_TYPE_GPSMAPPER:
+ a_gpsmapper_write_file ( vtl, f );
+ break;
+ case FILE_TYPE_GPX:
+ a_gpx_write_file ( vtl, f );
+ break;
+ case FILE_TYPE_GPSPOINT:
+ a_gpspoint_write_file ( vtl, f );
+ break;
+ default:
+ g_critical("Houston, we've had a problem. file_type=%d", file_type);
+ }
}
- else
- a_gpspoint_write_file ( vtl, f );
fclose ( f );
f = NULL;
return TRUE;