Changeset 16920 in josm for trunk

Timestamp:

2020-08-23T21:02:52+02:00 (4 years ago)

Author:

simon04

Message:

fix #7638 - Download dialog: add status bar with lat/lon of mouse cursor and selected download area (for experts)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (3 diffs)
• bbox/SlippyMapControler.java (modified) (1 diff)
• download/DownloadDialog.java (modified) (7 diffs)
• download/SlippyMapChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -69 +69 @@
     private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
     private static final BooleanProperty PROP_SHOWDLAREA = new BooleanProperty("slippy_map_chooser.show_downloaded_area", true);
+
     /**
      * The property name used for the resize button.
@@ -74 +75 @@
      */
     public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
+
+    /**
+     * The property name used for the {@link org.openstreetmap.josm.data.coor.ILatLon} of the mouse cursor on the map.
+     * @see #addPropertyChangeListener(java.beans.PropertyChangeListener)
+     */
+    public static final String CURSOR_COORDINATE_PROP = SlippyMapBBoxChooser.class.getName() + ".coordinate";
 
     private final SizeButton iSizeButton;
@@ -236 +243 @@
         PROP_SHOWDLAREA.put(this.showDownloadAreaButtonModel.isSelected());
         this.repaint();
+    }
+
+    /**
+     * Handles a {@link SlippyMapControler#mouseMoved} event
+     * @param point The point in the view
+     */
+    public void handleMouseMoved(Point point) {
+        final ICoordinate coordinate = getPosition(point);
+        final LatLon latLon = new LatLon(coordinate.getLat(), coordinate.getLon());
+        firePropertyChange(CURSOR_COORDINATE_PROP, null, latLon);
     }
 

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -162 +162 @@
     @Override
     public void mouseMoved(MouseEvent e) {
+        iSlippyMapChooser.handleMouseMoved(e.getPoint());
         iSlippyMapChooser.handleAttribution(e.getPoint(), false);
     }

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -6 +6 @@
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -24 +25 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.Icon;
@@ -40 +42 @@
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -52 +59 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
+import org.openstreetmap.josm.gui.widgets.ImageLabel;
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -101 +109 @@
     protected final DownloadSourceTabs downloadSourcesTab = new DownloadSourceTabs();
 
+    private final ImageLabel latText;
+    private final ImageLabel lonText;
+    private final ImageLabel bboxText;
+    {
+        final LatLon sample = new LatLon(90, 180);
+        final ICoordinateFormat sampleFormat = DMSCoordinateFormat.INSTANCE;
+        final Color background = new JPanel().getBackground();
+        latText = new ImageLabel("lat", null, sampleFormat.latToString(sample).length(), background);
+        lonText = new ImageLabel("lon", null, sampleFormat.lonToString(sample).length(), background);
+        bboxText = new ImageLabel("name", null, sampleFormat.toString(sample, "").length() * 2, background);
+    }
+
     protected JCheckBox cbStartup;
     protected JCheckBox cbZoomToDownloadedData;
@@ -158 +178 @@
 
         mainPanel.add(dialogSplit, GBC.eol().fill());
+
+        JPanel statusBarPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
+        statusBarPanel.setBorder(BorderFactory.createLineBorder(Color.GRAY));
+        statusBarPanel.add(latText);
+        statusBarPanel.add(lonText);
+        statusBarPanel.add(bboxText);
+        mainPanel.add(statusBarPanel, GBC.eol().fill(GBC.HORIZONTAL));
+        ExpertToggleAction.addVisibilitySwitcher(statusBarPanel);
 
         cbStartup = new JCheckBox(tr("Open this dialog on startup"));
@@ -283 +311 @@
             ds.boundingBoxChanged(b);
         }
+
+        bboxText.setText(b == null ? "" : String.join("  ",
+                CoordinateFormatManager.getDefaultFormat().toString(b.getMin(), " "),
+                CoordinateFormatManager.getDefaultFormat().toString(b.getMax(), " ")));
+    }
+
+    /**
+     * Updates the coordinates after moving the mouse cursor
+     * @param latLon the coordinates under the mouse cursor
+     */
+    public void mapCursorChanged(ILatLon latLon) {
+        latText.setText(CoordinateFormatManager.getDefaultFormat().latToString(latLon));
+        lonText.setText(CoordinateFormatManager.getDefaultFormat().lonToString(latLon));
     }
 

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.gui.bbox.BBoxChooser;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
@@ -73 +74 @@
             // resize and center the DownloadDialog
             iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
+        } else if (evt.getPropertyName().equals(SlippyMapBBoxChooser.CURSOR_COORDINATE_PROP)) {
+            iGui.mapCursorChanged((ILatLon) evt.getNewValue());
         }
     }