Fix misc bugs and bump version to 0.3

diff --git a/Makefile.am b/Makefile.am
index 3f414104cc0318965ff77dc9b6c2675fbaee7b14..f8becbad00ec1cd870fd068d552efe5ce08e8acf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ release: all dist
        git push --all
        echo $(VERSION) > LATEST
        scp LATEST $(PACKAGE)-$(VERSION).tar.* \
        git push --all
        echo $(VERSION) > LATEST
        scp LATEST $(PACKAGE)-$(VERSION).tar.* \

-               "lug@lug.rose-hulman.edu:/home/lug/htdocs/proj/$(PACKAGE)"; \
+               "spenceal@lug.rose-hulman.edu:/home/lug/htdocs/proj/$(PACKAGE)"; \

        rm -f LATEST
 
 depscan:
        rm -f LATEST
 
 depscan:

diff --git a/configure.ac b/configure.ac
index d3b93601b0c35fa2ecd31a112f860c1019e58d36..e9d4b08108824cedd97077971a1a57d1ae454cc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Init and options
 # Init and options

-AC_INIT([libgis], [0.3-p1], [spenceal@rose-hulman.edu])
+AC_INIT([libgis], [0.3], [spenceal@rose-hulman.edu])

 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 57a416d5914c03dee6595619a28fcfed2f38a11b..742a4956f89d083aec85173e95df259898c5dc5d 100644 (file)
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS=$(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 AM_CPPFLAGS=$(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 

-GTKDOC_LIBS        = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/src/libgis.la
+GTKDOC_LIBS        = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/src/libgis.la $(top_srcdir)/src/plugins/*.la

 DOC_MODULE         = libgis
 DOC_SOURCE_DIR     = $(top_srcdir)/src/
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 DOC_MODULE         = libgis
 DOC_SOURCE_DIR     = $(top_srcdir)/src/
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml


@@ -10,4 +10,4 @@ include $(top_srcdir)/gtk-doc.make
 CLEANFILES += libgis-sections.txt
 
 MAINTAINERCLEANFILES=\
 CLEANFILES += libgis-sections.txt
 
 MAINTAINERCLEANFILES=\

-       tmpl/* Makefile.in libgis-docs.sgml libgis-overrides.txt libgis.types libgis-scan.*
+       tmpl/* Makefile.in libgis-overrides.txt libgis.types libgis-scan.*

diff --git a/docs/api/libgis-docs.sgml b/docs/api/libgis-docs.sgml
new file mode 100644 (file)
index 0000000..16957c0
--- /dev/null
+++ b/docs/api/libgis-docs.sgml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
+       <bookinfo>
+               <title>libgis Reference Manual</title>
+       </bookinfo>
+
+       <chapter>
+               <title>Core API</title>
+               <xi:include href="xml/gis-world.xml"/>
+               <xi:include href="xml/gis-view.xml"/>
+               <xi:include href="xml/gis-opengl.xml"/>
+               <xi:include href="xml/gis-prefs.xml"/>
+       </chapter>
+
+       <chapter>
+               <title>Support</title>
+               <xi:include href="xml/gis-wms.xml"/>
+               <xi:include href="xml/gis-tile.xml"/>
+               <xi:include href="xml/gis-data.xml"/>
+               <xi:include href="xml/gpqueue.xml"/>
+               <xi:include href="xml/roam.xml"/>
+       </chapter>
+
+       <chapter>
+               <title>Plugins</title>
+               <xi:include href="xml/gis-plugin.xml"/>
+               <xi:include href="xml/bmng.xml"/>
+               <xi:include href="xml/srtm.xml"/>
+       </chapter>
+
+       <index>
+               <title>Index</title>
+       </index>
+
+</book>

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e3da6d153b43e6a36447e40cfb36366495f0c20..70ebf3c8c05e5630e291d4fd4e238e5b6b8181bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = plugins
+SUBDIRS = . plugins

 
 AM_CFLAGS   = -Wall --std=gnu99 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 
 AM_CFLAGS   = -Wall --std=gnu99 
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 86fba80ccee92a729767db5f3eacc147e81b3eb9..1b219904a0f1b0ea33295d6c5db776be8a1f1b47 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -370,6 +370,25 @@ void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile,
        g_list_free(triangles);
 }
 
        g_list_free(triangles);
 }
 

+static void _gis_opengl_clear_height_func_rec(RoamTriangle *root)
+{
+       if (!root)
+               return;
+       RoamPoint *points[] = {root->p.l, root->p.m, root->p.r, root->split};
+       for (int i = 0; i < G_N_ELEMENTS(points); i++) {
+               points[i]->height_func = NULL;
+               points[i]->height_data = NULL;
+               roam_point_update_height(points[i]);
+       }
+       _gis_opengl_clear_height_func_rec(root->kids[0]);
+       _gis_opengl_clear_height_func_rec(root->kids[1]);
+}
+void gis_opengl_clear_height_func(GisOpenGL *self)
+{
+       for (int i = 0; i < G_N_ELEMENTS(self->sphere->roots); i++)
+               _gis_opengl_clear_height_func_rec(self->sphere->roots[i]);
+}
+

 void gis_opengl_redraw(GisOpenGL *self)
 {
        g_debug("GisOpenGL: redraw");
 void gis_opengl_redraw(GisOpenGL *self)
 {
        g_debug("GisOpenGL: redraw");

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index 37099a7d93b873d28c295fd0ad2b024076818b1d..256d0d077600e2f7da097aefb3f819dccab43db6 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -74,6 +74,8 @@ void gis_opengl_render_tiles(GisOpenGL *opengl, GisTile *root);
 void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile,
                RoamHeightFunc height_func, gpointer user_data, gboolean update);
 
 void gis_opengl_set_height_func(GisOpenGL *self, GisTile *tile,
                RoamHeightFunc height_func, gpointer user_data, gboolean update);
 

+void gis_opengl_clear_height_func(GisOpenGL *self);
+

 void gis_opengl_redraw(GisOpenGL *opengl);
 
 void gis_opengl_begin(GisOpenGL *opengl);
 void gis_opengl_redraw(GisOpenGL *opengl);
 
 void gis_opengl_begin(GisOpenGL *opengl);

diff --git a/src/gis-plugin.c b/src/gis-plugin.c
index b0619f9b3e2fe16db971bccf26d95af54448055f..eb162b7c861df7a6ff6eebff77d1914bdba1712f 100644 (file)
--- a/src/gis-plugin.c
+++ b/src/gis-plugin.c
@@ -56,7 +56,8 @@ void gis_plugin_expose(GisPlugin *self)
 GtkWidget *gis_plugin_get_config(GisPlugin *self)
 {
        g_return_val_if_fail(GIS_IS_PLUGIN(self), NULL);
 GtkWidget *gis_plugin_get_config(GisPlugin *self)
 {
        g_return_val_if_fail(GIS_IS_PLUGIN(self), NULL);

-       return GIS_PLUGIN_GET_INTERFACE(self)->get_config(self);
+       GisPluginInterface *iface = GIS_PLUGIN_GET_INTERFACE(self);
+       return iface->get_config ? iface->get_config (self) : NULL;

 }
 
 
 }
 
 

diff --git a/src/gis-prefs.c b/src/gis-prefs.c
index 02d456dc0e17879278b025ee2204e4153108ec91..d7d7d6d7e96a4dbe11e5aea7f1f83ab370292e8d 100644 (file)
--- a/src/gis-prefs.c
+++ b/src/gis-prefs.c
@@ -15,18 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

+#include <config.h>
+

 #include <glib.h>
 #include "gis-marshal.h"
 #include "gis-prefs.h"
 
 #include <glib.h>
 #include "gis-marshal.h"
 #include "gis-prefs.h"
 

-

 enum {
        SIG_PREF_CHANGED,
        NUM_SIGNALS,
 };
 static guint signals[NUM_SIGNALS];
 
 enum {
        SIG_PREF_CHANGED,
        NUM_SIGNALS,
 };
 static guint signals[NUM_SIGNALS];
 

-

 /***********
  * Methods *
  ***********/
 /***********
  * Methods *
  ***********/


@@ -38,7 +38,7 @@ GisPrefs *gis_prefs_new(const gchar *config, const gchar *defaults)
                self->key_path = g_strdup(config);
        else
                self->key_path = g_build_filename(g_get_user_config_dir(),
                self->key_path = g_strdup(config);
        else
                self->key_path = g_build_filename(g_get_user_config_dir(),

-                               "gis", "config.ini", NULL);
+                               PACKAGE, "config.ini", NULL);

        GError *error = NULL;
        g_key_file_load_from_file(self->key_file, self->key_path,
                        G_KEY_FILE_KEEP_COMMENTS, &error);
        GError *error = NULL;
        g_key_file_load_from_file(self->key_file, self->key_path,
                        G_KEY_FILE_KEEP_COMMENTS, &error);


@@ -57,7 +57,6 @@ GisPrefs *gis_prefs_new(const gchar *config, const gchar *defaults)
                g_free(tmp);
        }
        if (error) {
                g_free(tmp);
        }
        if (error) {

-               g_clear_error(&error);

                g_warning("GisPrefs: new - Unable to load key file `%s': %s",
                        self->key_path, error->message);
        }
                g_warning("GisPrefs: new - Unable to load key file `%s': %s",
                        self->key_path, error->message);
        }

diff --git a/src/gis-tile.c b/src/gis-tile.c
index 7a0f0b832851c8e8d91535ad4844be651dfe4d6d..07baa09d6b4ab12e3f8b1a4d0bf070291a691810 100644 (file)
--- a/src/gis-tile.c
+++ b/src/gis-tile.c
@@ -22,8 +22,8 @@
 #include "gis-tile.h"
 
 gchar *gis_tile_path_table[2][2] = {
 #include "gis-tile.h"
 
 gchar *gis_tile_path_table[2][2] = {

-       {".00", ".01"},
-       {".10", ".11"},
+       {"00.", "01."},
+       {"10.", "11."},

 };
 
 GisTile *gis_tile_new(GisTile *parent,
 };
 
 GisTile *gis_tile_new(GisTile *parent,

diff --git a/src/gis-wms.c b/src/gis-wms.c
index 0c15e874d00a71e110cfe1090a2c66c8e04ce166..bd4704ddc4322f1b842db670318c7f4465980f9f 100644 (file)
--- a/src/gis-wms.c
+++ b/src/gis-wms.c
@@ -86,11 +86,9 @@ char *gis_wms_make_local(GisWms *self, GisTile *tile)
 {
        /* Get file path */
        gchar *tile_path = gis_tile_get_path(tile);
 {
        /* Get file path */
        gchar *tile_path = gis_tile_get_path(tile);

-       gchar *path = g_strdup_printf("%s/wms/%s%s%s",
-               g_get_user_cache_dir(),
-               self->cache_prefix,
-               tile_path,
-               self->cache_ext);
+       gchar *path = g_strdup_printf("%s/%s/%s%s%s",
+               g_get_user_cache_dir(), PACKAGE,
+               self->cache_prefix, tile_path, self->cache_ext);

        g_free(tile_path);
 
        /* Return if it already exists */
        g_free(tile_path);
 
        /* Return if it already exists */

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 6e49cb82c60e95a19106a0d5aff0629e824143bd..3ebba58d03ffb65696d1d619b96eae60b308d1b1 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,21 +1,17 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 MAINTAINERCLEANFILES = Makefile.in
 

-AM_CFLAGS       = -Wall --std=gnu99  -I../
-AM_CPPFLAGS     = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDFLAGS      = -module -avoid-version
-LIBS            = $(top_srcdir)/src/libgis.la
+AM_CFLAGS   = -Wall --std=gnu99  -I../
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDFLAGS  = -module -avoid-version
+LIBS        = $(top_srcdir)/src/libgis.la

 
 

-pluginsdir  = $(pkglibdir)
+pluginsdir  = "$(libdir)/gis"

 
 plugins_LTLIBRARIES = bmng.la srtm.la
 bmng_la_SOURCES     = bmng.c bmng.h
 
 plugins_LTLIBRARIES = bmng.la srtm.la
 bmng_la_SOURCES     = bmng.c bmng.h

+bmng_la_LIBADD      = $(top_srcdir)/src/libgis.la

 srtm_la_SOURCES     = srtm.c srtm.h
 srtm_la_SOURCES     = srtm.c srtm.h

+srtm_la_LIBADD      = $(top_srcdir)/src/libgis.la

 
 test:
        ( cd ../; make test )
 
 test:
        ( cd ../; make test )

-
-# Fixme...
-bmng_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
-srtm_la_DEPENDENCIES = $(top_srcdir)/src/libgis.la
-$(top_srcdir)/src/libgis.la: $(wildcard ../*.[ch])
-       ( cd ../; make libgis.la )

diff --git a/src/plugins/bmng.c b/src/plugins/bmng.c
index 8b027493e7036da1dc982898353d4a6515c6f698..7aff2a7cf9d083037c1f658735fa25d7b040424c 100644 (file)
--- a/src/plugins/bmng.c
+++ b/src/plugins/bmng.c
@@ -136,7 +136,8 @@ GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *op
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */

-       g_signal_connect(self->view, "location-changed", G_CALLBACK(_on_location_changed), self);
+       self->sigid = g_signal_connect(self->view, "location-changed",
+                       G_CALLBACK(_on_location_changed), self);

 
        return self;
 }
 
        return self;
 }


@@ -144,7 +145,8 @@ GisPluginBmng *gis_plugin_bmng_new(GisWorld *world, GisView *view, GisOpenGL *op
 static void gis_plugin_bmng_expose(GisPlugin *_self)
 {
        GisPluginBmng *self = GIS_PLUGIN_BMNG(_self);
 static void gis_plugin_bmng_expose(GisPlugin *_self)
 {
        GisPluginBmng *self = GIS_PLUGIN_BMNG(_self);

-       g_debug("GisPluginBmng: expose");
+       g_debug("GisPluginBmng: expose opengl=%p tiles=%p,%p",
+                       self->opengl, self->tiles, self->tiles->data);

        gis_opengl_render_tiles(self->opengl, self->tiles);
 }
 
        gis_opengl_render_tiles(self->opengl, self->tiles);
 }
 


@@ -172,13 +174,14 @@ static void gis_plugin_bmng_init(GisPluginBmng *self)
        self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        self->wms   = gis_wms_new(
                "http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",
        self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        self->wms   = gis_wms_new(
                "http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",

-               "bmng", ".jpg", TILE_WIDTH, TILE_HEIGHT);
+               "bmng/", "jpg", TILE_WIDTH, TILE_HEIGHT);

 }
 static void gis_plugin_bmng_dispose(GObject *gobject)
 {
        g_debug("GisPluginBmng: dispose");
        GisPluginBmng *self = GIS_PLUGIN_BMNG(gobject);
        /* Drop references */
 }
 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_OBJECT_CLASS(gis_plugin_bmng_parent_class)->dispose(gobject);
 }
 static void gis_plugin_bmng_finalize(GObject *gobject)
        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 5ebed781c3022f573ccc05d85a87ebe9f4601dca..f8eadca680fcc020961647a2488ce81a716e1251 100644 (file)
--- a/src/plugins/bmng.h
+++ b/src/plugins/bmng.h
@@ -39,6 +39,7 @@ struct _GisPluginBmng {
        GisTile   *tiles;
        GisWms    *wms;
        GMutex    *mutex;
        GisTile   *tiles;
        GisWms    *wms;
        GMutex    *mutex;

+       gulong     sigid;

 };
 
 struct _GisPluginBmngClass {
 };
 
 struct _GisPluginBmngClass {

diff --git a/src/plugins/srtm.c b/src/plugins/srtm.c
index 67dd7e09d87a656a58105792ac4a6e786f3ec373..e4460fe9d2e2e3338f6dd8f4ca7386670ce6e430 100644 (file)
--- a/src/plugins/srtm.c
+++ b/src/plugins/srtm.c
@@ -162,8 +162,7 @@ static gboolean _load_tile_cb(gpointer _load)
        /* Do necessasairy processing */
        /* TODO: Lock this and move to thread, can remove self from _load then */
        if (LOAD_BIL)
        /* Do necessasairy processing */
        /* TODO: Lock this and move to thread, can remove self from _load then */
        if (LOAD_BIL)

-               gis_opengl_set_height_func(self->opengl, tile,
-                       _height_func, self, TRUE);
+               gis_opengl_set_height_func(self->opengl, tile, _height_func, self, TRUE);

 
        /* Cleanup unneeded things */
        if (!LOAD_BIL)
 
        /* Cleanup unneeded things */
        if (!LOAD_BIL)


@@ -250,7 +249,8 @@ GisPluginSrtm *gis_plugin_srtm_new(GisWorld *world, GisView *view, GisOpenGL *op
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */
        g_thread_create(_update_tiles, self, FALSE, NULL);
 
        /* Connect signals */

-       g_signal_connect(view, "location-changed", G_CALLBACK(_on_location_changed), self);
+       self->sigid = g_signal_connect(self->view, "location-changed",
+                       G_CALLBACK(_on_location_changed), self);

 
        return self;
 }
 
        return self;
 }


@@ -288,13 +288,16 @@ static void gis_plugin_srtm_init(GisPluginSrtm *self)
        self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        self->wms   = gis_wms_new(
                "http://www.nasa.network.com/elev", "srtm30", "application/bil",
        self->tiles = gis_tile_new(NULL, NORTH, SOUTH, EAST, WEST);
        self->wms   = gis_wms_new(
                "http://www.nasa.network.com/elev", "srtm30", "application/bil",

-               "srtm", ".bil", TILE_WIDTH, TILE_HEIGHT);
+               "srtm/", "bil", TILE_WIDTH, TILE_HEIGHT);

 }
 static void gis_plugin_srtm_dispose(GObject *gobject)
 {
        g_debug("GisPluginSrtm: dispose");
        GisPluginSrtm *self = GIS_PLUGIN_SRTM(gobject);
        /* Drop references */
 }
 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);
+       if (LOAD_BIL)
+               gis_opengl_clear_height_func(self->opengl);

        G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);
 }
 static void gis_plugin_srtm_finalize(GObject *gobject)
        G_OBJECT_CLASS(gis_plugin_srtm_parent_class)->dispose(gobject);
 }
 static void gis_plugin_srtm_finalize(GObject *gobject)

diff --git a/src/plugins/srtm.h b/src/plugins/srtm.h
index 32fc08acf263333aff5ba16a045f19de1c680cc9..890fd2e6e7ecbb8dc26b49f7eb19b3cf2f00ad55 100644 (file)
--- a/src/plugins/srtm.h
+++ b/src/plugins/srtm.h
@@ -39,6 +39,7 @@ struct _GisPluginSrtm {
        GisTile   *tiles;
        GisWms    *wms;
        GMutex    *mutex;
        GisTile   *tiles;
        GisWms    *wms;
        GMutex    *mutex;

+       gulong     sigid;

 };
 
 struct _GisPluginSrtmClass {
 };
 
 struct _GisPluginSrtmClass {

diff --git a/src/roam.c b/src/roam.c
index 9f2474f6105f0f74c10f65b961a6e08e1a4a4663..de09bceed5b7819bdb5dc58248890e0e8896a213 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -672,7 +672,8 @@ GList *roam_sphere_get_intersect(RoamSphere *self,
         * time = 30      * 2*333           * i_cost = 20000 * i_cost */
        GList *list = NULL;
        for (int i = 0; i < G_N_ELEMENTS(self->roots); i++)
         * time = 30      * 2*333           * i_cost = 20000 * i_cost */
        GList *list = NULL;
        for (int i = 0; i < G_N_ELEMENTS(self->roots); i++)

-               list = _roam_sphere_get_intersect_rec(self->roots[i], list, n, s, e, w);
+               list = _roam_sphere_get_intersect_rec(self->roots[i],
+                               list, n, s, e, w);

        return list;
 }
 void roam_sphere_free_tri(RoamTriangle *tri)
        return list;
 }
 void roam_sphere_free_tri(RoamTriangle *tri)

diff --git a/src/wms_test.c b/src/wms_test.c
index c45665996c6ccb3cff7c42599787e43b281cb483..625d83feace3419f18b4e71bd1c4f82e03e7e6ae 100644 (file)
--- a/src/wms_test.c
+++ b/src/wms_test.c
@@ -40,7 +40,7 @@ gpointer do_cache(gpointer _image)
        g_message("Fetching image");
        GisWms *bmng_wms = gis_wms_new(
                "http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",
        g_message("Fetching image");
        GisWms *bmng_wms = gis_wms_new(
                "http://www.nasa.network.com/wms", "bmng200406", "image/jpeg",

-               "bmng", ".jpg", 512, 256);
+               "bmng_test/", "jpg", 512, 256);

        const char *path = gis_wms_make_local(bmng_wms, tile);
 
        g_message("Loading image: [%s]", path);
        const char *path = gis_wms_make_local(bmng_wms, tile);
 
        g_message("Loading image: [%s]", path);