Changeset 8598 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java

Timestamp:

2015-07-12T23:55:18+02:00 (9 years ago)

Author:

wiktorn

Message:

TileSource:

• added method - getTileId that returns unique identifier for the tile, that should not collide with other tile sources
• added JavaDocs

JCSCacheManager:

• moved from object count limit to object size limit
• fixed bug with unnecessary re-creation of auxilary cache, that could result in cache corruption/loss of current cache data

CachedTileLoaderFactory, WMSCachedTileLoader, TMSCachedTileLoader

• un-abstract CachedTileLoaderFactory, use reflection to create TileLoaders
• adjust constructors

TMSCachedTileLoader, AbstractCachedTileSourceLayer:

• move cache related settings to AbstractCachedTileSourceLayer
• move cache instation to AbstractCachedTileSourceLayer
• make "flush tile cache" command clear only one tile source

TMSCachedTileLoaderJob:

• make "flush tile cache" command clear only one tile source
• reorder methods

TemplatedWMSTileSource:

• java docs
• inline of private methods: getTileXMax, getTileYMax
• fix sonar issues
• make WMS layer zoom levels closer to TMS (addresses: #11459)

WMTSTileSource:

• fix Sonar issues
• use topLeftCorner in X/Y tile max calculations instead of world bounds (fixes issues with WMTS-es, for which topLeftCorner lies outside projection world bounds)

AbstractTileSourceLayer:

• draw warning, when min-zoom-level is set, and tiles are not loaded due to too many tiles on screen

TMSLayer, WMSLayer, WMTSLayer:

• expose access to cache object for ImageryPreferences

CacheContentsPanel:

• add panel for managing cache regions and tile sources within the regions

CommonSettingsPanel, TMSSettingsPanel:

• move settings common to all imagery layers from TMSSettingsPanel to CommonSettingsPanel

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (modified) (9 diffs)

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

@@ -12 +12 @@
 import javax.swing.SpinnerNumberModel;
 
-import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -31 +29 @@
     private final JSpinner maxZoomLvl;
     private final JCheckBox addToSlippyMapChosser = new JCheckBox();
-    private final JosmTextField tilecacheDir = new JosmTextField();
-    private final JSpinner maxElementsOnDisk;
+
     private final JSpinner maxConcurrentDownloads;
     private final JSpinner maxDownloadsPerHost;
@@ -46 +43 @@
         maxZoomLvl = new JSpinner(new SpinnerNumberModel(
                 TMSLayer.PROP_MAX_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
-        maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(
-                TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1));
         maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(
                 TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
         maxDownloadsPerHost = new JSpinner(new SpinnerNumberModel(
                 TMSCachedTileLoader.HOST_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
+
 
         add(new JLabel(tr("Auto zoom by default: ")), GBC.std());
@@ -73 +69 @@
         add(addToSlippyMapChosser, GBC.eol().fill(GBC.HORIZONTAL));
 
-        add(new JLabel(tr("Tile cache directory: ")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std());
-        add(tilecacheDir, GBC.eol().fill(GBC.HORIZONTAL));
-
         add(new JLabel(tr("Maximum concurrent downloads: ")), GBC.std());
         add(GBC.glue(5, 0), GBC.std());
@@ -84 +76 @@
         add(GBC.glue(5, 0), GBC.std());
         add(maxDownloadsPerHost, GBC.eol());
-
-
-        add(new JLabel(tr("Maximum elements in disk cache: ")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std());
-        add(this.maxElementsOnDisk, GBC.eol());
 
     }
@@ -101 +88 @@
         this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null));
         this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null));
-        this.tilecacheDir.setText(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
-        this.maxElementsOnDisk.setValue(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get());
         this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get());
         this.maxDownloadsPerHost.setValue(TMSCachedTileLoader.HOST_LIMIT.get());
@@ -114 +99 @@
         boolean restartRequired = false;
 
-        if (TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get() != this.addToSlippyMapChosser.isSelected()) {
+        if (!TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get().equals(this.addToSlippyMapChosser.isSelected())) {
             restartRequired = true;
         }
@@ -122 +107 @@
         TMSLayer.setMaxZoomLvl((Integer) this.maxZoomLvl.getValue());
         TMSLayer.setMinZoomLvl((Integer) this.minZoomLvl.getValue());
-
-        if (!TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().equals(this.maxElementsOnDisk.getValue())) {
-            TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.put((Integer) this.maxElementsOnDisk.getValue());
-            restartRequired = true;
-        }
 
         if (!TMSCachedTileLoader.THREAD_LIMIT.get().equals(this.maxConcurrentDownloads.getValue())) {
@@ -138 +118 @@
         }
 
-        if (!CachedTileLoaderFactory.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {
-            restartRequired = true;
-            CachedTileLoaderFactory.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
-        }
-
         return restartRequired;
     }