Changeset 8451 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2015-06-03T01:46:01+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11512 - Add most commonly used ellipsoids (patch by BathoryPeter)

Location:

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

Files:

• Ellipsoid.java (modified) (2 diffs)
• Projections.java (modified) (1 diff)

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

@@ -15 +15 @@
 
     /**
+     * Airy 1830
+     */
+    public static final Ellipsoid Airy = Ellipsoid.create_a_b(6377563.396, 6356256.910);
+
+    /**
+     * Modified Airy 1849
+     */
+    public static final Ellipsoid AiryMod = Ellipsoid.create_a_b(6377340.189, 6356034.446);
+
+    /**
+     * Australian National Spheroid (Australian Natl & S. Amer. 1969)
+     * same as GRS67 Modified
+     */
+    public static final Ellipsoid AustSA = Ellipsoid.create_a_rf(6378160.0, 298.25);
+    
+    /**
+     * Bessel 1841 ellipsoid
+     */
+    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
+    
+    /**
      * Clarke 1866 ellipsoid
      */
-    public static final Ellipsoid clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
+    public static final Ellipsoid Clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
 
     /**
      * 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)<br>
+    public static final Ellipsoid ClarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
+
+    /**
+     * GRS67 ellipsoid
+     */
+    public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167427);
+
+    /**
+     * GRS80 ellipsoid
+     */
+    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
+
+    /**
+     * Hayford's ellipsoid 1909 (ED50 system)
+     * Also known as International 1924
      * Proj.4 code: intl
      */
-    public static final Ellipsoid hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
-
-    /**
-     * GRS67 ellipsoid
-     */
-    public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167472);
-
-    /**
-     * GRS80 ellipsoid
-     */
-    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
+    public static final Ellipsoid Hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
+
+    /**
+     * Helmert 1906
+     */
+    public static final Ellipsoid Helmert = Ellipsoid.create_a_rf(6378200.0, 298.3);
+
+    /**
+     * Krassowsky 1940 ellipsoid
+     */
+    public static final Ellipsoid Krassowsky = Ellipsoid.create_a_rf(6378245.0, 298.3);
+
+    /**
+     * WGS72 ellipsoid
+     */
+    public static final Ellipsoid WGS72 = Ellipsoid.create_a_rf(6378135.0, 298.26);
 
     /**
@@ -45 +82 @@
     public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
 
-    /**
-     * Bessel 1841 ellipsoid
-     */
-    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
 
     /**

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

@@ -75 +75 @@
         registerBaseProjection("tmerc", TransverseMercator.class, "core");
 
-        ellipsoids.put("clrk66", Ellipsoid.clarke1866);
-        ellipsoids.put("clarkeIGN", Ellipsoid.clarkeIGN);
-        ellipsoids.put("intl", Ellipsoid.hayford);
+        ellipsoids.put("airy", Ellipsoid.Airy);
+        ellipsoids.put("mod_airy", Ellipsoid.AiryMod);
+        ellipsoids.put("aust_SA", Ellipsoid.AustSA);
+        ellipsoids.put("bessel", Ellipsoid.Bessel1841);
+        ellipsoids.put("clrk66", Ellipsoid.Clarke1866);
+        ellipsoids.put("clarkeIGN", Ellipsoid.ClarkeIGN);
+        ellipsoids.put("intl", Ellipsoid.Hayford);
+        ellipsoids.put("helmert", Ellipsoid.Helmert);
+        ellipsoids.put("krass", Ellipsoid.Krassowsky);
         ellipsoids.put("GRS67", Ellipsoid.GRS67);
         ellipsoids.put("GRS80", Ellipsoid.GRS80);
+        ellipsoids.put("WGS72", Ellipsoid.WGS72);
         ellipsoids.put("WGS84", Ellipsoid.WGS84);
-        ellipsoids.put("bessel", Ellipsoid.Bessel1841);
 
         datums.put("WGS84", WGS84Datum.INSTANCE);