Changeset 11947 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-04-17T18:31:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14642 - IAE at AbstractTileSourceLayer.getBestZoom

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -412 +412 @@
          */
         int intResult = (int) Math.round(result + 1 + ZOOM_OFFSET.get() / 1.9);
-        intResult = Utils.clamp(intResult, getMinZoomLvl(), getMaxZoomLvl());
+        int minZoom = getMinZoomLvl();
+        int maxZoom = getMaxZoomLvl();
+        if (minZoom <= maxZoom) {
+            intResult = Utils.clamp(intResult, minZoom, maxZoom);
+        } else if (intResult > maxZoom) {
+            intResult = maxZoom;
+        }
         return intResult;
     }