Changeset 1722 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

Timestamp:

2009-07-03T12:33:32+02:00 (15 years ago)

Author:

stoecker

Message:

Large rework in projection handling - now allows only switching and more specific projections
TODO:

• allow subprojections (i.e. settings for projections)
• setup preferences for subprojections
• better support of the new projection depending world bounds (how to handle valid data outside of world)
• do not allow to zoom out of the world - zoom should stop when whole world is displayed
• fix Lambert and SwissGrid to handle new OutOfWorld style and subprojections
• fix new UTM projection
• handle layers with fixed projection on projection change
• allow easier projection switching (e.g. in menu)

NOTE:
This checkin very likely will cause problems. Please report or fix them. Older plugins may have trouble. The SVN plugins
have been fixed but may have problems nevertheless. This is a BIG change, but will make JOSMs internal structure much cleaner
and reduce lots of projection related problems.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) (3 diffs)

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -28 +30 @@
 
         for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
-            if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
+            if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection", Mercator.class.getName()))) {
                 projectionCombo.setSelectedIndex(i);
                 break;
@@ -54 +56 @@
 
     public boolean ok() {
-        boolean restart = Main.pref.put("projection",
-        projectionCombo.getSelectedItem().getClass().getName());
+        String projname = projectionCombo.getSelectedItem().getClass().getName();
+        if(Main.pref.put("projection", projname))
+            Main.setProjection(projname);
         if(Main.pref.put("coordinates",
         ((CoordinateFormat)coordinatesCombo.getSelectedItem()).name()))
-            restart = true;
-        return restart;
+            Node.setCoordinateFormat();
+        return false;
     }
 }