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

Timestamp:

2011-02-21T11:22:45+01:00 (13 years ago)

Author:

stoecker

Message:

correct mercator projection scaling factor

File:

• trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -22 +22 @@
 public class Mercator implements Projection {
 
+    final double radius = 6378137.0;
+
     public EastNorth latlon2eastNorth(LatLon p) {
         return new EastNorth(
-                p.lon()*Math.PI/180,
-                Math.log(Math.tan(Math.PI/4+p.lat()*Math.PI/360)));
+                p.lon()*Math.PI/180*radius,
+                Math.log(Math.tan(Math.PI/4+p.lat()*Math.PI/360))*radius);
     }
 
     public LatLon eastNorth2latlon(EastNorth p) {
         return new LatLon(
-                Math.atan(Math.sinh(p.north()))*180/Math.PI,
-                p.east()*180/Math.PI);
+                Math.atan(Math.sinh(p.north()/radius))*180/Math.PI,
+                p.east()/radius*180/Math.PI);
     }
 
@@ -60 +62 @@
     public double getDefaultZoomInPPD() {
         // This will set the scale bar to about 100 km
-        return 0.000158;
+        return 1000.0;/*0.000158*/
     }
 }