Changeset 10748 in josm for trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
- Timestamp:
- 2016-08-06T19:21:33+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
r10680 r10748 17 17 * Airy 1830 18 18 */ 19 public static final Ellipsoid Airy = Ellipsoid.create _a_b(6377563.396, 6356256.910);19 public static final Ellipsoid Airy = Ellipsoid.createAb(6377563.396, 6356256.910); 20 20 21 21 /** 22 22 * Modified Airy 1849 23 23 */ 24 public static final Ellipsoid AiryMod = Ellipsoid.create _a_b(6377340.189, 6356034.446);24 public static final Ellipsoid AiryMod = Ellipsoid.createAb(6377340.189, 6356034.446); 25 25 26 26 /** … … 28 28 * same as GRS67 Modified 29 29 */ 30 public static final Ellipsoid AustSA = Ellipsoid.create _a_rf(6378160.0, 298.25);30 public static final Ellipsoid AustSA = Ellipsoid.createArf(6378160.0, 298.25); 31 31 32 32 /** 33 33 * Bessel 1841 ellipsoid 34 34 */ 35 public static final Ellipsoid Bessel1841 = Ellipsoid.create _a_rf(6377397.155, 299.1528128);35 public static final Ellipsoid Bessel1841 = Ellipsoid.createArf(6377397.155, 299.1528128); 36 36 37 37 /** 38 38 * Bessel 1841 (Namibia) 39 39 */ 40 public static final Ellipsoid BesselNamibia = Ellipsoid.create _a_rf(6377483.865, 299.1528128);40 public static final Ellipsoid BesselNamibia = Ellipsoid.createArf(6377483.865, 299.1528128); 41 41 42 42 /** 43 43 * Clarke 1866 ellipsoid 44 44 */ 45 public static final Ellipsoid Clarke1866 = Ellipsoid.create _a_b(6378206.4, 6356583.8);45 public static final Ellipsoid Clarke1866 = Ellipsoid.createAb(6378206.4, 6356583.8); 46 46 47 47 /** 48 48 * Clarke 1880 (modified) 49 49 */ 50 public static final Ellipsoid Clarke1880 = Ellipsoid.create _a_rf(6378249.145, 293.4663);50 public static final Ellipsoid Clarke1880 = Ellipsoid.createArf(6378249.145, 293.4663); 51 51 52 52 /** 53 53 * Clarke 1880 IGN (French national geographic institute) 54 54 */ 55 public static final Ellipsoid ClarkeIGN = Ellipsoid.create _a_b(6378249.2, 6356515.0);55 public static final Ellipsoid ClarkeIGN = Ellipsoid.createAb(6378249.2, 6356515.0); 56 56 57 57 /** 58 58 * Everest (Sabah & Sarawak) 59 59 */ 60 public static final Ellipsoid EverestSabahSarawak = Ellipsoid.create _a_rf(6377298.556, 300.8017);60 public static final Ellipsoid EverestSabahSarawak = Ellipsoid.createArf(6377298.556, 300.8017); 61 61 62 62 /** 63 63 * GRS67 ellipsoid 64 64 */ 65 public static final Ellipsoid GRS67 = Ellipsoid.create _a_rf(6378160.0, 298.247167427);65 public static final Ellipsoid GRS67 = Ellipsoid.createArf(6378160.0, 298.247167427); 66 66 67 67 /** 68 68 * GRS80 ellipsoid 69 69 */ 70 public static final Ellipsoid GRS80 = Ellipsoid.create _a_rf(6378137.0, 298.257222101);70 public static final Ellipsoid GRS80 = Ellipsoid.createArf(6378137.0, 298.257222101); 71 71 72 72 /** … … 75 75 * Proj.4 code: intl 76 76 */ 77 public static final Ellipsoid Hayford = Ellipsoid.create _a_rf(6378388.0, 297.0);77 public static final Ellipsoid Hayford = Ellipsoid.createArf(6378388.0, 297.0); 78 78 79 79 /** 80 80 * Helmert 1906 81 81 */ 82 public static final Ellipsoid Helmert = Ellipsoid.create _a_rf(6378200.0, 298.3);82 public static final Ellipsoid Helmert = Ellipsoid.createArf(6378200.0, 298.3); 83 83 84 84 /** 85 85 * Krassowsky 1940 ellipsoid 86 86 */ 87 public static final Ellipsoid Krassowsky = Ellipsoid.create _a_rf(6378245.0, 298.3);87 public static final Ellipsoid Krassowsky = Ellipsoid.createArf(6378245.0, 298.3); 88 88 89 89 /** 90 90 * WGS66 ellipsoid 91 91 */ 92 public static final Ellipsoid WGS66 = Ellipsoid.create _a_rf(6378145.0, 298.25);92 public static final Ellipsoid WGS66 = Ellipsoid.createArf(6378145.0, 298.25); 93 93 94 94 /** 95 95 * WGS72 ellipsoid 96 96 */ 97 public static final Ellipsoid WGS72 = Ellipsoid.create _a_rf(6378135.0, 298.26);97 public static final Ellipsoid WGS72 = Ellipsoid.createArf(6378135.0, 298.26); 98 98 99 99 /** 100 100 * WGS84 ellipsoid 101 101 */ 102 public static final Ellipsoid WGS84 = Ellipsoid.create _a_rf(6378137.0, 298.257223563);102 public static final Ellipsoid WGS84 = Ellipsoid.createArf(6378137.0, 298.257223563); 103 103 104 104 /** … … 162 162 * @return the new ellipsoid 163 163 */ 164 public static Ellipsoid create _a_b(double a, double b) {164 public static Ellipsoid createAb(double a, double b) { 165 165 double e2 = (a*a - b*b) / (a*a); 166 166 double e = Math.sqrt(e2); … … 176 176 * @return the new ellipsoid 177 177 */ 178 public static Ellipsoid create _a_es(double a, double es) {178 public static Ellipsoid createAes(double a, double es) { 179 179 double b = a * Math.sqrt(1.0 - es); 180 180 double e = Math.sqrt(es); … … 190 190 * @return the new ellipsoid 191 191 */ 192 public static Ellipsoid create _a_f(double a, double f) {192 public static Ellipsoid createAf(double a, double f) { 193 193 double b = a * (1.0 - f); 194 194 double e2 = f * (2 - f); … … 205 205 * @return the new ellipsoid 206 206 */ 207 public static Ellipsoid create _a_rf(double a, double rf) {208 return create _a_f(a, 1.0 / rf);207 public static Ellipsoid createArf(double a, double rf) { 208 return createAf(a, 1.0 / rf); 209 209 } 210 210
Note:
See TracChangeset
for help on using the changeset viewer.