Make simple GPSBabel filter options use the updated acquire framework options.

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

diff --git a/src/vikwaypoint.c b/src/vikwaypoint.c
index 8175dd1b14e561af0daf777594ebef8a5694a6ad..21d63deb366679707ef5731fad110d52e2e5628a 100644 (file)
--- a/src/vikwaypoint.c
+++ b/src/vikwaypoint.c
@@ -26,6 +26,7 @@
 #include "vikwaypoint.h"
 #include "globals.h"
 #include "garminsymbols.h"
+#include "dems.h"
 #include <glib/gi18n.h>
 
 VikWaypoint *vik_waypoint_new()
@@ -42,10 +43,7 @@ void vik_waypoint_set_name(VikWaypoint *wp, const gchar *name)
   if ( wp->name )
     g_free ( wp->name );
 
-  if ( name && name[0] != '\0' )
-    wp->name = g_strdup(name);
-  else
-    wp->name = NULL;
+  wp->name = g_strdup(name);
 }
 
 void vik_waypoint_set_comment_no_copy(VikWaypoint *wp, gchar *comment)
@@ -77,6 +75,17 @@ void vik_waypoint_set_description(VikWaypoint *wp, const gchar *description)
     wp->description = NULL;
 }
 
+void vik_waypoint_set_url(VikWaypoint *wp, const gchar *url)
+{
+  if ( wp->url )
+    g_free ( wp->url );
+
+  if ( url && url[0] != '\0' )
+    wp->url = g_strdup(url);
+  else
+    wp->url = NULL;
+}
+
 void vik_waypoint_set_image(VikWaypoint *wp, const gchar *image)
 {
   if ( wp->image )
@@ -91,13 +100,18 @@ void vik_waypoint_set_image(VikWaypoint *wp, const gchar *image)
 
 void vik_waypoint_set_symbol(VikWaypoint *wp, const gchar *symname)
 {
+  const gchar *hashed_symname;
+
   if ( wp->symbol )
     g_free ( wp->symbol );
 
   // NB symbol_pixbuf is just a reference, so no need to free it
 
   if ( symname && symname[0] != '\0' ) {
-    wp->symbol = g_strdup(symname);
+    hashed_symname = a_get_hashed_sym ( symname );
+    if ( hashed_symname )
+      symname = hashed_symname;
+    wp->symbol = g_strdup ( symname );
     wp->symbol_pixbuf = a_get_wp_sym ( wp->symbol );
   }
   else {
@@ -112,6 +126,8 @@ void vik_waypoint_free(VikWaypoint *wp)
     g_free ( wp->comment );
   if ( wp->description )
     g_free ( wp->description );
+  if ( wp->url )
+    g_free ( wp->url );
   if ( wp->image )
     g_free ( wp->image );
   if ( wp->symbol )
@@ -125,14 +141,39 @@ VikWaypoint *vik_waypoint_copy(const VikWaypoint *wp)
   new_wp->coord = wp->coord;
   new_wp->visible = wp->visible;
   new_wp->altitude = wp->altitude;
+  new_wp->has_timestamp = wp->has_timestamp;
+  new_wp->timestamp = wp->timestamp;
   vik_waypoint_set_name(new_wp,wp->name);
   vik_waypoint_set_comment(new_wp,wp->comment);
   vik_waypoint_set_description(new_wp,wp->description);
+  vik_waypoint_set_url(new_wp,wp->url);
   vik_waypoint_set_image(new_wp,wp->image);
   vik_waypoint_set_symbol(new_wp,wp->symbol);
   return new_wp;
 }
 
+/**
+ * vik_waypoint_apply_dem_data:
+ * @wp:            The Waypoint to operate on
+ * @skip_existing: When TRUE, don't change the elevation if the waypoint already has a value
+ *
+ * Set elevation data for a waypoint using available DEM information
+ *
+ * Returns: TRUE if the waypoint was updated
+ */
+gboolean vik_waypoint_apply_dem_data ( VikWaypoint *wp, gboolean skip_existing )
+{
+  gboolean updated = FALSE;
+  if ( !(skip_existing && wp->altitude != VIK_DEFAULT_ALTITUDE) ) {
+    gint16 elev = a_dems_get_elev_by_coord ( &(wp->coord), VIK_DEM_INTERPOL_BEST );
+    if ( elev != VIK_DEM_INVALID_ELEVATION ) {
+      wp->altitude = (gdouble)elev;
+      updated = TRUE;
+    }
+  }
+  return updated;
+}
+
 /*
  * Take a Waypoint and convert it into a byte array
  */
@@ -155,6 +196,7 @@ void vik_waypoint_marshall ( VikWaypoint *wp, guint8 **data, guint *datalen)
   vwm_append(wp->name);
   vwm_append(wp->comment);
   vwm_append(wp->description);
+  vwm_append(wp->url);
   vwm_append(wp->image);
   vwm_append(wp->symbol);
 
@@ -189,6 +231,7 @@ VikWaypoint *vik_waypoint_unmarshall (guint8 *data, guint datalen)
   vwu_get(new_wp->name);
   vwu_get(new_wp->comment);
   vwu_get(new_wp->description);
+  vwu_get(new_wp->url);
   vwu_get(new_wp->image); 
   vwu_get(new_wp->symbol);