Ignore:
Timestamp:
2015-06-03T01:46:01+02:00 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java

    r8378 r8451  
    1515
    1616    /**
     17     * Airy 1830
     18     */
     19    public static final Ellipsoid Airy = Ellipsoid.create_a_b(6377563.396, 6356256.910);
     20
     21    /**
     22     * Modified Airy 1849
     23     */
     24    public static final Ellipsoid AiryMod = Ellipsoid.create_a_b(6377340.189, 6356034.446);
     25
     26    /**
     27     * Australian National Spheroid (Australian Natl & S. Amer. 1969)
     28     * same as GRS67 Modified
     29     */
     30    public static final Ellipsoid AustSA = Ellipsoid.create_a_rf(6378160.0, 298.25);
     31   
     32    /**
     33     * Bessel 1841 ellipsoid
     34     */
     35    public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
     36   
     37    /**
    1738     * Clarke 1866 ellipsoid
    1839     */
    19     public static final Ellipsoid clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
     40    public static final Ellipsoid Clarke1866 = Ellipsoid.create_a_b(6378206.4, 6356583.8);
    2041
    2142    /**
    2243     * Clarke 1880 IGN (French national geographic institute)
    2344     */
    24     public static final Ellipsoid clarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
    25 
    26     /**
    27      * Hayford's ellipsoid 1909 (ED50 system)<br>
     45    public static final Ellipsoid ClarkeIGN = Ellipsoid.create_a_b(6378249.2, 6356515.0);
     46
     47    /**
     48     * GRS67 ellipsoid
     49     */
     50    public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167427);
     51
     52    /**
     53     * GRS80 ellipsoid
     54     */
     55    public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
     56
     57    /**
     58     * Hayford's ellipsoid 1909 (ED50 system)
     59     * Also known as International 1924
    2860     * Proj.4 code: intl
    2961     */
    30     public static final Ellipsoid hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
    31 
    32     /**
    33      * GRS67 ellipsoid
    34      */
    35     public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167472);
    36 
    37     /**
    38      * GRS80 ellipsoid
    39      */
    40     public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
     62    public static final Ellipsoid Hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
     63
     64    /**
     65     * Helmert 1906
     66     */
     67    public static final Ellipsoid Helmert = Ellipsoid.create_a_rf(6378200.0, 298.3);
     68
     69    /**
     70     * Krassowsky 1940 ellipsoid
     71     */
     72    public static final Ellipsoid Krassowsky = Ellipsoid.create_a_rf(6378245.0, 298.3);
     73
     74    /**
     75     * WGS72 ellipsoid
     76     */
     77    public static final Ellipsoid WGS72 = Ellipsoid.create_a_rf(6378135.0, 298.26);
    4178
    4279    /**
     
    4582    public static final Ellipsoid WGS84 = Ellipsoid.create_a_rf(6378137.0, 298.257223563);
    4683
    47     /**
    48      * Bessel 1841 ellipsoid
    49      */
    50     public static final Ellipsoid Bessel1841 = Ellipsoid.create_a_rf(6377397.155, 299.1528128);
    5184
    5285    /**
  • trunk/src/org/openstreetmap/josm/data/projection/Projections.java

    r8404 r8451  
    7575        registerBaseProjection("tmerc", TransverseMercator.class, "core");
    7676
    77         ellipsoids.put("clrk66", Ellipsoid.clarke1866);
    78         ellipsoids.put("clarkeIGN", Ellipsoid.clarkeIGN);
    79         ellipsoids.put("intl", Ellipsoid.hayford);
     77        ellipsoids.put("airy", Ellipsoid.Airy);
     78        ellipsoids.put("mod_airy", Ellipsoid.AiryMod);
     79        ellipsoids.put("aust_SA", Ellipsoid.AustSA);
     80        ellipsoids.put("bessel", Ellipsoid.Bessel1841);
     81        ellipsoids.put("clrk66", Ellipsoid.Clarke1866);
     82        ellipsoids.put("clarkeIGN", Ellipsoid.ClarkeIGN);
     83        ellipsoids.put("intl", Ellipsoid.Hayford);
     84        ellipsoids.put("helmert", Ellipsoid.Helmert);
     85        ellipsoids.put("krass", Ellipsoid.Krassowsky);
    8086        ellipsoids.put("GRS67", Ellipsoid.GRS67);
    8187        ellipsoids.put("GRS80", Ellipsoid.GRS80);
     88        ellipsoids.put("WGS72", Ellipsoid.WGS72);
    8289        ellipsoids.put("WGS84", Ellipsoid.WGS84);
    83         ellipsoids.put("bessel", Ellipsoid.Bessel1841);
    8490
    8591        datums.put("WGS84", WGS84Datum.INSTANCE);
Note: See TracChangeset for help on using the changeset viewer.