#include "jpg.h"
#include "gpx.h"
+#include "geojson.h"
#include "babel.h"
#include <string.h>
#include <glib/gi18n.h>
#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 "<?xm"
#define VIK_MAGIC_LEN 4
+#define GPX_MAGIC_LEN 4
#define VIKING_FILE_VERSION 1
struct _Stack {
Stack *under;
- gpointer *data;
+ gpointer data;
};
static void pop(Stack **stack) {
*stack = tmp;
}
-static gboolean check_magic ( FILE *f, const gchar *magic_number )
+static gboolean check_magic ( FILE *f, const gchar *magic_number, guint magic_length )
{
- gchar magic[VIK_MAGIC_LEN];
+ gchar magic[magic_length];
gboolean rv = FALSE;
gint8 i;
if ( fread(magic, 1, sizeof(magic), f) == sizeof(magic) &&
*/
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;
// 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 ( line+5, NULL ) );
+ 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)
} 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;
/* ---------------------------------------------------- */
-static FILE *xfopen ( const char *fn, const char *mode )
+static FILE *xfopen ( const char *fn )
{
if ( strcmp(fn,"-") == 0 )
return stdin;
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;
*
* Returns: a newly allocated string
*/
-gchar *append_file_ext ( const gchar *filename, VikLoadType_t type )
+gchar *append_file_ext ( const gchar *filename, VikFileType_t type )
{
gchar *new_name = NULL;
const gchar *ext = NULL;
case FILE_TYPE_KML:
ext = ".kml";
break;
+ case FILE_TYPE_GEOJSON:
+ ext = ".geojson";
+ break;
case FILE_TYPE_GPSMAPPER:
case FILE_TYPE_GPSPOINT:
default:
filename = filename + 7;
g_debug ( "Loading file %s from URI %s", filename, filename_or_uri );
}
- FILE *f = xfopen ( filename, "r" );
+ FILE *f = xfopen ( filename );
if ( ! f )
return LOAD_TYPE_READ_FAILURE;
gchar *dirpath = g_path_get_dirname ( filename );
// Attempt loading the primary file type first - our internal .vik file:
- if ( check_magic ( f, VIK_MAGIC ) )
+ if ( check_magic ( f, VIK_MAGIC, VIK_MAGIC_LEN ) )
{
if ( file_read ( top, f, dirpath, vp ) )
load_answer = LOAD_TYPE_VIK_SUCCESS;
vik_layer_rename ( vtl, a_file_basename ( filename ) );
// In fact both kml & gpx files start the same as they are in xml
- if ( a_file_check_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 ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL, NULL ) ) ) {
+ ProcessOptions po = { "-i kml", filename, NULL, NULL, NULL, NULL };
+ if ( ! ( success = a_babel_convert_from ( VIK_TRW_LAYER(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 ) ) {
+ else if ( a_file_check_ext ( filename, ".gpx" ) || check_magic ( f, GPX_MAGIC, GPX_MAGIC_LEN ) ) {
if ( ! ( success = a_gpx_read_file ( VIK_TRW_LAYER(vtl), f ) ) ) {
load_answer = LOAD_TYPE_GPX_FAILURE;
}
}
-const gchar *a_file_basename ( const gchar *filename )
-{
- const gchar *t = filename + strlen(filename) - 1;
- while ( --t > filename )
- if ( *(t-1) == G_DIR_SEPARATOR )
- break;
- if ( t >= filename )
- return t;
- return filename;
-}
-
/* example:
gboolean is_gpx = a_file_check_ext ( "a/b/c.gpx", ".gpx" );
*/
FILE *f = g_fopen ( filename, "w" );
if ( f )
{
+ gboolean result = TRUE;
+
if ( trk ) {
switch ( file_type ) {
case FILE_TYPE_GPX:
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, NULL, "-o kml", filename, NULL, NULL );
}
}
fclose ( f );
- f = NULL;
- return TRUE;
+ return result;
}
return FALSE;
}
// Handle DOS names that are on different drives:
if (currentDirectory[0] != absoluteFilename[0]) {
// not on the same drive, so only absolute filename will do
- strcpy(relativeFilename, absoluteFilename);
+ g_strlcpy(relativeFilename, absoluteFilename, MAXPATHLEN+1);
return relativeFilename;
}
i++;
}
- strcpy(relativeFilename, &absoluteFilename[i]);
+ g_strlcpy(relativeFilename, &absoluteFilename[i], MAXPATHLEN+1);
return relativeFilename;
}