Changeset 26909 in osm for applications/viewer

Timestamp:

2011-10-20T01:43:00+02:00 (13 years ago)

Author:

donvip

Message:

see #josm6109 and #josm6288 - Allow to flush Disk Tile cache

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (modified) (6 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -20 +20 @@
 import java.net.URLConnection;
 import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
@@ -52 +54 @@
 
     protected String cacheDirBase;
+    
+    protected final Map<TileSource, File> sourceCacheDirMap;
 
     protected long maxCacheFileAge = FILE_AGE_ONE_WEEK;
@@ -96 +100 @@
         log.finest("Tile cache directory: " + cacheDir);
         cacheDirBase = cacheDir.getAbsolutePath();
+        sourceCacheDirMap = new HashMap<TileSource, File>();
     }
 
@@ -112 +117 @@
     }
 
+    protected File getSourceCacheDir(TileSource source) {
+        File dir = sourceCacheDirMap.get(source);
+        if (dir == null) {
+            dir = new File(cacheDirBase, source.getName().replaceAll("[\\\\/:*?\"<>|]", "_"));
+            if (!dir.exists()) {
+                dir.mkdirs();
+            }
+        }
+        return dir;
+    }
+    
     protected class FileLoadJob implements Runnable {
         InputStream input = null;
@@ -140 +156 @@
                 tile.loading = true;
             }
-            tileCacheDir = new File(cacheDirBase, source.getName().replaceAll("[\\\\/:*?\"<>|]", "_"));
-            if (!tileCacheDir.exists()) {
-                tileCacheDir.mkdirs();
-            }
+            tileCacheDir = getSourceCacheDir(source);
             if (loadTileFromFile())
                 return;
@@ -463 +476 @@
         this.cacheDirBase = dir.getAbsolutePath();
     }
-
+    
+    public void clearCache(TileSource source) {
+        File dir = getSourceCacheDir(source);
+        if (dir.isDirectory()) {
+            for (File file : dir.listFiles()) {
+                file.delete();
+            }
+        }
+        dir.delete();
+    }
 }