X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/ccccf35688f1e365de2bd7d104f1d1ca4e5e4616..f3c798e9818e701f4db1819debe30c3771f38542:/src/globals.c

diff --git a/src/globals.c b/src/globals.c
index ed349756..70de10ca 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -83,6 +83,7 @@ static VikLayerParam io_prefs_non_windows[] = {
 
 static VikLayerParam io_prefs_external_gpx[] = {
   { VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_1", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 1:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL },
+  { VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_2", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 2:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL },
 };
 
 /* End of Options static stuff */
@@ -125,9 +126,12 @@ void a_vik_preferences_init ()
   a_preferences_register(&io_prefs_non_windows[0], tmp, VIKING_PREFERENCES_IO_GROUP_KEY);
 #endif
 
-  // JOSM for OSM editing around a GPX tracj
+  // JOSM for OSM editing around a GPX track
   tmp.s = "josm";
   a_preferences_register(&io_prefs_external_gpx[0], tmp, VIKING_PREFERENCES_IO_GROUP_KEY);
+  // Add a second external program - another OSM editor by default
+  tmp.s = "merkaartor";
+  a_preferences_register(&io_prefs_external_gpx[1], tmp, VIKING_PREFERENCES_IO_GROUP_KEY);
 }
 
 vik_degree_format_t a_vik_get_degree_format ( )
@@ -184,7 +188,7 @@ gdouble a_vik_get_default_long ( )
 vik_kml_export_units_t a_vik_get_kml_export_units ( )
 {
   vik_kml_export_units_t units;
-  units = a_preferences_get(VIKING_PREFERENCES_NAMESPACE "kml_export_units")->u;
+  units = a_preferences_get(VIKING_PREFERENCES_IO_NAMESPACE "kml_export_units")->u;
   return units;
 }
 
@@ -199,3 +203,8 @@ const gchar* a_vik_get_external_gpx_program_1 ( )
 {
   return a_preferences_get(VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_1")->s;
 }
+
+const gchar* a_vik_get_external_gpx_program_2 ( )
+{
+  return a_preferences_get(VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_2")->s;
+}