Changeset 12093 in josm for trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

Timestamp:

2017-05-10T12:22:20+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #14734 - Handling imagery offsets when reprojecting

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
@@ -62 +63 @@
     private boolean showErrors;
 
-    /**
-     * The displacement
-     */
-    private EastNorth displacement = new EastNorth(0, 0);
+    private OffsetBookmark offsetBookmark = null;
+    /**
+     * the displacement (basically caches the displacement from the offsetBookmark
+     * in the current projection)
+     */
+    private EastNorth displacement = EastNorth.ZERO;
 
     private final CopyOnWriteArrayList<DisplaySettingsChangeListener> listeners = new CopyOnWriteArrayList<>();
@@ -189 +192 @@
 
     /**
-     * Set the displacement
-     * @param displacement The new displacement
-     * @since 10571
-     */
-    public void setDisplacement(EastNorth displacement) {
+     * Sets an offset bookmark to use.
+     * 
+     * @param offsetBookmark the offset bookmark, may be null
+     */
+    public void setOffsetBookmark(OffsetBookmark offsetBookmark) {
+        this.offsetBookmark = offsetBookmark;
+        if (offsetBookmark == null) {
+            setDisplacement(EastNorth.ZERO);
+        } else {
+            setDisplacement(offsetBookmark.getDisplacement(Main.getProjection()));
+        }
+    }
+
+    /**
+     * Gets the offset bookmark in use.
+     * @return the offset bookmark, may be null
+     */
+    public OffsetBookmark getOffsetBookmark() {
+        return this.offsetBookmark;
+    }
+
+    private void setDisplacement(EastNorth displacement) {
         CheckParameterUtil.ensureValidCoordinates(displacement, "displacement");
         this.displacement = displacement;
         fireSettingsChange(DISPLACEMENT);
-    }
-
-    /**
-     * Adds the given value to the displacement.
-     * @param displacement The value to add.
-     * @since 10571
-     */
-    public void addDisplacement(EastNorth displacement) {
-        CheckParameterUtil.ensureValidCoordinates(displacement, "displacement");
-        setDisplacement(this.displacement.add(displacement));
     }