Changeset 15411 in josm for trunk/src

Timestamp:

2019-10-04T00:35:55+02:00 (6 years ago)

Author:

Don-vip

Message:

add robustness

File:

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

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

@@ -376 +376 @@
                     LatLon center = info.getBounds().getCenter();
                     if (!first.getBbox().bounds(center)) {
-                        first = layers.stream().filter(l -> l.getBbox().bounds(center)).findFirst().orElse(first);
+                        final Layer ffirst = first;
+                        first = layers.stream()
+                                .filter(l -> l.getMaxZoom() >= info.getMaxZoom() && l.getBbox() != null && l.getBbox().bounds(center)).findFirst()
+                                .orElseGet(() -> layers.stream().filter(l -> l.getBbox() != null && l.getBbox().bounds(center)).findFirst()
+                                        .orElse(ffirst));
                     }
                 }