Merge branch 'GeoRefImprove'

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

diff --git a/src/viktrwlayer_waypointlist.c b/src/viktrwlayer_waypointlist.c
index d99e00888a77bebb7681c0ed4dd74eaba31b8e03..dd8aa8db8a9c673f6104c9ab8572e01576bbdc27 100644 (file)
--- a/src/viktrwlayer_waypointlist.c
+++ b/src/viktrwlayer_waypointlist.c
@@ -29,6 +29,7 @@
 
 #include "viking.h"
 #include "viktrwlayer_waypointlist.h"
+#include "viktrwlayer_wpwin.h"
 
 // Long formatted date+basic time - listing this way ensures the string comparison sort works - so no local type format %x or %c here!
 #define WAYPOINT_LIST_DATE_FORMAT "%Y-%m-%d %H:%M"
@@ -191,7 +192,7 @@ static void trw_layer_waypoint_view ( menu_array_values values )
        VikWaypoint *wpt = VIK_WAYPOINT(values[MA_WPT]);
        VikViewport *vvp = VIK_VIEWPORT(values[MA_VVP]);
 
-       vik_viewport_set_center_coord ( vvp, &(wpt->coord) );
+       vik_viewport_set_center_coord ( vvp, &(wpt->coord), TRUE );
 
        trw_layer_waypoint_select (values);
 
@@ -356,7 +357,6 @@ static gboolean trw_layer_waypoint_button_pressed ( GtkWidget *tree_view,
  */
 static void trw_layer_waypoint_list_add ( vik_trw_waypoint_list_t *vtdl,
                                           GtkTreeStore *store,
-                                          vik_units_distance_t dist_units,
                                           vik_units_height_t height_units )
 {
        GtkTreeIter t_iter;
@@ -469,14 +469,13 @@ static void vik_trw_layer_waypoint_list_internal ( GtkWidget *dialog,
 
        //gtk_tree_selection_set_select_function ( gtk_tree_view_get_selection (GTK_TREE_VIEW(vt)), vik_treeview_selection_filter, vt, NULL );
 
-       vik_units_distance_t dist_units = a_vik_get_units_distance ();
        vik_units_height_t height_units = a_vik_get_units_height ();
 
        //GList *gl = get_waypoints_and_layers_cb ( vl, user_data );
        //g_list_foreach ( waypoints_and_layers, (GFunc) trw_layer_waypoint_list_add, store );
        GList *gl = waypoints_and_layers;
        while ( gl ) {
-               trw_layer_waypoint_list_add ( (vik_trw_waypoint_list_t*)gl->data, store, dist_units, height_units );
+               trw_layer_waypoint_list_add ( (vik_trw_waypoint_list_t*)gl->data, store, height_units );
                gl = g_list_next ( gl );
        }