X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/eba605f5feacac442397a3b520c72b818cf2d497..98b7eddc9f9fa0b72f2344cbabb0f69ee177906e:/src/vikviewport.h

diff --git a/src/vikviewport.h b/src/vikviewport.h
index 878ec818..eca466fb 100644
--- a/src/vikviewport.h
+++ b/src/vikviewport.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 #include "vikcoord.h"
 
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
 #define IS_VIK_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_VIEWPORT_TYPE))
 #define IS_VIK_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_VIEWPORT_TYPE))
 
-#define VIK_VIEWPORT_MAX_ZOOM 8192.0
+#define VIK_VIEWPORT_MAX_ZOOM 32768.0
 #define VIK_VIEWPORT_MIN_ZOOM 0.125
 
 /* used for coord to screen etc, screen to coord */
@@ -97,10 +97,9 @@ void vik_viewport_get_min_max_lat_lon ( VikViewport *vp, gdouble *min_lat, gdoub
 typedef enum {
   VIK_VIEWPORT_DRAWMODE_UTM=0,
   VIK_VIEWPORT_DRAWMODE_EXPEDIA,
-  VIK_VIEWPORT_DRAWMODE_GOOGLE,
-  VIK_VIEWPORT_DRAWMODE_KH,
   VIK_VIEWPORT_DRAWMODE_MERCATOR,
-  VIK_VIEWPORT_NUM_DRAWMODES
+  VIK_VIEWPORT_DRAWMODE_LATLON,
+  VIK_VIEWPORT_NUM_DRAWMODES      /*< skip >*/
 } VikViewportDrawMode;
 
 VikCoordMode vik_viewport_get_coord_mode ( const VikViewport *vvp );
@@ -136,13 +135,23 @@ void vik_viewport_draw_pixbuf ( VikViewport *vvp, GdkPixbuf *pixbuf, gint src_x,
 gint vik_viewport_get_width ( VikViewport *vvp );
 gint vik_viewport_get_height ( VikViewport *vvp );
 
+void vik_viewport_reset_copyrights ( VikViewport *vp );
+void vik_viewport_add_copyright ( VikViewport *vp, const gchar *copyright );
+
+void vik_viewport_reset_logos ( VikViewport *vp );
+void vik_viewport_add_logo ( VikViewport *vp, const GdkPixbuf *logo );
+
 /* Viewport features */
 void vik_viewport_draw_scale ( VikViewport *vvp );
 void vik_viewport_set_draw_scale ( VikViewport *vvp, gboolean draw_scale );
 gboolean vik_viewport_get_draw_scale ( VikViewport *vvp );
+void vik_viewport_draw_copyright ( VikViewport *vvp );
 void vik_viewport_draw_centermark ( VikViewport *vvp );
 void vik_viewport_set_draw_centermark ( VikViewport *vvp, gboolean draw_centermark );
 gboolean vik_viewport_get_draw_centermark ( VikViewport *vvp );
+void vik_viewport_draw_logo ( VikViewport *vvp );
+void vik_viewport_set_draw_highlight ( VikViewport *vvp, gboolean draw_highlight );
+gboolean vik_viewport_get_draw_highlight ( VikViewport *vvp );
 
 /* Color/graphics context management */
 void vik_viewport_set_background_color ( VikViewport *vvp, const gchar *color );
@@ -154,6 +163,13 @@ GdkGC *vik_viewport_new_gc ( VikViewport *vvp, const gchar *colorname, gint thic
 GdkGC *vik_viewport_new_gc_from_color ( VikViewport *vvp, GdkColor *color, gint thickness );
 GdkFunction vik_gc_get_function ( GdkGC *gc );
 
+void vik_viewport_set_highlight_color ( VikViewport *vvp, const gchar *color );
+const gchar *vik_viewport_get_highlight_color ( VikViewport *vvp );
+GdkColor *vik_viewport_get_highlight_gdkcolor ( VikViewport *vvp );
+void vik_viewport_set_highlight_gdkcolor ( VikViewport *vvp, GdkColor * );
+GdkGC* vik_viewport_get_gc_highlight ( VikViewport *vvp );
+void vik_viewport_set_highlight_thickness ( VikViewport *vvp, gint thickness );
+
 /* Drawing primitives */
 void a_viewport_clip_line ( gint *x1, gint *y1, gint *x2, gint *y2 ); /* run this before drawing a line. vik_viewport_draw_line runs it for you */
 void vik_viewport_draw_line ( VikViewport *vvp, GdkGC *gc, gint x1, gint y1, gint x2, gint y2 );