Changeset 13243 in josm for trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

Timestamp:

2017-12-26T17:50:55+01:00 (6 years ago)

Author:

michael2402

Message:

See #15310: Replace use of dx/dy in bookmark loading/storing code.

File:

• trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (modified) (3 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
-import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -86 +85 @@
                 layer.getInfo().getName(),
                 null,
-                curOff.east(), curOff.north(), center.lon(), center.lat());
+                curOff, center);
         layer.getDisplaySettings().setOffsetBookmark(tempOffset);
         addListeners();
@@ -293 +292 @@
                 // US locale to force decimal separator to be '.'
                 try (Formatter us = new Formatter(Locale.US)) {
-                    TileSourceDisplaySettings ds = layer.getDisplaySettings();
+                    EastNorth displacement = layer.getDisplaySettings().getDisplacement();
                     tOffset.setText(us.format(new StringBuilder()
                         .append("%1.").append(precision).append("f; %1.").append(precision).append('f').toString(),
-                        ds.getDx(), ds.getDy()).toString());
+                        displacement.east(), displacement.north()).toString());
                 }
             }