Changeset 8598 in josm for trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.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/bbox/SlippyMapBBoxChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
+import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 
@@ -139 +141 @@
         headers.put("User-Agent", Version.getInstance().getFullAgentString());
 
-        cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this, headers);
+        cachedLoader = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class).makeTileLoader(this,  headers);
 
         uncachedLoader = new OsmTileLoader(this);