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

Timestamp:

2012-03-10T18:51:51+01:00 (13 years ago)

Author:

bastiK

Message:

extend options for ellipsoid, use formal definition instead of computed values

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• Ellipsoid.java (modified) (3 diffs)
• Lambert.java (modified) (1 diff)
• UTM_France_DOM.java (modified) (1 diff)

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
@@ -15 +17 @@
 public class Ellipsoid {
     /**
-     * Clarke's ellipsoid (NTF system)
-     */
-    public static final Ellipsoid clarke = new Ellipsoid(6378249.2, 6356515.0);
+     * Clarke 1880 IGN (French national geographic institute)
+     */
+    public static final Ellipsoid clarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
     /**
      * Hayford's ellipsoid 1909 (ED50 system)
      * Proj.4 code: intl
      */
-    public static final Ellipsoid hayford =
-        new Ellipsoid(6378388.0, 6356911.9461);
+    public static final Ellipsoid hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
     /**
      * GRS80 ellipsoid
      */
-    public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.3141);
+    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
 
     /**
      * WGS84 ellipsoid
      */
-    public static final Ellipsoid WGS84 = new Ellipsoid(6378137.0, 6356752.3142);
+    public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
 
     /**
      * Bessel 1841 ellipsoid
      */
-    public static final Ellipsoid Bessel1841 = new Ellipsoid(6377397.155, 6356078.962822);
+    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
 
     /**
@@ -62 +63 @@
 
     /**
-     * create a new ellipsoid and precompute its parameters
-     *
-     * @param a ellipsoid long axis (in meters)
-     * @param b ellipsoid short axis (in meters)
-     */
-    public Ellipsoid(double a, double b) {
+     * private constructur - use one of the create_* methods
+     *
+     * @param a semimajor radius of the ellipsoid axis
+     * @param b semiminor radius of the ellipsoid axis
+     * @param e first eccentricity of the ellipsoid ( = sqrt((a*a - b*b)/(a*a)))
+     * @param e2 first eccentricity squared
+     * @param eb2 square of the second eccentricity
+     */
+    private Ellipsoid(double a, double b, double e, double e2, double eb2) {
         this.a = a;
         this.b = b;
-        e2 = (a*a - b*b) / (a*a);
-        e = Math.sqrt(e2);
-        eb2 = e2 / (1.0 - e2);
+        this.e = e;
+        this.e2 = e2;
+        this.eb2 = eb2;
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param b semiminor radius of the ellipsoid axis (in meters)
+     */
+    public static Ellipsoid create_a_b(double a, double b) {
+        double e2 = (a*a - b*b) / (a*a);
+        double e = Math.sqrt(e2);
+        double eb2 = e2 / (1.0 - e2);
+        return new Ellipsoid(a, b, e, e2, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param es first eccentricity squared
+     */
+    public static Ellipsoid create_a_es(double a, double es) {
+        double b = a * Math.sqrt(1.0 - es);
+        double e = Math.sqrt(es);
+        double eb2 = es / (1.0 - es);
+        return new Ellipsoid(a, b, e, es, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param f flattening ( = (a - b) / a)
+     */
+    public static Ellipsoid create_a_f(double a, double f) {
+        double b = a * (1.0 - f);
+        double e2 = f * (2 - f);
+        double e = Math.sqrt(e2);
+        double eb2 = e2 / (1.0 - e2);
+        return new Ellipsoid(a, b, e, e2, eb2);
+    }
+
+    /**
+     * create a new ellipsoid
+     *
+     * @param a semimajor radius of the ellipsoid axis (in meters)
+     * @param rf inverse flattening
+     */
+    public static Ellipsoid create_a_rf(double a, double rf) {
+        return create_a_f(a, 1.0 / rf);
     }
 

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

@@ -100 +100 @@
     private void updateParameters(final int layoutZone) {
         this.layoutZone = layoutZone;
-        ellps = Ellipsoid.clarke;
+        ellps = Ellipsoid.clarkeIGN;
         datum = null; // no datum needed, we have a shift file
         nadgrids = ntf_rgf93Grid;

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

@@ -24 +24 @@
 /**
  * This class implements all projections for French departements in the Caribbean Sea and
- * Indian Ocean using the UTM transvers Mercator projection and specific geodesic settings (7 parameters transformation algorithm).
+ * Indian Ocean using the UTM transvers Mercator projection and specific geodesic settings.
  *
  */