Changeset 31371 in osm

Timestamp:

2015-07-13T00:10:52+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

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• interfaces/TileSource.java (modified) (5 diffs)
• tilesources/AbstractTMSTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -97 +97 @@
 
     /**
+     * Creates tile identifier that is unique among all tile sources, but the same tile will always
+     * get the same identifier. Used for creation of cache key.
+     *
+     * @param zoom
+     * @param tilex
+     * @param tiley
+     * @return tile identifier
+     */
+    String getTileId(int zoom, int tilex, int tiley);
+
+    /**
      * Specifies how large each tile is.
      * @return The size of a single tile in pixels. -1 if default size should be used
@@ -145 +156 @@
     public Point latLonToXY(double lat, double lon, int zoom);
 
+    /**
+     * @param point
+     * @param zoom
+     * @return transforms longitude and latitude to pixel space (as if all tiles at specified zoom level where joined)
+     */
     public Point latLonToXY(ICoordinate point, int zoom);
 
@@ -172 +188 @@
     public ICoordinate XYToLatLon(Point point, int zoom);
 
+    /**
+     *
+     * @param x
+     * @param y
+     * @param zoom
+     * @return WGS84 Coordinates of given point
+     */
     public ICoordinate XYToLatLon(int x, int y, int zoom);
 
@@ -200 +223 @@
     public TileXY latLonToTileXY(double lat, double lon, int zoom);
 
+    /**
+     *
+     * @param point
+     * @param zoom
+     * @return x and y tile indices
+     */
     public TileXY latLonToTileXY(ICoordinate point, int zoom);
 
@@ -227 +256 @@
     public ICoordinate tileXYToLatLon(TileXY xy, int zoom);
 
+    /**
+     *
+     * @param tile
+     * @return WGS84 coordinates of given tile
+     */
     public ICoordinate tileXYToLatLon(Tile tile);
 
+    /**
+     *
+     * @param x
+     * @param y
+     * @param zoom
+     * @return WGS84 coordinates of given tile
+     */
     public ICoordinate tileXYToLatLon(int x, int y, int zoom);
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

@@ -278 +278 @@
     }
 
+    @Override
+    public String getTileId(int zoom, int tilex, int tiley) {
+        return this.baseUrl + "/" + zoom + "/" + tilex + "/" + tiley;
+    }
+
     private int getTileMax(int zoom) {
         return (int)Math.pow(2.0, zoom) - 1;