Changeset 13387 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2018-02-06T23:39:53+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15880 - nicer exception

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)

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

@@ -1418 +1418 @@
         if (coordinateConverter.requiresReprojection()) {
             Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS());
+            if (projServer == null) {
+                throw new IllegalStateException(tileSource.toString());
+            }
             ProjectionBounds projBounds = new ProjectionBounds(
                     CoordinateConversion.projToEn(topLeftUnshifted),
@@ -1889 +1892 @@
             try {
                 drawInViewArea(graphics.getDefaultGraphics(), graphics.getMapView(), graphics.getClipBounds().getProjectionBounds());
-            } catch (IllegalArgumentException e) {
+            } catch (IllegalArgumentException | IllegalStateException e) {
                 throw BugReport.intercept(e)
                                .put("graphics", graphics).put("tileSource", tileSource).put("currentZoomLevel", currentZoomLevel);