Changeset 3692 in josm for trunk/src/org

Timestamp:

2010-12-03T14:45:14+01:00 (14 years ago)

Author:

bastiK

Message:

applied #5681 (patch by Hanno Hecker) - fix to SWEREF99 / EPSG:3008 projection

File:

• trunk/src/org/openstreetmap/josm/data/projection/Epsg3008.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -16 +17 @@
 
     private final static double UTMScaleFactor = 1.0;
+    private double UTMCentralMeridianRad;
+    private double offsetEastMeters = 150000;
+    private double offsetNorthMeters = 0;
 
     public Epsg3008()
     {
-        setProjectionParameters(13.5, 150000, 0);
+        UTMCentralMeridianRad = Math.toRadians(13.5);
     }
 
@@ -50 +54 @@
                 new LatLon(62.26, 14.65));  // new LatLon(90.0, 180.0));
     }
+
+    @Override
+    public EastNorth latlon2eastNorth(LatLon p) {
+        EastNorth a = mapLatLonToXY(Math.toRadians(p.lat()), Math.toRadians(p.lon()), UTMCentralMeridianRad);
+        return new EastNorth(a.east() * UTMScaleFactor + offsetEastMeters, a.north() * UTMScaleFactor + offsetNorthMeters);
+    }
+
+    @Override
+    public LatLon eastNorth2latlon(EastNorth p) {
+        return mapXYToLatLon((p.east() - offsetEastMeters)/UTMScaleFactor, (p.north() - offsetNorthMeters)/UTMScaleFactor, UTMCentralMeridianRad);
+    }
+
 }