Changeset 12093 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.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/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -81 +81 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
@@ -334 +335 @@
     @Override
     @Deprecated
-    public void displace(double dx, double dy) {
-        getDisplaySettings().addDisplacement(new EastNorth(dx, dy));
-    }
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Use {@link TileSourceDisplaySettings}
-     */
-    @Override
-    @Deprecated
-    public void setOffset(double dx, double dy) {
-        getDisplaySettings().setDisplacement(new EastNorth(dx, dy));
+    public void setOffset(OffsetBookmark offset) {
+        getDisplaySettings().setOffsetBookmark(offset);
     }
 
@@ -1856 +1847 @@
     public void projectionChanged(Projection oldValue, Projection newValue) {
         super.projectionChanged(oldValue, newValue);
+        displaySettings.setOffsetBookmark(displaySettings.getOffsetBookmark());
         if (tileCache != null) {
             tileCache.clear();