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

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (4 diffs)
• actions/AutoScaleAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• data/ViewportData.java (modified) (3 diffs)
• gui/MapView.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)

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

@@ -700 +700 @@
      * @param layer the layer
      * 
-     * @see #addLayer(org.openstreetmap.josm.gui.layer.Layer, org.openstreetmap.josm.data.ProjectionBounds)
-     * @see #addLayer(org.openstreetmap.josm.gui.layer.Layer, org.openstreetmap.josm.data.ViewportData)
+     * @see #addLayer(Layer, ProjectionBounds)
+     * @see #addLayer(Layer, ViewportData)
      */
     public final void addLayer(final Layer layer) {
@@ -715 +715 @@
      * 
      * @param layer the layer
-     * @param bounds the bounds of the layer (target zoom area)
+     * @param bounds the bounds of the layer (target zoom area); can be null, then
+     * the viewport isn't changed
      */
     public final synchronized void addLayer(final Layer layer, ProjectionBounds bounds) {
-        addLayer(layer, new ViewportData(bounds));
+        addLayer(layer, bounds == null ? null : new ViewportData(bounds));
     }
 
@@ -727 +728 @@
      * 
      * @param layer the layer
-     * @param viewport the viewport to zoom to
+     * @param viewport the viewport to zoom to; can be null, then the viewport
+     * isn't changed
      */
     public final synchronized void addLayer(final Layer layer, ViewportData viewport) {
@@ -738 +740 @@
         if (noMap) {
             Main.map.setVisible(true);
+        } else if (viewport != null) {
+            Main.map.mapView.zoomTo(viewport);
         }
     }

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

@@ -85 +85 @@
         bboxCalculator.enlargeBoundingBox();
         if (bboxCalculator.getBounds() != null) {
-            Main.map.mapView.recalculateCenterScale(bboxCalculator);
+            Main.map.mapView.zoomTo(bboxCalculator);
         }
     }
@@ -174 +174 @@
                 BoundingXYVisitor bbox = getBoundingBox();
                 if (bbox != null && bbox.getBounds() != null) {
-                    Main.map.mapView.recalculateCenterScale(bbox);
+                    Main.map.mapView.zoomTo(bbox);
                 }
             }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -265 +265 @@
             BoundingXYVisitor v = new BoundingXYVisitor();
             v.visit(pb);
-            Main.map.mapView.recalculateCenterScale(v);
+            Main.map.mapView.zoomTo(v);
         }
 

trunk/src/org/openstreetmap/josm/data/ViewportData.java

@@ -3 +3 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -28 +29 @@
      */
     public ViewportData(EastNorth center, Double scale) {
+        CheckParameterUtil.ensureParameterNotNull(center);
+        CheckParameterUtil.ensureParameterNotNull(scale);
         this.center = center;
         this.scale = scale;
@@ -34 +37 @@
 
     public ViewportData(ProjectionBounds bounds) {
+        CheckParameterUtil.ensureParameterNotNull(bounds);
         this.center = null;
         this.scale = null;

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);
                     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -244 +244 @@
                     BoundingXYVisitor bbox1 = new BoundingXYVisitor();
                     bbox1.visit(bbox);
-                    Main.map.mapView.recalculateCenterScale(bbox1);
+                    Main.map.mapView.zoomTo(bbox1);
                 }
             });