Changeset 8598 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery

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/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -89 +89 @@
         verifyBounds(wallonieBounds, testSource, 6, 1063, 1219);
         verifyBounds(wallonieBounds, testSource, 11, 17724, 20324);
-        LatLon ll = new LatLon(testSource.tileXYToLatLon(1063, 1219, 6));
-
+    }
+
+    @Test
+    public void testWALLONIENoMatrixDimension() throws MalformedURLException, IOException {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
+        WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml"));
+        Bounds wallonieBounds = new Bounds(
+                new LatLon(49.485372459967245, 2.840548314430268),
+                new LatLon(50.820959517561256, 6.427849693016202)
+                );
+
+        verifyBounds(wallonieBounds, testSource, 6, 1063, 1219);
+        verifyBounds(wallonieBounds, testSource, 11, 17724, 20324);
     }