X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/ed691ed1eafc70b1855699be6499bdc8e86bb8d4..00de8de3e9c61db157855abdc793c403ab24ab0e:/src/datasource_bfilter.c

diff --git a/src/datasource_bfilter.c b/src/datasource_bfilter.c
index 848af0f4..9b61cc7b 100644
--- a/src/datasource_bfilter.c
+++ b/src/datasource_bfilter.c
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2007, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2014, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * See: http://www.gpsbabel.org/htmldoc-development/Data_Filters.html
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,8 +31,7 @@
 #include "gpx.h"
 #include "acquire.h"
 
-
-/************************************ Simplify ***********************************/
+/************************************ Simplify (Count) *****************************/
 
 static void datasource_bfilter_simplify_get_cmd_string ( VikLayerParamData *paramdatas, gchar **cmd, gchar **input_file_type, const gchar *input_filename, gpointer not_used );
 
@@ -43,7 +44,7 @@ VikLayerParamScale simplify_params_scales[] = {
 };
 
 VikLayerParam bfilter_simplify_params[] = {
-  { "numberofpoints", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Max number of points:"), VIK_LAYER_WIDGET_SPINBUTTON, simplify_params_scales, NULL, NULL },
+  { VIK_LAYER_NUM_TYPES, "numberofpoints", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Max number of points:"), VIK_LAYER_WIDGET_SPINBUTTON, simplify_params_scales, NULL, NULL, NULL, NULL, NULL },
 };
 
 VikLayerParamData bfilter_simplify_params_defaults[] = {
@@ -84,6 +85,70 @@ static void datasource_bfilter_simplify_get_cmd_string ( VikLayerParamData *para
   *cmd = g_strdup_printf ( "gpsbabel -i gpx -f %s -x simplify,count=%d -o gpx -F -", input_filename, paramdatas[0].u );
 }
 
+/**************************** Compress (Simplify by Error Factor Method) *****************************/
+
+static void datasource_bfilter_compress_get_cmd_string ( VikLayerParamData *paramdatas, gchar **cmd, gchar **input_file_type, const gchar *input_filename, gpointer not_used );
+
+/* TODO: shell_escape stuff */
+
+static VikLayerParamScale compress_spin_scales[] = { {0.0, 1.000, 0.001, 3} };
+
+VikLayerParam bfilter_compress_params[] = {
+  //{ VIK_LAYER_NUM_TYPES, "compressmethod", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Simplify Method:"), VIK_LAYER_WIDGET_COMBOBOX, compress_method, NULL, NULL, NULL, NULL, NULL },
+  { VIK_LAYER_NUM_TYPES, "compressfactor", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Error Factor:"), VIK_LAYER_WIDGET_SPINBUTTON, compress_spin_scales, NULL,
+      N_("Specifies the maximum allowable error that may be introduced by removing a single point by the crosstrack method. See the manual or GPSBabel Simplify Filter documentation for more detail."), NULL, NULL, NULL },
+};
+
+VikLayerParamData bfilter_compress_params_defaults[] = {
+  /* Annoyingly 'C' cannot initialize unions properly */
+  /* It's dependent on the standard used or the compiler support... */
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L || __GNUC__
+  { .d = 0.001 },
+#else
+  { 0.001 },
+#endif
+};
+
+/**
+ * Allow 'compressing' tracks/routes using the Simplify by Error Factor method
+ */
+VikDataSourceInterface vik_datasource_bfilter_compress_interface = {
+  N_("Compress Tracks..."),
+  N_("Compressed Tracks"),
+  VIK_DATASOURCE_CREATENEWLAYER,
+  VIK_DATASOURCE_INPUTTYPE_TRWLAYER,
+  TRUE,
+  FALSE, // Close the dialog after successful operation
+  TRUE,
+  NULL, NULL, NULL,
+  (VikDataSourceGetCmdStringFunc)   datasource_bfilter_compress_get_cmd_string,
+  (VikDataSourceProcessFunc)        a_babel_convert_from_shellcommand,
+  NULL, NULL, NULL,
+  (VikDataSourceOffFunc) NULL,
+
+  bfilter_compress_params,
+  sizeof(bfilter_compress_params)/sizeof(bfilter_compress_params[0]),
+  bfilter_compress_params_defaults,
+  NULL,
+  0
+};
+
+/**
+ * http://www.gpsbabel.org/htmldoc-development/filter_simplify.html
+ */
+static void datasource_bfilter_compress_get_cmd_string ( VikLayerParamData *paramdatas, gchar **cmd, gchar **input_file_type, const gchar *input_filename, gpointer not_used )
+{
+  *input_file_type = NULL;
+  gchar units = a_vik_get_units_distance() == VIK_UNITS_DISTANCE_KILOMETRES ? 'k' : ' ';
+  // I toyed with making the length,crosstrack or relative methods selectable
+  // However several things:
+  // - mainly that typical values to use for the error relate to method being used - so hard to explain and then give a default sensible value in the UI
+  // - also using relative method fails when track doesn't have HDOP info - error reported to stderr - which we don't capture ATM
+  // - options make this more complicated to use - is even that useful to be allowed to change the error value?
+  // NB units not applicable if relative method used - defaults to Miles when not specified
+  *cmd = g_strdup_printf ( "gpsbabel -i gpx -f %s -x simplify,crosstrack,error=%-.5f%c -o gpx -F -", input_filename, paramdatas[0].d, units );
+}
+
 /************************************ Duplicate Location ***********************************/
 
 static void datasource_bfilter_dup_get_cmd_string ( VikLayerParamData *paramdatas, gchar **cmd, gchar **input_file_type, const gchar *input_filename, gpointer not_used );