Changeset 7817 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-12-17T13:46:53+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #10861 - Zoom to layer when opening new file (see #10860)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (2 diffs)
• dialogs/SelectionListDialog.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

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

@@ -529 +529 @@
     @Override public void paint(Graphics g) {
         if (initialViewport != null) {
-            if (initialViewport.getBounds() != null) {
-                BoundingXYVisitor box = new BoundingXYVisitor();
-                box.visit(initialViewport.getBounds());
-                recalculateCenterScale(box);
-            } else {
-                zoomTo(initialViewport.getCenter(), initialViewport.getScale(), true);
-            }
+            zoomTo(initialViewport);
             initialViewport = null;
         }
@@ -693 +687 @@
     /**
      * Set the new dimension to the view.
-     */
+     * 
+     * @deprecated use #zoomTo(BoundingXYVisitor)
+     */
+    @Deprecated
     public void recalculateCenterScale(BoundingXYVisitor box) {
-        if (box == null) {
-            box = new BoundingXYVisitor();
-        }
-        if (box.getBounds() == null) {
-            box.visit(getProjection().getWorldBoundsLatLon());
-        }
-        if (!box.hasExtend()) {
-            box.enlargeBoundingBox();
-        }
-
-        zoomTo(box.getBounds());
+        zoomTo(box);
     }
 

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

@@ -43 +43 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -580 +581 @@
         zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.getMin()),
                 getProjection().latlon2eastNorth(box.getMax())));
+    }
+
+    public void zoomTo(ViewportData viewport) {
+        if (viewport == null) return;
+        if (viewport.getBounds() != null) {
+            BoundingXYVisitor box = new BoundingXYVisitor();
+            box.visit(viewport.getBounds());
+            zoomTo(box);
+        } else {
+            zoomTo(viewport.getCenter(), viewport.getScale(), true);
+        }
+    }
+
+    /**
+     * Set the new dimension to the view.
+     */
+    public void zoomTo(BoundingXYVisitor box) {
+        if (box == null) {
+            box = new BoundingXYVisitor();
+        }
+        if (box.getBounds() == null) {
+            box.visit(getProjection().getWorldBoundsLatLon());
+        }
+        if (!box.hasExtend()) {
+            box.enlargeBoundingBox();
+        }
+
+        zoomTo(box.getBounds());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -451 +451 @@
                 return;
             box.enlargeBoundingBox();
-            Main.map.mapView.recalculateCenterScale(box);
+            Main.map.mapView.zoomTo(box);
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -746 +746 @@
                         BoundingXYVisitor bbox = new BoundingXYVisitor();
                         yLayer.visitBoundingBox(bbox);
-                        Main.map.mapView.recalculateCenterScale(bbox);
+                        Main.map.mapView.zoomTo(bbox);
                     }