Changeset 4285 in josm for trunk/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java

Timestamp:

2011-08-07T12:17:39+02:00 (13 years ago)

Author:

bastiK

Message:

major projection rework

More modular structure, inspired by Proj.4.

There are almost no semantic changes to the projection algorithms. Mostly factors of 'a' and 180/PI have been moved from one place to the other. In UTM_France_DOM, the ellipsoid conversion for the first 3 projections has been changed from hayford <-> GRS80 to hayford <-> WGS84.

Some redundant algorithms have been removed. In particular:

• UTM_France_DOM used to have its own Transverse Mercator implementation. It is different from the implementation in TransverseMercator.java as it has another series expansion. For EPSG::2975, there are numeric differences on centimeter scale. However, the new data fits better with Proj.4 output.
• Also removed are alternate implementations of LambertConformalConic. (They are all quite similar, though.)

File:

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

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

@@ -6 +6 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.datum.GRS80Datum;
 
 /**
@@ -13 +14 @@
  * @author Viesturs Zarins
  */
-public class TransverseMercatorLV extends TransverseMercator {
+public class TransverseMercatorLV extends AbstractProjection {
 
-    public TransverseMercatorLV()
-    {
-        setProjectionParameters(24, 500000, -6000000);
+    public TransverseMercatorLV() {
+        ellps = Ellipsoid.GRS80;
+        proj = new org.openstreetmap.josm.data.projection.proj.TransverseMercator(ellps);
+        datum = GRS80Datum.INSTANCE;
+        lon_0 = 24;
+        x_0 = 500000;
+        y_0 = -6000000;
+        k_0 = 0.9996;
     }
-
-    @Override public String toString() {
+    
+    @Override 
+    public String toString() {
         return tr("LKS-92 (Latvia TM)");
     }
 
-    private int epsgCode() {
+    @Override
+    public Integer getEpsgCode() {
         return 3059;
-    }
-
-    @Override
-    public String toCode() {
-        return "EPSG:"+ epsgCode();
     }
 
@@ -38 +41 @@
     }
 
+    @Override
     public String getCacheDirectoryName() {
-        return "epsg"+ epsgCode();
+        return "epsg"+ getEpsgCode();
     }