Changeset 13387 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

see #15880 - nicer exception

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/WMTSTileSource.java (modified) (2 diffs)
• gui/MapViewState.java (modified) (2 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• gui/layer/MapViewGraphics.java (modified) (1 diff)
• gui/layer/imagery/TileCoordinateConverter.java (modified) (1 diff)

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

@@ -720 +720 @@
     @Override
     public int getTileSize() {
-        // 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()) {
-            return projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
+        if (tileProjection != 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()) {
+                return projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
+            }
         }
         // if no layers is found, fallback to default mercator tile size. Maybe it will work
@@ -1059 +1061 @@
     @Override
     public String getServerCRS() {
-        return tileProjection.toCode();
+        return tileProjection != null ? tileProjection.toCode() : null;
     }
 }

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -159 +159 @@
     }
 
+    @Override
+    public String toString() {
+        return getClass().getName() + " [projecting=" + this.projecting
+            + " viewWidth=" + this.viewWidth
+            + " viewHeight=" + this.viewHeight
+            + " scale=" + this.scale
+            + " topLeft=" + this.topLeft + ']';
+    }
+
     /**
      * The scale in east/north units per pixel.
@@ -762 +771 @@
             return null;
         }
-    }
-
+
+        @Override
+        public String toString() {
+            return "MapViewRectangle [p1=" + p1 + ", p2=" + p2 + ']';
+        }
+    }
 }

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);

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

@@ -60 +60 @@
         return clipBounds;
     }
+
+    @Override
+    public String toString() {
+        return "MapViewGraphics [graphics=" + graphics + ", mapView=" + mapView + ", clipBounds=" + clipBounds + ']';
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

@@ -202 +202 @@
      */
     public boolean requiresReprojection() {
-        return !tileSource.getServerCRS().equals(Main.getProjection().toCode());
+        return !Objects.equals(tileSource.getServerCRS(), Main.getProjection().toCode());
     }
 }