Changeset 5670 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2013-01-25T22:34:19+01:00 (11 years ago)

Author:

bastiK

Message:

session: save & restore map position and scale (see #4029)

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (2 diffs)

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

@@ -219 +219 @@
     /**
      * Constructs a new {@code MapView}.
-     * @param contentPane The content pane used to register shortcuts in its {@link InputMap} and {@link ActionMap}
-     */
-    public MapView(final JPanel contentPane) {
+     * @param contentPane The content pane used to register shortcuts in its
+     * {@link InputMap} and {@link ActionMap}
+     * @param viewportData the initial viewport of the map. Can be null, then
+     * the viewport is derived from the layer data.
+     */
+    public MapView(final JPanel contentPane, final ViewportData viewportData) {
         Main.pref.addPreferenceChangeListener(this);
 
@@ -237 +240 @@
 
                 mapMover = new MapMover(MapView.this, contentPane);
-                OsmDataLayer layer = getEditLayer();
-                if (layer != null) {
-                    if (!zoomToDataSetBoundingBox(layer.data)) {
-                        // no bounding box defined
-                        AutoScaleAction.autoScale("data");
+                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");
                     }
-                } else {
-                    AutoScaleAction.autoScale("layer");
                 }
             }