Changeset 11299 in josm

Timestamp:

2016-11-23T23:39:44+01:00 (7 years ago)

Author:

simon04

Message:

Use Projection inside OsmUrlToBounds

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Ellipsoid;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -33 +36 @@
         if (b != null)
             return b;
-        int i = url.indexOf("#map");
-        if (i >= 0) {
+        if (url.contains("#map")) {
             // probably it's a URL following the new scheme?
             return parseHashURLs(url);
         }
-        i = url.indexOf('?');
+        final int i = url.indexOf('?');
         if (i == -1) {
             return null;
@@ -201 +203 @@
         double deltaX = width / 2.0 / scale;
         double deltaY = height / 2.0 / scale;
-        double x = Math.toRadians(lon) * Ellipsoid.WGS84.a;
-        double y = mercatorY(lat);
+        final Projection mercator = Projections.getProjectionByCode("EPSG:3857");
+        final EastNorth projected = mercator.latlon2eastNorth(new LatLon(lat, lon));
         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)) * Ellipsoid.WGS84.a;
-    }
-
-    public static double invMercatorY(double north) {
-        return Math.toDegrees(Math.atan(Math.sinh(north / Ellipsoid.WGS84.a)));
+                mercator.eastNorth2latlon(projected.add(-deltaX, -deltaY)),
+                mercator.eastNorth2latlon(projected.add(deltaX, deltaY)));
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java

@@ -3 +3 @@
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -11 +15 @@
 */
 public class OsmUrlToBoundsTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    /**
+     * Test for {@link OsmUrlToBounds#positionToBounds}.
+     */
+    @Test
+    public void testPositionToBounds() {
+        Assert.assertEquals(new Bounds(51.7123487,8.7552027,51.7251104,8.7680773),
+                OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17));
+        Assert.assertEquals(new Bounds(40.8582551,-75.7534187,40.8660446,-75.7469813),
+                OsmUrlToBounds.positionToBounds(40.86215, -75.75020, 18));
+    }
+
     /**
      * data for {@link #testParse}