use default values VIK_DEFAULT_DOP, VIK_DEFAULT_ALTITUDE

diff --git a/src/geonamessearch.c b/src/geonamessearch.c
index ae58bef82a5bcb2a7296b8f351cfd0893cd653d5..47ea1a8e6e36b3fada579e91245e78b988c6e6a5 100644 (file)
--- a/src/geonamessearch.c
+++ b/src/geonamessearch.c
@@ -628,7 +628,6 @@ void a_geonames_wikipedia_box(VikWindow *vw, VikTrwLayer *vtl, VikLayersPanel *v
   while (wp_runner) {
     wiki_geoname = (found_geoname *)wp_runner->data;
     wiki_wp = vik_waypoint_new();
   while (wp_runner) {
     wiki_geoname = (found_geoname *)wp_runner->data;
     wiki_wp = vik_waypoint_new();

-    wiki_wp->altitude = VIK_DEFAULT_ALTITUDE;

     wiki_wp->visible = TRUE;
     vik_coord_load_from_latlon(&(wiki_wp->coord), vik_trw_layer_get_coord_mode ( vtl ), &(wiki_geoname->ll));
     vik_waypoint_set_comment(wiki_wp, wiki_geoname->desc);
     wiki_wp->visible = TRUE;
     vik_coord_load_from_latlon(&(wiki_wp->coord), vik_trw_layer_get_coord_mode ( vtl ), &(wiki_geoname->ll));
     vik_waypoint_set_comment(wiki_wp, wiki_geoname->desc);

diff --git a/src/gpx.c b/src/gpx.c
index 86d35b0f8496cee4abf3604ca767a3548b2edb35..fd5e024f160de433c2e7984209267f46499863ed 100644 (file)
--- a/src/gpx.c
+++ b/src/gpx.c
@@ -193,7 +193,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr)
      case tt_wpt:
        if ( set_c_ll( attr ) ) {
          c_wp = vik_waypoint_new ();
      case tt_wpt:
        if ( set_c_ll( attr ) ) {
          c_wp = vik_waypoint_new ();

-         c_wp->altitude = VIK_DEFAULT_ALTITUDE;

          if ( ! get_attr ( attr, "hidden" ) )
            c_wp->visible = TRUE;
 
          if ( ! get_attr ( attr, "hidden" ) )
            c_wp->visible = TRUE;
 


@@ -214,10 +213,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr)
      case tt_trk_trkseg_trkpt:
        if ( set_c_ll( attr ) ) {
          c_tp = vik_trackpoint_new ();
      case tt_trk_trkseg_trkpt:
        if ( set_c_ll( attr ) ) {
          c_tp = vik_trackpoint_new ();

-         c_tp->altitude = VIK_DEFAULT_ALTITUDE;
-         c_tp->hdop = VIK_DEFAULT_DOP;
-         c_tp->vdop = VIK_DEFAULT_DOP;
-         c_tp->pdop = VIK_DEFAULT_DOP;

          vik_coord_load_from_latlon ( &(c_tp->coord), vik_trw_layer_get_coord_mode ( vtl ), &c_ll );
          if ( f_tr_newseg ) {
            c_tp->newsegment = TRUE;
          vik_coord_load_from_latlon ( &(c_tp->coord), vik_trw_layer_get_coord_mode ( vtl ), &c_ll );
          if ( f_tr_newseg ) {
            c_tp->newsegment = TRUE;


@@ -240,7 +235,6 @@ static void gpx_start(VikTrwLayer *vtl, const char *el, const char **attr)
 
      case tt_waypoint:
        c_wp = vik_waypoint_new ();
 
      case tt_waypoint:
        c_wp = vik_waypoint_new ();

-       c_wp->altitude = VIK_DEFAULT_ALTITUDE;

        c_wp->visible = TRUE;
        break;
 
        c_wp->visible = TRUE;
        break;
 

diff --git a/src/viktrack.c b/src/viktrack.c
index 250e8d6c3fe16e69d8253c27decb6d3e8b0a625b..4d43815d135d33ae69dc3f99c489bc7d5143d13b 100644 (file)
--- a/src/viktrack.c
+++ b/src/viktrack.c
@@ -117,6 +117,10 @@ VikTrackpoint *vik_trackpoint_new()
   VikTrackpoint *tp = g_malloc0(sizeof(VikTrackpoint));
   tp->speed = NAN;
   tp->course = NAN;
   VikTrackpoint *tp = g_malloc0(sizeof(VikTrackpoint));
   tp->speed = NAN;
   tp->course = NAN;

+  tp->altitude = VIK_DEFAULT_ALTITUDE;
+  tp->hdop = VIK_DEFAULT_DOP;
+  tp->vdop = VIK_DEFAULT_DOP;
+  tp->pdop = VIK_DEFAULT_DOP;

   return tp;
 }
 
   return tp;
 }
 

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
index 1cd3878451b7e9de7165410725b19d4503f33dd3..a28c7cd7caba1405e36d69b4f75816e37c0d7394 100644 (file)
--- a/src/viktrwlayer.c
+++ b/src/viktrwlayer.c
@@ -1643,7 +1643,6 @@ gboolean vik_trw_layer_new_waypoint ( VikTrwLayer *vtl, GtkWindow *w, const VikC
   gchar *name = highest_wp_number_get(vtl);
   VikWaypoint *wp = vik_waypoint_new();
   wp->coord = *def_coord;
   gchar *name = highest_wp_number_get(vtl);
   VikWaypoint *wp = vik_waypoint_new();
   wp->coord = *def_coord;

-  wp->altitude = VIK_DEFAULT_ALTITUDE;

 
   if ( a_dialog_new_waypoint ( w, &name, wp, vik_trw_layer_get_waypoints ( vtl ), vtl->coord_mode ) )
   {
 
   if ( a_dialog_new_waypoint ( w, &name, wp, vik_trw_layer_get_waypoints ( vtl ), vtl->coord_mode ) )
   {


@@ -3429,7 +3428,6 @@ static gboolean tool_new_track_click ( VikTrwLayer *vtl, GdkEventButton *event,
   tp->newsegment = FALSE;
   tp->has_timestamp = FALSE;
   tp->timestamp = 0;
   tp->newsegment = FALSE;
   tp->has_timestamp = FALSE;
   tp->timestamp = 0;

-  tp->altitude = VIK_DEFAULT_ALTITUDE;

   vtl->current_track->trackpoints = g_list_append ( vtl->current_track->trackpoints, tp );
 
   vtl->ct_x1 = vtl->ct_x2;
   vtl->current_track->trackpoints = g_list_append ( vtl->current_track->trackpoints, tp );
 
   vtl->ct_x1 = vtl->ct_x2;

diff --git a/src/vikwaypoint.c b/src/vikwaypoint.c
index 87073e5a2c8710dc0104267a70473fbb604a4e60..fe7522ee78fa55313181ce02be96b12202b20446 100644 (file)
--- a/src/vikwaypoint.c
+++ b/src/vikwaypoint.c
@@ -29,6 +29,7 @@
 VikWaypoint *vik_waypoint_new()
 {
   VikWaypoint *wp = g_malloc ( sizeof ( VikWaypoint ) );
 VikWaypoint *vik_waypoint_new()
 {
   VikWaypoint *wp = g_malloc ( sizeof ( VikWaypoint ) );

+  wp->altitude = VIK_DEFAULT_ALTITUDE;

   wp->comment = NULL;
   wp->image = NULL;
   wp->symbol = NULL;
   wp->comment = NULL;
   wp->image = NULL;
   wp->symbol = NULL;