X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1406f28d8811c6ff93337f1fb52f261cd0a11cb9..5f95559592dfdbf92b2fc0d39906329facf1729e:/src/viktrwlayer.h

diff --git a/src/viktrwlayer.h b/src/viktrwlayer.h
index 11ea6de5..cbed60c4 100644
--- a/src/viktrwlayer.h
+++ b/src/viktrwlayer.h
@@ -27,6 +27,7 @@
 #include "vikviewport.h"
 #include "vikwaypoint.h"
 #include "viktrack.h"
+#include "viklayerspanel.h"
 
 #define VIK_TRW_LAYER_TYPE            (vik_trw_layer_get_type ())
 #define VIK_TRW_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_TRW_LAYER_TYPE, VikTrwLayer))
@@ -34,6 +35,13 @@
 #define IS_VIK_TRW_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_TRW_LAYER_TYPE))
 #define IS_VIK_TRW_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_TRW_LAYER_TYPE))
 
+enum {
+  VIK_TRW_LAYER_SUBLAYER_TRACKS,
+  VIK_TRW_LAYER_SUBLAYER_WAYPOINTS,
+  VIK_TRW_LAYER_SUBLAYER_TRACK,
+  VIK_TRW_LAYER_SUBLAYER_WAYPOINT
+};
+
 typedef struct _VikTrwLayerClass VikTrwLayerClass;
 struct _VikTrwLayerClass
 {
@@ -54,10 +62,13 @@ gint vik_trw_layer_get_property_tracks_line_thickness ( VikTrwLayer *vtl );
 
 void vik_trw_layer_add_waypoint ( VikTrwLayer *vtl, gchar *name, VikWaypoint *wp );
 void vik_trw_layer_add_track ( VikTrwLayer *vtl, gchar *name, VikTrack *t );
-VikWaypoint *vik_trw_layer_get_waypoint ( VikTrwLayer *vtl, gchar *name );
+
+// Waypoint returned is the first one
+VikWaypoint *vik_trw_layer_get_waypoint ( VikTrwLayer *vtl, const gchar *name );
+
+// Track returned is the first one
 VikTrack *vik_trw_layer_get_track ( VikTrwLayer *vtl, const gchar *name );
-gboolean vik_trw_layer_delete_waypoint ( VikTrwLayer *vtl, const gchar *wp_name );
-gboolean vik_trw_layer_delete_track ( VikTrwLayer *vtl, const gchar *trk_name );
+gboolean vik_trw_layer_delete_track ( VikTrwLayer *vtl, VikTrack *trk );
 
 gboolean vik_trw_layer_auto_set_view ( VikTrwLayer *vtl, VikViewport *vvp );
 gboolean vik_trw_layer_find_center ( VikTrwLayer *vtl, VikCoord *dest );
@@ -67,12 +78,16 @@ gboolean vik_trw_layer_new_waypoint ( VikTrwLayer *vtl, GtkWindow *w, const VikC
 
 VikCoordMode vik_trw_layer_get_coord_mode ( VikTrwLayer *vtl );
 
+gboolean vik_trw_layer_uniquify ( VikTrwLayer *vtl, VikLayersPanel *vlp );
+
 void vik_trw_layer_delete_all_waypoints ( VikTrwLayer *vtl );
 void vik_trw_layer_delete_all_tracks ( VikTrwLayer *vtl );
-void trw_layer_cancel_tps_of_track ( VikTrwLayer *vtl, const gchar *trk_name );
+void trw_layer_cancel_tps_of_track ( VikTrwLayer *vtl, VikTrack *trk );
 
 /* Exposed Layer Interface function definitions */
 // Intended only for use by other trw_layer subwindows
 void trw_layer_verify_thumbnails ( VikTrwLayer *vtl, GtkWidget *vp );
+// Other functions only for use by other trw_layer subwindows
+gchar *trw_layer_new_unique_sublayer_name ( VikTrwLayer *vtl, gint sublayer_type, const gchar *name );
 
 #endif