Ticket #2425: 20090413-update-default-project-to-marcator.diff

src/org/openstreetmap/josm/Main.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.projection.Epsg4326;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.GettingStarted;
@@ -255 +255 @@
             Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance();
         } catch (final Exception e) {
             e.printStackTrace();
-            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using EPSG:4326"));
-            Main.proj = new Epsg4326();
+            JOptionPane.showMessageDialog(null, tr("The projection could not be read from preferences. Using Mercartor"));
+            Main.proj = new Mercator();
         }
 
         try {

src/org/openstreetmap/josm/data/Preferences.java

@@ -27 +27 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AboutAction;
-import org.openstreetmap.josm.data.projection.Epsg4326;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -343 +343 @@
         put("propertiesdialog.visible", true);
         put("selectionlist.visible", true);
         put("commandstack.visible", true);
-        put("projection", Epsg4326.class.getName());
-        put("osm-server.url", "http://www.openstreetmap.org/api");
+        put("projection", Mercator.class.getName());
+        put("osm-server.url", "http://api.openstreetmap.org/api");
         if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
             put("laf", "javax.swing.plaf.metal.MetalLookAndFeel");
         } else {