Changeset 2626 in josm for trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

Timestamp:

2009-12-13T11:48:12+01:00 (14 years ago)

Author:

jttt

Message:

Fixed some of the warnings found by FindBugs

File:

• trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -31 +31 @@
                 String bbox[] = map.get("bbox").split(",");
                 b = new Bounds(
-                    new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
-                    new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
+                        new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
+                        new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
             } else if (map.containsKey("minlat")) {
                 String s = map.get("minlat");
@@ -45 +45 @@
             } else {
                 b = positionToBounds(parseDouble(map, "lat"),
-                                     parseDouble(map, "lon"),
-                                     Integer.parseInt(map.get("zoom")));
+                        parseDouble(map, "lon"),
+                        Integer.parseInt(map.get("zoom")));
             }
         } catch (NumberFormatException x) {
@@ -81 +81 @@
      */
     private static Bounds parseShortLink(final String url) {
-        if (!url.startsWith(SHORTLINK_PREFIX)) {
+        if (!url.startsWith(SHORTLINK_PREFIX))
             return null;
-        }
         final String shortLink = url.substring(SHORTLINK_PREFIX.length());
 
@@ -125 +124 @@
         // 2**32 == 4294967296
         return positionToBounds(y * 180.0 / 4294967296.0 - 90.0,
-                                x * 360.0 / 4294967296.0 - 180.0,
-                                // TODO: -2 was not in ruby code
-                                zoom - 8 - (zoomOffset % 3) - 2);
+                x * 360.0 / 4294967296.0 - 180.0,
+                // TODO: -2 was not in ruby code
+                zoom - 8 - (zoomOffset % 3) - 2);
     }
 
@@ -133 +132 @@
         final double size = 180.0 / Math.pow(2, zoom);
         return new Bounds(
-                          new LatLon(lat - size/2, lon - size),
-                          new LatLon(lat + size/2, lon + size));
+                new LatLon(lat - size/2, lon - size),
+                new LatLon(lat + size/2, lon + size));
     }
 
@@ -144 +143 @@
         int zoom = 0;
         while (zoom <= 20) {
-            if (size >= 180)
+            if (size >= 180) {
                 break;
+            }
             size *= 2;
             zoom++;
@@ -163 +163 @@
         double lon = (Math.round(pos.lon() * decimals));
         lon /= decimals;
-        return new String("http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom);
+        return "http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom;
     }
 }