Changeset 11840 in josm for trunk

Timestamp:

2017-04-05T11:13:08+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - small fix for [11835] + change order in zoomNoUndoTo

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (2 diffs)
• test/data/renderer/area-fill-color/reference.png (modified) ( previous)
• test/data/renderer/area-fill-image/reference.png (modified) ( previous)
• test/data/renderer/area-icon/reference.png (modified) ( previous)
• test/data/renderer/area-text/reference.png (modified) ( previous)
• test/data/renderer/node-shapes/reference.png (modified) ( previous)
• test/data/renderer/node-text/reference.png (modified) ( previous)
• test/data/renderer/order/reference.png (modified) ( previous)
• test/data/renderer/way-color/reference.png (modified) ( previous)
• test/data/renderer/way-dashes/reference.png (modified) ( previous)
• test/data/renderer/way-width/reference.png (modified) ( previous)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -635 +635 @@
         // values, so it is not an issue in this case. It only shows when zooming
         // in & back out, etc.
-        MapViewState mvs = getState().usingScale(newScale).movedTo(state.getCenterAtPixel(), newCenter);
+        MapViewState mvs = getState().usingScale(newScale);
+        mvs = mvs.movedTo(mvs.getCenter(), newCenter);
         Point2D enOrigin = mvs.getPointFor(new EastNorth(0, 0)).getInView();
         Point2D enOriginAligned = new Point2D.Double(Math.round(enOrigin.getX()), Math.round(enOrigin.getY()));
@@ -657 +658 @@
      */
     private void zoomNoUndoTo(EastNorth newCenter, double newScale, boolean initial) {
-        if (!newCenter.equals(getCenter())) {
-            EastNorth oldCenter = getCenter();
-            state = state.movedTo(state.getCenterAtPixel(), newCenter);
-            if (!initial) {
-                firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
-            }
-        }
         if (!Utils.equalsEpsilon(getScale(), newScale)) {
             double oldScale = getScale();
             state = state.usingScale(newScale);
-            // temporary. Zoom logic needs to be moved.
-            state = state.movedTo(state.getCenterAtPixel(), newCenter);
             if (!initial) {
                 firePropertyChange(PROPNAME_SCALE, oldScale, newScale);
+            }
+        }
+        if (!newCenter.equals(getCenter())) {
+            EastNorth oldCenter = getCenter();
+            state = state.movedTo(state.getCenter(), newCenter);
+            if (!initial) {
+                firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
             }
         }