Changeset 15409 in josm for trunk/src/org

Timestamp:

2019-10-03T22:02:47+02:00 (5 years ago)

Author:

Don-vip

Message:

find a more suitable WMTS layer when no default is provided. Helps to get more reliable imagery integration test

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (4 diffs)

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

@@ -183 +183 @@
             return crs;
         }
+
+        /**
+         * Returns tile matrix max zoom. Assumes first zoom starts at 0, with continuous zoom levels.
+         * @return tile matrix max zoom
+         * @since 15409
+         */
+        public int getMaxZoom() {
+            return tileMatrix.size() - 1;
+        }
     }
 
@@ -258 +267 @@
         public TileMatrixSet getTileMatrixSet() {
             return tileMatrixSet;
+        }
+
+        /**
+         * Returns layer max zoom.
+         * @return layer max zoom
+         * @since 15409
+         */
+        public int getMaxZoom() {
+            return tileMatrixSet != null ? tileMatrixSet.getMaxZoom() : 0;
         }
     }
@@ -334 +352 @@
             if (!layers.isEmpty()) {
                 Layer first = layers.iterator().next();
+                // If max zoom lower than expected, try to find a better layer
+                if (first.getMaxZoom() < info.getMaxZoom()) {
+                    first = layers.stream().filter(l -> l.getMaxZoom() >= info.getMaxZoom()).findFirst().orElse(first);
+                }
                 this.defaultLayer = new DefaultLayer(info.getImageryType(), first.identifier, first.style, first.tileMatrixSet.identifier);
             } else {
@@ -943 +965 @@
     public int getMaxZoom() {
         if (this.currentTileMatrixSet != null) {
-            return this.currentTileMatrixSet.tileMatrix.size()-1;
+            return this.currentTileMatrixSet.getMaxZoom();
         }
         return 0;