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

Timestamp:

2018-03-28T23:24:09+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16129 - add new Ellipsoids taken from PROJ.4

Location:

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

Files:

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

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

@@ -57 +57 @@
 
     /**
+     * Everest 1830
+     */
+    public static final Ellipsoid Everest = Ellipsoid.createArf(6377276.345, 300.8017);
+
+    /**
+     * Everest 1948
+     */
+    public static final Ellipsoid Everest1948 = Ellipsoid.createArf(6377304.063, 300.8017);
+
+    /**
+     * Everest 1956
+     */
+    public static final Ellipsoid Everest1956 = Ellipsoid.createArf(6377301.243, 300.8017);
+
+    /**
+     * Everest 1969
+     */
+    public static final Ellipsoid Everest1969 = Ellipsoid.createArf(6377295.664, 300.8017);
+
+    /**
      * Everest (Sabah & Sarawak)
      */
@@ -70 +90 @@
      */
     public static final Ellipsoid FischerMod = Ellipsoid.createArf(6378155., 298.3);
+
+    /**
+     * Fischer 1968
+     */
+    public static final Ellipsoid Fischer1968 = Ellipsoid.createArf(6378150., 298.3);
 
     /**
@@ -94 +119 @@
 
     /**
+     * Hough
+     */
+    public static final Ellipsoid Hough = Ellipsoid.createArf(6378270.0, 297.0);
+
+    /**
      * Krassowsky 1940 ellipsoid
      */
     public static final Ellipsoid Krassowsky = Ellipsoid.createArf(6378245.0, 298.3);
+
+    /**
+     * Sphere
+     */
+    public static final Ellipsoid Sphere = Ellipsoid.createAb(6371008.7714, 6371008.7714);
+
+    /**
+     * Walbeck
+     */
+    public static final Ellipsoid Walbeck = Ellipsoid.createAb(6376896.0, 6355834.8467);
 
     /**

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

@@ -109 +109 @@
         ellipsoids.put("clrk80", Ellipsoid.Clarke1880);
         ellipsoids.put("clrk80ign", Ellipsoid.ClarkeIGN);
+        ellipsoids.put("evrst30", Ellipsoid.Everest);
+        ellipsoids.put("evrst48", Ellipsoid.Everest1948);
+        ellipsoids.put("evrst56", Ellipsoid.Everest1956);
+        ellipsoids.put("evrst69", Ellipsoid.Everest1969);
         ellipsoids.put("evrstSS", Ellipsoid.EverestSabahSarawak);
         ellipsoids.put("fschr60", Ellipsoid.Fischer);
         ellipsoids.put("fschr60m", Ellipsoid.FischerMod);
+        ellipsoids.put("fschr68", Ellipsoid.Fischer1968);
         ellipsoids.put("intl", Ellipsoid.Hayford);
         ellipsoids.put("helmert", Ellipsoid.Helmert);
+        ellipsoids.put("hough", Ellipsoid.Hough);
         ellipsoids.put("krass", Ellipsoid.Krassowsky);
+        ellipsoids.put("sphere", Ellipsoid.Sphere);
+        ellipsoids.put("walbeck", Ellipsoid.Walbeck);
         ellipsoids.put("GRS67", Ellipsoid.GRS67);
         ellipsoids.put("GRS80", Ellipsoid.GRS80);