Changeset 16457 in osm for applications/editors

Timestamp:

2009-07-12T20:23:10+02:00 (15 years ago)

Author:

dhansen

Message:

Use tile cleanup code to actually flush all tiles objects
at flush time, not just their images.

File:

• applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -138 +138 @@
                         for (SlippyMapTile t : tileStorage.values()) {
                             t.dropImage();
-                            }
+                        }
                         System.out.println("done");
-                        }
-                    }));
+                        shrinkTileStorage(0);
+                    }
+                }));
         // end of adding menu commands
 
@@ -234 +235 @@
     }
 
-    long lastCheck = 0;
     /**
      * <p>
-     * Check if tiles.size() is not more than max_nr_tiles. If yes, oldest tiles by timestamp
-     * are fired out from cache.
+     * Check if tiles.size() is not more than maxNrTiles.
+     * If yes, oldest tiles by timestamp are flushed from
+     * the cache.
      * </p>
      */
-    public void checkTileStorage() {
-        int maxZoom = 30; // SlippyMapPreferences.getMaxZoomLvl();
-        long now = System.currentTimeMillis();
-        if (now - lastCheck < 1000)
-                return;
-        lastCheck = now;
+    public void shrinkTileStorage(int maxNrTiles)
+    {
         TreeSet<SlippyMapTile> tiles = new TreeSet<SlippyMapTile>(new TileTimeComp());
         tiles.addAll(tileStorage.values());
-        int max_nr_tiles = 100;
-        if (tiles.size() < max_nr_tiles) {
-            Main.debug("total of " + tiles.size() + " loaded tiles, size OK " + now);
+        if (tiles.size() < maxNrTiles) {
+            Main.debug("total of " + tiles.size() + " loaded tiles, size OK (< " + maxNrTiles + ")");
             return;
         }
-        int nr_to_drop = tiles.size() - max_nr_tiles;;
+        int nr_to_drop = tiles.size() - maxNrTiles;;
         Main.debug("total of " + tiles.size() + " tiles, need to flush " + nr_to_drop + " tiles");
         for (SlippyMapTile t : tiles) {
@@ -262 +258 @@
             nr_to_drop--;
         }
+    }
+    long lastCheck = 0;
+    public void checkTileStorage() {
+        int maxZoom = 30; // SlippyMapPreferences.getMaxZoomLvl();
+        long now = System.currentTimeMillis();
+        if (now - lastCheck < 1000)
+                return;
+        lastCheck = now;
+        shrinkTileStorage(150);
     }