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

Timestamp:

2014-02-19T00:30:40+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9692 - IllegalStateException with print and pdfimport plugins (regression from r6509)

File:

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

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

@@ -416 +416 @@
         int width = getWidth()/2;
         int height = getHeight()/2;
-        if (width == 0 || height == 0) {
-            throw new IllegalStateException("Cannot zoom into undimensioned NavigatableComponent");
-        }
         LatLon l1 = new LatLon(b.getMinLat(), lon);
         LatLon l2 = new LatLon(b.getMaxLat(), lon);
@@ -424 +421 @@
         EastNorth e2 = getProjection().latlon2eastNorth(l2);
         double d = e2.north() - e1.north();
-        if(d < height*newScale)
-        {
+        if (height > 0 && d < height*newScale) {
             double newScaleH = d/height;
             e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMinLon()));
             e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMaxLon()));
             d = e2.east() - e1.east();
-            if(d < width*newScale) {
+            if (width > 0 && d < width*newScale) {
                 newScale = Math.max(newScaleH, d/width);
             }
-        }
-        else
-        {
+        } else if (height > 0) {
             d = d/(l1.greatCircleDistance(l2)*height*10);
-            if(newScale < d) {
+            if (newScale < d) {
                 newScale = d;
             }