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

Timestamp:

2016-06-20T00:06:54+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13001 - Add MainPanel + some new methods (patch by michael2402, modified) - gsoc-core

File:

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

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

@@ -32 +32 @@
 
 import javax.swing.AbstractButton;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -42 +40 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.ViewportData;
@@ -495 +494 @@
      * Constructs a new {@code MapView}.
      * @param layerManager The layers to display.
-     * @param contentPane The content pane used to register shortcuts in its
-     * {@link InputMap} and {@link ActionMap}
+     * @param contentPane Ignored. Main content pane is used.
      * @param viewportData the initial viewport of the map. Can be null, then
      * the viewport is derived from the layer data.
@@ -598 +596 @@
         if (layer instanceof MarkerLayer && playHeadMarker == null) {
             playHeadMarker = PlayHeadMarker.create();
+        }
+
+        ProjectionBounds viewProjectionBounds = layer.getViewProjectionBounds();
+        if (viewProjectionBounds != null) {
+            scheduleZoomTo(new ViewportData(viewProjectionBounds));
         }