Changeset 15733 in josm for trunk

Timestamp:

2020-01-19T21:21:52+01:00 (5 years ago)

Author:

simon04

Message:

see #17220 - LayerListDialog: show imagery offset in tooltip

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ImageryAdjustAction.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (4 diffs)
• gui/layer/imagery/TileSourceDisplaySettings.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.util.Formatter;
 import java.util.Locale;
 
@@ -316 +315 @@
         private void updateOffsetIntl() {
             if (layer != null) {
-                // Support projections with very small numbers (e.g. 4326)
-                int precision = ProjectionRegistry.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
-                // US locale to force decimal separator to be '.'
-                try (Formatter us = new Formatter(Locale.US)) {
-                    EastNorth displacement = layer.getDisplaySettings().getDisplacement();
-                    tOffset.setText(us.format(new StringBuilder()
-                        .append("%1.").append(precision).append("f; %1.").append(precision).append('f').toString(),
-                        displacement.east(), displacement.north()).toString());
-                }
+                // ROOT locale to force decimal separator to be '.'
+                tOffset.setText(layer.getDisplaySettings().getDisplacementString(Locale.ROOT));
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -21 +21 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -73 +74 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
+import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeEvent;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeListener;
@@ -651 +653 @@
             Layer layer = (Layer) value;
             if (layer instanceof AbstractTileSourceLayer<?>) {
-                if (EastNorth.ZERO.equals(((AbstractTileSourceLayer<?>) layer).getDisplaySettings().getDisplacement())) {
+                final TileSourceDisplaySettings displaySettings = ((AbstractTileSourceLayer<?>) layer).getDisplaySettings();
+                if (EastNorth.ZERO.equals(displaySettings.getDisplacement())) {
                     cb.setSelected(false);
                     cb.setEnabled(false); // TODO: allow reselecting checkbox and thereby setting the old offset again
@@ -658 +661 @@
                     cb.setSelected(true);
                     cb.setEnabled(true);
-                    cb.setToolTipText(tr("layer has a user-defined offset (click to remove offset)"));
+                    cb.setToolTipText(tr("layer has an offset of {0} (click to remove offset)",
+                            displaySettings.getDisplacementString(Locale.getDefault())));
                 }
 

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -3 +3 @@
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -197 +198 @@
 
     /**
+     * Gets the displacement of the image formatted as a string
+     * @param locale the locale used to format the decimals
+     * @return the displacement string
+     * @see #getDisplacement()
+     * @since 15733
+     */
+    public String getDisplacementString(final Locale locale) {
+        // Support projections with very small numbers (e.g. 4326)
+        int precision = ProjectionRegistry.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;
+        return String.format(locale, "%1." + precision + "f; %1." + precision + "f", getDx(), getDy());
+    }
+
+    /**
      * Sets an offset bookmark to use. Loads the displacement from the bookmark.
      *