Changeset 5548 in josm

Timestamp:

2012-11-01T16:52:19+01:00 (12 years ago)

Author:

bastiK

Message:

remove Projection classes (replaced by data/epsg file)

concludes the projection rework from ealier this year

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/BelgianLambert1972.java (deleted)
• data/projection/BelgianLambert2008.java (deleted)
• data/projection/CustomProjection.java (modified) (7 diffs)
• data/projection/Epsg3008.java (deleted)
• data/projection/Epsg4326.java (deleted)
• data/projection/GaussKrueger.java (deleted)
• data/projection/Lambert.java (deleted)
• data/projection/Lambert93.java (deleted)
• data/projection/LambertCC9Zones.java (deleted)
• data/projection/LambertEST.java (deleted)
• data/projection/Mercator.java (deleted)
• data/projection/Projection.java (modified) (2 diffs)
• data/projection/Projections.java (modified) (4 diffs)
• data/projection/Puwg.java (deleted)
• data/projection/SwissGrid.java (deleted)
• data/projection/TransverseMercatorLV.java (deleted)
• data/projection/UTM.java (deleted)
• data/projection/UTM_France_DOM.java (deleted)
• data/validation/OsmValidator.java (modified) (4 diffs)
• gui/preferences/projection/AbstractProjectionChoice.java (modified) (2 diffs)
• gui/preferences/projection/CustomProjectionChoice.java (modified) (2 diffs)
• gui/preferences/projection/GaussKruegerProjectionChoice.java (modified) (3 diffs)
• gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (modified) (3 diffs)
• gui/preferences/projection/LambertProjectionChoice.java (modified) (3 diffs)
• gui/preferences/projection/ListProjectionChoice.java (modified) (1 diff)
• gui/preferences/projection/ProjectionChoice.java (modified) (4 diffs)
• gui/preferences/projection/ProjectionPreference.java (modified) (4 diffs)
• gui/preferences/projection/PuwgProjectionChoice.java (modified) (3 diffs)
• gui/preferences/projection/SingleProjectionChoice.java (modified) (5 diffs)
• gui/preferences/projection/SwissGridProjectionChoice.java (modified) (2 diffs)
• gui/preferences/projection/UTMProjectionChoice.java (modified) (8 diffs)
• gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.projection.datum.ThreeParameterDatum;
 import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
+import org.openstreetmap.josm.data.projection.proj.Mercator;
 import org.openstreetmap.josm.data.projection.proj.Proj;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
@@ -38 +39 @@
      */
     protected String pref;
+    protected String name;
+    protected String code;
+    protected String cacheDir;
     protected Bounds bounds;
 
@@ -83 +87 @@
 
     public CustomProjection() {
-        this.pref = null;
     }
 
     public CustomProjection(String pref) {
+        this(null, null, pref, null);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name describe projection in one or two words
+     * @param code unique code for this projection - may be null
+     * @param pref the string that defines the custom projection
+     * @param cacheDir cache directory name
+     */
+    public CustomProjection(String name, String code, String pref, String cacheDir) {
+        this.name = name;
+        this.code = code;
+        this.pref = pref;
+        this.cacheDir = cacheDir;
         try {
-            this.pref = pref;
             update(pref);
         } catch (ProjectionConfigurationException ex) {
@@ -104 +122 @@
             ellps = Ellipsoid.WGS84;
             datum = WGS84Datum.INSTANCE;
-            proj = new org.openstreetmap.josm.data.projection.proj.Mercator();
+            proj = new Mercator();
             bounds = new Bounds(
                     new LatLon(-85.05112877980659, -180.0),
@@ -429 +447 @@
     @Override
     public Integer getEpsgCode() {
+        if (code != null && code.startsWith("EPSG:")) {
+            try {
+                return Integer.parseInt(code.substring(5));
+            } catch (NumberFormatException e) {}
+        }
         return null;
     }
@@ -434 +457 @@
     @Override
     public String toCode() {
-        return "proj:" + (pref == null ? "ERROR" : pref);
+        return code != null ? code : "proj:" + (pref == null ? "ERROR" : pref);
     }
 
     @Override
     public String getCacheDirectoryName() {
-        return "proj-"+Utils.md5Hex(pref == null ? "" : pref).substring(0, 4);
+        return cacheDir != null ? cacheDir : "proj-"+Utils.md5Hex(pref == null ? "" : pref).substring(0, 4);
     }
 
@@ -452 +475 @@
     @Override
     public String toString() {
-        return tr("Custom Projection");
+        return name != null ? name : tr("Custom Projection");
     }
 }

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection;
 
@@ -7 +7 @@
 
 /**
- * Classes implementing this are able to convert lat/lon values to
- * planar screen coordinates.
+ * A projection, i.e. a class that supports conversion from lat/lon
+ * to east/north and back.
  *
- * @author imi
+ * The conversion from east/north to the screen coordinates is simply a scale
+ * factor and x/y offset.
  */
 public interface Projection {
     /**
-     * The default scale factor in east/north units per pixel ({@link #NavigatableComponent#scale}))
+     * The default scale factor in east/north units per pixel ({@link #NavigatableComponent#scale})).
      * FIXME: misnomer
+     * @return the scale factor
      */
     double getDefaultZoomInPPD();
 
     /**
-     * Convert from lat/lon to northing/easting.
+     * Convert from lat/lon to easting/northing.
      *
-     * @param p     The geo point to convert. x/y members of the point are filled.
+     * @param ll the geographical point to convert (in WGS84 lat/lon)
+     * @return the corresponding east/north coordinates
      */
-    EastNorth latlon2eastNorth(LatLon p);
+    EastNorth latlon2eastNorth(LatLon ll);
 
     /**
-     * Convert from norting/easting to lat/lon.
+     * Convert from easting/norting to lat/lon.
      *
-     * @param p     The geo point to convert. lat/lon members of the point are filled.
+     * @param en the geographical point to convert (in projected coordinates)
+     * @return the corresponding lat/lon (WGS84)
      */
-    LatLon eastNorth2latlon(EastNorth p);
+    LatLon eastNorth2latlon(EastNorth en);
 
     /**
-     * Describe the projection converter in one or two words.
+     * Describe the projection in one or two words.
+     * @return the name / description
      */
     String toString();
 
     /**
-     * Return projection code. This should be a unique identifier.
+     * Return projection code.
+     *
+     * This should be a unique identifier.
      * If projection supports parameters, return a different code
      * for each set of parameters.
      * 
      * The EPSG code can be used (if defined for the projection).
+     *
+     * @return the projection identifier
      */
     String toCode();
 
     /**
-     * Get a filename compatible string (for the cache directory)
+     * Get a filename compatible string (for the cache directory).
+     * @return the cache directory name (base name)
      */
     String getCacheDirectoryName();
 
     /**
-     * Get the bounds of the world
+     * Get the bounds of the world.
+     * @return the supported lat/lon rectangle for this projection
      */
     Bounds getWorldBoundsLatLon();

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -47 +48 @@
      * should be compatible to PROJ.4
      */
-    public static Map<String, ProjFactory> projs = new HashMap<String, ProjFactory>();
-    public static Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
-    public static Map<String, Datum> datums = new HashMap<String, Datum>();
-    public static Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
-    public static Map<String, String> inits = new HashMap<String, String>();
+    final public static Map<String, ProjFactory> projs = new HashMap<String, ProjFactory>();
+    final public static Map<String, Ellipsoid> ellipsoids = new HashMap<String, Ellipsoid>();
+    final public static Map<String, Datum> datums = new HashMap<String, Datum>();
+    final public static Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
+    final public static Map<String, Pair<String, String>> inits = new HashMap<String, Pair<String, String>>();
 
     static {
@@ -109 +110 @@
 
     public static String getInit(String id) {
-        return inits.get(id);
+        return inits.get(id.toLowerCase()).b;
     }
 
@@ -116 +117 @@
      */
     private static void loadInits() {
-        Pattern epsgPattern = Pattern.compile("\\A<(\\d+)>(.*)<>\\Z");
+        Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
         try {
             InputStream in = new MirroredInputStream("resource://data/epsg");
             BufferedReader r = new BufferedReader(new InputStreamReader(in));
-            String line;
+            String line, lastline = "";
             while ((line = r.readLine()) != null) {
                 line = line.trim();
                 if (!line.startsWith("#") && !line.isEmpty()) {
+                    if (!lastline.startsWith("#")) throw new AssertionError();
+                    String name = lastline.substring(1).trim();
                     Matcher m = epsgPattern.matcher(line);
                     if (m.matches()) {
-                        inits.put("epsg:" + m.group(1), m.group(2).trim());
+                        inits.put("epsg:" + m.group(1), Pair.create(name, m.group(2).trim()));
                     } else {
                         System.err.println("Warning: failed to parse line from the epsg projection definition: "+line);
                     }
                 }
+                lastline = line;
             }
         } catch (IOException ex) {

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -12 +12 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -23 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
-import org.openstreetmap.josm.data.projection.Epsg4326;
-import org.openstreetmap.josm.data.projection.Lambert;
-import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.validation.tests.BuildingInBuilding;
 import org.openstreetmap.josm.data.validation.tests.Coastlines;
@@ -57 +55 @@
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 
 /**
@@ -253 +252 @@
      */
     public void initializeGridDetail() {
-        if (Main.getProjection().toString().equals(new Epsg4326().toString())) {
+        String code = Main.getProjection().toCode();
+        if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) {
             OsmValidator.griddetail = 10000;
-        } else if (Main.getProjection().toString().equals(new Mercator().toString())) {
+        } else if (Arrays.asList(ProjectionPreference.mercator.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.01;
-        } else if (Main.getProjection().toString().equals(new Lambert().toString())) {
+        } else if (Arrays.asList(ProjectionPreference.lambert.allCodes()).contains(code)) {
             OsmValidator.griddetail = 0.1;
         } else {

trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.projection;
 
+import org.openstreetmap.josm.data.projection.CustomProjection;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
+
 abstract public class AbstractProjectionChoice implements ProjectionChoice {
-    private String id;
-    private String name;
+    
+    protected String name;
+    protected String id;
+    protected String cacheDir;
 
-    public AbstractProjectionChoice(String id, String name) {
+    /**
+     * Constructor.
+     *
+     * @param name short name of the projection choice as shown in the GUI
+     * @param id unique identifier for the projection choice
+     * @param cacheDir a cache directory name
+     */
+    public AbstractProjectionChoice(String name, String id, String cacheDir) {
+        this.name = name;
         this.id = id;
-        this.name = name;
+        this.cacheDir = cacheDir;
     }
+
+    /**
+     * Constructor (without cacheDir argument).
+     *
+     * Only for core projection choices, where chacheDir is the same as
+     * the second part of the id.
+     */
+    public AbstractProjectionChoice(String name, String id) {
+        this(name, id, null);
+        if (!id.startsWith("core:")) throw new IllegalArgumentException();
+        this.cacheDir = id.substring(5);
+    }
+
     @Override
     public String getId() {
         return id;
     }
-    
+
+    public String getCacheDir() {
+        return cacheDir;
+    }
+
     @Override
     public String toString() {
@@ -20 +51 @@
     }
 
+    abstract public String getCurrentCode();
+    
+    abstract public String getProjectionName();
+
+    @Override
+    public Projection getProjection() {
+        String code = getCurrentCode();
+        String pref = Projections.getInit(code);
+        if (pref == null)
+            throw new AssertionError("Error: Unkown projection code");
+        return new CustomProjection(getProjectionName(), code, pref, getCacheDir());
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -43 +43 @@
 
     public CustomProjectionChoice() {
-        super("core:custom", tr("Custom Projection"));
+        super(tr("Custom Projection"), "core:custom");
     }
 
@@ -207 +207 @@
 
     @Override
+    public String getCurrentCode() {
+        // not needed - getProjection() is overridden
+        throw new UnsupportedOperationException(); 
+    }
+
+    @Override
+    public String getProjectionName() {
+        // not needed - getProjection() is overridden
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public JPanel getPreferencePanel(ActionListener listener) {
         return new PreferencePanel(pref, listener);

trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java

@@ -7 +7 @@
 import java.util.Collections;
 
-import org.openstreetmap.josm.data.projection.GaussKrueger;
-import org.openstreetmap.josm.data.projection.Projection;
-
 public class GaussKruegerProjectionChoice extends ListProjectionChoice {
 
@@ -15 +12 @@
 
     public GaussKruegerProjectionChoice() {
-        super("core:gauss-krueger", tr("Gau\u00DF-Kr\u00FCger"), zones, tr("GK Zone"));
+        super(tr("Gau\u00DF-Kr\u00FCger"), "core:gauss-krueger", zones, tr("GK Zone"));
     }
 
     @Override
-    public Projection getProjection() {
-        return new GaussKrueger(index + 2);
+    public String getCurrentCode() {
+        return "EPSG:"+Integer.toString(31466 + index);
     }
 
@@ -57 +54 @@
     }
     
+    @Override
+    public String getProjectionName() {
+        return tr("Gau\u00DF-Kr\u00FCger Zone {0}", index + 2);
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

@@ -11 +11 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -31 +29 @@
 
     public LambertCC9ZonesProjectionChoice() {
-        super("core:lambertcc9", tr("Lambert CC9 Zone (France)"), lambert9zones, tr("Lambert CC Zone"));
+        super(tr("Lambert CC9 Zone (France)"), "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));
     }
 
@@ -48 +46 @@
 
     @Override
-    public Projection getProjection() {
-        return new LambertCC9Zones(index);
+    public String getCurrentCode() {
+        return "EPSG:" + Integer.toString(3942+index); //CC42 is EPSG:3942 (up to EPSG:3950 for CC50)
+    }
+
+    @Override
+    public String getProjectionName() {
+        return tr("Lambert CC9 Zone (France)");
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

@@ -11 +11 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.data.projection.Lambert;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -26 +24 @@
 
     public LambertProjectionChoice() {
-        super("core:lambert", tr("Lambert 4 Zones (France)"), lambert4zones, tr("Lambert CC Zone"));
+        super(tr("Lambert 4 Zones (France)"), "core:lambert", lambert4zones, tr("Lambert CC Zone"));
     }
 
@@ -43 +41 @@
 
     @Override
-    public Projection getProjection() {
-        return new Lambert(index);
+    public String getCurrentCode() {
+        return "EPSG:" + Integer.toString(27561+index);
+    }
+
+    @Override
+    public String getProjectionName() {
+        return tr("Lambert 4 Zones (France)");
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

@@ -18 +18 @@
 abstract public class ListProjectionChoice extends AbstractProjectionChoice {
 
-    protected int index;
+    protected int index;        // 0-based index
     protected int defaultIndex;
     protected Object[] entries;
     protected String label;
 
-    public ListProjectionChoice(String id, String name, Object[] entries, String label) {
-        this(id, name, entries, label, 0);
-    }
-
     /**
      * Constructor
      *
+     * @param name the display name
      * @param id the unique id for this ProjectionChoice
-     * @param name the display name
      * @param entries the list of display entries for the combo-box
      * @param label a label shown left to the combo-box
      * @param defaultIndex the default index for the combo-box
      */
-    public ListProjectionChoice(String id, String name, Object[] entries, String label, int defaultIndex) {
-        super(id, name);
+    public ListProjectionChoice(String name, String id, Object[] entries, String label, int defaultIndex) {
+        super(name, id);
         this.entries = entries;
         this.label = label;
         this.defaultIndex = defaultIndex;
+    }
+
+    public ListProjectionChoice(String name, String id, Object[] entries, String label) {
+        this(name, id, entries, label, 0);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java

@@ -18 +18 @@
     /**
      * Get a unique id for the projection choice.
+     *
+     * Will be used to save the user selection to the preference file.
+     * 
+     * @return the string identifier
      */
     String getId();
@@ -27 +31 @@
      * listener from getPreferencePanel is invoked.
      *
-     * Argument may be null to reset everything.
+     * @param args preferences as a list of strings; may be null
+     * to reset everything.
      */
     void setPreferences(Collection<String> args);
@@ -56 +61 @@
 
     /**
-     * Return all projection codes supported by this projection class.
+     * Return all projection codes supported by this projection choice.
      */
     String[] allCodes();
@@ -69 +74 @@
     Collection<String> getPreferencesFromCode(String code);
 
+    /**
+     * Short name of the projection choice as shown in the GUI (combo box).
+     * 
+     * @return the name
+     */
+    String toString();
+
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
-import org.openstreetmap.josm.data.projection.BelgianLambert1972;
-import org.openstreetmap.josm.data.projection.BelgianLambert2008;
-import org.openstreetmap.josm.data.projection.Epsg3008;
-import org.openstreetmap.josm.data.projection.Epsg4326;
-import org.openstreetmap.josm.data.projection.Lambert93;
-import org.openstreetmap.josm.data.projection.LambertEST;
-import org.openstreetmap.josm.data.projection.Mercator;
+import org.openstreetmap.josm.data.projection.CustomProjection;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.TransverseMercatorLV;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -45 +38 @@
 import org.openstreetmap.josm.tools.GBC;
 
+/**
+ * Projection preferences.
+ *
+ * How to add new Projections:
+ *  - Find EPSG code for the projection.
+ *  - Look up the parameter string for Proj4, e.g. on http://spatialreference.org/
+ *      and add it to the file 'data/epsg' in JOSM trunk
+ *  - Search for official references and verify the parameter values. These
+ *      documents are often available in the local language only.
+ *  - Use {@link #registerProjectionChoice()}, to make the entry known to JOSM.
+ *
+ * In case there is no EPSG code:
+ *  - override {@link AbstractProjectionChoice#getProjection()} and provide
+ *    a manual implementation of the projection. Use {@link CustomProjection}
+ *    if possible.
+ */
 public class ProjectionPreference implements SubPreferenceSetting {
 
@@ -56 +65 @@
     private static Map<String, ProjectionChoice> projectionChoicesById = new HashMap<String, ProjectionChoice>();
 
-    public static ProjectionChoice mercator = new SingleProjectionChoice("core:mercator", new Mercator());
+    public static final ProjectionChoice wgs84;
+    public static final ProjectionChoice mercator;
+    public static final ProjectionChoice lambert;
     static {
-        // global projections
-        registerProjectionChoice("core:wgs84", new Epsg4326());
-        registerProjectionChoice(mercator);
+
+        /************************
+         * Global projections.
+         */
+
+        /**
+         * WGS84: Directly use latitude / longitude values as x/y.
+         */
+        wgs84 = registerProjectionChoice(tr("WGS84 Geographic"), "core:wgs84", 4326, "epsg4326");
+
+        /**
+         * Mercator Projection.
+         *
+         * The center of the mercator projection is always the 0 grad
+         * coordinate.
+         *
+         * See also USGS Bulletin 1532
+         * (http://egsc.usgs.gov/isb/pubs/factsheets/fs08799.html)
+         * initially EPSG used 3785 but that has been superseded by 3857,
+         * see http://www.epsg-registry.org/
+         */
+        mercator = registerProjectionChoice(tr("Mercator"), "core:mercator", 
+                3857);
+        
+        /**
+         * UTM.
+         */
         registerProjectionChoice(new UTMProjectionChoice());
-        // regional - alphabetical order by country code
-        registerProjectionChoice("core:belambert1972", new BelgianLambert1972());   // BE
-        registerProjectionChoice("core:belambert2008", new BelgianLambert2008());   // BE
-        registerProjectionChoice(new SwissGridProjectionChoice());                  // CH
-        registerProjectionChoice(new GaussKruegerProjectionChoice());               // DE
-        registerProjectionChoice("core:lambertest", new LambertEST());              // EE
-        registerProjectionChoice(new LambertProjectionChoice());                    // FR
-        registerProjectionChoice("core:lambert93", new Lambert93());                // FR
-        registerProjectionChoice(new LambertCC9ZonesProjectionChoice());            // FR
-        registerProjectionChoice(new UTM_France_DOM_ProjectionChoice());            // FR
-        registerProjectionChoice("core:tmerclv", new TransverseMercatorLV());       // LV
-        registerProjectionChoice(new PuwgProjectionChoice());                       // PL
-        registerProjectionChoice("core:sweref99", new Epsg3008());                  // SE
+
+        /************************
+         * Regional - alphabetical order by country code.
+         */
+
+        /**
+         * Belgian Lambert 72 projection.
+         *
+         * As specified by the Belgian IGN in this document:
+         * http://www.ngi.be/Common/Lambert2008/Transformation_Geographic_Lambert_FR.pdf
+         *
+         * @author Don-vip
+         */
+        registerProjectionChoice(tr("Belgian Lambert 1972"), "core:belgianLambert1972", 31370);     // BE
+        /**
+         * Belgian Lambert 2008 projection.
+         *
+         * As specified by the Belgian IGN in this document:
+         * http://www.ngi.be/Common/Lambert2008/Transformation_Geographic_Lambert_FR.pdf
+         *
+         * @author Don-vip
+         */
+        registerProjectionChoice(tr("Belgian Lambert 2008"), "core:belgianLambert2008", 3812);      // BE
+
+        /**
+         * SwissGrid CH1903 / L03, see http://de.wikipedia.org/wiki/Swiss_Grid.
+         *
+         * Actually, what we have here, is CH1903+ (EPSG:2056), but without
+         * the additional false easting of 2000km and false northing 1000 km.
+         *
+         * To get to CH1903, a shift file is required. So currently, there are errors
+         * up to 1.6m (depending on the location).
+         */
+        registerProjectionChoice(new SwissGridProjectionChoice());                                  // CH
+
+        registerProjectionChoice(new GaussKruegerProjectionChoice());                               // DE
+
+        /**
+         * Estonian Coordinate System of 1997.
+         *
+         * Thanks to Johan Montagnat and its geoconv java converter application
+         * (http://www.i3s.unice.fr/~johan/gps/ , published under GPL license)
+         * from which some code and constants have been reused here.
+         */
+        registerProjectionChoice(tr("Lambert Zone (Estonia)"), "core:lambertest", 3301);            // EE
+
+        /**
+         * Lambert conic conform 4 zones using the French geodetic system NTF.
+         *
+         * This newer version uses the grid translation NTF<->RGF93 provided by IGN for a submillimetric accuracy.
+         * (RGF93 is the French geodetic system similar to WGS84 but not mathematically equal)
+         *
+         * Source: http://professionnels.ign.fr/DISPLAY/000/526/700/5267002/transformation.pdf
+         * @author Pieren
+         */
+        registerProjectionChoice(lambert = new LambertProjectionChoice());                          // FR
+        /**
+         * Lambert 93 projection.
+         * 
+         * As specified by the IGN in this document
+         * http://professionnels.ign.fr/DISPLAY/000/526/702/5267026/NTG_87.pdf
+         * @author Don-vip
+         */
+        registerProjectionChoice(tr("Lambert 93 (France)"), "core:lambert93", 2154);                // FR
+        /**
+         * Lambert Conic Conform 9 Zones projection.
+         *
+         * As specified by the IGN in this document
+         * http://professionnels.ign.fr/DISPLAY/000/526/700/5267002/transformation.pdf
+         * @author Pieren
+         */
+        registerProjectionChoice(new LambertCC9ZonesProjectionChoice());                            // FR
+        /**
+         * French departements in the Caribbean Sea and Indian Ocean.
+         *
+         * Using the UTM transvers Mercator projection and specific geodesic settings.
+         */
+        registerProjectionChoice(new UTM_France_DOM_ProjectionChoice());                            // FR
+
+        /**
+         * LKS-92/ Latvia TM projection.
+         *
+         * Based on data from spatialreference.org.
+         * http://spatialreference.org/ref/epsg/3059/
+         *
+         * @author Viesturs Zarins
+         */
+        registerProjectionChoice(tr("LKS-92 (Latvia TM)"), "core:tmerclv", 3059);                   // LV
+
+        /**
+         * PUWG 1992 and 2000 are the official cordinate systems in Poland.
+         *
+         * They use the same math as UTM only with different constants.
+         *
+         * @author steelman
+         */
+        registerProjectionChoice(new PuwgProjectionChoice());                                       // PL
+
+        /**
+         * SWEREF99 13 30 projection. Based on data from spatialreference.org.
+         * http://spatialreference.org/ref/epsg/3008/
+         *
+         * @author Hanno Hecker
+         */
+        registerProjectionChoice(tr("SWEREF99 13 30 / EPSG:3008 (Sweden)"), "core:sweref99", 3008); // SE
+
+        /************************
+         * Custom projection.
+         */
         registerProjectionChoice(new CustomProjectionChoice());
     }
@@ -83 +214 @@
     }
 
-    public static void registerProjectionChoice(String id, Projection projection) {
-        registerProjectionChoice(new SingleProjectionChoice(id, projection));
+    public static ProjectionChoice registerProjectionChoice(String name, String id, Integer epsg, String cacheDir) {
+        ProjectionChoice pc = new SingleProjectionChoice(name, id, "EPSG:"+epsg, cacheDir);
+        registerProjectionChoice(pc);
+        return pc;
+    }
+
+    private static ProjectionChoice registerProjectionChoice(String name, String id, Integer epsg) {
+        ProjectionChoice pc = new SingleProjectionChoice(name, id, "EPSG:"+epsg);
+        registerProjectionChoice(pc);
+        return pc;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java

@@ -7 +7 @@
 import java.util.Collections;
 
-import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.Puwg;
-
 public class PuwgProjectionChoice extends ListProjectionChoice {
 
+    public static final String[] CODES = {
+        "EPSG:2180",
+        "EPSG:2176",
+        "EPSG:2177",
+        "EPSG:2178",
+        "EPSG:2179"
+    };
+    public static final String[] NAMES = {
+        tr("PUWG 1992 (Poland)"),
+        tr("PUWG 2000 Zone {0} (Poland)", 5),
+        tr("PUWG 2000 Zone {0} (Poland)", 6),
+        tr("PUWG 2000 Zone {0} (Poland)", 7),
+        tr("PUWG 2000 Zone {0} (Poland)", 8)
+    };
+
     public PuwgProjectionChoice() {
-        super("core:puwg", tr("PUWG (Poland)"), Puwg.zones, tr("PUWG Zone"));
+        super(tr("PUWG (Poland)"), "core:puwg", NAMES, tr("PUWG Zone"));
     }
 
     @Override
-    public Projection getProjection() {
-        return new Puwg(index);
+    public String getCurrentCode() {
+        return CODES[index];
     }
 
     @Override
+    public String getProjectionName() {
+        return NAMES[index];
+    }
+
+
+    @Override
     public String[] allCodes() {
-        String[] zones = new String[Puwg.zones.length];
-        for (int index = 0; index < Puwg.zones.length; index++) {
-            zones[index] = Puwg.zones[index].toCode();
+        String[] zones = new String[CODES.length];
+        for (int idx = 0; idx < CODES.length; idx++) {
+            zones[idx] = CODES[idx];
         }
         return zones;
@@ -32 +50 @@
     @Override
     public Collection<String> getPreferencesFromCode(String code) {
-        for (Puwg.PuwgData p : Puwg.zones) {
-            if (code.equals(p.toCode()))
-                return Collections.singleton(code);
+        for (String code2 : CODES) {
+            if (code.equals(code2))
+                return Collections.singleton(code2);
         }
         return null;
@@ -41 +59 @@
     @Override
     protected String indexToZone(int index) {
-        return Puwg.zones[index].toCode();
+        return CODES[index];
     }
 
     @Override
     protected int zoneToIndex(String zone) {
-        for (int i=0; i<Puwg.zones.length; i++) {
-            if (zone.equals(Puwg.zones[i].toCode())) {
+        for (int i=0; i<CODES.length; i++) {
+            if (zone.equals(CODES[i])) {
                 return i;
             }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/SingleProjectionChoice.java

@@ -8 +8 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.data.projection.Projection;
-
 /**
  * ProjectionChoice, that offers just one projection as choice.
@@ -15 +13 @@
  * The GUI is an empty panel.
  */
-public class SingleProjectionChoice implements ProjectionChoice {
+public class SingleProjectionChoice extends AbstractProjectionChoice {
 
-    private String id;
-    private String name;
-    private Projection projection;
+    protected String code;
 
-    public SingleProjectionChoice(String id, String name, Projection projection) {
-        this.id = id;
-        this.name = name;
-        this.projection = projection;
+    /**
+     * Constructor.
+     *
+     * @param name short name of the projection choice as shown in the GUI
+     * @param id unique identifier for the projection choice, e.g. "core:thisproj"
+     * @param code the unique identifier for the projection, e.g. "EPSG:1234"
+     * @param cacheDir a cache directory name
+     */
+    public SingleProjectionChoice(String name, String id, String code, String cacheDir) {
+        super(name, id, cacheDir);
+        this.code = code;
     }
 
-    public SingleProjectionChoice(String id, Projection projection) {
-        this(id, projection.toString(), projection);
+    public SingleProjectionChoice(String name, String id, String code) {
+        super(name, id);
+        this.code = code;
     }
 
@@ -37 +41 @@
 
     @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
     public String[] allCodes() {
-        return new String[] { projection.toCode() };
+        return new String[] { code };
     }
 
@@ -56 +55 @@
 
     @Override
-    public Projection getProjection() {
-        return projection;
-    }
-
-    @Override
     public String toString() {
         return name;
@@ -67 +61 @@
     @Override
     public Collection<String> getPreferencesFromCode(String code) {
-        if (code.equals(projection.toCode()))
+        if (code.equals(this.code))
             return Collections.emptyList();
         else
             return null;
     }
+
+    @Override
+    public String getCurrentCode() {
+        return code;
+    }
+
+    @Override
+    public String getProjectionName() {
+        return name; // the same name as the projection choice
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java

@@ -10 +10 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.data.projection.SwissGrid;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
@@ -17 +16 @@
 
     public SwissGridProjectionChoice() {
-        super("core:swissgrid", tr("Swiss Grid (Switzerland)"), new SwissGrid());
+        super(tr("Swiss Grid (Switzerland)"), "core:swissgrid", "EPSG:21781");
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -16 +16 @@
 import javax.swing.JRadioButton;
 
-import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.UTM;
 import org.openstreetmap.josm.tools.GBC;
 
 public class UTMProjectionChoice extends ListProjectionChoice {
 
-    private static final UTM.Hemisphere DEFAULT_HEMISPHERE = UTM.Hemisphere.North;
+    public enum Hemisphere { North, South }
 
-    private UTM.Hemisphere hemisphere;
+    private static final Hemisphere DEFAULT_HEMISPHERE = Hemisphere.North;
+
+    private Hemisphere hemisphere;
     
     private final static List<String> cbEntries = new ArrayList<String>();
     static {
         for (int i = 1; i <= 60; i++) {
-                cbEntries.add(Integer.toString(i));
+            cbEntries.add(Integer.toString(i));
         }
     }
 
     public UTMProjectionChoice() {
-        super("core:utm", tr("UTM"), cbEntries.toArray(), tr("UTM Zone"));
+        super(tr("UTM"), "core:utm", cbEntries.toArray(), tr("UTM Zone"));
     }
 
@@ -46 +46 @@
             //Hemisphere
             north = new JRadioButton();
-            north.setSelected(hemisphere == UTM.Hemisphere.North);
+            north.setSelected(hemisphere == Hemisphere.North);
             south = new JRadioButton();
-            south.setSelected(hemisphere == UTM.Hemisphere.South);
+            south.setSelected(hemisphere == Hemisphere.South);
 
             ButtonGroup group = new ButtonGroup();
@@ -82 +82 @@
 
     @Override
-    public Projection getProjection() {
-        return new UTM(index + 1, hemisphere);
+    public String getCurrentCode() {
+        int zone = index + 1;
+        int code = 32600 + zone + (hemisphere == Hemisphere.South ? 100 : 0);
+        return "EPSG:" + Integer.toString(code);
     }
+
+    @Override
+    public String getProjectionName() {
+        return tr("UTM");
+    }
+
 
     @Override
@@ -90 +98 @@
         UTMPanel p = (UTMPanel) panel;
         int index = p.prefcb.getSelectedIndex();
-        UTM.Hemisphere hemisphere = p.south.isSelected()?UTM.Hemisphere.South:UTM.Hemisphere.North;
+        Hemisphere hemisphere = p.south.isSelected()?Hemisphere.South:Hemisphere.North;
         return Arrays.asList(indexToZone(index), hemisphere.toString());
     }
@@ -98 +106 @@
         ArrayList<String> projections = new ArrayList<String>(60*4);
         for (int zone = 1;zone <= 60; zone++) {
-            for (UTM.Hemisphere hemisphere : UTM.Hemisphere.values()) {
-                projections.add("EPSG:" + (32600 + zone + (hemisphere == UTM.Hemisphere.South?100:0)));
+            for (Hemisphere hemisphere : Hemisphere.values()) {
+                projections.add("EPSG:" + (32600 + zone + (hemisphere == Hemisphere.South?100:0)));
             }
         }
@@ -110 +118 @@
         if (code.startsWith("EPSG:326") || code.startsWith("EPSG:327")) {
             try {
-                UTM.Hemisphere hemisphere = code.charAt(7)=='6'?UTM.Hemisphere.North:UTM.Hemisphere.South;
+                Hemisphere hemisphere = code.charAt(7)=='6'?Hemisphere.North:Hemisphere.South;
                 String zonestring = code.substring(8);
                 int zoneval = Integer.parseInt(zonestring);
@@ -123 +131 @@
     public void setPreferences(Collection<String> args) {
         super.setPreferences(args);
-        UTM.Hemisphere hemisphere = DEFAULT_HEMISPHERE;
+        Hemisphere hemisphere = DEFAULT_HEMISPHERE;
 
         if(args != null) {
@@ -129 +137 @@
 
             if (array.length > 1) {
-                hemisphere = UTM.Hemisphere.valueOf(array[1]);
+                hemisphere = Hemisphere.valueOf(array[1]);
             }
         }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
-
-import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 
 public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice {
@@ -19 +16 @@
     private final static String[] utmGeodesicsNames = { FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name};
 
+    private final static Integer FortMarigotEPSG = 2969;
+    private final static Integer SainteAnneEPSG = 2970;
+    private final static Integer MartiniqueEPSG = 2973;
+    private final static Integer ReunionEPSG = 2975;
+    private final static Integer GuyaneEPSG = 2972;
+    private final static Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
+
     public UTM_France_DOM_ProjectionChoice() {
-        super("core:utmfrancedom", tr("UTM France (DOM)"), utmGeodesicsNames, tr("UTM Geodesic system"));
+        super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
     }
 
@@ -37 +41 @@
 
     @Override
-    public Projection getProjection() {
-        return new UTM_France_DOM(index);
+    public String getProjectionName() {
+        return utmGeodesicsNames[index];
+    }
+
+    @Override
+    public String getCurrentCode() {
+        return "EPSG:" + utmEPSGs[index];
     }
 
     @Override
     public String[] allCodes() {
-        String[] res = new String[UTM_France_DOM.utmEPSGs.length];
-        for (int i=0; i<UTM_France_DOM.utmEPSGs.length; ++i) {
-            res[i] = "EPSG:"+UTM_France_DOM.utmEPSGs[i];
+        String[] res = new String[utmEPSGs.length];
+        for (int i=0; i<utmEPSGs.length; ++i) {
+            res[i] = "EPSG:" + utmEPSGs[i];
         }
         return res;
@@ -52 +61 @@
     @Override
     public Collection<String> getPreferencesFromCode(String code) {
-        for (int i=0; i < UTM_France_DOM.utmEPSGs.length; i++ )
-            if (("EPSG:"+UTM_France_DOM.utmEPSGs[i]).equals(code))
+        for (int i=0; i < utmEPSGs.length; i++ )
+            if (("EPSG:" + utmEPSGs[i]).equals(code))
                 return Collections.singleton(Integer.toString(i+1));
         return null;