Changeset 5670 in josm for trunk/src/org/openstreetmap/josm/gui/MapFrame.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/MapFrame.java (modified) (2 diffs)

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

@@ -54 +54 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData;
 import org.openstreetmap.josm.gui.dialogs.ChangesetDialog;
 import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
@@ -144 +145 @@
     private final Map<Layer, MapMode> lastMapMode = new HashMap<Layer, MapMode>();
 
-    public MapFrame(JPanel contentPane) {
+    /**
+     * Constructs a new {@code MapFrame}.
+     * @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 MapFrame(JPanel contentPane, ViewportData viewportData) {
         setSize(400,400);
         setLayout(new BorderLayout());
 
 
-        mapView = new MapView(contentPane);
+        mapView = new MapView(contentPane, viewportData);
 
         new FileDrop(mapView);