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

Timestamp:

2014-12-17T01:49:45+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #10860 - set initial viewport correctly when mapview is opened

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (5 diffs)
• NavigatableComponent.java (modified) (7 diffs)

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

@@ -37 +37 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
-import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.ViewportData;
@@ -233 +231 @@
      */
     public MapView(final JPanel contentPane, final ViewportData viewportData) {
+        initialViewport = viewportData;
         Main.pref.addPreferenceChangeListener(this);
         final boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
@@ -250 +249 @@
 
                 mapMover = new MapMover(MapView.this, contentPane);
-                if (viewportData != null) {
-                    zoomTo(viewportData.getCenter(), viewportData.getScale());
-                } else {
-                    OsmDataLayer layer = getEditLayer();
-                    if (layer != null) {
-                        if (!zoomToDataSetBoundingBox(layer.data)) {
-                            // no bounding box defined
-                            AutoScaleAction.autoScale("data");
-                        }
-                    } else {
-                        AutoScaleAction.autoScale("layer");
-                    }
-                }
             }
         });
@@ -542 +528 @@
      */
     @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);
+            }
+            initialViewport = null;
+        }
         if (BugReportExceptionHandler.exceptionHandlingInProgress())
             return;
@@ -868 +864 @@
     }
 
-    /**
-     * Tries to zoom to the download boundingbox[es] of the current edit layer
-     * (aka {@link OsmDataLayer}). If the edit layer has multiple download bounding
-     * boxes it zooms to a large virtual bounding box containing all smaller ones.
-     *
-     * @return <code>true</code> if a zoom operation has been performed
-     */
-    public boolean zoomToDataSetBoundingBox(DataSet ds) {
-        // In case we already have an existing data layer ...
-        OsmDataLayer layer= getEditLayer();
-        if (layer == null)
-            return false;
-        Collection<DataSource> dataSources = ds.dataSources;
-        // ... with bounding box[es] of data loaded from OSM or a file...
-        BoundingXYVisitor bbox = new BoundingXYVisitor();
-        for (DataSource source : dataSources) {
-            bbox.visit(source.bounds);
-        }
-        if (bbox.hasExtend()) {
-            // ... we zoom to it's bounding box
-            recalculateCenterScale(bbox);
-            return true;
-        }
-        return false;
-    }
-
     public boolean addTemporaryLayer(MapViewPaintable mvp) {
         if (temporaryLayers.contains(mvp)) return false;

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
+import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -182 +183 @@
     private Polygon paintPoly = null;
 
+    protected ViewportData initialViewport;
+
     /**
      * Constructs a new {@code NavigatableComponent}.
@@ -406 +409 @@
 
     /**
-     * Zoom to the given coordinate.
+     * Zoom to the given coordinate and scale.
+     *
      * @param newCenter The center x-value (easting) to zoom to.
      * @param newScale The scale to use.
      */
     public void zoomTo(EastNorth newCenter, double newScale) {
+        zoomTo(newCenter, newScale, false);
+    }
+
+    /**
+     * Zoom to the given coordinate and scale.
+     *
+     * @param newCenter The center x-value (easting) to zoom to.
+     * @param newScale The scale to use.
+     * @param initial true if this call initializes the viewport.
+     */
+    public void zoomTo(EastNorth newCenter, double newScale, boolean initial) {
         Bounds b = getProjection().getWorldBoundsLatLon();
         LatLon cl = Projections.inverseProject(newCenter);
@@ -446 +461 @@
 
         if (!newCenter.equals(center) || (scale != newScale)) {
-            pushZoomUndo(center, scale);
-            zoomNoUndoTo(newCenter, newScale);
+            if (!initial) {
+                pushZoomUndo(center, scale);
+            }
+            zoomNoUndoTo(newCenter, newScale, initial);
         }
     }
@@ -453 +470 @@
     /**
      * Zoom to the given coordinate without adding to the zoom undo buffer.
+     *
      * @param newCenter The center x-value (easting) to zoom to.
      * @param newScale The scale to use.
-     */
-    private void zoomNoUndoTo(EastNorth newCenter, double newScale) {
+     * @param initial true if this call initializes the viewport.
+     */
+    private void zoomNoUndoTo(EastNorth newCenter, double newScale, boolean intial) {
         if (!newCenter.equals(center)) {
             EastNorth oldCenter = center;
             center = newCenter;
-            firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
+            if (!intial) {
+                firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
+            }
         }
         if (scale != newScale) {
             double oldScale = scale;
             scale = newScale;
-            firePropertyChange(PROPNAME_SCALE, oldScale, newScale);
-        }
-
-        repaint();
-        fireZoomChanged();
+            if (!intial) {
+                firePropertyChange(PROPNAME_SCALE, oldScale, newScale);
+            }
+        }
+
+        if (!intial) {
+            repaint();
+            fireZoomChanged();
+        }
     }
 
@@ -595 +620 @@
             ZoomData zoom = zoomUndoBuffer.pop();
             zoomRedoBuffer.push(new ZoomData(center, scale));
-            zoomNoUndoTo(zoom.getCenterEastNorth(), zoom.getScale());
+            zoomNoUndoTo(zoom.getCenterEastNorth(), zoom.getScale(), false);
         }
     }
@@ -603 +628 @@
             ZoomData zoom = zoomRedoBuffer.pop();
             zoomUndoBuffer.push(new ZoomData(center, scale));
-            zoomNoUndoTo(zoom.getCenterEastNorth(), zoom.getScale());
+            zoomNoUndoTo(zoom.getCenterEastNorth(), zoom.getScale(), false);
         }
     }