Changeset 8659 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-08-12T23:10:17+02:00 (9 years ago)

Author:

wiktorn

Message:

More performance improvements

• Use one MemoryTileCache instance per multiple layers. This results in smaller memory footprint when working with many layers
• fix default maximum TimeToLive in JCS
• TemplatedWMSTileSource now caches degreesPerZoom, so it's not computed on every request

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractCachedTileSourceLayer.java (modified) (1 diff)
• AbstractTileSourceLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java

@@ -36 +36 @@
      */
     public static final IntegerProperty MAX_DISK_CACHE_SIZE = new IntegerProperty(PREFERENCE_PREFIX + "max_disk_size", 512);
-
-    /**
-     * use fairly small memory cache, as cached objects are quite big, as they contain BufferedImages
-     */
-    public static final IntegerProperty MEMORY_CACHE_SIZE = new IntegerProperty(PREFERENCE_PREFIX + "cache.max_objects_ram", 200);
 
     private ICacheAccess<String, BufferedImageCacheEntry> cache;

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -134 +134 @@
     public boolean showErrors;
 
-    protected TileCache tileCache;
+    /**
+     * use fairly small memory cache, as cached objects are quite big, as they contain BufferedImages
+     */
+    public static final IntegerProperty MEMORY_CACHE_SIZE = new IntegerProperty(PREFERENCE_PREFIX + "cache.max_objects_ram", 200);
+
+    /*
+     *  use MemoryTileCache instead of tileLoader JCS cache, as tileLoader caches only content (byte[] of image)
+     *  and MemoryTileCache caches whole Tile. This gives huge performance improvement when a lot of tiles are visible
+     *  in MapView (for example - when limiting min zoom in imagery)
+     *
+     *  Use static instance so memory is shared between layers to prevent out of memory exceptions, when user is working with many layers
+     */
+    protected static TileCache tileCache = new MemoryTileCache(MEMORY_CACHE_SIZE.get());
     protected AbstractTMSTileSource tileSource;
     protected TileLoader tileLoader;
@@ -174 +186 @@
 
         tileLoader = getTileLoaderFactory().makeTileLoader(this, headers);
-        /*
-         *  use MemoryTileCache instead of tileLoader JCS cache, as tileLoader caches only content (byte[] of image)
-         *  and MemoryTileCache caches whole Tile. This gives huge performance improvement when a lot of tiles are visible
-         *  in MapView (for example - when limiting min zoom in imagery)
-         */
-        tileCache = new MemoryTileCache(AbstractCachedTileSourceLayer.MEMORY_CACHE_SIZE.get());
 
         try {