Changeset 71 in josm for src/org/openstreetmap/josm/data/projection
- Timestamp:
- 2006-03-25T16:21:09+01:00 (18 years ago)
- Location:
- src/org/openstreetmap/josm/data/projection
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/data/projection/Epsg4263.java
r52 r71 1 1 package org.openstreetmap.josm.data.projection; 2 2 3 import org.openstreetmap.josm.data.GeoPoint; 3 import org.openstreetmap.josm.data.coor.LatLon; 4 import org.openstreetmap.josm.data.coor.EastNorth; 4 5 5 6 /** … … 10 11 public class Epsg4263 implements Projection { 11 12 12 public void latlon2xy(GeoPoint p) { 13 p.x = p.lon; 14 p.y = p.lat; 13 public EastNorth latlon2eastNorth(LatLon p) { 14 return new EastNorth(p.lon(), p.lat()); 15 15 } 16 16 17 public void xy2latlon(GeoPoint p) { 18 p.lat = p.y; 19 p.lon = p.x; 17 public LatLon eastNorth2latlon(EastNorth p) { 18 return new LatLon(p.north(), p.east()); 20 19 } 21 20 -
src/org/openstreetmap/josm/data/projection/Mercator.java
r52 r71 1 1 package org.openstreetmap.josm.data.projection; 2 2 3 import org.openstreetmap.josm.data.GeoPoint; 3 import org.openstreetmap.josm.data.coor.LatLon; 4 import org.openstreetmap.josm.data.coor.EastNorth; 4 5 5 6 /** … … 14 15 public class Mercator implements Projection { 15 16 16 public void latlon2xy(GeoPoint p) { 17 p.x = p.lon*Math.PI/180; 18 p.y = Math.log(Math.tan(Math.PI/4+p.lat*Math.PI/360)); 17 public EastNorth latlon2eastNorth(LatLon p) { 18 return new EastNorth( 19 p.lon()*Math.PI/180, 20 Math.log(Math.tan(Math.PI/4+p.lat()*Math.PI/360))); 19 21 } 20 22 21 public void xy2latlon(GeoPoint p) { 22 p.lon = p.x*180/Math.PI; 23 p.lat = Math.atan(Math.sinh(p.y))*180/Math.PI; 23 public LatLon eastNorth2latlon(EastNorth p) { 24 return new LatLon( 25 p.east()*180/Math.PI, 26 Math.atan(Math.sinh(p.north()))*180/Math.PI); 24 27 } 25 28 -
src/org/openstreetmap/josm/data/projection/Projection.java
r58 r71 1 1 package org.openstreetmap.josm.data.projection; 2 2 3 import org.openstreetmap.josm.data.GeoPoint; 3 import org.openstreetmap.josm.data.coor.LatLon; 4 import org.openstreetmap.josm.data.coor.EastNorth; 4 5 5 6 /** … … 20 21 * @param p The geo point to convert. x/y members of the point are filled. 21 22 */ 22 void latlon2xy(GeoPointp);23 EastNorth latlon2eastNorth(LatLon p); 23 24 24 25 /** … … 27 28 * @param p The geo point to convert. lat/lon members of the point are filled. 28 29 */ 29 void xy2latlon(GeoPointp);30 LatLon eastNorth2latlon(EastNorth p); 30 31 31 32 /**
Note:
See TracChangeset
for help on using the changeset viewer.