Changeset 7816 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (7 diffs)

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