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

Timestamp:

2009-10-24T13:39:45+02:00 (15 years ago)

Author:

stoecker

Message:

apply #3737 - patch by Pieren - new Lambert zones for France, still needs some rework

Location:

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

Files:

• Ellipsoid.java (modified) (2 diffs)
• Lambert.java (modified) (1 diff)
• LambertCC9Zones.java (added)
• Projection.java (modified) (1 diff)

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

@@ -11 +11 @@
  * the reference ellipsoids
  */
-class Ellipsoid {
+public class Ellipsoid {
     /**
      * Clarke's ellipsoid (NTF system)
@@ -22 +22 @@
         new Ellipsoid(6378388.0, 6356911.9461);
     /**
+     * GRS80 ellipsoid
+     */
+    public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.3141);
+
+    /**
      * WGS84 ellipsoid
      */
-    public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.314);
+    public static final Ellipsoid WGS84 = new Ellipsoid(6378137.0, 6356752.3142);
 
     /**

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

@@ -141 +141 @@
 
     @Override public String toString() {
-        return tr("Lambert Zone (France)");
+        return tr("Lambert 4 Zones (France)");
     }
 
     public String toCode() {
-        return "EPSG:"+(27571+currentZone);
+        return "EPSG:"+(27561+currentZone);
     }
 

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

@@ -31 +31 @@
         new UTM_20N_Guadeloupe_Fort_Marigot(),
         new UTM_20N_Martinique_Fort_Desaix(),
-        new GaussLaborde_Reunion()
+        new GaussLaborde_Reunion(),
+        new LambertCC9Zones()    // Still needs proper default zoom
     };