Changeset 9230 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-12-31T16:37:24+01:00 (8 years ago)

Author:

Don-vip

Message:

fix javadoc errors/warnings

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• HttpClient.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (3 diffs)

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

@@ -437 +437 @@
     /**
      * Sets whether not to set header {@code Connection=close}
-     * <p/>
+     * <p>
      * This might fix #7640, see
      * <a href='https://web.archive.org/web/20140118201501/http://www.tikalk.com/java/forums/httpurlconnection-disable-keep-alive'>here</a>.

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Ellipsoid;
 
 public final class OsmUrlToBounds {
@@ -188 +189 @@
     }
 
-    /** radius of the earth */
-    public static final double R = 6378137.0;
-
     public static Bounds positionToBounds(final double lat, final double lon, final int zoom) {
         int tileSizeInPixels = 256;
@@ -207 +205 @@
             width = 640;
         }
-        double scale = (1 << zoom) * tileSizeInPixels / (2 * Math.PI * R);
+        double scale = (1 << zoom) * tileSizeInPixels / (2 * Math.PI * Ellipsoid.WGS84.a);
         double deltaX = width / 2.0 / scale;
         double deltaY = height / 2.0 / scale;
-        double x = Math.toRadians(lon) * R;
+        double x = Math.toRadians(lon) * Ellipsoid.WGS84.a;
         double y = mercatorY(lat);
-        return new Bounds(invMercatorY(y - deltaY), Math.toDegrees(x - deltaX) / R, invMercatorY(y + deltaY), Math.toDegrees(x + deltaX) / R);
+        return new Bounds(
+                invMercatorY(y - deltaY), Math.toDegrees(x - deltaX) / Ellipsoid.WGS84.a,
+                invMercatorY(y + deltaY), Math.toDegrees(x + deltaX) / Ellipsoid.WGS84.a);
     }
 
     public static double mercatorY(double lat) {
-        return Math.log(Math.tan(Math.PI/4 + Math.toRadians(lat)/2)) * R;
+        return Math.log(Math.tan(Math.PI/4 + Math.toRadians(lat)/2)) * Ellipsoid.WGS84.a;
     }
 
     public static double invMercatorY(double north) {
-        return Math.toDegrees(Math.atan(Math.sinh(north / R)));
+        return Math.toDegrees(Math.atan(Math.sinh(north / Ellipsoid.WGS84.a)));
     }