Index: images/latlon.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: images/latlon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Index: src/utilsplugin2/UtilsPlugin2.java =================================================================== --- src/utilsplugin2/UtilsPlugin2.java (revision 27399) +++ src/utilsplugin2/UtilsPlugin2.java (working copy) @@ -32,6 +32,7 @@ JMenuItem undoSelection; JMenuItem extractPoint; JMenuItem wiki; + JMenuItem latlon; JMenuItem replaceGeometry; JMenuItem tagBuffer; @@ -64,6 +65,7 @@ extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction()); symmetry = MainMenu.add(toolsMenu, new SymmetryAction()); wiki = MainMenu.add(toolsMenu, new OpenPageAction()); + latlon = MainMenu.add(toolsMenu, new LatLonAction()); JMenu selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, Main.main.menu.defaultMenuPos, "help"); selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction()); Index: src/utilsplugin2/LatLonAction.java =================================================================== --- src/utilsplugin2/LatLonAction.java (revision 0) +++ src/utilsplugin2/LatLonAction.java (revision 0) @@ -0,0 +1,93 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package utilsplugin2; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import java.util.Collection; +import java.util.LinkedList; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.actions.JosmAction; + +/** + * This action displays a dialog where the user can enter a latitude and longitude, + * and when ok is pressed, a new node is created at the specified position. + */ +public final class LatLonAction extends JosmAction { + // remember input from last time + private String textLatLon; + + public LatLonAction() { + super(tr("Lat Lon tool"), "latlon", tr("Create geometry by entering lat lon coordinates for it."), + Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), KeyEvent.VK_D, Shortcut.GROUP_EDIT, + Shortcut.SHIFT_DEFAULT), true); + putValue("help", ht("/Action/AddNode")); + } + + public void actionPerformed(ActionEvent e) { + if (!isEnabled()) + return; + + LatLonDialog dialog = new LatLonDialog(Main.parent, tr("Add Node..."), ht("/Action/AddNode")); + + if (textLatLon != null) { + dialog.setLatLonText(textLatLon); + } + + dialog.showDialog(); + + if (dialog.getValue() != 1) + return; + + LatLon[] coordinates = dialog.getCoordinates(); + String type = dialog.getGeomType(); + if (coordinates == null) + return; + + textLatLon = dialog.getLatLonText(); + + // we create a list of commands that will modify the map in the way we want. + Collection cmds = new LinkedList(); + // first we create all the nodes, then we do extra stuff based on what geometry type we need. + LinkedList nodes = new LinkedList(); + + for (LatLon ll : coordinates) { + Node nnew = new Node(ll); + nodes.add(nnew); + cmds.add(new AddCommand(nnew)); + } + + if (type == "nodes") { + //we dont need to do anything, we already have all the nodes + } + if (type == "way") { + Way wnew = new Way(); + wnew.setNodes(nodes); + cmds.add(new AddCommand(wnew)); + } + if (type == "area") { + nodes.add(nodes.get(0)); // this is needed to close the way. + Way wnew = new Way(); + wnew.setNodes(nodes); + cmds.add(new AddCommand(wnew)); + } + Main.main.undoRedo.add(new SequenceCommand(tr("Lat Lon tool"), cmds)); + Main.map.mapView.repaint(); + } + + @Override + protected void updateEnabledState() { + setEnabled(getEditLayer() != null); + } +} Index: src/utilsplugin2/LatLonDialog.java =================================================================== --- src/utilsplugin2/LatLonDialog.java (revision 0) +++ src/utilsplugin2/LatLonDialog.java (revision 0) @@ -0,0 +1,475 @@ +// License: GPL. For details, see LICENSE file. +package utilsplugin2; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Color; +import java.awt.Component; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +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; +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; + +import javax.swing.text.Document; +import javax.swing.JTextArea; +import javax.swing.JScrollPane; +import javax.swing.ButtonGroup; +import javax.swing.JRadioButton; + +import javax.swing.UIManager; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.coor.CoordinateFormat; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.widgets.HtmlPanel; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.WindowGeometry; + +public class LatLonDialog extends ExtendedDialog { + private static final Color BG_COLOR_ERROR = new Color(255,224,224); + + public JTabbedPane tabs; + private JTextArea taLatLon; + private JScrollPane spScroll; + private JRadioButton rbNodes; + private JRadioButton rbWay; + private JRadioButton rbClosedWay; + private ButtonGroup bgType; + private String geomType; + + private LatLon[] latLonCoordinates; + + 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 buildLatLon() { + JPanel pnl = new JPanel(new GridBagLayout()); + pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + + pnl.add(new JLabel(tr("Coordinates:")), GBC.std().insets(0,10,5,0)); + + taLatLon = new JTextArea(5,24); + taLatLon.getDocument().addDocumentListener(new CoordinateListener()); + spScroll = new JScrollPane(taLatLon); + pnl.add(spScroll, GBC.eol().insets(0,10,0,0).fill().weight(2.0, 2.0)); + + //Radio button setup + bgType = new ButtonGroup(); + + rbNodes = new JRadioButton("Nodes", true); + rbNodes.setActionCommand("nodes"); + bgType.add(rbNodes); + pnl.add(rbNodes, GBC.eol()); + + rbWay = new JRadioButton("Way"); + rbWay.setActionCommand("way"); + bgType.add(rbWay); + pnl.add(rbWay, GBC.eol()); + + rbClosedWay = new JRadioButton("Closed Way (Area)"); + rbClosedWay.setActionCommand("area"); + bgType.add(rbClosedWay); + pnl.add(rbClosedWay, GBC.eol()); + + //pnl.add(bgType, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL).weight(2.0, 0.0)); + //pnl.add(new JRadioButton("test")); + //pnl.add(bgType); + + 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 nodes, one for each line.
If you enter two lines with the same coordinates there will be generated duplicate nodes.
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:
    " + + "
  • degrees°
    • " + + "
  • degrees° minutes'
    • " + + "
  • degrees° minutes' seconds"
    • " + + "
" + + "Symbols °, ', ′, ", ″ are optional.

" + + "Some examples:
    " + + "
  • 49.29918° 19.24788°
    • " + + "
  • N 49.29918 E 19.24788
    • " + + "
  • W 49°29.918' S 19°24.788'
    • " + + "
  • N 49°29'04" E 19°24'43"
    • " + + "
  • 49.29918 N, 19.24788 E
    • " + + "
  • 49°29'21" N 19°24'38" E
    • " + + "
  • 49 29 51, 19 24 18
    • " + + "
  • 49 29, 19 24
    • " + + "
  • E 49 29, N 19 24
    • " + + "
  • 49° 29; 19° 24
    • " + + "
  • N 49° 29, W 19° 24
    • " + + "
  • 49° 29.5 S, 19° 24.6 E
    • " + + "
  • N 49 29.918 E 19 15.88
    • " + + "
  • 49 29.4 19 24.5
    • " + + "
  • -49 29.4 N -19 24.5 W
" + + "
  • 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(); + taLatLon.getDocument().addDocumentListener(inputVerifier); + + // select the text in the field on focus + // + TextFieldFocusHandler focusHandler = new TextFieldFocusHandler(); + taLatLon.addFocusListener(focusHandler); + return pnl; + } + + protected void build() { + tabs = new JTabbedPane(); + tabs.addTab(tr("Lat/Lon"), buildLatLon()); + tabs.getModel().addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + switch (tabs.getModel().getSelectedIndex()) { + case 0: parseLatLonUserInput(); break; + default: throw new AssertionError(); + } + } + }); + setContent(tabs, false); + } + + public LatLonDialog(Component parent, String title, String help) { + super(Main.parent, tr("Add Node..."), new String[] { tr("Ok"), tr("Cancel") }); + setButtonIcons(new String[] { "ok", "cancel" }); + configureContextsensitiveHelp("/Action/AddNode", true); + + build(); + setCoordinates(null); + } + + public void setCoordinates(LatLon[] ll) { + if (ll == null) { + ll = new LatLon[] {}; + } + this.latLonCoordinates = ll; + String text = ""; + for (LatLon latlon : ll) { + text = text + latlon.latToString(CoordinateFormat.getDefaultFormat()) + " " + latlon.lonToString(CoordinateFormat.getDefaultFormat()) + "\n"; + } + taLatLon.setText(text); + setOkEnabled(true); + } + + public LatLon[] getCoordinates() { + return latLonCoordinates; + } + + public LatLon[] getLatLonCoordinates() { + return latLonCoordinates; + } + + public String getGeomType() { + return bgType.getSelection().getActionCommand(); + } + + protected void setErrorFeedback(JTextArea tf, String message) { + tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1)); + tf.setToolTipText(message); + tf.setBackground(BG_COLOR_ERROR); + } + + protected void clearErrorFeedback(JTextArea tf, String message) { + tf.setBorder(UIManager.getBorder("TextField.border")); + tf.setToolTipText(message); + tf.setBackground(UIManager.getColor("TextField.background")); + } + + protected Double parseDoubleFromUserInput(String input) { + if (input == null) return null; + // remove white space and an optional degree symbol + // + input = input.trim(); + input = input.replaceAll(DEG, ""); + + // try to parse using the current locale + // + NumberFormat f = NumberFormat.getNumberInstance(); + Number n=null; + ParsePosition pp = new ParsePosition(0); + n = f.parse(input,pp); + if (pp.getErrorIndex() >= 0 || pp.getIndex()= 0 || pp.getIndex() 0) { + buttons.get(0).setEnabled(b); + } + } + + @Override + public void setVisible(boolean visible) { + if (visible) { + WindowGeometry.centerInWindow(Main.parent, getSize()).applySafe(this); + } + super.setVisible(visible); + } + + class LatLonInputVerifier implements DocumentListener { + public void changedUpdate(DocumentEvent e) { + parseLatLonUserInput(); + } + + public void insertUpdate(DocumentEvent e) { + parseLatLonUserInput(); + } + + public void removeUpdate(DocumentEvent e) { + parseLatLonUserInput(); + } + } + + static class TextFieldFocusHandler implements FocusListener { + public void focusGained(FocusEvent e) { + Component c = e.getComponent(); + if (c instanceof JTextArea) { + JTextArea tf = (JTextArea)c; + tf.selectAll(); + } + } + public void focusLost(FocusEvent e) {} + } + + private static LatLon[] parseLatLons(final String text) { + String lines[] = text.split("\\r?\\n"); + List latLons = new ArrayList(); + for (String line : lines) { + latLons.add(parseLatLon(line)); + } + return latLons.toArray(new LatLon[]{}); + } + + private static LatLon parseLatLon(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 getLatLonText() { + return taLatLon.getText(); + } + + public void setLatLonText(String text) { + taLatLon.setText(text); + } + + private class CoordinateListener implements DocumentListener { + public void changedUpdate(DocumentEvent e) { + //not fired + } + public void insertUpdate(DocumentEvent e) { + updateButtons(); + } + public void removeUpdate(DocumentEvent e) { + updateButtons(); + } + private void updateButtons() { + String text = taLatLon.getText(); + String[] lines = text.split("\r\n|\r|\n"); + rbNodes.setEnabled(true); + rbWay.setEnabled(true); + rbClosedWay.setEnabled(true); + if (lines.length < 3) { + rbClosedWay.setEnabled(false); + bgType.setSelected(rbNodes.getModel(), true); + } + if (lines.length < 2) { + rbWay.setEnabled(false); + bgType.setSelected(rbNodes.getModel(), true); + } + } + } +}