Changeset 10486 in josm

Timestamp:

2016-06-25T11:14:09+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13049 - Inform map view of Projection updates (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• gui/MapViewState.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1431 +1431 @@
         if (newValue == null ^ oldValue == null
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-
+            if (Main.map != null) {
+                // This needs to be called first
+                Main.map.mapView.fixProjection();
+            }
             synchronized (Main.class) {
                 Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();

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

@@ -100 +100 @@
     }
 
+    private MapViewState(Projection projection, MapViewState mapViewState) {
+        this.projection = projection;
+        this.scale = mapViewState.scale;
+        this.topLeft = mapViewState.topLeft;
+
+        viewWidth = mapViewState.viewWidth;
+        viewHeight = mapViewState.viewHeight;
+        topLeftInWindow = mapViewState.topLeftInWindow;
+        topLeftOnScreen = mapViewState.topLeftOnScreen;
+    }
+
     /**
      * The scale in east/north units per pixel.
@@ -236 +247 @@
 
     /**
+     * Creates a state that uses the projection.
+     * @param projection The projection to use.
+     * @return The new state.
+     * @since 10486
+     */
+    public MapViewState usingProjection(Projection projection) {
+        if (projection.equals(this.projection)) {
+            return this;
+        } else {
+            return new MapViewState(projection, this);
+        }
+    }
+
+    /**
      * Create the default {@link MapViewState} object for the given map view. The screen position won't be set so that this method can be used
      * before the view was added to the hirarchy.

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

@@ -51 +51 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
@@ -177 +178 @@
         setLayout(null);
         state = MapViewState.createDefaultState(getWidth(), getHeight());
+        // uses weak link.
+        Main.addProjectionChangeListener(new ProjectionChangeListener() {
+            @Override
+            public void projectionChanged(Projection oldValue, Projection newValue) {
+                fixProjection();
+            }
+        });
     }
 
@@ -324 +332 @@
     protected boolean isVisibleOnScreen() {
         return SwingUtilities.getWindowAncestor(this) != null && isShowing();
+    }
+
+    /**
+     * Changes the projection settings used for this map view.
+     * <p>
+     * Made public temporarely, will be made private later.
+     */
+    public void fixProjection() {
+        state = state.usingProjection(Main.getProjection());
+        repaint();
     }