Ticket #1730: ticket1730_rev2.patch
| File ticket1730_rev2.patch, 8.9 KB (added by , 17 years ago) |
|---|
-
home/mli/workspace/JOSM/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java
13 13 14 14 import org.openstreetmap.josm.Main; 15 15 import org.openstreetmap.josm.data.projection.Projection; 16 import org.openstreetmap.josm.data.projection.Projection.CoordinateDisplay; 16 17 import org.openstreetmap.josm.tools.GBC; 17 18 18 19 public class ProjectionPreference implements PreferenceSetting { … … 21 22 * Combobox with all projections available 22 23 */ 23 24 private JComboBox projectionCombo = new JComboBox(Projection.allProjections); 25 private JComboBox coordinatesCombo = new JComboBox(CoordinateDisplay.values()); 24 26 25 27 public void addGui(PreferenceDialog gui) { 26 for (int i = 0; i < projectionCombo.getItemCount(); ++i) { 27 if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) { 28 projectionCombo.setSelectedIndex(i); 29 break; 30 } 31 } 28 29 for (int i = 0; i < projectionCombo.getItemCount(); ++i) { 30 if (projectionCombo.getItemAt(i).getClass().getName().equals(Main.pref.get("projection"))) { 31 projectionCombo.setSelectedIndex(i); 32 break; 33 } 34 } 35 36 for (int i = 0; i < coordinatesCombo.getItemCount(); ++i) { 37 if (coordinatesCombo.getItemAt(i).toString().equals(Main.pref.get("coordinates"))) { 38 coordinatesCombo.setSelectedIndex(i); 39 break; 40 } 41 } 42 32 43 projectionCombo.addActionListener(gui.requireRestartAction); 44 coordinatesCombo.addActionListener(gui.requireRestartAction); 33 45 34 46 JPanel projPanel = new JPanel(); 35 47 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)); 38 50 projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL)); 39 51 projPanel.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5)); 52 projPanel.add(new JLabel(tr("Display coordinates as")), GBC.std().insets(5,5,0,5)); 53 projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL)); 54 projPanel.add(coordinatesCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5)); 40 55 gui.map.add(projPanel, GBC.eol().insets(0,0,0,10).fill(GBC.HORIZONTAL)); 41 56 } 42 57 43 58 public void ok() { 44 59 Main.pref.put("projection", projectionCombo.getSelectedItem().getClass().getName()); 60 Main.pref.put("coordinates", coordinatesCombo.getSelectedItem().toString()); 45 61 } 46 62 } -
home/mli/workspace/JOSM/src/org/openstreetmap/josm/gui/MapStatus.java
88 88 } 89 89 } 90 90 91 String mCord; 91 92 DecimalFormat latlon = new DecimalFormat("###0.0000"); 92 ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 8);93 ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11); 93 94 ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20); 94 95 JTextField helpText = new JTextField(); 95 ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 7);96 ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 10); 96 97 ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6); 97 98 ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6); 98 99 ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 8); … … 253 254 */ 254 255 public MapStatus(final MapFrame mapFrame) { 255 256 this.mv = mapFrame.mapView; 256 257 258 mCord = Main.pref.get("coordinates"); 259 257 260 // Listen for mouse movements and set the position text field 258 261 mv.addMouseMotionListener(new MouseMotionListener(){ 259 262 public void mouseDragged(MouseEvent e) { … … 265 268 // Do not update the view, if ctrl is pressed. 266 269 if ((e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) == 0) { 267 270 LatLon p = mv.getLatLon(e.getX(),e.getY()); 268 latText.setText( latlon.format(p.lat()));269 lonText.setText( latlon.format(p.lon()));271 latText.setText(p.lat(mCord, latlon)); 272 lonText.setText(p.lon(mCord, latlon)); 270 273 } 271 274 } 272 275 }); -
home/mli/workspace/JOSM/src/org/openstreetmap/josm/data/coor/LatLon.java
1 1 // License: GPL. Copyright 2007 by Immanuel Scholz and others 2 2 package org.openstreetmap.josm.data.coor; 3 3 4 import java.text.DecimalFormat; 5 import java.text.NumberFormat; 6 import java.lang.Math; 7 4 8 import org.openstreetmap.josm.data.Bounds; 5 9 import org.openstreetmap.josm.data.projection.Projection; 6 import java.text.NumberFormat;10 import org.openstreetmap.josm.data.projection.Projection.CoordinateDisplay; 7 11 8 12 /** 9 13 * LatLon are unprojected latitude / longitude coordinates. … … 13 17 * @author Imi 14 18 */ 15 19 public class LatLon extends Coordinate { 20 21 private static DecimalFormat DMSsFormatter = new DecimalFormat("00.0"); 22 private static DecimalFormat DMmFormatter = new DecimalFormat("00.00"); 23 24 public static String convertDDToDMS(double pCoordinate, boolean pIsLon) { 25 26 String tDir = ""; 27 if (pIsLon && pCoordinate < 0) {tDir = "W";} 28 else if (pIsLon && pCoordinate > 0) {tDir = "E";} 29 else if (!pIsLon && pCoordinate < 0) {tDir = "S";} 30 else if (!pIsLon && pCoordinate > 0) {tDir = "N";} 31 32 double tAbsCoord = Math.abs(pCoordinate); 33 int tDegree = (int) tAbsCoord; 34 double tTmpMinutes = (tAbsCoord - tDegree) * 60; 35 int tMinutes = (int) tTmpMinutes; 36 double tSeconds = (tTmpMinutes - tMinutes) * 60; 37 38 return tDir + Math.abs(tDegree) + "\u00B0" + tMinutes + "\'" + DMSsFormatter.format(tSeconds) + "\""; 39 } 16 40 41 public static String convertDDToDM(double pCoordinate, boolean pIsLon) { 42 43 int tDegree = (int) pCoordinate; 44 double tTmpMinutes = (pCoordinate - tDegree) * 60; 45 int tMinutes = Math.abs((int) tTmpMinutes); 46 47 return tDegree + "\u00B0" + DMmFormatter.format(tMinutes) + "'"; 48 } 49 17 50 public LatLon(double lat, double lon) { 18 51 super(lon, lat); 19 52 } … … 21 54 public double lat() { 22 55 return y; 23 56 } 57 58 public String lat(String pCoord, DecimalFormat pFormat) { 59 60 boolean tIsLon = false; 61 62 if (pCoord.equals(CoordinateDisplay.DD.toString())) { 63 return pFormat.format(y); 64 } else if (pCoord.equals(CoordinateDisplay.DM.toString())) { 65 return convertDDToDM(y, tIsLon); 66 } else if (pCoord.equals(CoordinateDisplay.DMS.toString())) { 67 return convertDDToDMS(y, tIsLon); 68 } else { 69 return "ERROR"; 70 } 71 } 24 72 25 73 public double lon() { 26 74 return x; 27 75 } 76 77 public String lon(String pCoord, DecimalFormat pFormat) { 78 79 boolean tIsLon = true; 80 81 if (pCoord.equals(CoordinateDisplay.DD.toString())) { 82 return pFormat.format(x); 83 } else if (pCoord.equals(CoordinateDisplay.DM.toString())) { 84 return convertDDToDM(x, tIsLon); 85 } else if (pCoord.equals(CoordinateDisplay.DMS.toString())) { 86 return convertDDToDMS(x, tIsLon); 87 } else { 88 return "ERROR"; 89 } 90 } 28 91 29 92 /** 30 93 * @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 }; 38 38 39 39 /** 40 * Possible ways to display coordinates 41 */ 42 public enum CoordinateDisplay { 43 DD {public String toString() {return "hddd.ddddd°";}}, 44 DM {public String toString() {return "hddd.mm.mmm'";}}, 45 DMS {public String toString() {return "hddd°mm'ss.s\"";}}; 46 } 47 48 /** 40 49 * Convert from lat/lon to northing/easting. 41 50 * 42 51 * @param p The geo point to convert. x/y members of the point are filled.
