Changeset 24567 in osm for applications/editors/josm

Timestamp:

2010-12-03T23:13:57+01:00 (14 years ago)

Author:

upliner

Message:

catch NumberFormatException, fix zoomlevel restriction

Location:

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery

Files:

• ImageryPreferenceEditor.java (modified) (1 diff)
• tms/TMSLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java

@@ -454 +454 @@
                 info.setURL((String)o);
             case 2:
-                if(info.imageryType == ImageryType.WMS)
-                    info.pixelPerDegree = Double.parseDouble((String) o);
-                else
-                    info.maxZoom = Integer.parseInt((String) o);
+                info.pixelPerDegree = 0;
+                info.maxZoom = 0;
+                try {
+                    if(info.imageryType == ImageryType.WMS)
+                        info.pixelPerDegree = Double.parseDouble((String) o);
+                    else
+                        info.maxZoom = Integer.parseInt((String) o);
+                } catch (NumberFormatException e) {
+                }
             }
         }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.imagery.ImageryInfo;
-import org.openstreetmap.josm.plugins.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.plugins.imagery.ImageryLayer;
 import org.openstreetmap.josm.plugins.imagery.ImageryPreferences;
+import org.openstreetmap.josm.plugins.imagery.ImageryInfo.ImageryType;
 
 /**
@@ -151 +151 @@
 
         currentZoomLevel = getBestZoom();
-        if (tileSource.getMaxZoom() < currentZoomLevel)
-            currentZoomLevel = tileSource.getMaxZoom();
-        if (tileSource.getMinZoom() > currentZoomLevel)
-            currentZoomLevel = tileSource.getMinZoom();
+        if (currentZoomLevel > getMaxZoomLvl())
+            currentZoomLevel = getMaxZoomLvl();
+        if (currentZoomLevel < getMinZoomLvl())
+            currentZoomLevel = getMinZoomLvl();
         clearTileCache();
         //tileloader = new OsmTileLoader(this);