Changeset 8861 in josm

Timestamp:

2015-10-11T23:54:48+02:00 (9 years ago)

Author:

wiktorn

Message:

Remove MEMORY_SIZE based settings and fix high cpu usage when showing low-zoom
tiles.

• Remove MEMORY_SIZE settings from common imagery settings panel.
• When working with low-zoom high CPU might occured. This happend, because

border tiles were not added to MemoryTileCache. Now this is fixed

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• preferences/imagery/CommonSettingsPanel.java (modified) (5 diffs)

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

@@ -140 +140 @@
     public static final IntegerProperty ZOOM_OFFSET = new IntegerProperty(PREFERENCE_PREFIX + ".zoom_offset", 0);
 
-    /**
-     * 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",
-            (int) Math.max(200,  200 * Math.pow(4, ZOOM_OFFSET.get())));
-
     /*
      *  use MemoryTileCache instead of tileLoader JCS cache, as tileLoader caches only content (byte[] of image)
@@ -880 +874 @@
      */
     private Tile getTile(int x, int y, int zoom) {
-        if (x < 0 || x >= tileSource.getTileXMax(zoom) || y < 0 || y >= tileSource.getTileYMax(zoom))
+        if (x < 0 || x > tileSource.getTileXMax(zoom) || y < 0 || y > tileSource.getTileYMax(zoom))
             return null;
         return tileCache.getTile(tileSource, x, y, zoom);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -39 +39 @@
     private final JosmTextField tilecacheDir = new JosmTextField();
     private final JSpinner maxElementsOnDisk;
-    private final JSpinner maxElementsInRam;
     private final JSlider tilesZoom = new JSlider(-2, 2, 0);
 
@@ -49 +48 @@
         super(new GridBagLayout());
 
-        this.maxElementsInRam = new JSpinner(new SpinnerNumberModel(
-                AbstractCachedTileSourceLayer.MEMORY_CACHE_SIZE.get().intValue(), 0, Integer.MAX_VALUE, 1));
         this.maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(
                 AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().intValue(), 0, Integer.MAX_VALUE, 1));
@@ -98 +95 @@
         add(this.maxElementsOnDisk, GBC.eol());
 
-        add(new JLabel(tr("Maximum number of objects in memory cache: ")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std());
-        add(this.maxElementsInRam, GBC.eol());
-
         this.tilesZoom.setPaintLabels(true);
         this.tilesZoom.setMajorTickSpacing(2);
@@ -122 +115 @@
         this.tilecacheDir.setText(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
         this.maxElementsOnDisk.setValue(AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get());
-        this.maxElementsInRam.setValue(AbstractCachedTileSourceLayer.MEMORY_CACHE_SIZE.get());
         this.tilesZoom.setValue(AbstractTileSourceLayer.ZOOM_OFFSET.get());
     }
@@ -147 +139 @@
         }
 
-        if (!AbstractCachedTileSourceLayer.MEMORY_CACHE_SIZE.get().equals(this.maxElementsInRam.getValue())) {
-            AbstractCachedTileSourceLayer.MEMORY_CACHE_SIZE.put((Integer) this.maxElementsInRam.getValue());
-            restartRequired = true;
-        }
-
         if (!AbstractTileSourceLayer.ZOOM_OFFSET.get().equals(this.tilesZoom.getValue())) {
             // TODO: make warning about too small MEMORY_CACHE_SIZE?