Changeset 71 in josm for src/org/openstreetmap/josm/data/projection/Mercator.java

Timestamp:

2006-03-25T16:21:09+01:00 (18 years ago)

Author:

imi

Message:

• refactored GpsPoint to be immutable and added LatLon and NorthEast
• refactored Bounding Box calculations
• various other renames

File:

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

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data.projection;
 
-import org.openstreetmap.josm.data.GeoPoint;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -14 +15 @@
 public class Mercator implements Projection {
 
-        public void latlon2xy(GeoPoint p) {
-                p.x = p.lon*Math.PI/180;
-                p.y = Math.log(Math.tan(Math.PI/4+p.lat*Math.PI/360));
+        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)));
         }
 
-        public void xy2latlon(GeoPoint p) {
-                p.lon = p.x*180/Math.PI;
-                p.lat = Math.atan(Math.sinh(p.y))*180/Math.PI;
+        public LatLon eastNorth2latlon(EastNorth p) {
+                return new LatLon(
+                        p.east()*180/Math.PI,
+                        Math.atan(Math.sinh(p.north()))*180/Math.PI);
         }