Changeset 8670 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-08-17T19:13:17+02:00 (9 years ago)

Author:

simon04

Message:

fix #11749 - Jump to Position: add D M S and D M.M coordinate support to

File:

• trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LatLonDialog;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -150 +151 @@
                 ll = new LatLon(Double.parseDouble(lat.getText()), Double.parseDouble(lon.getText()));
             } catch (NumberFormatException ex) {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("Could not parse Latitude, Longitude or Zoom. Please check."),
-                        tr("Unable to parse Lon/Lat"), JOptionPane.ERROR_MESSAGE);
+                try {
+                    ll = LatLonDialog.parseLatLon(lat.getText() + "; " + lon.getText());
+                } catch (IllegalArgumentException ex2) {
+                    JOptionPane.showMessageDialog(Main.parent,
+                            tr("Could not parse Latitude, Longitude or Zoom. Please check."),
+                            tr("Unable to parse Lon/Lat"), JOptionPane.ERROR_MESSAGE);
+                }
             }
         }