Changeset 13539 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-03-18T15:13:52+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16084 - WMTS: support different tile sizes for layers using the same projection

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -738 +738 @@
             return cachedTileSize;
         }
-        if (tileProjection != null) {
+        if (currentTileMatrixSet != null) {
             // no support for non-square tiles (tileHeight != tileWidth)
             // and for different tile sizes at different zoom levels
-            Collection<Layer> projLayers = getLayers(null, tileProjection.toCode());
-            if (!projLayers.isEmpty()) {
-                cachedTileSize = projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
-                return cachedTileSize;
-            }
-        }
-        // if no layers is found, fallback to default mercator tile size. Maybe it will work
+            cachedTileSize = currentTileMatrixSet.tileMatrix.get(0).tileHeight;
+            return cachedTileSize;
+        }
+        // Fallback to default mercator tile size. Maybe it will work
         Logging.warn("WMTS: Could not determine tile size. Using default tile size of: {0}", getDefaultTileSize());
         return getDefaultTileSize();