Changeset 2496 in josm for trunk

Timestamp:

2009-11-22T11:07:36+01:00 (15 years ago)

Author:

stoecker

Message:

see #3989 - subprojection fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/UTM.java (modified) (1 diff)
• gui/preferences/ProjectionPreference.java (modified) (3 diffs)

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

@@ -430 +430 @@
                 String zonestring = code.substring(9);
                 int zoneval = Integer.parseInt(zonestring);
-                if(zoneval > 0 && zone <= 60)
+                if(zoneval > 0 && zoneval <= 60)
                 {
                     return Collections.singleton(zonestring);

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

@@ -91 +91 @@
         projPanel.add(bounds, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(projSubPrefPanel, projSubPrefPanelGBC);
+
         JScrollPane scrollpane = new JScrollPane(projPanel);
         gui.mapcontent.addTab(tr("Map Projection"), scrollpane);
 
-        projectionCode.setText(Main.proj.toCode());
-        Bounds b = Main.proj.getWorldBoundsLatLon();
+        updateMeta(Main.proj);
+    }
+
+    private void updateMeta(Projection proj)
+    {
+        projectionCode.setText(proj.toCode());
+        Bounds b = proj.getWorldBoundsLatLon();
         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
         bounds.setText(b.getMin().latToString(cf)+"; "+b.getMin().lonToString(cf)+" : "+b.getMax().latToString(cf)+"; "+b.getMax().lonToString(cf));
-        /* TODO: Fix bugs, refresh code line and world bounds, fix design (e.g. add border around sub-prefs-stuff */
     }
 
@@ -109 +114 @@
             prefs = ((ProjectionSubPrefs) proj).getPreferences();
 
-        if(Main.pref.put("projection", projname)) {
-            setProjection(projname, prefs);
-        }
+        Main.pref.put("projection", projname);
+        setProjection(projname, prefs);
 
         if(Main.pref.put("coordinates",
@@ -200 +204 @@
         projPanel.add(projSubPrefPanel, projSubPrefPanelGBC);
         projPanel.revalidate();
+        projSubPrefPanel.repaint();
+        updateMeta(proj);
     }