Index: /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 1928)
+++ /trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java	(revision 1929)
@@ -12,48 +12,153 @@
  */
 class Ellipsoid {
-  /**
-   * Clarke's elipsoid (NTF system)
-   */
-  public static final Ellipsoid clarke = new Ellipsoid(6378249.2, 6356515.0);
-  /**
-   * Hayford's ellipsoid (ED50 system)
-   */
-  public static final Ellipsoid hayford =
-    new Ellipsoid(6378388.0, 6356911.9461);
-  /**
-   * WGS84 elipsoid
-   */
-  public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.314);
+    /**
+     * Clarke's ellipsoid (NTF system)
+     */
+    public static final Ellipsoid clarke = new Ellipsoid(6378249.2, 6356515.0);
+    /**
+     * Hayford's ellipsoid (ED50 system)
+     */
+    public static final Ellipsoid hayford =
+        new Ellipsoid(6378388.0, 6356911.9461);
+    /**
+     * WGS84 ellipsoid
+     */
+    public static final Ellipsoid GRS80 = new Ellipsoid(6378137.0, 6356752.314);
 
-  /**
-   * half long axis
-   */
-  public final double a;
-  /**
-   * half short axis
-   */
-  public final double b;
-  /**
-   * first excentricity
-   */
-  public final double e;
-  /**
-   * first excentricity squared
-   */
-  public final double e2;
+    /**
+     * half long axis
+     */
+    public final double a;
+    /**
+     * half short axis
+     */
+    public final double b;
+    /**
+     * first eccentricity
+     */
+    public final double e;
+    /**
+     * first eccentricity squared
+     */
+    public final double e2;
 
-  /**
-   * create a new ellipsoid and precompute its parameters
-   *
-   * @param a ellipsoid long axis (in meters)
-   * @param b ellipsoid short axis (in meters)
-   */
-  public Ellipsoid(double a, double b) {
-    this.a = a;
-    this.b = b;
-    e2 = (a*a - b*b) / (a*a);
-    e = Math.sqrt(e2);
-  }
+    /**
+     * square of the second eccentricity
+     */
+    public final double eb2;
+
+    /**
+     * create a new ellipsoid and precompute its parameters
+     *
+     * @param a ellipsoid long axis (in meters)
+     * @param b ellipsoid short axis (in meters)
+     */
+    public Ellipsoid(double a, double b) {
+        this.a = a;
+        this.b = b;
+        e2 = (a*a - b*b) / (a*a);
+        e = Math.sqrt(e2);
+        eb2 = e2 / (1.0 - e2);
+    }
+
+    /**
+     * Returns the <i>radius of curvature in the prime vertical</i>
+     * for this reference ellipsoid at the specified latitude.
+     *
+     * @param phi The local latitude (radians).
+     * @return The radius of curvature in the prime vertical (meters).
+     */
+    public double verticalRadiusOfCurvature(final double phi) {
+        return a / Math.sqrt(1.0 - (e2 * sqr(Math.sin(phi))));
+    }
+
+    private static double sqr(final double x) {
+        return x * x;
+    }
+
+    /**
+     *  Returns the meridional arc, the true meridional distance on the
+     * ellipsoid from the equator to the specified latitude, in meters.
+     *
+     * @param phi   The local latitude (in radians).
+     * @return  The meridional arc (in meters).
+     */
+    public double meridionalArc(final double phi) {
+        final double sin2Phi = Math.sin(2.0 * phi);
+        final double sin4Phi = Math.sin(4.0 * phi);
+        final double sin6Phi = Math.sin(6.0 * phi);
+        final double sin8Phi = Math.sin(8.0 * phi);
+        // TODO . calculate 'f'
+        //double f = 1.0 / 298.257222101; // GRS80
+        double f = 1.0 / 298.257223563; // WGS84
+        final double n = f / (2.0 - f);
+        final double n2 = n * n;
+        final double n3 = n2 * n;
+        final double n4 = n3 * n;
+        final double n5 = n4 * n;
+        final double n1n2 = n - n2;
+        final double n2n3 = n2 - n3;
+        final double n3n4 = n3 - n4;
+        final double n4n5 = n4 - n5;
+        final double ap = a * (1.0 - n + (5.0 / 4.0) * (n2n3) + (81.0 / 64.0) * (n4n5));
+        final double bp = (3.0 / 2.0) * a * (n1n2 + (7.0 / 8.0) * (n3n4) + (55.0 / 64.0) * n5);
+        final double cp = (15.0 / 16.0) * a * (n2n3 + (3.0 / 4.0) * (n4n5));
+        final double dp = (35.0 / 48.0) * a * (n3n4 + (11.0 / 16.0) * n5);
+        final double ep = (315.0 / 512.0) * a * (n4n5);
+        return ap * phi - bp * sin2Phi + cp * sin4Phi - dp * sin6Phi + ep * sin8Phi;
+    }
+
+    /**
+     *  Returns the <i>radius of curvature in the meridian<i>
+     *  for this reference ellipsoid at the specified latitude.
+     *
+     * @param phi The local latitude (in radians).
+     * @return  The radius of curvature in the meridian (in meters).
+     */
+    public double meridionalRadiusOfCurvature(final double phi) {
+        return verticalRadiusOfCurvature(phi)
+        / (1.0 + eb2 * sqr(Math.cos(phi)));
+    }
+
+    /**
+     * Returns isometric latitude of phi on given first eccentricity (e)
+     * @param phi The local latitude (radians).
+     * @return isometric latitude of phi on first eccentricity (e)
+     */
+    public double latitudeIsometric(double phi, double e) {
+        double v1 = 1-e*Math.sin(phi);
+        double v2 = 1+e*Math.sin(phi);
+        return Math.log(Math.tan(Math.PI/4+phi/2)*Math.pow(v1/v2,e/2));
+    }
+
+    /**
+     * Returns isometric latitude of phi on first eccentricity (e)
+     * @param phi The local latitude (radians).
+     * @return isometric latitude of phi on first eccentricity (e)
+     */
+    public double latitudeIsometric(double phi) {
+        double v1 = 1-e*Math.sin(phi);
+        double v2 = 1+e*Math.sin(phi);
+        return Math.log(Math.tan(Math.PI/4+phi/2)*Math.pow(v1/v2,e/2));
+    }
+
+    /*
+     * Returns geographic latitude of isometric latitude of first eccentricity (e)
+     * and epsilon precision
+     */
+    public double latitude(double latIso, double e, double epsilon) {
+        double lat0 = 2*Math.atan(Math.exp(latIso))-Math.PI/2;
+        double lati = lat0;
+        double lati1 = 1.0; // random value to start the iterative processus
+        while(Math.abs(lati1-lati)>=epsilon) {
+            lati = lati1;
+            double v1 = 1+e*Math.sin(lati);
+            double v2 = 1-e*Math.sin(lati);
+            lati1 = 2*Math.atan(Math.pow(v1/v2,e/2)*Math.exp(latIso))-Math.PI/2;
+        }
+        return lati1;
+    }
 }
 
 
+
Index: /trunk/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java	(revision 1929)
+++ /trunk/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java	(revision 1929)
@@ -0,0 +1,218 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class GaussLaborde_Reunion implements Projection {
+
+    private static final double lon0 = Math.toRadians(55.53333333333333333333);
+    private static final double lat0 = Math.toRadians(-21.11666666666666666666);
+    private static final double x0 = 160000.0;
+    private static final double y0 = 50000.0;
+    private static final double k0 = 1;
+
+    private static double sinLat0 = Math.sin(lat0);
+    private static double cosLat0 = Math.cos(lat0);
+    private static double n1 = Math.sqrt(1 + cosLat0*cosLat0*cosLat0*cosLat0*Ellipsoid.hayford.e2/(1-Ellipsoid.hayford.e2));
+    private static double phic = Math.asin(sinLat0/n1);
+    private static double c = Ellipsoid.hayford.latitudeIsometric(phic, 0) - n1*Ellipsoid.hayford.latitudeIsometric(lat0, Ellipsoid.hayford.e);
+    private static double n2 = k0*Ellipsoid.hayford.a*Math.sqrt(1-Ellipsoid.hayford.e2)/(1-Ellipsoid.hayford.e2*sinLat0*sinLat0);
+    private static double xs = x0;
+    private static double ys = y0 - n2*phic;
+    private static final double epsilon = 1e-11;
+    private static final double scaleDiff = -32.3241E-6;
+    private static final double Tx = 789.524;
+    private static final double Ty = -626.486;
+    private static final double Tz = -89.904;
+    private static final double rx = Math.toRadians(0.6006/3600);
+    private static final double ry = Math.toRadians(76.7946/3600);
+    private static final double rz = Math.toRadians(-10.5788/3600);
+    private static final double rx2 = rx*rx;
+    private static final double ry2 = ry*ry;
+    private static final double rz2 = rz*rz;
+
+    public LatLon eastNorth2latlon(EastNorth p) {
+        // plan Gauss-Laborde to geographic Piton-des-Neiges
+        LatLon geo = Geographic(p);
+
+        // geographic Piton-des-Neiges/Hayford to geographic WGS84/GRS80
+        LatLon wgs = PTN2GRS80(geo);
+        return new LatLon(Math.toDegrees(wgs.lat()), Math.toDegrees(wgs.lon()));
+    }
+
+    /*
+     * Convert projected coordinates (Gauss-Laborde) to reference ellipsoid Hayforf geographic Piton-des-Neiges
+     * @return geographic coordinates in radian
+     */
+    private LatLon Geographic(EastNorth eastNorth) {
+        double dxn = (eastNorth.east()-xs)/n2;
+        double dyn = (eastNorth.north()-ys)/n2;
+        double lambda = Math.atan(sinh(dxn)/Math.cos(dyn));
+        double latIso = Ellipsoid.hayford.latitudeIsometric(Math.asin(Math.sin(dyn)/cosh(dxn)), 0);
+        double lon = lon0 + lambda/n1;
+        double lat = Ellipsoid.hayford.latitude((latIso-c)/n1, Ellipsoid.hayford.e, 1E-12);
+        return new LatLon(lat, lon);
+    }
+
+    /**
+     * Convert geographic Piton-des-Neiges ellipsoid Hayford to geographic WGS84/GRS80
+     * @param PTN in radian
+     * @return
+     */
+    private LatLon PTN2GRS80(LatLon PTN) {
+        double lat = PTN.lat();
+        double lon = PTN.lon();
+        double N = Ellipsoid.hayford.a / (Math.sqrt(1.0 - Ellipsoid.hayford.e2 * Math.sin(lat) * Math.sin(lat)));
+        double X = (N/* +height */) * Math.cos(lat) * Math.cos(lon);
+        double Y = (N/* +height */) * Math.cos(lat) * Math.sin(lon);
+        double Z = (N * (1.0 - Ellipsoid.hayford.e2)/* + height */) * Math.sin(lat);
+
+        // translation
+        double coord[] = sevenParametersTransformation(X, Y, Z);
+
+        // WGS84 cartesian => WGS84 geographic
+        return cart2LatLon(coord[0], coord[1], coord[2], Ellipsoid.GRS80);
+    }
+
+    /**
+     * 7 parameters transformation
+     * @param coord X, Y, Z in array
+     * @return transformed X, Y, Z in array
+     */
+    private double[] sevenParametersTransformation(double Xa, double Ya, double Za){
+        double Xb = Tx + Xa*(1+scaleDiff) + Za*ry - Ya*rz;
+        double Yb = Ty + Ya*(1+scaleDiff) + Xa*rz - Za*rx;
+        double Zb = Tz + Za*(1+scaleDiff) + Ya*rx - Xa*ry;
+        return new double[]{Xb, Yb, Zb};
+    }
+
+    public EastNorth latlon2eastNorth(LatLon wgs) {
+        // translate ellipsoid GRS80 (WGS83) => reference ellipsoid geographic R\u00E9union
+        LatLon geo = GRS802Hayford(wgs);
+
+        // reference ellipsoid geographic => GaussLaborde plan
+        return GaussLabordeProjection(geo);
+    }
+
+    private LatLon GRS802Hayford(LatLon wgs) {
+        double lat = Math.toRadians(wgs.lat()); // degree to radian
+        double lon = Math.toRadians(wgs.lon());
+        // WGS84 geographic => WGS84 cartesian
+        double N = Ellipsoid.GRS80.a / (Math.sqrt(1.0 - Ellipsoid.GRS80.e2 * Math.sin(lat) * Math.sin(lat)));
+        double X = (N/* +height */) * Math.cos(lat) * Math.cos(lon);
+        double Y = (N/* +height */) * Math.cos(lat) * Math.sin(lon);
+        double Z = (N * (1.0 - Ellipsoid.GRS80.e2)/* + height */) * Math.sin(lat);
+        // translation
+        double coord[] = invSevenParametersTransformation(X, Y, Z);
+        // Gauss cartesian => Gauss geographic
+        return Geographic(coord[0], coord[1], coord[2], Ellipsoid.hayford);
+    }
+
+    /**
+     * 7 parameters inverse transformation
+     * @param coord X, Y, Z in array
+     * @return transformed X, Y, Z in array
+     */
+    private double[] invSevenParametersTransformation(double Vx, double Vy, double Vz){
+        Vx = Vx - Tx;
+        Vy = Vy - Ty;
+        Vz = Vz - Tz;
+        double e = 1 + scaleDiff;
+        double e2 = e*e;
+        double det = e*(e2 + rx2 + ry2 + rz2);
+        double Ux = ((e2 + rx2)*Vx + (e*rz + rx*ry)*Vy + (rx*rz - e*ry)*Vz)/det;
+        double Uy = ((-e*rz + rx*ry)*Vx + (e2 + ry2)*Vy + (e*rx + ry*rz)*Vz)/det;
+        double Uz = ((e*ry + rx*rz)*Vx + (-e*rx + ry*rz)*Vy + (e2 + rz2)*Vz)/det;
+        return new double[]{Ux, Uy, Uz};
+    }
+
+    private LatLon Geographic(double X, double Y, double Z, Ellipsoid ell) {
+        double norm = Math.sqrt(X * X + Y * Y);
+        double lg = 2.0 * Math.atan(Y / (X + norm));
+        double lt = Math.atan(Z / (norm * (1.0 - (ell.a * ell.e2 / Math.sqrt(X * X + Y * Y + Z * Z)))));
+        double delta = 1.0;
+        while (delta > epsilon) {
+            double s2 = Math.sin(lt);
+            s2 *= s2;
+            double l = Math.atan((Z / norm)
+                    / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
+            delta = Math.abs(l - lt);
+            lt = l;
+        }
+        double s2 = Math.sin(lt);
+        s2 *= s2;
+        // h = norm / Math.cos(lt) - ell.a / Math.sqrt(1.0 - ell.e2 * s2);
+        return new LatLon(lt, lg);
+    }
+
+    private EastNorth GaussLabordeProjection(LatLon geo) {
+        double lambda = n1*(geo.lon()-lon0);
+        double latIso = c + n1*Ellipsoid.hayford.latitudeIsometric(geo.lat());
+        double x = xs + n2*Ellipsoid.hayford.latitudeIsometric(Math.asin(Math.sin(lambda)/((Math.exp(latIso) + Math.exp(-latIso))/2)),0);
+        double y = ys + n2*Math.atan(((Math.exp(latIso) - Math.exp(-latIso))/2)/(Math.cos(lambda)));
+        return new EastNorth(x, y);
+    }
+
+    /**
+     * initializes from cartesian coordinates
+     *
+     * @param X 1st coordinate in meters
+     * @param Y 2nd coordinate in meters
+     * @param Z 3rd coordinate in meters
+     * @param ell reference ellipsoid
+     */
+    private LatLon cart2LatLon(double X, double Y, double Z, Ellipsoid ell) {
+        double norm = Math.sqrt(X * X + Y * Y);
+        double lg = 2.0 * Math.atan(Y / (X + norm));
+        double lt = Math.atan(Z / (norm * (1.0 - (ell.a * ell.e2 / Math.sqrt(X * X + Y * Y + Z * Z)))));
+        double delta = 1.0;
+        while (delta > epsilon) {
+            double s2 = Math.sin(lt);
+            s2 *= s2;
+            double l = Math.atan((Z / norm)
+                    / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
+            delta = Math.abs(l - lt);
+            lt = l;
+        }
+        double s2 = Math.sin(lt);
+        s2 *= s2;
+        // h = norm / Math.cos(lt) - ell.a / Math.sqrt(1.0 - ell.e2 * s2);
+        return new LatLon(lt, lg);
+    }
+
+    /*
+     * hyperbolic sine
+     */
+    public static final double sinh(double x) {
+        return (Math.exp(x) - Math.exp(-x))/2;
+    }
+    /*
+     * hyperbolic cosine
+     */
+    public static final double cosh(double x) {
+        return (Math.exp(x) + Math.exp(-x))/2;
+    }
+
+    public String getCacheDirectoryName() {
+        return this.toString();
+    }
+
+    public Bounds getWorldBoundsLatLon() {
+        return new Bounds(
+                new LatLon(-21.5, 55.14),
+                new LatLon(-20.76, 55.94));
+    }
+
+    public String toCode() {
+        return "EPSG::3727";
+    }
+
+    @Override public String toString() {
+        return tr("Gauss-Laborde R\u00E9union 1947");
+    }
+
+}
Index: /trunk/src/org/openstreetmap/josm/data/projection/Projection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/Projection.java	(revision 1928)
+++ /trunk/src/org/openstreetmap/josm/data/projection/Projection.java	(revision 1929)
@@ -5,5 +5,4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.ProjectionBounds;
 
 /**
@@ -25,8 +24,12 @@
         new Epsg4326(),
         new Mercator(),
+        new LambertEST(),
         new Lambert(),
-        new LambertEST(),
         new SwissGrid(),
-        new UTM()
+        new UTM(),
+        new UTM_20N_Guadeloupe_Ste_Anne(),
+        new UTM_20N_Guadeloupe_Fort_Marigot(),
+        new UTM_20N_Martinique_Fort_Desaix(),
+        new GaussLaborde_Reunion()
     };
 
Index: /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java	(revision 1929)
+++ /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java	(revision 1929)
@@ -0,0 +1,312 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection;
+
+/**
+ * This class is not a direct implementation of Projection. It collects all methods used
+ * for the projection of the French departements in the Caribbean Sea UTM zone 20N
+ * but using each time different local geodesic settings for the 7 parameters transformation algorithm.
+ */
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class UTM_20N_France_DOM {
+
+    /**
+     * false east in meters (constant)
+     */
+    private static final double Xs = 500000.0;
+    /**
+     * false north in meters (0 in northern hemisphere, 10000000 in southern
+     * hemisphere)
+     */
+    private static double Ys = 0;
+    /**
+     * origin meridian longitude
+     */
+    protected double lg0;
+    /**
+     * UTM zone (from 1 to 60)
+     */
+    int zone = 20;
+    /**
+     * whether north or south hemisphere
+     */
+    private boolean isNorth = true;
+    /**
+     * 7 parameters transformation
+     */
+    double tx = 0.0;
+    double ty = 0.0;
+    double tz = 0.0;
+    double rx = 0;
+    double ry = 0;
+    double rz = 0;
+    double scaleDiff = 0;
+    /**
+     * precision in iterative schema
+     */
+    public static final double epsilon = 1e-11;
+    public final static double DEG_TO_RAD = Math.PI / 180;
+    public final static double RAD_TO_DEG = 180 / Math.PI;
+
+    public UTM_20N_France_DOM(double[] translation, double[] rotation, double scaleDiff) {
+        this.tx = translation[0];
+        this.ty = translation[1];
+        this.tz = translation[2];
+        this.rx = rotation[0]/206264.806247096355; // seconds to radian
+        this.ry = rotation[1]/206264.806247096355;
+        this.rz = rotation[2]/206264.806247096355;
+        this.scaleDiff = scaleDiff;
+    }
+    public EastNorth latlon2eastNorth(LatLon p) {
+        // translate ellipsoid GRS80 (WGS83) => reference ellipsoid geographic
+        LatLon geo = GRS802Hayford(p);
+
+        // reference ellipsoid geographic => UTM projection
+        return MTProjection(geo, Ellipsoid.hayford.a, Ellipsoid.hayford.e);
+    }
+
+    /**
+     * Translate latitude/longitude in WGS84, (ellipsoid GRS80) to UTM
+     * geographic, (ellipsoid Hayford)
+     */
+    private LatLon GRS802Hayford(LatLon wgs) {
+        double lat = Math.toRadians(wgs.lat()); // degree to radian
+        double lon = Math.toRadians(wgs.lon());
+        // WGS84 geographic => WGS84 cartesian
+        double N = Ellipsoid.GRS80.a / (Math.sqrt(1.0 - Ellipsoid.GRS80.e2 * Math.sin(lat) * Math.sin(lat)));
+        double X = (N/* +height */) * Math.cos(lat) * Math.cos(lon);
+        double Y = (N/* +height */) * Math.cos(lat) * Math.sin(lon);
+        double Z = (N * (1.0 - Ellipsoid.GRS80.e2)/* + height */) * Math.sin(lat);
+        // translation
+        double coord[] = invSevenParametersTransformation(X, Y, Z);
+        // UTM cartesian => UTM geographic
+        return Geographic(coord[0], coord[1], coord[2], Ellipsoid.hayford);
+    }
+
+    /**
+     * initializes from cartesian coordinates
+     *
+     * @param X
+     *            1st coordinate in meters
+     * @param Y
+     *            2nd coordinate in meters
+     * @param Z
+     *            3rd coordinate in meters
+     * @param ell
+     *            reference ellipsoid
+     */
+    private LatLon Geographic(double X, double Y, double Z, Ellipsoid ell) {
+        double norm = Math.sqrt(X * X + Y * Y);
+        double lg = 2.0 * Math.atan(Y / (X + norm));
+        double lt = Math.atan(Z / (norm * (1.0 - (ell.a * ell.e2 / Math.sqrt(X * X + Y * Y + Z * Z)))));
+        double delta = 1.0;
+        while (delta > epsilon) {
+            double s2 = Math.sin(lt);
+            s2 *= s2;
+            double l = Math.atan((Z / norm)
+                    / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
+            delta = Math.abs(l - lt);
+            lt = l;
+        }
+        double s2 = Math.sin(lt);
+        s2 *= s2;
+        // h = norm / Math.cos(lt) - ell.a / Math.sqrt(1.0 - ell.e2 * s2);
+        return new LatLon(lt, lg);
+    }
+
+    /**
+     * initalizes from geographic coordinates
+     *
+     * @param coord geographic coordinates triplet
+     * @param a reference ellipsoid long axis
+     * @param e reference ellipsoid excentricity
+     */
+    private EastNorth MTProjection(LatLon coord, double a, double e) {
+        double n = 0.9996 * a;
+        Ys = (coord.lat() >= 0.0) ? 0.0 : 10000000.0;
+        double r6d = Math.PI / 30.0;
+        //zone = (int) Math.floor((coord.lon() + Math.PI) / r6d) + 1;
+        lg0 = r6d * (zone - 0.5) - Math.PI;
+        double e2 = e * e;
+        double e4 = e2 * e2;
+        double e6 = e4 * e2;
+        double e8 = e4 * e4;
+        double C[] = {
+                1.0 - e2/4.0 - 3.0*e4/64.0 - 5.0*e6/256.0 - 175.0*e8/16384.0,
+                e2/8.0 - e4/96.0 - 9.0*e6/1024.0 - 901.0*e8/184320.0,
+                13.0*e4/768.0 + 17.0*e6/5120.0 - 311.0*e8/737280.0,
+                61.0*e6/15360.0 + 899.0*e8/430080.0,
+                49561.0*e8/41287680.0
+        };
+        double s = e * Math.sin(coord.lat());
+        double l = Math.log(Math.tan(Math.PI/4.0 + coord.lat()/2.0) *
+                Math.pow((1.0 - s) / (1.0 + s), e/2.0));
+        double phi = Math.asin(Math.sin(coord.lon() - lg0) /
+                ((Math.exp(l) + Math.exp(-l)) / 2.0));
+        double ls = Math.log(Math.tan(Math.PI/4.0 + phi/2.0));
+        double lambda = Math.atan(((Math.exp(l) - Math.exp(-l)) / 2.0) /
+                Math.cos(coord.lon() - lg0));
+
+        double north = C[0] * lambda;
+        double east = C[0] * ls;
+        for(int k = 1; k < 5; k++) {
+            double r = 2.0 * k * lambda;
+            double m = 2.0 * k * ls;
+            double em = Math.exp(m);
+            double en = Math.exp(-m);
+            double sr = Math.sin(r)/2.0 * (em + en);
+            double sm = Math.cos(r)/2.0 * (em - en);
+            north += C[k] * sr;
+            east += C[k] * sm;
+        }
+        east *= n;
+        east += Xs;
+        north *= n;
+        north += Ys;
+        return new EastNorth(east, north);
+    }
+
+    public LatLon eastNorth2latlon(EastNorth p) {
+        MTProjection(p.east(), p.north(), zone, isNorth);
+        LatLon geo = Geographic(p, Ellipsoid.hayford.a, Ellipsoid.hayford.e, 0.0 /* z */);
+
+        // reference ellipsoid geographic => reference ellipsoid cartesian
+        //Hayford2GRS80(ellipsoid, geo);
+        double N = Ellipsoid.hayford.a / (Math.sqrt(1.0 - Ellipsoid.hayford.e2 * Math.sin(geo.lat()) * Math.sin(geo.lat())));
+        double X = (N /*+ h*/) * Math.cos(geo.lat()) * Math.cos(geo.lon());
+        double Y = (N /*+ h*/) * Math.cos(geo.lat()) * Math.sin(geo.lon());
+        double Z = (N * (1.0-Ellipsoid.hayford.e2) /*+ h*/) * Math.sin(geo.lat());
+
+        // translation
+        double coord[] = sevenParametersTransformation(X, Y, Z);
+
+        // WGS84 cartesian => WGS84 geographic
+        LatLon wgs = cart2LatLon(coord[0], coord[1], coord[2], Ellipsoid.GRS80);
+        return new LatLon(Math.toDegrees(wgs.lat()), Math.toDegrees(wgs.lon()));
+    }
+
+    /**
+     * initializes new projection coordinates (in north hemisphere)
+     *
+     * @param east east from origin in meters
+     * @param north north from origin in meters
+     * @param zone zone number (from 1 to 60)
+     * @param isNorth true in north hemisphere, false in south hemisphere
+     */
+    private void MTProjection(double east, double north, int zone, boolean isNorth) {
+        Ys = isNorth ? 0.0 : 10000000.0;
+        double r6d = Math.PI / 30.0;
+        lg0 = r6d * (zone - 0.5) - Math.PI;
+    }
+
+    public double scaleFactor() {
+        return 1/Math.PI/2;
+    }
+
+    /**
+     * initalizes from projected coordinates (Mercator transverse projection)
+     *
+     * @param coord projected coordinates pair
+     * @param e reference ellipsoid excentricity
+     * @param a reference ellipsoid long axis
+     * @param z altitude in meters
+     */
+    private LatLon Geographic(EastNorth coord, double a, double e, double z) {
+        double n = 0.9996 * a;
+        double e2 = e * e;
+        double e4 = e2 * e2;
+        double e6 = e4 * e2;
+        double e8 = e4 * e4;
+        double C[] = {
+                1.0 - e2/4.0 - 3.0*e4/64.0 - 5.0*e6/256.0 - 175.0*e8/16384.0,
+                e2/8.0 + e4/48.0 + 7.0*e6/2048.0 + e8/61440.0,
+                e4/768.0 + 3.0*e6/1280.0 + 559.0*e8/368640.0,
+                17.0*e6/30720.0 + 283.0*e8/430080.0,
+                4397.0*e8/41287680.0
+        };
+        double l = (coord.north() - Ys) / (n * C[0]);
+        double ls = (coord.east() - Xs) / (n * C[0]);
+        double l0 = l;
+        double ls0 = ls;
+        for(int k = 1; k < 5; k++) {
+            double r = 2.0 * k * l0;
+            double m = 2.0 * k * ls0;
+            double em = Math.exp(m);
+            double en = Math.exp(-m);
+            double sr = Math.sin(r)/2.0 * (em + en);
+            double sm = Math.cos(r)/2.0 * (em - en);
+            l -= C[k] * sr;
+            ls -= C[k] * sm;
+        }
+        double lon = lg0 + Math.atan(((Math.exp(ls) - Math.exp(-ls)) / 2.0) /
+                Math.cos(l));
+        double phi = Math.asin(Math.sin(l) /
+                ((Math.exp(ls) + Math.exp(-ls)) / 2.0));
+        l = Math.log(Math.tan(Math.PI/4.0 + phi/2.0));
+        double lat = 2.0 * Math.atan(Math.exp(l)) - Math.PI / 2.0;
+        double lt0;
+        do {
+            lt0 = lat;
+            double s = e * Math.sin(lat);
+            lat = 2.0 * Math.atan(Math.pow((1.0 + s) / (1.0 - s), e/2.0) *
+                    Math.exp(l)) - Math.PI / 2.0;
+        }
+        while(Math.abs(lat-lt0) >= epsilon);
+        //h = z;
+
+        return new LatLon(lat, lon);
+    }
+
+    /**
+     * initializes from cartesian coordinates
+     *
+     * @param X 1st coordinate in meters
+     * @param Y 2nd coordinate in meters
+     * @param Z 3rd coordinate in meters
+     * @param ell reference ellipsoid
+     */
+    private LatLon cart2LatLon(double X, double Y, double Z, Ellipsoid ell) {
+        double norm = Math.sqrt(X * X + Y * Y);
+        double lg = 2.0 * Math.atan(Y / (X + norm));
+        double lt = Math.atan(Z / (norm * (1.0 - (ell.a * ell.e2 / Math.sqrt(X * X + Y * Y + Z * Z)))));
+        double delta = 1.0;
+        while (delta > epsilon) {
+            double s2 = Math.sin(lt);
+            s2 *= s2;
+            double l = Math.atan((Z / norm)
+                    / (1.0 - (ell.a * ell.e2 * Math.cos(lt) / (norm * Math.sqrt(1.0 - ell.e2 * s2)))));
+            delta = Math.abs(l - lt);
+            lt = l;
+        }
+        double s2 = Math.sin(lt);
+        s2 *= s2;
+        // h = norm / Math.cos(lt) - ell.a / Math.sqrt(1.0 - ell.e2 * s2);
+        return new LatLon(lt, lg);
+    }
+
+    /**
+     * 7 parameters transformation
+     * @param coord X, Y, Z in array
+     * @return transformed X, Y, Z in array
+     */
+    private double[] sevenParametersTransformation(double Xa, double Ya, double Za){
+        double Xb = tx + Xa*(1+scaleDiff) + Za*ry - Ya*rz;
+        double Yb = ty + Ya*(1+scaleDiff) + Xa*rz - Za*rx;
+        double Zb = tz + Za*(1+scaleDiff) + Ya*rx - Xa*ry;
+        return new double[]{Xb, Yb, Zb};
+    }
+
+    /**
+     * 7 parameters inverse transformation
+     * @param coord X, Y, Z in array
+     * @return transformed X, Y, Z in array
+     */
+    private double[] invSevenParametersTransformation(double Xa, double Ya, double Za){
+        double Xb = (1-scaleDiff)*(-tx + Xa + ((-tz+Za)*(-ry) - (-ty+Ya)*(-rz)));
+        double Yb = (1-scaleDiff)*(-ty + Ya + ((-tx+Xa)*(-rz) - (-tz+Za)*(-rx)));
+        double Zb = (1-scaleDiff)*(-tz + Za + ((-ty+Ya)*(-rx) - (-tx+Xa)*(-ry)));
+        return new double[]{Xb, Yb, Zb};
+    }
+
+}
Index: /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java	(revision 1929)
+++ /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java	(revision 1929)
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/*
+ * Local geodisic system with UTM zone 20N projection.
+ * Apply to Guadeloupe, France - St Martin and St Barthelemy islands
+ */
+public class UTM_20N_Guadeloupe_Fort_Marigot extends UTM_20N_France_DOM implements Projection {
+    public UTM_20N_Guadeloupe_Fort_Marigot() {
+        super(new double[]{136.596, 248.148, -429.789},
+                new double[]{0, 0, 0},
+                0);
+    }
+
+    public String getCacheDirectoryName() {
+        return this.toString();
+    }
+
+    public Bounds getWorldBoundsLatLon() {
+        return new Bounds(
+                new LatLon(17.6,-63.25),
+                new LatLon(18.5,-62.5));
+    }
+
+    public String toCode() {
+        return "EPSG::2969";
+    }
+
+    @Override public String toString() {
+        return tr("UTM20N Guadeloupe Fort-Marigot 1949");
+    }
+
+}
Index: /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java	(revision 1929)
+++ /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java	(revision 1929)
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/*
+ * Local geodisic system with UTM zone 20N projection.
+ * Apply to Guadeloupe, France - Grande-Terre and surrounding islands.
+ */
+public class UTM_20N_Guadeloupe_Ste_Anne extends UTM_20N_France_DOM implements Projection {
+    public UTM_20N_Guadeloupe_Ste_Anne() {
+        super (new double[]{-472.29, -5.63, -304.12},
+                new double[]{0.4362, -0.8374, 0.2563},
+                1.8984E-6);
+    }
+
+    public String getCacheDirectoryName() {
+        return this.toString();
+    }
+
+    public Bounds getWorldBoundsLatLon() {
+        return new Bounds(
+                new LatLon(15.8,-61.8),
+                new LatLon(16.6,-60.9));
+    }
+
+    public String toCode() {
+        return "EPSG::2970";
+    }
+
+    @Override public String toString() {
+        return tr("UTM20N Guadeloupe Ste-Anne 1948");
+    }
+
+}
Index: /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java	(revision 1929)
+++ /trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java	(revision 1929)
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/*
+ * Local geodisic system with UTM zone 20N projection.
+ * Apply to Martinique, France and surrounding islands
+ */
+public class UTM_20N_Martinique_Fort_Desaix extends UTM_20N_France_DOM implements Projection {
+    public UTM_20N_Martinique_Fort_Desaix() {
+        super(new double[]{126.926, 547.939, 130.409},
+                new double[]{-2.78670, 5.16124,  -0.85844},
+                13.82265E-6);
+    }
+
+    public String getCacheDirectoryName() {
+        return this.toString();
+    }
+
+    public Bounds getWorldBoundsLatLon() {
+        return new Bounds(
+                new LatLon(14.25,-61.25),
+                new LatLon(15.025,-60.725));
+    }
+
+    public String toCode() {
+        return "EPSG::2973";
+    }
+
+    @Override public String toString() {
+        return tr("UTM20N Martinique Fort Desaix 1952");
+    }
+}