Fix naming for the GisView/GisWorld -> GisViewer merge

diff --git a/.gitignore b/.gitignore
index 3c8d2e750766e0bd5e2ef68732a20ec7341dc8f8..17eadc0e1c3929cebf898924f92c561df35bc213 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.gz
 *~
 .*.swp
+.swp
 Makefile
 Makefile.in
 aclocal.m4

diff --git a/src/Makefile.am b/src/Makefile.am
index b609d2f7edeb5048a7dfd4a2dceda49decd74aa0..b10656547e2e2bb5707d0bcc19a740742191191c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,23 +10,23 @@ lib_LTLIBRARIES  = libgis.la
 gis_includedir = $(includedir)/gis
 gis_include_HEADERS = \
        gis.h         \
-       gis-world.h   \
-       gis-view.h    \
+       gis-viewer.h  \
        gis-prefs.h   \
        gis-opengl.h  \
        gis-plugin.h  \
+       gis-util.h    \
        gis-data.h    \
        gis-tile.h    \
        gis-wms.h     \
        gpqueue.h     \
        roam.h
 libgis_la_SOURCES = \
-       gis-world.c   gis-world.h   \
-       gis-view.c    gis-view.h    \
+       gis-viewer.c  gis-viewer.h  \
        gis-prefs.c   gis-prefs.h   \
        gis-opengl.c  gis-opengl.h  \
        gis-plugin.c  gis-plugin.h  \
        gis-marshal.c gis-marshal.h \
+       gis-util.c    gis-util.h    \
        gis-data.c    gis-data.h    \
        gis-tile.c    gis-tile.h    \
        gis-wms.c     gis-wms.h     \
@@ -47,7 +47,7 @@ bin_PROGRAMS = gis_test wms_test
 gis_test_SOURCES  = gis_test.c gis.h
 gis_test_LDADD    = $(AM_LDADD) libgis.la
 
-wms_test_SOURCES  = wms_test.c gis-world.c gis-world.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
+wms_test_SOURCES  = wms_test.c gis-util.c gis-util.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
 wms_test_LDADD    = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 0352fce0a75ba8713390b46a165052af0fd9a93a..f186f5faec9719e52290daaa397bc7d9a7fdaefc 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -28,6 +28,7 @@
 #include <GL/glu.h>
 
 #include "gis-opengl.h"
+#include "gis-util.h"
 #include "roam.h"
 
 #define FOV_DIST   2000.0
@@ -45,8 +46,8 @@ static void set_visuals(GisOpenGL *self)
 
        /* Camera 1 */
        double lat, lon, elev, rx, ry, rz;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
-       gis_view_get_rotation(self->view, &rx, &ry, &rz);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
+       gis_viewer_get_rotation(self->viewer, &rx, &ry, &rz);
        glRotatef(rx, 1, 0, 0);
        glRotatef(rz, 0, 0, 1);
 
@@ -195,20 +196,20 @@ static gboolean on_key_press(GisOpenGL *self, GdkEventKey *event, gpointer _)
                        event->keyval, event->state, GDK_plus);
 
        double lat, lon, elev, pan;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
        pan = MIN(elev/(EARTH_R/2), 30);
        guint kv = event->keyval;
        gdk_threads_leave();
-       if      (kv == GDK_Left  || kv == GDK_h) gis_view_pan(self->view,  0,  -pan, 0);
-       else if (kv == GDK_Down  || kv == GDK_j) gis_view_pan(self->view, -pan, 0,   0);
-       else if (kv == GDK_Up    || kv == GDK_k) gis_view_pan(self->view,  pan, 0,   0);
-       else if (kv == GDK_Right || kv == GDK_l) gis_view_pan(self->view,  0,   pan, 0);
-       else if (kv == GDK_minus || kv == GDK_o) gis_view_zoom(self->view, 10./9);
-       else if (kv == GDK_plus  || kv == GDK_i) gis_view_zoom(self->view, 9./10);
-       else if (kv == GDK_H) gis_view_rotate(self->view,  0, 0, -2);
-       else if (kv == GDK_J) gis_view_rotate(self->view,  2, 0,  0);
-       else if (kv == GDK_K) gis_view_rotate(self->view, -2, 0,  0);
-       else if (kv == GDK_L) gis_view_rotate(self->view,  0, 0,  2);
+       if      (kv == GDK_Left  || kv == GDK_h) gis_viewer_pan(self->viewer,  0,  -pan, 0);
+       else if (kv == GDK_Down  || kv == GDK_j) gis_viewer_pan(self->viewer, -pan, 0,   0);
+       else if (kv == GDK_Up    || kv == GDK_k) gis_viewer_pan(self->viewer,  pan, 0,   0);
+       else if (kv == GDK_Right || kv == GDK_l) gis_viewer_pan(self->viewer,  0,   pan, 0);
+       else if (kv == GDK_minus || kv == GDK_o) gis_viewer_zoom(self->viewer, 10./9);
+       else if (kv == GDK_plus  || kv == GDK_i) gis_viewer_zoom(self->viewer, 9./10);
+       else if (kv == GDK_H) gis_viewer_rotate(self->viewer,  0, 0, -2);
+       else if (kv == GDK_J) gis_viewer_rotate(self->viewer,  2, 0,  0);
+       else if (kv == GDK_K) gis_viewer_rotate(self->viewer, -2, 0,  0);
+       else if (kv == GDK_L) gis_viewer_rotate(self->viewer,  0, 0,  2);
 
        /* Testing */
        else if (kv == GDK_w) {self->wireframe = !self->wireframe; gtk_widget_queue_draw(GTK_WIDGET(self));}
@@ -231,7 +232,7 @@ static gboolean _update_errors_cb(gpointer sphere)
        roam_sphere_update_errors(sphere);
        return FALSE;
 }
-static void on_view_changed(GisView *view,
+static void on_view_changed(GisViewer *viewer,
                gdouble _1, gdouble _2, gdouble _3, GisOpenGL *self)
 {
        g_debug("GisOpenGL: on_view_changed");
@@ -263,18 +264,16 @@ static gboolean on_idle(GisOpenGL *self)
 /***********
  * Methods *
  ***********/
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins)
+GisOpenGL *gis_opengl_new(GisViewer *viewer, GisPlugins *plugins)
 {
        g_debug("GisOpenGL: new");
        GisOpenGL *self = g_object_new(GIS_TYPE_OPENGL, NULL);
-       self->world   = world;
-       self->view    = view;
+       self->viewer  = viewer;
        self->plugins = plugins;
-       g_object_ref(world);
-       g_object_ref(view);
+       g_object_ref(viewer);
 
-       g_signal_connect(self->view, "location-changed", G_CALLBACK(on_view_changed), self);
-       g_signal_connect(self->view, "rotation-changed", G_CALLBACK(on_view_changed), self);
+       g_signal_connect(self->viewer, "location-changed", G_CALLBACK(on_view_changed), self);
+       g_signal_connect(self->viewer, "rotation-changed", G_CALLBACK(on_view_changed), self);
 
        self->sphere = roam_sphere_new(self);
 
@@ -499,13 +498,9 @@ static void gis_opengl_dispose(GObject *_self)
                roam_sphere_free(self->sphere);
                self->sphere = NULL;
        }
-       if (self->world) {
-               g_object_unref(self->world);
-               self->world = NULL;
-       }
-       if (self->view) {
-               g_object_unref(self->view);
-               self->view = NULL;
+       if (self->viewer) {
+               g_object_unref(self->viewer);
+               self->viewer = NULL;
        }
        G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
 }

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 2e80d07cad55824e3ff27e09d7828e9136a5a9a8..a0f612596e0a8541458f7911cd3e09ee5ace0f2b 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -33,8 +33,7 @@
 typedef struct _GisOpenGL      GisOpenGL;
 typedef struct _GisOpenGLClass GisOpenGLClass;
 
-#include "gis-view.h"
-#include "gis-world.h"
+#include "gis-viewer.h"
 #include "gis-plugin.h"
 #include "gis-tile.h"
 #include "roam.h"
@@ -43,8 +42,7 @@ struct _GisOpenGL {
        GtkDrawingArea parent_instance;
 
        /* instance members */
-       GisWorld   *world;
-       GisView    *view;
+       GisViewer  *viewer;
        GisPlugins *plugins;
        RoamSphere *sphere;
        guint       sm_source[2];
@@ -62,7 +60,7 @@ struct _GisOpenGLClass {
 GType gis_opengl_get_type(void);
 
 /* Methods */
-GisOpenGL *gis_opengl_new(GisWorld *world, GisView *view, GisPlugins *plugins);
+GisOpenGL *gis_opengl_new(GisViewer *viewer, GisPlugins *plugins);
 
 void gis_opengl_center_position(GisOpenGL *opengl,
                gdouble lat, gdouble lon, gdouble elev);

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index c6382380d5646d2f58ce2c43662c0fc2a1fe313d..f87b09a6ba50d860558fecb126af919ca8e35118 100644 (file)
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -119,7 +119,7 @@ GList *gis_plugins_available(GisPlugins *self)
 }
 
 GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
-               GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs)
+               GisViewer *viewer, GisOpenGL *opengl, GisPrefs *prefs)
 {
        g_debug("GisPlugins: load %s", name);
        gchar *path = g_strdup_printf("%s/%s.%s", self->dir, name, G_MODULE_SUFFIX);
@@ -155,7 +155,7 @@ GisPlugin *gis_plugins_load(GisPlugins *self, const char *name,
 
        GisPluginStore *store = g_new0(GisPluginStore, 1);
        store->name = g_strdup(name);
-       store->plugin = constructor(world, view, opengl, prefs);
+       store->plugin = constructor(viewer, opengl, prefs);
        g_ptr_array_add(self->plugins, store);
        return store->plugin;
 }

diff --git a/src/gis-plugin.h b/src/gis-plugin.h
index 7fd75a7b134bbce4abc1fab8d4e3334c01efb2cb..c142cdb8bf1b0b4414f414c55754d04c13757257 100644 (file)
--- a/src/gis-plugin.h
+++ b/src/gis-plugin.h
@@ -46,8 +46,7 @@ void       gis_plugin_expose(GisPlugin *self);
 GtkWidget *gis_plugin_get_config(GisPlugin *self);
 
 /* Plugins API */
-#include "gis-world.h"
-#include "gis-view.h"
+#include "gis-viewer.h"
 #include "gis-opengl.h"
 #include "gis-prefs.h"
 
@@ -56,13 +55,13 @@ struct _GisPlugins {
        GPtrArray *plugins;
 };
 
-typedef GisPlugin *(*GisPluginConstructor)(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+typedef GisPlugin *(*GisPluginConstructor)(GisViewer *viewer, GisOpenGL *opengl, GisPrefs *prefs);
 
 GisPlugins *gis_plugins_new(gchar *dir);
 void        gis_plugins_free();
 GList      *gis_plugins_available(GisPlugins *plugins);
 GisPlugin  *gis_plugins_load(GisPlugins *plugins, const char *name,
-               GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+               GisViewer *viewer, GisOpenGL *opengl, GisPrefs *prefs);
 gboolean    gis_plugins_unload(GisPlugins *plugins, const char *name);
 void        gis_plugins_foreach(GisPlugins *plugins, GCallback callback, gpointer user_data);
 

diff --git a/src/gis-prims.c b/src/gis-prims.c
index 80d29cc71c7aefa1a3328249e0a9f9fb8de751c8..23376bb778cbf8bb1934ca79b500cb05d4986d37 100644 (file)
--- a/src/gis-prims.c
+++ b/src/gis-prims.c
@@ -18,8 +18,8 @@
 #include <glib.h>
 #include <GL/glu.h>
 
-#include "gis-world.h"
 #include "gis-prims.h"
+#include "gis-util.h"
 
 /* TODO
  *   - Manage normals for GisPoint

diff --git a/src/gis-tile.c b/src/gis-tile.c
index 07baa09d6b4ab12e3f8b1a4d0bf070291a691810..e265e05342b12c1bb2d8d07d60a4ccf30e4edfb3 100644 (file)
--- a/src/gis-tile.c
+++ b/src/gis-tile.c
@@ -18,8 +18,8 @@
 #include <config.h>
 #include <glib.h>
 
-#include "gis-world.h"
 #include "gis-tile.h"
+#include "gis-util.h"
 
 gchar *gis_tile_path_table[2][2] = {
        {"00.", "01."},

diff --git a/src/gis-util.c b/src/gis-util.c
index c2af66dd9da6cdba1fac20cec7efc96df916c49a..3bd5246002e134843c7c8c2a13726dbc8e05c653 100644 (file)
--- a/src/gis-util.c
+++ b/src/gis-util.c
@@ -20,7 +20,6 @@
 
 #include "gis-util.h"
 
-
 /******************
  * Global helpers *
  ******************/

diff --git a/src/gis-viewer.c b/src/gis-viewer.c
index 5041d591ffd03911d5b8d4576fc43b53b8505be1..078d98a335744cacae8f65275ef60e404be53876 100644 (file)
--- a/src/gis-viewer.c
+++ b/src/gis-viewer.c
@@ -18,7 +18,10 @@
 #include <glib.h>
 
 #include "gis-marshal.h"
-#include "gis-view.h"
+#include "gis-viewer.h"
+
+#include "gis-util.h"
+
 
 /* Constants */
 enum {
@@ -38,8 +41,9 @@ enum {
 };
 static guint signals[NUM_SIGNALS];
 
+
 /* Misc helpers */
-static void _gis_view_fix_location(GisView *self)
+static void _gis_viewer_fix_location(GisViewer *self)
 {
        while (self->location[0] <  -90) self->location[0] += 180;
        while (self->location[0] >   90) self->location[0] -= 180;
@@ -49,180 +53,180 @@ static void _gis_view_fix_location(GisView *self)
 }
 
 /* Signal helpers */
-static void _gis_view_emit_location_changed(GisView *self)
+static void _gis_viewer_emit_location_changed(GisViewer *self)
 {
        g_signal_emit(self, signals[SIG_LOCATION_CHANGED], 0,
                        self->location[0],
                        self->location[1],
                        self->location[2]);
 }
-static void _gis_view_emit_rotation_changed(GisView *self)
+static void _gis_viewer_emit_rotation_changed(GisViewer *self)
 {
        g_signal_emit(self, signals[SIG_ROTATION_CHANGED], 0,
                        self->rotation[0],
                        self->rotation[1],
                        self->rotation[2]);
 }
-static void _gis_view_emit_time_changed(GisView *self)
+static void _gis_viewer_emit_time_changed(GisViewer *self)
 {
        g_signal_emit(self, signals[SIG_TIME_CHANGED], 0,
                        self->time);
 }
-static void _gis_view_emit_site_changed(GisView *self)
+static void _gis_viewer_emit_site_changed(GisViewer *self)
 {
        g_signal_emit(self, signals[SIG_SITE_CHANGED], 0,
                        self->site);
 }
-static void _gis_world_emit_refresh(GisWorld *world)
+static void _gis_viewer_emit_refresh(GisViewer *self)
 {
-       g_signal_emit(world, signals[SIG_REFRESH], 0);
+       g_signal_emit(self, signals[SIG_REFRESH], 0);
 }
-static void _gis_world_emit_offline(GisWorld *world)
+static void _gis_viewer_emit_offline(GisViewer *self)
 {
-       g_signal_emit(world, signals[SIG_OFFLINE], 0,
-                       world->offline);
+       g_signal_emit(self, signals[SIG_OFFLINE], 0,
+                       self->offline);
 }
 
 
 /***********
  * Methods *
  ***********/
-GisView *gis_view_new()
+GisViewer *gis_viewer_new()
 {
-       g_debug("GisView: new");
-       return g_object_new(GIS_TYPE_VIEW, NULL);
+       g_debug("GisViewer: new");
+       return g_object_new(GIS_TYPE_VIEWER, NULL);
 }
 
-void gis_view_set_time(GisView *self, const char *time)
+void gis_viewer_set_time(GisViewer *self, const char *time)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: set_time - time=%s", time);
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: set_time - time=%s", time);
        g_free(self->time);
        self->time = g_strdup(time);
-       _gis_view_emit_time_changed(self);
+       _gis_viewer_emit_time_changed(self);
 }
 
-gchar *gis_view_get_time(GisView *self)
+gchar *gis_viewer_get_time(GisViewer *self)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: get_time");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: get_time");
        return self->time;
 }
 
-void gis_view_set_location(GisView *self, gdouble lat, gdouble lon, gdouble elev)
+void gis_viewer_set_location(GisViewer *self, gdouble lat, gdouble lon, gdouble elev)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: set_location");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: set_location");
        self->location[0] = lat;
        self->location[1] = lon;
        self->location[2] = elev;
-       _gis_view_fix_location(self);
-       _gis_view_emit_location_changed(self);
+       _gis_viewer_fix_location(self);
+       _gis_viewer_emit_location_changed(self);
 }
 
-void gis_view_get_location(GisView *self, gdouble *lat, gdouble *lon, gdouble *elev)
+void gis_viewer_get_location(GisViewer *self, gdouble *lat, gdouble *lon, gdouble *elev)
 {
-       g_assert(GIS_IS_VIEW(self));
-       //g_debug("GisView: get_location");
+       g_assert(GIS_IS_VIEWER(self));
+       //g_debug("GisViewer: get_location");
        *lat  = self->location[0];
        *lon  = self->location[1];
        *elev = self->location[2];
 }
 
-void gis_view_pan(GisView *self, gdouble lat, gdouble lon, gdouble elev)
+void gis_viewer_pan(GisViewer *self, gdouble lat, gdouble lon, gdouble elev)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: pan - lat=%8.3f, lon=%8.3f, elev=%8.3f", lat, lon, elev);
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: pan - lat=%8.3f, lon=%8.3f, elev=%8.3f", lat, lon, elev);
        self->location[0] += lat;
        self->location[1] += lon;
        self->location[2] += elev;
-       _gis_view_fix_location(self);
-       _gis_view_emit_location_changed(self);
+       _gis_viewer_fix_location(self);
+       _gis_viewer_emit_location_changed(self);
 }
 
-void gis_view_zoom(GisView *self, gdouble scale)
+void gis_viewer_zoom(GisViewer *self, gdouble scale)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: zoom");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: zoom");
        self->location[2] *= scale;
-       _gis_view_emit_location_changed(self);
+       _gis_viewer_emit_location_changed(self);
 }
 
-void gis_view_set_rotation(GisView *self, gdouble x, gdouble y, gdouble z)
+void gis_viewer_set_rotation(GisViewer *self, gdouble x, gdouble y, gdouble z)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: set_rotation");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: set_rotation");
        self->rotation[0] = x;
        self->rotation[1] = y;
        self->rotation[2] = z;
-       _gis_view_emit_rotation_changed(self);
+       _gis_viewer_emit_rotation_changed(self);
 }
 
-void gis_view_get_rotation(GisView *self, gdouble *x, gdouble *y, gdouble *z)
+void gis_viewer_get_rotation(GisViewer *self, gdouble *x, gdouble *y, gdouble *z)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: get_rotation");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: get_rotation");
        *x = self->rotation[0];
        *y = self->rotation[1];
        *z = self->rotation[2];
 }
 
-void gis_view_rotate(GisView *self, gdouble x, gdouble y, gdouble z)
+void gis_viewer_rotate(GisViewer *self, gdouble x, gdouble y, gdouble z)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: rotate - x=%.0f, y=%.0f, z=%.0f", x, y, z);
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: rotate - x=%.0f, y=%.0f, z=%.0f", x, y, z);
        self->rotation[0] += x;
        self->rotation[1] += y;
        self->rotation[2] += z;
-       _gis_view_emit_rotation_changed(self);
+       _gis_viewer_emit_rotation_changed(self);
 }
 
 /* To be deprecated, use {get,set}_location */
-void gis_view_set_site(GisView *self, const gchar *site)
+void gis_viewer_set_site(GisViewer *self, const gchar *site)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: set_site");
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: set_site");
        g_free(self->site);
        self->site = g_strdup(site);
-       _gis_view_emit_site_changed(self);
+       _gis_viewer_emit_site_changed(self);
 }
 
-gchar *gis_view_get_site(GisView *self)
+gchar *gis_viewer_get_site(GisViewer *self)
 {
-       g_assert(GIS_IS_VIEW(self));
-       g_debug("GisView: get_site - %s", self->site);
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: get_site - %s", self->site);
        return self->site;
 }
 
-void gis_world_refresh(GisWorld *world)
+void gis_viewer_refresh(GisViewer *self)
 {
-       g_debug("GisWorld: refresh");
-       _gis_world_emit_refresh(world);
+       g_debug("GisViewer: refresh");
+       _gis_viewer_emit_refresh(self);
 }
 
-void gis_world_set_offline(GisWorld *world, gboolean offline)
+void gis_viewer_set_offline(GisViewer *self, gboolean offline)
 {
-       g_assert(GIS_IS_WORLD(world));
-       g_debug("GisWorld: set_offline - %d", offline);
-       world->offline = offline;
-       _gis_world_emit_offline(world);
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: set_offline - %d", offline);
+       self->offline = offline;
+       _gis_viewer_emit_offline(self);
 }
 
-gboolean gis_world_get_offline(GisWorld *world)
+gboolean gis_viewer_get_offline(GisViewer *self)
 {
-       g_assert(GIS_IS_WORLD(world));
-       g_debug("GisWorld: get_offline - %d", world->offline);
-       return world->offline;
+       g_assert(GIS_IS_VIEWER(self));
+       g_debug("GisViewer: get_offline - %d", self->offline);
+       return self->offline;
 }
 
 
 /****************
  * GObject code *
  ****************/
-G_DEFINE_TYPE(GisView, gis_view, G_TYPE_OBJECT);
-static void gis_view_init(GisView *self)
+G_DEFINE_TYPE(GisViewer, gis_viewer, G_TYPE_OBJECT);
+static void gis_viewer_init(GisViewer *self)
 {
-       g_debug("GisView: init");
+       g_debug("GisViewer: init");
        /* Default values */
        self->time = g_strdup("");
        self->site = g_strdup("");
@@ -233,52 +237,52 @@ static void gis_view_init(GisView *self)
        self->rotation[1] = 0;
        self->rotation[2] = 0;
 }
-static void gis_view_dispose(GObject *gobject)
+static void gis_viewer_dispose(GObject *gobject)
 {
-       g_debug("GisView: dispose");
+       g_debug("GisViewer: dispose");
        /* Drop references to other GObjects */
-       G_OBJECT_CLASS(gis_view_parent_class)->dispose(gobject);
+       G_OBJECT_CLASS(gis_viewer_parent_class)->dispose(gobject);
 }
-static void gis_view_finalize(GObject *gobject)
+static void gis_viewer_finalize(GObject *gobject)
 {
-       g_debug("GisView: finalize");
-       GisView *self = GIS_VIEW(gobject);
+       g_debug("GisViewer: finalize");
+       GisViewer *self = GIS_VIEWER(gobject);
        g_free(self->time);
        g_free(self->site);
-       G_OBJECT_CLASS(gis_view_parent_class)->finalize(gobject);
+       G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject);
 }
-static void gis_view_set_property(GObject *object, guint property_id,
+static void gis_viewer_set_property(GObject *object, guint property_id,
                const GValue *value, GParamSpec *pspec)
 {
-       g_debug("GisView: set_property");
-       GisView *self = GIS_VIEW(object);
+       g_debug("GisViewer: set_property");
+       GisViewer *self = GIS_VIEWER(object);
        switch (property_id) {
-       case PROP_TIME:     gis_view_set_time(self, g_value_get_string (value));  break;
-       case PROP_SITE:     gis_view_set_site(self, g_value_get_string (value));  break;
-       case PROP_OFFLINE:  gis_view_set_site(self, g_value_get_boolean(value)); break;
-       default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+       case PROP_TIME:    gis_viewer_set_time   (self, g_value_get_string (value)); break;
+       case PROP_SITE:    gis_viewer_set_site   (self, g_value_get_string (value)); break;
+       case PROP_OFFLINE: gis_viewer_set_offline(self, g_value_get_boolean(value)); break;
+       default:           G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
        }
 }
-static void gis_view_get_property(GObject *object, guint property_id,
+static void gis_viewer_get_property(GObject *object, guint property_id,
                GValue *value, GParamSpec *pspec)
 {
-       g_debug("GisView: get_property");
-       GisView *self = GIS_VIEW(object);
+       g_debug("GisViewer: get_property");
+       GisViewer *self = GIS_VIEWER(object);
        switch (property_id) {
-       case PROP_TIME:     g_value_set_string (value, gis_view_get_time(self)); break;
-       case PROP_SITE:     g_value_set_string (value, gis_view_get_site(self)); break;
-       case PROP_OFFLINE:  g_value_set_boolean(value, gis_view_get_site(self)); break;
-       default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+       case PROP_TIME:    g_value_set_string (value, gis_viewer_get_time   (self)); break;
+       case PROP_SITE:    g_value_set_string (value, gis_viewer_get_site   (self)); break;
+       case PROP_OFFLINE: g_value_set_boolean(value, gis_viewer_get_offline(self)); break;
+       default:           G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
        }
 }
-static void gis_view_class_init(GisViewClass *klass)
+static void gis_viewer_class_init(GisViewerClass *klass)
 {
-       g_debug("GisView: class_init");
+       g_debug("GisViewer: class_init");
        GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-       gobject_class->dispose      = gis_view_dispose;
-       gobject_class->finalize     = gis_view_finalize;
-       gobject_class->get_property = gis_view_get_property;
-       gobject_class->set_property = gis_view_set_property;
+       gobject_class->dispose      = gis_viewer_dispose;
+       gobject_class->finalize     = gis_viewer_finalize;
+       gobject_class->get_property = gis_viewer_get_property;
+       gobject_class->set_property = gis_viewer_set_property;
        g_object_class_install_property(gobject_class, PROP_TIME,
                g_param_spec_pointer(
                        "time",
@@ -288,14 +292,16 @@ static void gis_view_class_init(GisViewClass *klass)
        g_object_class_install_property(gobject_class, PROP_SITE,
                g_param_spec_pointer(
                        "site",
-                       "site seen by the viewport",
-                       "Site of the viewport. Currently this is the name of the radar site.",
+                       "site seen by the viewerport",
+                       "Site of the viewerport. "
+                       "Currently this is the name of the radar site.",
                        G_PARAM_READWRITE));
        g_object_class_install_property(gobject_class, PROP_OFFLINE,
                g_param_spec_pointer(
                        "offline",
                        "whether the viewer should access the network",
-                       "Offline state of the viewer. If set to true, the viewer will not access the network",
+                       "Offline state of the viewer. "
+                       "If set to true, the viewer will not access the network",
                        G_PARAM_READWRITE));
        signals[SIG_TIME_CHANGED] = g_signal_new(
                        "time-changed",

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 6b0d6bdfb2b5f0d40a667c77060c478df022637f..b6eb0f7d04ca117e15fade3c961b9bb5fb93be90 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -15,23 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIS_VIEW_H__
-#define __GIS_VIEW_H__
+#ifndef __GIS_VIEWER_H__
+#define __GIS_VIEWER_H__
 
 #include <glib-object.h>
 
 /* Type macros */
-#define GIS_TYPE_VIEW            (gis_view_get_type())
-#define GIS_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_VIEW, GisView))
-#define GIS_IS_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_VIEW))
-#define GIS_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_VIEW, GisViewClass))
-#define GIS_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_VIEW))
-#define GIS_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_VIEW, GisViewClass))
+#define GIS_TYPE_VIEWER            (gis_viewer_get_type())
+#define GIS_VIEWER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_VIEWER, GisViewer))
+#define GIS_IS_VIEWER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_VIEWER))
+#define GIS_VIEWER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_VIEWER, GisViewerClass))
+#define GIS_IS_VIEWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_VIEWER))
+#define GIS_VIEWER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_VIEWER, GisViewerClass))
 
-typedef struct _GisView      GisView;
-typedef struct _GisViewClass GisViewClass;
+typedef struct _GisViewer      GisViewer;
+typedef struct _GisViewerClass GisViewerClass;
 
-struct _GisView {
+struct _GisViewer {
        GObject parent_instance;
 
        /* instance members */
@@ -42,36 +42,36 @@ struct _GisView {
        gboolean offline;
 };
 
-struct _GisViewClass {
+struct _GisViewerClass {
        GObjectClass parent_class;
 
        /* class members */
 };
 
-GType gis_view_get_type(void);
+GType gis_viewer_get_type(void);
 
 /* Methods */
-GisView *gis_view_new();
+GisViewer *gis_viewer_new();
 
-void gis_view_set_time(GisView *view, const gchar *time);
-gchar *gis_view_get_time(GisView *view);
+void gis_viewer_set_time(GisViewer *viewer, const gchar *time);
+gchar *gis_viewer_get_time(GisViewer *viewer);
 
-void gis_view_set_location(GisView *view, gdouble  lat, gdouble  lon, gdouble  elev);
-void gis_view_get_location(GisView *view, gdouble *lat, gdouble *lon, gdouble *elev);
-void gis_view_pan         (GisView *view, gdouble  lat, gdouble  lon, gdouble  elev);
-void gis_view_zoom        (GisView *view, gdouble  scale);
+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);
+void gis_viewer_pan         (GisViewer *viewer, gdouble  lat, gdouble  lon, gdouble  elev);
+void gis_viewer_zoom        (GisViewer *viewer, gdouble  scale);
 
-void gis_view_set_rotation(GisView *view, gdouble  x, gdouble  y, gdouble  z);
-void gis_view_get_rotation(GisView *view, gdouble *x, gdouble *y, gdouble *z);
-void gis_view_rotate      (GisView *view, gdouble  x, gdouble  y, gdouble  z);
+void gis_viewer_set_rotation(GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
+void gis_viewer_get_rotation(GisViewer *viewer, gdouble *x, gdouble *y, gdouble *z);
+void gis_viewer_rotate      (GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
 
 /* To be deprecated, use {get,set}_location */
-void gis_view_set_site(GisView *view, const gchar *site);
-gchar *gis_view_get_site(GisView *view);
+void gis_viewer_set_site(GisViewer *viewer, const gchar *site);
+gchar *gis_viewer_get_site(GisViewer *viewer);
 
-void gis_world_refresh(GisWorld *world);
+void gis_viewer_refresh(GisViewer *viewer);
 
-void gis_world_set_offline(GisWorld *world, gboolean offline);
-gboolean gis_world_get_offline(GisWorld *world);
+void gis_viewer_set_offline(GisViewer *viewer, gboolean offline);
+gboolean gis_viewer_get_offline(GisViewer *viewer);
 
 #endif

diff --git a/src/gis.h b/src/gis.h
index 6ff9789231eb7e8bfc291617e5749a03266f34dd..a8261ab7e35b01a328d21acc7c8372950a9901a3 100644 (file)
--- a/src/gis.h
+++ b/src/gis.h
@@ -19,12 +19,12 @@
 #define __GIS_H__
 
 /* GIS Core */
-#include "gis-world.h"
-#include "gis-view.h"
+#include "gis-viewer.h"
 #include "gis-opengl.h"
 #include "gis-prefs.h"
 
 /* GIS helprs */
+#include "gis-util.h"
 #include "gis-data.h"
 #include "gis-tile.h"
 #include "gis-wms.h"

diff --git a/src/gis_test.c b/src/gis_test.c
index ead9d99f6e5a51d07f04ea9629570c83224ed584..124ed5389e28f22922a37d763a35c92dafce456d 100644 (file)
--- a/src/gis_test.c
+++ b/src/gis_test.c
@@ -47,9 +47,8 @@ int main(int argc, char **argv)
 
        GisPrefs   *prefs   = gis_prefs_new(NULL, NULL);
        GisPlugins *plugins = gis_plugins_new(NULL);
-       GisWorld   *world   = gis_world_new();
-       GisView    *view    = gis_view_new();
-       GisOpenGL  *opengl  = gis_opengl_new(world, view, plugins);
+       GisViewer  *viewer  = gis_viewer_new();
+       GisOpenGL  *opengl  = gis_opengl_new(viewer, plugins);
 
        gdk_threads_enter();
        GtkWidget  *window  = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -59,18 +58,17 @@ int main(int argc, char **argv)
        gtk_widget_show_all(window);
        gdk_threads_leave();
 
-       gis_plugins_load(plugins, "bmng", world, view, opengl, prefs);
-       //gis_plugins_load(plugins, "srtm", world, view, opengl, prefs);
-       gis_plugins_load(plugins, "test", world, view, opengl, prefs);
+       gis_plugins_load(plugins, "bmng", viewer, opengl, prefs);
+       //gis_plugins_load(plugins, "srtm", viewer, opengl, prefs);
+       gis_plugins_load(plugins, "test", viewer, opengl, prefs);
 
-       gis_view_set_site(view, "KLSX");
+       gis_viewer_set_site(viewer, "KLSX");
 
        gdk_threads_enter();
        gtk_main();
 
        g_object_unref(prefs);
-       g_object_unref(world);
-       g_object_unref(view);
+       g_object_unref(viewer);
        g_object_unref(opengl);
        gis_plugins_free(plugins);
        gdk_threads_leave();

diff --git a/src/plugins/bmng.c b/src/plugins/bmng.c
index 370fa2072b43b44d37e0ac64648c7374558ea82f..57b81a64d6f44309ff32d4abcbfac377d68fb940 100644 (file)
--- a/src/plugins/bmng.c
+++ b/src/plugins/bmng.c
@@ -103,7 +103,7 @@ static gpointer _update_tiles(gpointer _self)
        GisPluginBmng *self = _self;
        g_mutex_lock(self->mutex);
        gdouble lat, lon, elev;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
        gis_tile_update(self->tiles,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
                        lat, lon, elev,
@@ -117,8 +117,8 @@ static gpointer _update_tiles(gpointer _self)
 /*************
  * Callbacks *
  *************/
-static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdouble elev,
-               GisPluginBmng *self)
+static void _on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev, GisPluginBmng *self)
 {
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
@@ -126,11 +126,11 @@ static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdoubl
 /***********
  * Methods *
  ***********/
-GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginBmng *gis_plugin_bmng_new(GisViewer *viewer, GisOpenGL *opengl)
 {
        g_debug("GisPluginBmng: new");
        GisPluginBmng *self = g_object_new(GIS_TYPE_PLUGIN_BMNG, NULL);
-       self->view   = view;
+       self->viewer = viewer;
        self->opengl = opengl;
 
        /* Load initial tiles */
@@ -138,7 +138,7 @@ GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *op
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
-       self->sigid = g_signal_connect(self->view, "location-changed",
+       self->sigid = g_signal_connect(self->viewer, "location-changed",
                        G_CALLBACK(_on_location_changed), self);
 
        return self;
@@ -183,7 +183,7 @@ static void gis_plugin_bmng_dispose(GObject *gobject)
        g_debug("GisPluginBmng: dispose");
        GisPluginBmng *self = GIS_PLUGIN_BMNG(gobject);
        /* Drop references */
-       g_signal_handler_disconnect(self->view, self->sigid);
+       g_signal_handler_disconnect(self->viewer, self->sigid);
        G_OBJECT_CLASS(gis_plugin_bmng_parent_class)->dispose(gobject);
 }
 static void gis_plugin_bmng_finalize(GObject *gobject)

diff --git a/src/plugins/bmng.h b/src/plugins/bmng.h
index f8eadca680fcc020961647a2488ce81a716e1251..083f6e68263b20d39994d7ae68818a7762fb770f 100644 (file)
--- a/src/plugins/bmng.h
+++ b/src/plugins/bmng.h
@@ -34,7 +34,7 @@ struct _GisPluginBmng {
        GObject parent_instance;
 
        /* instance members */
-       GisView   *view;
+       GisViewer *viewer;
        GisOpenGL *opengl;
        GisTile   *tiles;
        GisWms    *wms;
@@ -49,6 +49,6 @@ struct _GisPluginBmngClass {
 GType gis_plugin_bmng_get_type();
 
 /* Methods */
-GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
+GisPluginBmng *gis_plugin_bmng_new(GisViewer *viewer, GisOpenGL *opengl);
 
 #endif

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index e4460fe9d2e2e3338f6dd8f4ca7386670ce6e430..61c17e7a87c29995f898b3311be9bc33b5c7e217 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -214,7 +214,7 @@ static gpointer _update_tiles(gpointer _self)
        GisPluginSrtm *self = _self;
        g_mutex_lock(self->mutex);
        gdouble lat, lon, elev;
-       gis_view_get_location(self->view, &lat, &lon, &elev);
+       gis_viewer_get_location(self->viewer, &lat, &lon, &elev);
        gis_tile_update(self->tiles,
                        MAX_RESOLUTION, TILE_WIDTH, TILE_WIDTH,
                        lat, lon, elev,
@@ -228,8 +228,8 @@ static gpointer _update_tiles(gpointer _self)
 /*************
  * Callbacks *
  *************/
-static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdouble elev,
-               GisPluginSrtm *self)
+static void _on_location_changed(GisViewer *viewer,
+               gdouble lat, gdouble lon, gdouble elev, GisPluginSrtm *self)
 {
        g_thread_create(_update_tiles, self, FALSE, NULL);
 }
@@ -237,11 +237,11 @@ static void _on_location_changed(GisView *view, gdouble lat, gdouble lon, gdoubl
 /***********
  * Methods *
  ***********/
-GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginSrtm *gis_plugin_srtm_new(GisViewer *viewer, GisOpenGL *opengl)
 {
        g_debug("GisPluginSrtm: new");
        GisPluginSrtm *self = g_object_new(GIS_TYPE_PLUGIN_SRTM, NULL);
-       self->view   = view;
+       self->viewer = viewer;
        self->opengl = opengl;
 
        /* Load initial tiles */
@@ -249,7 +249,7 @@ GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *op
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
-       self->sigid = g_signal_connect(self->view, "location-changed",
+       self->sigid = g_signal_connect(self->viewer, "location-changed",
                        G_CALLBACK(_on_location_changed), self);
 
        return self;
@@ -295,7 +295,7 @@ static void gis_plugin_srtm_dispose(GObject *gobject)
        g_debug("GisPluginSrtm: dispose");
        GisPluginSrtm *self = GIS_PLUGIN_SRTM(gobject);
        /* Drop references */
-       g_signal_handler_disconnect(self->view, self->sigid);
+       g_signal_handler_disconnect(self->viewer, self->sigid);
        if (LOAD_BIL)
                gis_opengl_clear_height_func(self->opengl);
        G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);

diff --git a/src/plugins/srtm.h b/src/plugins/srtm.h
index 890fd2e6e7ecbb8dc26b49f7eb19b3cf2f00ad55..37825cef4ab5da185c64599b413bd913a4c18589 100644 (file)
--- a/src/plugins/srtm.h
+++ b/src/plugins/srtm.h
@@ -34,7 +34,7 @@ struct _GisPluginSrtm {
        GObject parent_instance;
 
        /* instance members */
-       GisView   *view;
+       GisViewer *viewer;
        GisOpenGL *opengl;
        GisTile   *tiles;
        GisWms    *wms;
@@ -49,6 +49,6 @@ struct _GisPluginSrtmClass {
 GType gis_plugin_srtm_get_type();
 
 /* Methods */
-GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
+GisPluginSrtm *gis_plugin_srtm_new(GisViewer *viewer, GisOpenGL *opengl);
 
 #endif

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 4d1af53baca97efb10fcea47dcc099c76fafaaa7..81b1f6073a61bfd407a425b75eebd2c1e5a6caa4 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -26,11 +26,11 @@
 /***********
  * Methods *
  ***********/
-GisPluginTest *gis_plugin_test_new(GisWorld *world, GisView *view, GisOpenGL *opengl)
+GisPluginTest *gis_plugin_test_new(GisViewer *viewer, GisOpenGL *opengl)
 {
        g_debug("GisPluginTest: new");
        GisPluginTest *self = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
-       self->view   = view;
+       self->viewer = viewer;
        self->opengl = opengl;
        return self;
 }
@@ -111,7 +111,7 @@ static void gis_plugin_test_init(GisPluginTest *self)
 {
        g_debug("GisPluginTest: init");
        /* Set defaults */
-       self->view   = NULL;
+       self->viewer = NULL;
        self->opengl = NULL;
 }
 static void gis_plugin_test_dispose(GObject *gobject)

diff --git a/src/plugins/test.h b/src/plugins/test.h
index 939e95c334d4dfae3aa149f73a796b92278381c4..3a3797b71c896602b78c337536fec6e5f658e7fe 100644 (file)
--- a/src/plugins/test.h
+++ b/src/plugins/test.h
@@ -34,7 +34,7 @@ struct _GisPluginTest {
        GObject parent_instance;
 
        /* instance members */
-       GisView   *view;
+       GisViewer *viewer;
        GisOpenGL *opengl;
 };
 
@@ -45,6 +45,6 @@ struct _GisPluginTestClass {
 GType gis_plugin_test_get_type();
 
 /* Methods */
-GisPluginTest *gis_plugin_test_new(GisWorld *world, GisView *view, GisOpenGL *opengl);
+GisPluginTest *gis_plugin_test_new(GisViewer *viewer, GisOpenGL *opengl);
 
 #endif

diff --git a/src/roam.c b/src/roam.c
index 3fe2e4c241a35c8b97c41d469fc134f04c587eec..4bc294c08097c644ab0fa771e9e25c0b60c13218 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -22,11 +22,9 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include "gis-world.h"
-
+#include "gis-util.h"
 #include "roam.h"
 
-
 /**
  * TODO:
  *   - Optimize for memory consumption

diff --git a/src/wms_test.c b/src/wms_test.c
index 625d83feace3419f18b4e71bd1c4f82e03e7e6ae..dd27cc7c9428378ce4b68a0a3737e856c0cebf7e 100644 (file)
--- a/src/wms_test.c
+++ b/src/wms_test.c
@@ -1,9 +1,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gis-world.h"
 #include "gis-tile.h"
 #include "gis-wms.h"
+#include "gis-util.h"
 
 struct CacheState {
        GtkWidget *image;