Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 3654) +++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 3656) @@ -20,4 +20,7 @@ */ public final class AddNodeAction extends JosmAction { + // remember input from last time + private String text; + //static private final Logger logger = Logger.getLogger(AddNodeAction.class.getName()); @@ -34,4 +37,9 @@ LatLonDialog dialog = new LatLonDialog(Main.parent, tr("Add Node..."), ht("/Action/AddNode")); + + if (text != null) { + dialog.setText(text); + } + dialog.setVisible(true); if (dialog.isCanceled()) @@ -41,4 +49,7 @@ if (coordinates == null) return; + + text = dialog.getText(); + Node nnew = new Node(coordinates); Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 3654) +++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 3656) @@ -99,6 +99,6 @@ } - private final static String SOUTH = trc("compass", "S"); - private final static String NORTH = trc("compass", "N"); + public final static String SOUTH = trc("compass", "S"); + public final static String NORTH = trc("compass", "N"); public String latToString(CoordinateFormat d) { switch(d) { @@ -115,6 +115,6 @@ } - private final static String WEST = trc("compass", "W"); - private final static String EAST = trc("compass", "E"); + public final static String WEST = trc("compass", "W"); + public final static String EAST = trc("compass", "E"); public String lonToString(CoordinateFormat d) { switch(d) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 3654) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 3656) @@ -17,5 +17,9 @@ import java.text.NumberFormat; import java.text.ParsePosition; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.swing.AbstractAction; @@ -26,4 +30,5 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JSeparator; import javax.swing.JTextField; import javax.swing.KeyStroke; @@ -38,4 +43,5 @@ import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.widgets.HtmlPanel; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; @@ -45,6 +51,5 @@ private static final Color BG_COLOR_ERROR = new Color(255,224,224); - private JTextField tfLat; - private JTextField tfLon; + private JTextField tfLatLon; private String help; private boolean canceled = false; @@ -53,31 +58,74 @@ private CancelAction actCancel; + private static final double ZERO = 0.0; + private static final String DEG = "\u00B0"; + private static final String MIN = "\u2032"; + private static final String SEC = "\u2033"; + + private static final char N_TR = LatLon.NORTH.charAt(0); + private static final char S_TR = LatLon.SOUTH.charAt(0); + private static final char E_TR = LatLon.EAST.charAt(0); + private static final char W_TR = LatLon.WEST.charAt(0); + + private static final Pattern p = Pattern.compile( + "([+|-]?\\d+[.,]\\d+)|" // (1) + + "([+|-]?\\d+)|" // (2) + + "("+DEG+"|o|deg)|" // (3) + + "('|"+MIN+"|min)|" // (4) + + "(\"|"+SEC+"|sec)|" // (5) + + "(,|;)|" // (6) + + "([NSEW"+N_TR+S_TR+E_TR+W_TR+"])|"// (7) + + "\\s+|" + + "(.+)"); + protected JPanel buildInputForm() { JPanel pnl = new JPanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); - pnl.add(new JLabel(""+ - tr("Enter the coordinates for the new node.") + - "
" + tr("Use decimal degrees.") + - "
" + tr("Negative values denote Western/Southern hemisphere.")), - GBC.eol()); - - pnl.add(new JLabel(tr("Latitude")), GBC.std().insets(0,10,5,0)); - tfLat = new JTextField(12); - pnl.add(tfLat, GBC.eol().insets(0,10,0,0)); - pnl.add(new JLabel(tr("Longitude")), GBC.std().insets(0,0,5,10)); - tfLon = new JTextField(12); - pnl.add(tfLon, GBC.eol().insets(0,0,0,10)); + + pnl.add(new JLabel(tr("Coordinates:")), GBC.std().insets(0,10,5,0)); + tfLatLon = new JTextField(24); + pnl.add(tfLatLon, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL).weight(1.0, 0.0)); + + pnl.add(new JSeparator(), GBC.eol().fill(GBC.HORIZONTAL).insets(0,5,0,5)); + + pnl.add(new HtmlPanel( + tr("Enter the coordinates for the new node.
You can separate longitude and latitude with space, comma or semicolon.
" + + "Use positive numbers or N, E characters to indicate North or East cardinal direction.
" + + "For South and West cardinal directions you can use either negative numbers or S, W characters.
" + + "Coordinate value can be in one of three formats:" + + "Symbols °, ', ′, ", ″ are optional.

" + + "Some examples:" + + "
  • 48 deg 42' 52.13\" N, 21 deg 11' 47.60\" E
    • " + )), + GBC.eol().fill().weight(1.0, 1.0)); // parse and verify input on the fly // LatLonInputVerifier inputVerifier = new LatLonInputVerifier(); - tfLat.getDocument().addDocumentListener(inputVerifier); - tfLon.getDocument().addDocumentListener(inputVerifier); + tfLatLon.getDocument().addDocumentListener(inputVerifier); // select the text in the field on focus // TextFieldFocusHandler focusHandler = new TextFieldFocusHandler(); - tfLat.addFocusListener(focusHandler); - tfLon.addFocusListener(focusHandler); + tfLatLon.addFocusListener(focusHandler); return pnl; } @@ -131,6 +179,5 @@ } this.coordinates = coordinates; - tfLat.setText(coordinates.latToString(CoordinateFormat.DECIMAL_DEGREES)); - tfLon.setText(coordinates.lonToString(CoordinateFormat.DECIMAL_DEGREES)); + tfLatLon.setText(coordinates.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS) + " " + coordinates.lonToString(CoordinateFormat.DEGREES_MINUTES_SECONDS)); actOK.setEnabled(true); } @@ -157,5 +204,5 @@ // input = input.trim(); - input = input.replaceAll("\u00B0", ""); // the degree symbol + input = input.replaceAll(DEG, ""); // try to parse using the current locale @@ -177,34 +224,21 @@ } - protected Double parseLatFromUserInput() { - Double d = parseDoubleFromUserInput(tfLat.getText()); - if (d == null || ! LatLon.isValidLat(d)) { - setErrorFeedback(tfLat, tr("Please enter a valid latitude in the range -90..90")); - return null; - } else { - clearErrorFeedback(tfLat,tr("Please enter a latitude in the range -90..90")); - } - return d; - } - - protected Double parseLonFromUserInput() { - Double d = parseDoubleFromUserInput(tfLon.getText()); - if (d == null || ! LatLon.isValidLon(d)) { - setErrorFeedback(tfLon, tr("Please enter a valid longitude in the range -180..180")); - return null; - } else { - clearErrorFeedback(tfLon,tr("Please enter a longitude in the range -180..180")); - } - return d; - } - protected void parseUserInput() { - Double lat = parseLatFromUserInput(); - Double lon = parseLonFromUserInput(); - if (lat == null || lon == null) { + LatLon latLon; + try { + latLon = parse(tfLatLon.getText()); + if (!LatLon.isValidLat(latLon.lat()) || !LatLon.isValidLon(latLon.lon())) { + latLon = null; + } + } catch (IllegalArgumentException e) { + latLon = null; + } + if (latLon == null) { + setErrorFeedback(tfLatLon, tr("Please enter a GPS coordinates")); coordinates = null; actOK.setEnabled(false); } else { - coordinates = new LatLon(lat,lon); + clearErrorFeedback(tfLatLon,tr("Please enter a GPS coordinates")); + coordinates = latLon; actOK.setEnabled(true); } @@ -288,7 +322,132 @@ @Override public void windowOpened(WindowEvent e) { - tfLat.requestFocusInWindow(); - } - } - + tfLatLon.requestFocusInWindow(); + } + } + + private static LatLon parse(final String coord) { + final Matcher m = p.matcher(coord); + + final StringBuilder sb = new StringBuilder(); + final List list = new ArrayList(); + + while (m.find()) { + if (m.group(1) != null) { + sb.append('R'); // floating point number + list.add(Double.parseDouble(m.group(1).replace(',', '.'))); + } else if (m.group(2) != null) { + sb.append('Z'); // integer number + list.add(Double.parseDouble(m.group(2))); + } else if (m.group(3) != null) { + sb.append('o'); // degree sign + } else if (m.group(4) != null) { + sb.append('\''); // seconds sign + } else if (m.group(5) != null) { + sb.append('"'); // minutes sign + } else if (m.group(6) != null) { + sb.append(','); // separator + } else if (m.group(7) != null) { + sb.append("x"); // cardinal direction + String c = m.group(7).toUpperCase(); + if (c.equals("N") || c.equals("S") || c.equals("E") || c.equals("W")) { + list.add(c); + } else { + list.add(c.replace(N_TR, 'N').replace(S_TR, 'S') + .replace(E_TR, 'E').replace(W_TR, 'W')); + } + } else if (m.group(8) != null) { + throw new IllegalArgumentException("invalid token: " + m.group(8)); + } + } + + final String pattern = sb.toString(); + + final Object[] params = list.toArray(); + final LatLonHolder latLon = new LatLonHolder(); + + if (pattern.matches("Ro?,?Ro?")) { + setLatLonObj(latLon, + params[0], ZERO, ZERO, "N", + params[1], ZERO, ZERO, "E"); + } else if (pattern.matches("xRo?,?xRo?")) { + setLatLonObj(latLon, + params[1], ZERO, ZERO, params[0], + params[3], ZERO, ZERO, params[2]); + } else if (pattern.matches("Ro?x,?Ro?x")) { + setLatLonObj(latLon, + params[0], ZERO, ZERO, params[1], + params[2], ZERO, ZERO, params[3]); + } else if (pattern.matches("Zo[RZ]'?,?Zo[RZ]'?|Z[RZ],?Z[RZ]")) { + setLatLonObj(latLon, + params[0], params[1], ZERO, "N", + params[2], params[3], ZERO, "E"); + } else if (pattern.matches("xZo[RZ]'?,?xZo[RZ]'?|xZo?[RZ],?xZo?[RZ]")) { + setLatLonObj(latLon, + params[1], params[2], ZERO, params[0], + params[4], params[5], ZERO, params[3]); + } else if (pattern.matches("Zo[RZ]'?x,?Zo[RZ]'?x|Zo?[RZ]x,?Zo?[RZ]x")) { + setLatLonObj(latLon, + params[0], params[1], ZERO, params[2], + params[3], params[4], ZERO, params[5]); + } else if (pattern.matches("ZoZ'[RZ]\"?x,?ZoZ'[RZ]\"?x|ZZ[RZ]x,?ZZ[RZ]x")) { + setLatLonObj(latLon, + params[0], params[1], params[2], params[3], + params[4], params[5], params[6], params[7]); + } else if (pattern.matches("xZoZ'[RZ]\"?,?xZoZ'[RZ]\"?|xZZ[RZ],?xZZ[RZ]")) { + setLatLonObj(latLon, + params[1], params[2], params[3], params[0], + params[5], params[6], params[7], params[4]); + } else if (pattern.matches("ZZ[RZ],?ZZ[RZ]")) { + setLatLonObj(latLon, + params[0], params[1], params[2], "N", + params[3], params[4], params[5], "E"); + } else { + throw new IllegalArgumentException("invalid format: " + pattern); + } + + return new LatLon(latLon.lat, latLon.lon); + } + + private static class LatLonHolder { + double lat, lon; + } + + private static void setLatLonObj(final LatLonHolder latLon, + final Object coord1deg, final Object coord1min, final Object coord1sec, final Object card1, + final Object coord2deg, final Object coord2min, final Object coord2sec, final Object card2) { + + setLatLon(latLon, + (Double) coord1deg, (Double) coord1min, (Double) coord1sec, (String) card1, + (Double) coord2deg, (Double) coord2min, (Double) coord2sec, (String) card2); + } + + private static void setLatLon(final LatLonHolder latLon, + final double coord1deg, final double coord1min, final double coord1sec, final String card1, + final double coord2deg, final double coord2min, final double coord2sec, final String card2) { + + setLatLon(latLon, coord1deg, coord1min, coord1sec, card1); + setLatLon(latLon, coord2deg, coord2min, coord2sec, card2); + } + + private static void setLatLon(final LatLonHolder latLon, final double coordDeg, final double coordMin, final double coordSec, final String card) { + if (coordDeg < -180 || coordDeg > 180 || coordMin < 0 || coordMin >= 60 || coordSec < 0 || coordSec > 60) { + throw new IllegalArgumentException("out of range"); + } + + double coord = (coordDeg < 0 ? -1 : 1) * (Math.abs(coordDeg) + coordMin / 60 + coordSec / 3600); + coord = card.equals("N") || card.equals("E") ? coord : -coord; + if (card.equals("N") || card.equals("S")) { + latLon.lat = coord; + } else { + latLon.lon = coord; + } + } + + public String getText() { + return tfLatLon.getText(); + } + + public void setText(String text) { + tfLatLon.setText(text); + } }