#endif
#include "vikwebtool_datasource.h"
-
+#include <ctype.h>
#include <string.h>
#include <glib.h>
#include "globals.h"
#include "acquire.h"
-#include "util.h"
+#include "maputils.h"
+#include "dialog.h"
static GObjectClass *parent_class;
+static GHashTable *last_user_strings = NULL;
static void webtool_datasource_finalize ( GObject *gob );
static gchar *webtool_datasource_get_url ( VikWebtool *self, VikWindow *vw );
+static gboolean webtool_needs_user_string ( VikWebtool *self );
+
typedef struct _VikWebtoolDatasourcePrivate VikWebtoolDatasourcePrivate;
struct _VikWebtoolDatasourcePrivate
gchar *url;
gchar *url_format_code;
gchar *file_type;
+ gchar *babel_filter_args;
+ gchar *input_label;
+ gchar *user_string;
};
#define WEBTOOL_DATASOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
PROP_URL,
PROP_URL_FORMAT_CODE,
PROP_FILE_TYPE,
+ PROP_BABEL_FILTER_ARGS,
+ PROP_INPUT_LABEL
};
static void webtool_datasource_set_property (GObject *object,
VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( self );
switch ( property_id ) {
- case PROP_URL:
+
+ case PROP_URL:
g_free ( priv->url );
priv->url = g_value_dup_string ( value );
g_debug ( "VikWebtoolDatasource.url: %s", priv->url );
g_debug ( "VikWebtoolDatasource.file_type: %s", priv->url_format_code );
break;
+ case PROP_BABEL_FILTER_ARGS:
+ g_free ( priv->babel_filter_args );
+ priv->babel_filter_args = g_value_dup_string ( value );
+ g_debug ( "VikWebtoolDatasource.babel_filter_args: %s", priv->babel_filter_args );
+ break;
+
+ case PROP_INPUT_LABEL:
+ g_free ( priv->input_label );
+ priv->input_label = g_value_dup_string ( value );
+ g_debug ( "VikWebtoolDatasource.input_label: %s", priv->input_label );
+ break;
+
default:
/* We don't have any other property... */
G_OBJECT_WARN_INVALID_PROPERTY_ID ( object, property_id, pspec );
break;
- }
+ }
}
static void webtool_datasource_get_property (GObject *object,
switch ( property_id ) {
- case PROP_URL: g_value_set_string ( value, priv->url ); break;
- case PROP_URL_FORMAT_CODE: g_value_set_string ( value, priv->url_format_code ); break;
- case PROP_FILE_TYPE: g_value_set_string ( value, priv->url ); break;
+ case PROP_URL: g_value_set_string ( value, priv->url ); break;
+ case PROP_URL_FORMAT_CODE: g_value_set_string ( value, priv->url_format_code ); break;
+ case PROP_FILE_TYPE: g_value_set_string ( value, priv->url ); break;
+ case PROP_BABEL_FILTER_ARGS: g_value_set_string ( value, priv->babel_filter_args ); break;
+ case PROP_INPUT_LABEL: g_value_set_string ( value, priv->input_label ); break;
default:
/* We don't have any other property... */
G_OBJECT_WARN_INVALID_PROPERTY_ID ( object, property_id, pspec );
break;
- }
+ }
}
typedef struct {
VikExtTool *self;
VikWindow *vw;
VikViewport *vvp;
+ GtkWidget *user_string;
} datasource_t;
+
+static void ensure_last_user_strings_hash() {
+ if ( last_user_strings == NULL ) {
+ last_user_strings = g_hash_table_new_full ( g_str_hash,
+ g_str_equal,
+ g_free,
+ g_free );
+ }
+}
+
+
+static gchar *get_last_user_string ( const datasource_t *source ) {
+ ensure_last_user_strings_hash();
+ gchar *label = vik_ext_tool_get_label ( source->self );
+ gchar *last_str = g_hash_table_lookup ( last_user_strings, label );
+ g_free( label );
+ return last_str;
+}
+
+
+static void set_last_user_string ( const datasource_t *source, const gchar *s ) {
+ ensure_last_user_strings_hash();
+ g_hash_table_insert ( last_user_strings,
+ vik_ext_tool_get_label ( source->self ),
+ g_strdup ( s ) );
+}
+
static gpointer datasource_init ( acq_vik_t *avt )
{
datasource_t *data = g_malloc(sizeof(*data));
data->self = avt->userdata;
data->vw = avt->vw;
data->vvp = avt->vvp;
+ data->user_string = NULL;
return data;
}
+static void datasource_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data )
+{
+ datasource_t *widgets = (datasource_t *)user_data;
+ VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( widgets->self );
+ GtkWidget *user_string_label;
+ gchar *label = g_strdup_printf( "%s:", priv->input_label );
+ user_string_label = gtk_label_new ( label );
+ widgets->user_string = gtk_entry_new ( );
+
+ gchar *last_str = get_last_user_string ( widgets );
+ if ( last_str )
+ gtk_entry_set_text( GTK_ENTRY( widgets->user_string ), last_str );
+
+ // 'ok' when press return in the entry
+ g_signal_connect_swapped (widgets->user_string, "activate", G_CALLBACK(a_dialog_response_accept), dialog);
+
+ /* Packing all widgets */
+ GtkBox *box = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
+ gtk_box_pack_start ( box, user_string_label, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( box, widgets->user_string, FALSE, FALSE, 5 );
+ gtk_widget_show_all ( dialog );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+ // NB presently the focus is overridden later on by the acquire.c code.
+ gtk_widget_grab_focus ( widgets->user_string );
+
+ g_free ( label );
+}
+
+
+
static void datasource_get_cmd_string ( gpointer user_data, gchar **cmd, gchar **extra, DownloadMapOptions *options )
{
datasource_t *data = (datasource_t*) user_data;
VikWebtool *vwd = VIK_WEBTOOL ( data->self );
+ VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( data->self );
+
+ if ( webtool_needs_user_string ( vwd ) ) {
+ priv->user_string = g_strdup ( gtk_entry_get_text ( GTK_ENTRY ( data->user_string ) ) );
+
+ if ( priv->user_string[0] != '\0' ) {
+ set_last_user_string ( data, priv->user_string );
+ }
+ }
+
gchar *url = vik_webtool_get_url ( vwd, data->vw );
g_debug ("%s: %s", __FUNCTION__, url );
- // if url starts with 'http://' then only the copy the part after it - as the download code always inserts it!
- if ( !strncmp(url, "http://", 7 ) )
- *cmd = g_strndup ( &url[7], strlen (url) );
- else
- *cmd = g_strdup ( url );
+ *cmd = g_strdup ( url );
// Only use first section of the file_type string
// One can't use values like 'kml -x transform,rte=wpt' in order to do fancy things
// since it won't be in the right order for the overall GPSBabel command
// So prevent any potentially dangerous behaviour
- VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( data->self );
gchar **parts = NULL;
if ( priv->file_type )
parts = g_strsplit ( priv->file_type, " ", 0);
static gboolean datasource_process ( VikTrwLayer *vtl, const gchar *cmd, const gchar *extra, BabelStatusFunc status_cb, acq_dialog_widgets_t *adw, DownloadMapOptions *options )
{
- //datasource_t *data = (datasource_t *)adw->user_data;
+ datasource_t *data = (datasource_t *)adw->user_data;
+ VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( data->self );
// Dependent on the ExtTool / what extra has been set to...
// When extra is NULL - then it interprets results as a GPX
- gboolean result = a_babel_convert_from_url ( vtl, cmd, extra, status_cb, adw, options);
+ gboolean result = a_babel_convert_from_url_filter ( vtl, cmd, extra, priv->babel_filter_args, status_cb, adw, options);
return result;
}
static void webtool_datasource_open ( VikExtTool *self, VikWindow *vw )
{
+ gboolean search = webtool_needs_user_string ( VIK_WEBTOOL ( self ) );
+
// Use VikDataSourceInterface to give thready goodness controls of downloading stuff (i.e. can cancel the request)
// Can now create a 'VikDataSourceInterface' on the fly...
TRUE,
(VikDataSourceInitFunc) datasource_init,
(VikDataSourceCheckExistenceFunc) NULL,
- (VikDataSourceAddSetupWidgetsFunc) NULL,
+ (VikDataSourceAddSetupWidgetsFunc) (search ? datasource_add_setup_widgets : NULL),
(VikDataSourceGetCmdStringFunc) datasource_get_cmd_string,
(VikDataSourceProcessFunc) datasource_process,
(VikDataSourceProgressFunc) NULL,
};
memcpy ( vik_datasource_interface, &data, sizeof(VikDataSourceInterface) );
- a_acquire ( vw, vik_window_layers_panel(vw), vik_window_viewport (vw), vik_datasource_interface, self, cleanup );
+ a_acquire ( vw, vik_window_layers_panel(vw), vik_window_viewport (vw), data.mode, vik_datasource_interface, self, cleanup );
}
static void vik_webtool_datasource_class_init ( VikWebtoolDatasourceClass *klass )
PROP_FILE_TYPE,
pspec);
+ pspec = g_param_spec_string ("babel_filter_args",
+ "The command line filter options to pass to gpsbabel",
+ "Set the command line filter options for gpsbabel",
+ NULL, // default value
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+ g_object_class_install_property (gobject_class,
+ PROP_BABEL_FILTER_ARGS,
+ pspec);
+
+ pspec = g_param_spec_string ("input_label",
+ "The label for the user input box if input is required.",
+ "Set the label to be shown next to the user input box if an input term is required",
+ _("Search Term"),
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+ g_object_class_install_property (gobject_class,
+ PROP_INPUT_LABEL,
+ pspec);
+
parent_class = g_type_class_peek_parent (klass);
base_class = VIK_WEBTOOL_CLASS ( klass );
VikWebtoolDatasource *vik_webtool_datasource_new_with_members ( const gchar *label,
const gchar *url,
const gchar *url_format_code,
- const gchar *file_type )
+ const gchar *file_type,
+ const gchar *babel_filter_args,
+ const gchar *input_label )
{
VikWebtoolDatasource *result = VIK_WEBTOOL_DATASOURCE ( g_object_new ( VIK_WEBTOOL_DATASOURCE_TYPE,
"label", label,
"url", url,
"url_format_code", url_format_code,
"file_type", file_type,
+ "babel_filter_args", babel_filter_args,
+ "input_label", input_label,
NULL ) );
return result;
priv->url = NULL;
priv->url_format_code = NULL;
priv->file_type = NULL;
+ priv->babel_filter_args = NULL;
+ priv->input_label = NULL;
+ priv->user_string = NULL;
}
static void webtool_datasource_finalize ( GObject *gob )
g_free ( priv->url ); priv->url = NULL;
g_free ( priv->url_format_code ); priv->url_format_code = NULL;
g_free ( priv->file_type ); priv->file_type = NULL;
+ g_free ( priv->babel_filter_args ); priv->babel_filter_args = NULL;
+ g_free ( priv->input_label ); priv->input_label = NULL;
+ g_free ( priv->user_string); priv->user_string = NULL;
G_OBJECT_CLASS(parent_class)->finalize(gob);
}
guint8 zoom = 17; // A zoomed in default
// zoom - ideally x & y factors need to be the same otherwise use the default
if ( vik_viewport_get_xmpp ( viewport ) == vik_viewport_get_ympp ( viewport ) )
- zoom = mpp_to_zoom ( vik_viewport_get_zoom ( viewport ) );
+ zoom = map_utils_mpp_to_zoom_level ( vik_viewport_get_zoom ( viewport ) );
gchar szoom[G_ASCII_DTOSTR_BUF_SIZE];
g_snprintf ( szoom, G_ASCII_DTOSTR_BUF_SIZE, "%d", zoom );
gchar* values[MAX_NUMBER_CODES];
int i;
for ( i = 0; i < MAX_NUMBER_CODES; i++ ) {
- values[i] = g_strdup ( "" );
+ values[i] = '\0';
}
for ( i = 0; i < len; i++ ) {
case 'A': values[i] = g_strdup ( scenterlat ); break;
case 'O': values[i] = g_strdup ( scenterlon ); break;
case 'Z': values[i] = g_strdup ( szoom ); break;
+ case 'S': values[i] = g_strdup ( priv->user_string ); break;
default: break;
}
}
gchar *url = g_strdup_printf ( priv->url, values[0], values[1], values[2], values[3], values[4], values[5], values[6] );
for ( i = 0; i < MAX_NUMBER_CODES; i++ ) {
- g_free ( values[i] );
+ if ( values[i] != '\0' )
+ g_free ( values[i] );
}
return url;
}
+
+// NB Only works for ascii strings
+char* strcasestr2(const char *dst, const char *src)
+{
+ if ( !dst || !src )
+ return NULL;
+
+ if(src[0] == '\0')
+ return (char*)dst;
+
+ int len = strlen(src) - 1;
+ char sc = tolower(src[0]);
+ for(char dc = *dst; (dc = *dst); dst++) {
+ dc = tolower(dc);
+ if(sc == dc && (len == 0 || !strncasecmp(dst+1, src+1, len)))
+ return (char*)dst;
+ }
+
+ return NULL;
+}
+
+/**
+ * Returns true if the URL format contains 'S' -- that is, a search term entry
+ * box needs to be displayed
+ */
+static gboolean webtool_needs_user_string ( VikWebtool *self )
+{
+ VikWebtoolDatasourcePrivate *priv = WEBTOOL_DATASOURCE_GET_PRIVATE ( self );
+ // For some reason (my) Windows build gets built with -D_GNU_SOURCE
+#if (_GNU_SOURCE && !WINDOWS)
+ return (strcasestr(priv->url_format_code, "S") != NULL);
+#else
+ return (strcasestr2(priv->url_format_code, "S") != NULL);
+#endif
+}
projects / andy / viking.git / blobdiff