Use GisBounds for height_func instead of GisTile

[grits] / src / gis-viewer.h

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index b85120b3d978b62a8a9fc90f2481c786d5780d14..848206866687ee661549531d8f9f41eb81fcca6a 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -81,7 +81,6 @@ typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 #include "gis-plugin.h"
 #include "gis-prefs.h"
 #include "objects/gis-object.h"
-#include "objects/gis-tile.h"
 
 struct _GisViewer {
        GtkDrawingArea parent_instance;
@@ -89,7 +88,7 @@ struct _GisViewer {
        /* instance members */
        GisPlugins *plugins;
        GisPrefs   *prefs;
-       gchar      *time;
+       time_t      time;
        gdouble     location[3];
        gdouble     rotation[3];
        gboolean    offline;
@@ -111,7 +110,7 @@ struct _GisViewerClass {
                                  gdouble *px, gdouble *py, gdouble *pz);
 
        void (*clear_height_func)(GisViewer *viewer);
-       void (*set_height_func)  (GisViewer *viewer, GisTile *tile,
+       void (*set_height_func)  (GisViewer *viewer, GisBounds *bounds,
                                  GisHeightFunc height_func, gpointer user_data,
                                  gboolean update);
 
@@ -125,8 +124,8 @@ GType gis_viewer_get_type(void);
 /* Methods */
 void gis_viewer_setup(GisViewer *viewer, GisPlugins *plugins, GisPrefs *prefs);
 
-void gis_viewer_set_time(GisViewer *viewer, const gchar *time);
-gchar *gis_viewer_get_time(GisViewer *viewer);
+void gis_viewer_set_time(GisViewer *viewer, time_t time);
+time_t gis_viewer_get_time(GisViewer *viewer);
 
 void gis_viewer_set_location(GisViewer *viewer, gdouble  lat, gdouble  lon, gdouble  elev);
 void gis_viewer_get_location(GisViewer *viewer, gdouble *lat, gdouble *lon, gdouble *elev);
@@ -151,7 +150,7 @@ void gis_viewer_project(GisViewer *viewer,
                gdouble *px, gdouble *py, gdouble *pz);
 
 void gis_viewer_clear_height_func(GisViewer *viewer);
-void gis_viewer_set_height_func(GisViewer *viewer, GisTile *tile,
+void gis_viewer_set_height_func(GisViewer *viewer, GisBounds *bounds,
                GisHeightFunc height_func, gpointer user_data,
                gboolean update);