Decide the 'feature' type is more useful than seeing the country code.

[andy/viking.git] / src / datasource_osm.c

diff --git a/src/datasource_osm.c b/src/datasource_osm.c
index c7f91fe58334d289390bcb1145fec26f9fffe94e..22cb88e5ee329ae71ba287e4c5c56be7e503d250 100644 (file)
--- a/src/datasource_osm.c
+++ b/src/datasource_osm.c
@@ -45,21 +45,22 @@ static gdouble last_page_number = 0;
 
 static gpointer datasource_osm_init( );
 static void datasource_osm_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );
-static void datasource_osm_get_cmd_string ( datasource_osm_widgets_t *widgets, gchar **cmd, gchar **input_file_type ); 
+static void datasource_osm_get_cmd_string ( datasource_osm_widgets_t *widgets, gchar **cmd, gchar **input_file_type, DownloadMapOptions *options );
 static void datasource_osm_cleanup ( gpointer data );
 
 VikDataSourceInterface vik_datasource_osm_interface = {
   N_("OSM traces"),
   N_("OSM traces"),
-  VIK_DATASOURCE_URL,
   VIK_DATASOURCE_ADDTOLAYER,
   VIK_DATASOURCE_INPUTTYPE_NONE,
   TRUE,
   TRUE,
+  TRUE,
   (VikDataSourceInitFunc)              datasource_osm_init,
   (VikDataSourceCheckExistenceFunc)    NULL,
   (VikDataSourceAddSetupWidgetsFunc)   datasource_osm_add_setup_widgets,
   (VikDataSourceGetCmdStringFunc)      datasource_osm_get_cmd_string,
+  (VikDataSourceProcessFunc)            a_babel_convert_from_url,
   (VikDataSourceProgressFunc)          NULL,
   (VikDataSourceAddProgressWidgetsFunc)        NULL,
   (VikDataSourceCleanupFunc)           datasource_osm_cleanup,
@@ -86,7 +87,7 @@ static void datasource_osm_add_setup_widgets ( GtkWidget *dialog, VikViewport *v
   widgets->vvp = vvp;
 }
 
-static void datasource_osm_get_cmd_string ( datasource_osm_widgets_t *widgets, gchar **cmd, gchar **input_file_type )
+static void datasource_osm_get_cmd_string ( datasource_osm_widgets_t *widgets, gchar **cmd, gchar **input_file_type, DownloadMapOptions *options )
 {
   int page = 0;
   gdouble min_lat, max_lat, min_lon, max_lon;
@@ -109,7 +110,8 @@ static void datasource_osm_get_cmd_string ( datasource_osm_widgets_t *widgets, g
   page = last_page_number;
 
   *cmd = g_strdup_printf( DOWNLOAD_URL_FMT, sminlon, sminlat, smaxlon, smaxlat, page );
-  *input_file_type = g_strdup("gpx");
+  *input_file_type = NULL;
+  options = NULL;
 }
 
 static void datasource_osm_cleanup ( gpointer data )