Changeset 10343 in josm for trunk

Timestamp:

2016-06-08T23:01:38+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12934 - Add new MapViewState class that stores the current state of the map view (patch by michael2402) - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapViewState.java (added)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java (added)

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

@@ -47 +47 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.help.Helpful;
@@ -365 +366 @@
 
     public ProjectionBounds getProjectionBounds() {
-        return new ProjectionBounds(
-                new EastNorth(
-                        center.east() - getWidth()/2.0*scale,
-                        center.north() - getHeight()/2.0*scale),
-                        new EastNorth(
-                                center.east() + getWidth()/2.0*scale,
-                                center.north() + getHeight()/2.0*scale));
+        return new MapViewState(this).getViewArea().getProjectionBounds();
     }
 
@@ -383 +378 @@
     /* FIXME: replace with better method - used by Main to reset Bounds when projection changes, don't use otherwise */
     public Bounds getRealBounds() {
-        return new Bounds(
-                getProjection().eastNorth2latlon(new EastNorth(
-                        center.east() - getWidth()/2.0*scale,
-                        center.north() - getHeight()/2.0*scale)),
-                        getProjection().eastNorth2latlon(new EastNorth(
-                                center.east() + getWidth()/2.0*scale,
-                                center.north() + getHeight()/2.0*scale)));
+        return new MapViewState(this).getViewArea().getCornerBounds();
     }
 
@@ -408 +397 @@
 
     public ProjectionBounds getProjectionBounds(Rectangle r) {
-        EastNorth p1 = getEastNorth(r.x, r.y);
-        EastNorth p2 = getEastNorth(r.x + r.width, r.y + r.height);
-        ProjectionBounds pb = new ProjectionBounds(p1);
-        pb.extend(p2);
-        return pb;
+        MapViewState state = new MapViewState(this);
+        MapViewPoint p1 = state.getForView(r.getMinX(), r.getMinY());
+        MapViewPoint p2 = state.getForView(r.getMaxX(), r.getMaxY());
+        return p1.rectTo(p2).getProjectionBounds();
     }