X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/50a14534a51f892500ee82f867e8ab2f85b936ae..46e4fa54e7da3e4d0c0ba448a3ab9b16b5077664:/src/mapcache.c

diff --git a/src/mapcache.c b/src/mapcache.c
index 5ae0fc89..f697252d 100644
--- a/src/mapcache.c
+++ b/src/mapcache.c
@@ -42,7 +42,7 @@ static guint32 queue_size = 0;
 static GHashTable *cache = NULL;
 
 #define HASHKEY_FORMAT_STRING "%d-%d-%d-%d-%d-%d-%.3f-%.3f"
-#define HASHKEY_FORMAT_STRING_NOSHRINK "%d-%d-%d-%d-%d-%d-"
+#define HASHKEY_FORMAT_STRING_NOSHRINK_NOR_ALPHA "%d-%d-%d-%d-%d-"
 
 void a_mapcache_init ()
 {
@@ -101,7 +101,13 @@ void a_mapcache_add ( GdkPixbuf *pixbuf, gint x, gint y, gint z, guint8 type, gu
     queue_size -= 100;
     queue_count --;
     g_hash_table_remove ( cache, oldkey );
-    while ( queue_size > VIK_CONFIG_MAPCACHE_SIZE ) {
+
+    /* should delete BEFORE adding -- not really possible because don't know size,
+     * but you could guess size (only applic if add big file to full cache) */
+
+
+    while ( queue_size > VIK_CONFIG_MAPCACHE_SIZE &&
+        (queue_tail->next != queue_tail) ) { /* make sure there's more than one thing to delete */
       oldkey = list_shift ();
       oldbuf = g_hash_table_lookup ( cache, oldkey );
       queue_size -= gdk_pixbuf_get_rowstride(oldbuf) * gdk_pixbuf_get_height(oldbuf);
@@ -126,7 +132,7 @@ GdkPixbuf *a_mapcache_get ( gint x, gint y, gint z, guint8 type, guint zoom, gui
   return g_hash_table_lookup ( cache, key );
 }
 
-void a_mapcache_remove_all_shrinkfactors ( guint16 x, guint16 y, guint16 z, guint8 type, guint zoom, guint8 alpha )
+void a_mapcache_remove_all_shrinkfactors ( gint x, gint y, gint z, guint8 type, guint zoom )
 {
   char key[40];
   List *loop = queue_tail;
@@ -136,7 +142,7 @@ void a_mapcache_remove_all_shrinkfactors ( guint16 x, guint16 y, guint16 z, guin
   if ( queue_tail == NULL )
     return;
 
-  g_snprintf ( key, sizeof(key), HASHKEY_FORMAT_STRING_NOSHRINK, x, y, z, type, zoom, alpha );
+  g_snprintf ( key, sizeof(key), HASHKEY_FORMAT_STRING_NOSHRINK_NOR_ALPHA, x, y, z, type, zoom );
   len = strlen(key);
 
   /* TODO: check logic here */
@@ -145,10 +151,13 @@ void a_mapcache_remove_all_shrinkfactors ( guint16 x, guint16 y, guint16 z, guin
     if ( strncmp(tmp->key, key, len) == 0 )
     {
       g_hash_table_remove ( cache, tmp->key );
-      if ( tmp == loop )
+      if ( tmp == loop ) /* we deleted the last thing in the queue! */
         loop = queue_tail = NULL;
-      else
+      else {
         loop->next = tmp->next;
+        if ( tmp == queue_tail )
+          queue_tail = tmp->next;
+      }
       g_free ( tmp );
       tmp = NULL;
     }