Changeset 12093 in josm for trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.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/actions/ImageryAdjustAction.java (modified) (8 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -43 +44 @@
     private static Cursor cursor = ImageProvider.getCursor("normal", "move");
 
-    private EastNorth old;
+    private OffsetBookmark old;
+    private OffsetBookmark tempOffset;
     private EastNorth prevEastNorth;
     private transient AbstractTileSourceLayer<?> layer;
@@ -66 +68 @@
             layer.setVisible(true);
         }
-        old = layer.getDisplaySettings().getDisplacement();
+        old = layer.getDisplaySettings().getOffsetBookmark();
+        EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(Main.getProjection());
+        LatLon center;
+        if (Main.isDisplayingMapView()) {
+            center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
+        } else {
+            center = LatLon.ZERO;
+        }
+        tempOffset = new OffsetBookmark(
+                Main.getProjection().toCode(),
+                layer.getInfo().getName(),
+                null,
+                curOff.east(), curOff.north(), center.lon(), center.lat());
+        layer.getDisplaySettings().setOffsetBookmark(tempOffset);
         addListeners();
         showOffsetDialog(new ImageryOffsetDialog());
@@ -96 +111 @@
         if (offsetDialog != null) {
             if (layer != null) {
-                layer.getDisplaySettings().setDisplacement(old);
+                layer.getDisplaySettings().setOffsetBookmark(old);
             }
             hideOffsetDialog();
@@ -136 +151 @@
         if (dx != 0 || dy != 0) {
             double ppd = layer.getPPD();
-            layer.getDisplaySettings().addDisplacement(new EastNorth(dx / ppd, dy / ppd));
+            EastNorth d = tempOffset.getDisplacement().add(new EastNorth(dx / ppd, dy / ppd));
+            tempOffset.setDisplacement(d);
+            layer.getDisplaySettings().setOffsetBookmark(tempOffset);
             if (offsetDialog != null) {
                 offsetDialog.updateOffset();
@@ -163 +180 @@
         if (layer == null || prevEastNorth == null) return;
         EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
-        EastNorth d = layer.getDisplaySettings().getDisplacement().add(eastNorth).subtract(prevEastNorth);
-        layer.getDisplaySettings().setDisplacement(d);
+        EastNorth d = tempOffset.getDisplacement().add(eastNorth).subtract(prevEastNorth);
+        tempOffset.setDisplacement(d);
+        layer.getDisplaySettings().setOffsetBookmark(tempOffset);
         if (offsetDialog != null) {
             offsetDialog.updateOffset();
@@ -239 +257 @@
                     double dx = Double.parseDouble(easting);
                     double dy = Double.parseDouble(northing);
-                    layer.getDisplaySettings().setDisplacement(new EastNorth(dx, dy));
+                    tempOffset.setDisplacement(new EastNorth(dx, dy));
+                    layer.getDisplaySettings().setOffsetBookmark(tempOffset);
                 } catch (NumberFormatException nfe) {
                     // we repaint offset numbers in any case
@@ -305 +324 @@
             if (layer != null) {
                 if (getValue() != 1) {
-                    layer.getDisplaySettings().setDisplacement(old);
+                    layer.getDisplaySettings().setOffsetBookmark(old);
                 } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
                     OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);