Ticket #1730: ticket1730.patch

home/mli/workspace/JOSM/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projection.CoordinateDisplay;
 import org.openstreetmap.josm.tools.GBC;
 
 public class ProjectionPreference implements PreferenceSetting {
@@ -21 +22 @@
          * Combobox with all projections available
          */
         private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+        private JComboBox coordinatesCombo = new JComboBox(CoordinateDisplay.values());
 
         public void addGui(PreferenceDialog gui) {
-                for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
-                        if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
-                                projectionCombo.setSelectedIndex(i);
-                                break;
-                        }
-                }
+                
+        for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
+            if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) {
+                projectionCombo.setSelectedIndex(i);
+                break;
+            }
+        }
+
+        for (int i = 0; i < coordinatesCombo.getItemCount(); ++i) {
+            if (coordinatesCombo.getItemAt(i).toString().equals(Main.pref.get("coordinates"))) {
+                coordinatesCombo.setSelectedIndex(i);
+                break;
+            }
+        }
+
                 projectionCombo.addActionListener(gui.requireRestartAction);
+        coordinatesCombo.addActionListener(gui.requireRestartAction);
                 
                 JPanel projPanel = new JPanel();
                 projPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.gray), tr("Map Projection")));
@@ -37 +49 @@
                 projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5,5,0,5));
                 projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
                 projPanel.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
+            projPanel.add(new JLabel(tr("Display coordinates as")), GBC.std().insets(5,5,0,5));
+            projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+            projPanel.add(coordinatesCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
                 gui.map.add(projPanel, GBC.eol().insets(0,0,0,10).fill(GBC.HORIZONTAL));
     }
 
         public void ok() {
                 Main.pref.put("projection", projectionCombo.getSelectedItem().getClass().getName());
+                Main.pref.put("coordinates", coordinatesCombo.getSelectedItem().toString());
     }
 }

home/mli/workspace/JOSM/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -88 +88 @@
                 }
         }
 
+        String mCord;
     DecimalFormat latlon = new DecimalFormat("###0.0000");
-    ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 8);
+    ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 10);
     ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20);
     JTextField helpText = new JTextField();
-    ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 7);
+    ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 10);
     ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6);
     ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6);
     ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 8);
@@ -253 +254 @@
          */
         public MapStatus(final MapFrame mapFrame) {
                 this.mv = mapFrame.mapView;
-
+                
+                mCord = Main.pref.get("coordinates");
+                
                 // Listen for mouse movements and set the position text field
                 mv.addMouseMotionListener(new MouseMotionListener(){
                         public void mouseDragged(MouseEvent e) {
@@ -265 +268 @@
                                 // Do not update the view, if ctrl is pressed.
                                 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) {
                                         LatLon p = mv.getLatLon(e.getX(),e.getY());
-                                        latText.setText(latlon.format(p.lat()));
-                                        lonText.setText(latlon.format(p.lon()));
+                                        latText.setText(p.lat(mCord, latlon));
+                                        lonText.setText(p.lon(mCord, latlon));
                                 }
                         }
                 });

home/mli/workspace/JOSM/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.coor;
 
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
-import java.text.NumberFormat;
+import org.openstreetmap.josm.data.projection.Projection.CoordinateDisplay;
 
 /**
  * LatLon are unprojected latitude / longitude coordinates.
@@ -13 +16 @@
  * @author Imi
  */
 public class LatLon extends Coordinate {
+    
+    private static DecimalFormat mFormatter = new DecimalFormat("00.00");
+    
+    public static String convertDDToDMS(double pCordinate) {
+        
+        int tDegree = (int) pCordinate;
+        double tTmpMinutes = (pCordinate - tDegree) * 60;
+        int tMinutes = (int) tTmpMinutes;
+        double tSeconds = (tTmpMinutes - tMinutes) * 60;
+        
+        return tDegree + "\u00B0" + tMinutes + "\'" + mFormatter.format(tSeconds) + "\"";
+    }
 
         public LatLon(double lat, double lon) {
                 super(lon, lat);
@@ -21 +36 @@
         public double lat() {
                 return y;
         }
+        
+        public String lat(String pCord, DecimalFormat pFormat) {
+            
+            if (pCord.equals(CoordinateDisplay.DD.toString())) {
+                return pFormat.format(y);
+            }
+            else {
+                return convertDDToDMS(y);
+            }
+        }
 
         public double lon() {
                 return x;
         }
+        
+        public String lon(String pCord, DecimalFormat pFormat) {
+            
+       if (pCord.equals(CoordinateDisplay.DD.toString())) {
+            return pFormat.format(x);
+        }
+        else {
+            return convertDDToDMS(x);
+        }
+        }
 
         /**
          * @return <code>true</code> if the other point has almost the same lat/lon

home/mli/workspace/JOSM/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -37 +37 @@
         };
         
         /**
+         * Possible ways to display coordinates
+         */
+        public enum CoordinateDisplay {
+            DD {public String toString() {return "Decimal Degrees";}}, 
+            DMS {public String toString() {return "Degree Minute Second";}};
+        }
+        
+        /**
          * Convert from lat/lon to northing/easting. 
          * 
          * @param p             The geo point to convert. x/y members of the point are filled.