### Eclipse Workspace Patch 1.0
#P josm
Index: src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapView.java	(revision 993)
+++ src/org/openstreetmap/josm/gui/MapView.java	(working copy)
@@ -8,18 +8,19 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.Transparency;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 
+import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -28,11 +29,11 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -57,361 +58,398 @@
  */
 public class MapView extends NavigatableComponent {
 
-	/**
-	 * Interface to notify listeners of the change of the active layer.
-	 * @author imi
-	 * @deprecated Use Layer.LayerChangeListener instead
-	 */
-	@Deprecated public interface LayerChangeListener {
-		void activeLayerChange(Layer oldLayer, Layer newLayer);
-		void layerAdded(Layer newLayer);
-		void layerRemoved(Layer oldLayer);
-	}
+    /**
+     * Interface to notify listeners of the change of the active layer.
+     * @author imi
+     * @deprecated Use Layer.LayerChangeListener instead
+     */
+    @Deprecated
+    public interface LayerChangeListener {
+        void activeLayerChange(Layer oldLayer, Layer newLayer);
 
-	/**
-	 * A list of all layers currently loaded.
-	 */
-	private ArrayList<Layer> layers = new ArrayList<Layer>();
-	/**
-	 * The play head marker: there is only one of these so it isn't in any specific layer
-	 */
-	public PlayHeadMarker playHeadMarker = null;
-	/**
-	 * Direct link to the edit layer (if any) in the layers list.
-	 */
-	public OsmDataLayer editLayer;
-	/**
-	 * The layer from the layers list that is currently active.
-	 */
-	private Layer activeLayer;
-	
-	/**
-	 * The last event performed by mouse.
-	 */
-	public MouseEvent lastMEvent;
+        void layerAdded(Layer newLayer);
 
-	private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
-	
-	private BufferedImage offscreenBuffer;
-	
-	/**
-	 * The listener of the active layer changes.
-	 * @deprecated Use Layer.listener instead.
-	 */
-	@Deprecated private Collection<LayerChangeListener> listeners = new LinkedList<LayerChangeListener>();
+        void layerRemoved(Layer oldLayer);
+    }
 
-	public MapView() {
-		addComponentListener(new ComponentAdapter(){
-			@Override public void componentResized(ComponentEvent e) {
-				removeComponentListener(this);
+    /**
+     * A list of all layers currently loaded.
+     */
+    private ArrayList<Layer> layers = new ArrayList<Layer>();
+    /**
+     * The play head marker: there is only one of these so it isn't in any specific layer
+     */
+    public PlayHeadMarker playHeadMarker = null;
+    /**
+     * Direct link to the edit layer (if any) in the layers list.
+     */
+    public OsmDataLayer editLayer;
+    /**
+     * The layer from the layers list that is currently active.
+     */
+    private Layer activeLayer;
 
-				new AutoScaleAction("data").actionPerformed(null);
+    /**
+     * The last event performed by mouse.
+     */
+    public MouseEvent lastMEvent;
 
-				new MapMover(MapView.this, Main.contentPane);
-				Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, java.awt.event.InputEvent.SHIFT_MASK), "UP");
-				Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, java.awt.event.InputEvent.SHIFT_MASK), "DOWN");
-				Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, java.awt.event.InputEvent.SHIFT_MASK), "LEFT");
-				Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, java.awt.event.InputEvent.SHIFT_MASK), "RIGHT");
+    private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
 
-				Main.contentPane.getActionMap().put("UP", new MoveAction(MoveAction.Direction.UP));
-				Main.contentPane.getActionMap().put("DOWN", new MoveAction(MoveAction.Direction.DOWN));
-				Main.contentPane.getActionMap().put("LEFT", new MoveAction(MoveAction.Direction.LEFT));
-				Main.contentPane.getActionMap().put("RIGHT", new MoveAction(MoveAction.Direction.RIGHT));
-				
+    private BufferedImage offscreenBuffer;
 
-				MapSlider zoomSlider = new MapSlider(MapView.this);
-				add(zoomSlider);
-				zoomSlider.setBounds(3, 0, 114, 30);
+    /**
+     * The listener of the active layer changes.
+     * @deprecated Use Layer.listener instead.
+     */
+    @Deprecated
+    private Collection<LayerChangeListener> listeners = new LinkedList<LayerChangeListener>();
 
-				MapScaler scaler = new MapScaler(MapView.this, Main.proj);
-				add(scaler);
-				scaler.setLocation(10,30);
-			}
-		});
+    public MapView() {
+        addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                removeComponentListener(this);
 
-		// listend to selection changes to redraw the map
-		DataSet.selListeners.add(new SelectionChangedListener(){
-			public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-				repaint();
-			}
-		});
+                if (!zoomToEditLayerBoundingBox())
+                    new AutoScaleAction("data").actionPerformed(null);
 
-		//store the last mouse action
-		this.addMouseMotionListener(new MouseMotionListener() {
-			public void mouseDragged(MouseEvent e) {
-				mouseMoved(e);
-			}
-			public void mouseMoved(MouseEvent e) {
-				lastMEvent = e;
-			}
-		});
-	}
+                new MapMover(MapView.this, Main.contentPane);
+                InputMap inputMapWIFW = Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+                inputMapWIFW.put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_MASK), "UP");
+                inputMapWIFW.put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.SHIFT_MASK), "DOWN");
+                inputMapWIFW.put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK), "LEFT");
+                inputMapWIFW.put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK), "RIGHT");
 
-	/**
-	 * Add a layer to the current MapView. The layer will be added at topmost
-	 * position.
-	 */
-	public void addLayer(Layer layer) {
-		if (layer instanceof OsmDataLayer) {
-			editLayer = (OsmDataLayer)layer;
-			Main.ds = editLayer.data;
-			editLayer.listenerModified.add(new ModifiedChangedListener(){
-				public void modifiedChanged(boolean value, OsmDataLayer source) {
-					JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java OpenStreetMap - Editor"));
-				}
-			});
-		}
-		if (layer instanceof MarkerLayer && playHeadMarker == null)
-			playHeadMarker = PlayHeadMarker.create();
-		int pos = layers.size();
-		while(pos > 0 && layers.get(pos-1).background)
-			--pos;
-		layers.add(pos, layer);
+                Main.contentPane.getActionMap().put("UP", new MoveAction(MoveAction.Direction.UP));
+                Main.contentPane.getActionMap().put("DOWN", new MoveAction(MoveAction.Direction.DOWN));
+                Main.contentPane.getActionMap().put("LEFT", new MoveAction(MoveAction.Direction.LEFT));
+                Main.contentPane.getActionMap().put("RIGHT", new MoveAction(MoveAction.Direction.RIGHT));
 
-		// TODO: Deprecated
-		for (LayerChangeListener l : listeners)
-			l.layerAdded(layer);
-		for (Layer.LayerChangeListener l : Layer.listeners)
-			l.layerAdded(layer);
-		if (layer instanceof OsmDataLayer || activeLayer == null) {
-			// autoselect the new layer
-			Layer old = activeLayer;
-			setActiveLayer(layer);
-			for (Layer.LayerChangeListener l : Layer.listeners)
-				l.activeLayerChange(old, layer);
-		}
-		repaint();
-	}
+                MapSlider zoomSlider = new MapSlider(MapView.this);
+                add(zoomSlider);
+                zoomSlider.setBounds(3, 0, 114, 30);
 
-	@Override
-	protected DataSet getData()
-	{
-		if(activeLayer != null && activeLayer instanceof OsmDataLayer)
-			return ((OsmDataLayer)activeLayer).data;
-		return new DataSet();
-	}
+                MapScaler scaler = new MapScaler(MapView.this, Main.proj);
+                add(scaler);
+                scaler.setLocation(10, 30);
+            }
+        });
 
-	public Boolean isDrawableLayer()
-	{
-		return activeLayer != null && activeLayer instanceof OsmDataLayer;
-	}
+        // listend to selection changes to redraw the map
+        DataSet.selListeners.add(new SelectionChangedListener() {
+            public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+                repaint();
+            }
+        });
 
-	/**
-	 * Remove the layer from the mapview. If the layer was in the list before,
-	 * an LayerChange event is fired.
-	 */
-	public void removeLayer(Layer layer) {
-		if (layers.remove(layer)) {
-			// TODO: Deprecated
-			for (LayerChangeListener l : listeners)
-				l.layerRemoved(layer);
-			for (Layer.LayerChangeListener l : Layer.listeners)
-				l.layerRemoved(layer);
-		}
-		if (layer == editLayer) {
-			editLayer = null;
-			Main.ds.setSelected();
-		}
-		layer.destroy();
-	}
+        //store the last mouse action
+        this.addMouseMotionListener(new MouseMotionListener() {
+            public void mouseDragged(MouseEvent e) {
+                mouseMoved(e);
+            }
 
-	private Boolean virtualnodes = false;
-	public void enableVirtualNodes(Boolean state)
-	{
-		if(virtualnodes != state)
-		{
-			virtualnodes = state;
-			repaint();
-		}
-	}
-	public Boolean useVirtualNodes()
-	{
-		return virtualnodes;
-	}
+            public void mouseMoved(MouseEvent e) {
+                lastMEvent = e;
+            }
+        });
+    }
 
-	/**
-	 * Moves the layer to the given new position. No event is fired.
-	 * @param layer		The layer to move
-	 * @param pos		The new position of the layer
-	 */
-	public void moveLayer(Layer layer, int pos) {
-		int curLayerPos = layers.indexOf(layer);
-		if (curLayerPos == -1)
-			throw new IllegalArgumentException(tr("layer not in list."));
-		if (pos == curLayerPos)
-			return; // already in place.
-		layers.remove(curLayerPos);
-		if (pos >= layers.size())
-			layers.add(layer);
-		else
-			layers.add(pos, layer);
-	}
+    /**
+     * 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.  
+     * This implementation can be used for resolving ticket #1461. 
+     * 
+     * @return <code>true</code> if a zoom operation has been performed
+     * @author Jan Peter Stotz
+     */
+    private boolean zoomToEditLayerBoundingBox() {
+        // workaround for #1461 (zoom to download bounding box instead of all data)
+        // In case we already have an existing data layer ... 
+        Collection<DataSource> dataSources = Main.main.editLayer().data.dataSources;
+        // ... with bounding box[es] of data loaded from OSM or a file...
+        BoundingXYVisitor bbox = new BoundingXYVisitor();
+        for (DataSource ds : dataSources) {
+            if (ds.bounds != null) {
+                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.max));
+                bbox.visit(Main.proj.latlon2eastNorth(ds.bounds.min));
+            }
+            if (bbox.max != null && bbox.min != null && !bbox.max.equals(bbox.min)) {
+                // ... we zoom to it's bounding box
+                recalculateCenterScale(bbox);
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * Draw the component.
-	 */
-	@Override public void paint(Graphics g) {
-		if (center == null)
-			return; // no data loaded yet.
+    /**
+     * Add a layer to the current MapView. The layer will be added at topmost
+     * position.
+     */
+    public void addLayer(Layer layer) {
+        if (layer instanceof OsmDataLayer) {
+            editLayer = (OsmDataLayer) layer;
+            Main.ds = editLayer.data;
+            editLayer.listenerModified.add(new ModifiedChangedListener() {
+                public void modifiedChanged(boolean value, OsmDataLayer source) {
+                    JOptionPane.getFrameForComponent(Main.parent).setTitle(
+                            (value ? "*" : "") + tr("Java OpenStreetMap - Editor"));
+                }
+            });
+        }
+        if (layer instanceof MarkerLayer && playHeadMarker == null)
+            playHeadMarker = PlayHeadMarker.create();
+        int pos = layers.size();
+        while (pos > 0 && layers.get(pos - 1).background)
+            --pos;
+        layers.add(pos, layer);
 
-		// re-create offscreen-buffer if we've been resized, otherwise
-		// just re-use it.
-		if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth()
-		        || offscreenBuffer.getHeight() != getHeight())
-			offscreenBuffer = new BufferedImage(getWidth(), getHeight(),
-			        BufferedImage.TYPE_INT_ARGB);
+        // TODO: Deprecated
+        for (LayerChangeListener l : listeners)
+            l.layerAdded(layer);
+        for (Layer.LayerChangeListener l : Layer.listeners)
+            l.layerAdded(layer);
+        if (layer instanceof OsmDataLayer || activeLayer == null) {
+            // autoselect the new layer
+            Layer old = activeLayer;
+            setActiveLayer(layer);
+            for (Layer.LayerChangeListener l : Layer.listeners)
+                l.activeLayerChange(old, layer);
+        }
+        repaint();
+    }
 
-		Graphics2D tempG = offscreenBuffer.createGraphics();
-		tempG.setColor(Main.pref.getColor("background", Color.BLACK));
-		tempG.fillRect(0, 0, getWidth(), getHeight());
+    @Override
+    protected DataSet getData() {
+        if (activeLayer != null && activeLayer instanceof OsmDataLayer)
+            return ((OsmDataLayer) activeLayer).data;
+        return new DataSet();
+    }
 
-		for (int i = layers.size()-1; i >= 0; --i) {
-			Layer l = layers.get(i);
-			if (l.visible/* && l != getActiveLayer()*/)
-				l.paint(tempG, this);
-		}
+    public Boolean isDrawableLayer() {
+        return activeLayer != null && activeLayer instanceof OsmDataLayer;
+    }
 
-		/*if (getActiveLayer() != null && getActiveLayer().visible)
-			getActiveLayer().paint(tempG, this);*/
+    /**
+     * Remove the layer from the mapview. If the layer was in the list before,
+     * an LayerChange event is fired.
+     */
+    public void removeLayer(Layer layer) {
+        if (layers.remove(layer)) {
+            // TODO: Deprecated
+            for (LayerChangeListener l : listeners)
+                l.layerRemoved(layer);
+            for (Layer.LayerChangeListener l : Layer.listeners)
+                l.layerRemoved(layer);
+        }
+        if (layer == editLayer) {
+            editLayer = null;
+            Main.ds.setSelected();
+        }
+        layer.destroy();
+    }
 
-		for (MapViewPaintable mvp : temporaryLayers) {
-			mvp.paint(tempG, this);
-		}
-		
-		// draw world borders
-		tempG.setColor(Color.WHITE);
-		Bounds b = new Bounds();
-		Point min = getPoint(getProjection().latlon2eastNorth(b.min));
-		Point max = getPoint(getProjection().latlon2eastNorth(b.max));
-		int x1 = Math.min(min.x, max.x);
-		int y1 = Math.min(min.y, max.y);
-		int x2 = Math.max(min.x, max.x);
-		int y2 = Math.max(min.y, max.y);
-		if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
-			tempG.drawRect(x1, y1, x2-x1+1, y2-y1+1);
-		
-		if (playHeadMarker != null)
-			playHeadMarker.paint(tempG, this);
+    private Boolean virtualnodes = false;
 
-		g.drawImage(offscreenBuffer, 0, 0, null);
-		super.paint(g);
-	}
+    public void enableVirtualNodes(Boolean state) {
+        if (virtualnodes != state) {
+            virtualnodes = state;
+            repaint();
+        }
+    }
 
-	/**
-	 * Set the new dimension to the projection class. Also adjust the components
-	 * scale, if in autoScale mode.
-	 */
-	public void recalculateCenterScale(BoundingXYVisitor box) {
-		// -20 to leave some border
-		int w = getWidth()-20;
-		if (w < 20)
-			w = 20;
-		int h = getHeight()-20;
-		if (h < 20)
-			h = 20;
+    public Boolean useVirtualNodes() {
+        return virtualnodes;
+    }
 
-		EastNorth oldCenter = center;
-		double oldScale = this.scale;
+    /**
+     * Moves the layer to the given new position. No event is fired.
+     * @param layer		The layer to move
+     * @param pos		The new position of the layer
+     */
+    public void moveLayer(Layer layer, int pos) {
+        int curLayerPos = layers.indexOf(layer);
+        if (curLayerPos == -1)
+            throw new IllegalArgumentException(tr("layer not in list."));
+        if (pos == curLayerPos)
+            return; // already in place.
+        layers.remove(curLayerPos);
+        if (pos >= layers.size())
+            layers.add(layer);
+        else
+            layers.add(pos, layer);
+    }
 
-		if (box == null || box.min == null || box.max == null || box.min.equals(box.max)) {
-			// no bounds means whole world
-			center = getProjection().latlon2eastNorth(new LatLon(0,0));
-			EastNorth world = getProjection().latlon2eastNorth(new LatLon(Projection.MAX_LAT,Projection.MAX_LON));
-			double scaleX = world.east()*2/w;
-			double scaleY = world.north()*2/h;
-			scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
-		} else {
-			center = new EastNorth(box.min.east()/2+box.max.east()/2, box.min.north()/2+box.max.north()/2);
-			double scaleX = (box.max.east()-box.min.east())/w;
-			double scaleY = (box.max.north()-box.min.north())/h;
-			scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
-		}
+    /**
+     * Draw the component.
+     */
+    @Override
+    public void paint(Graphics g) {
+        if (center == null)
+            return; // no data loaded yet.
 
-		if (!center.equals(oldCenter))
-			firePropertyChange("center", oldCenter, center);
-		if (oldScale != scale)
-			firePropertyChange("scale", oldScale, scale);
-		repaint();
-	}
+        // re-create offscreen-buffer if we've been resized, otherwise
+        // just re-use it.
+        if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth()
+                || offscreenBuffer.getHeight() != getHeight())
+            offscreenBuffer = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB);
 
-	/**
-	 * Add a listener for changes of active layer.
-	 * @param listener The listener that get added.
-	 * @deprecated Use Layer.listener.add instead.
-	 */
-	@Deprecated public void addLayerChangeListener(LayerChangeListener listener) {
-		if (listener != null)
-			listeners.add(listener);
-	}
+        Graphics2D tempG = offscreenBuffer.createGraphics();
+        tempG.setColor(Main.pref.getColor("background", Color.BLACK));
+        tempG.fillRect(0, 0, getWidth(), getHeight());
 
-	/**
-	 * Remove the listener.
-	 * @param listener The listener that get removed from the list.
-	 * @deprecated Use Layer.listener.remove instead
-	 */
-	@Deprecated public void removeLayerChangeListener(LayerChangeListener listener) {
-		listeners.remove(listener);
-	}
+        for (int i = layers.size() - 1; i >= 0; --i) {
+            Layer l = layers.get(i);
+            if (l.visible/* && l != getActiveLayer()*/)
+                l.paint(tempG, this);
+        }
 
-	/**
-	 * @return An unmodificable list of all layers
-	 */
-	public Collection<Layer> getAllLayers() {
-		return Collections.unmodifiableCollection(layers);
-	}
+        /*if (getActiveLayer() != null && getActiveLayer().visible)
+        	getActiveLayer().paint(tempG, this);*/
 
-	/**
-	 * Set the active selection to the given value and raise an layerchange event.
-	 */
-	public void setActiveLayer(Layer layer) {
-		if (!layers.contains(layer))
-			throw new IllegalArgumentException("Layer must be in layerlist");
-		if (layer instanceof OsmDataLayer) {
-			editLayer = (OsmDataLayer)layer;
-			Main.ds = editLayer.data;
-		}
-		else
-			Main.ds.setSelected();
-		DataSet.fireSelectionChanged(Main.ds.getSelected());
-		Layer old = activeLayer;
-		activeLayer = layer;
-		if (old != layer) {
-			// TODO: Deprecated
-			for (LayerChangeListener l : listeners)
-				l.activeLayerChange(old, layer);
-			for (Layer.LayerChangeListener l : Layer.listeners)
-				l.activeLayerChange(old, layer);
-		}
-		repaint();
-	}
+        for (MapViewPaintable mvp : temporaryLayers) {
+            mvp.paint(tempG, this);
+        }
 
-	/**
-	 * @return The current active layer
-	 */
-	public Layer getActiveLayer() {
-		return activeLayer;
-	}
+        // draw world borders
+        tempG.setColor(Color.WHITE);
+        Bounds b = new Bounds();
+        Point min = getPoint(getProjection().latlon2eastNorth(b.min));
+        Point max = getPoint(getProjection().latlon2eastNorth(b.max));
+        int x1 = Math.min(min.x, max.x);
+        int y1 = Math.min(min.y, max.y);
+        int x2 = Math.max(min.x, max.x);
+        int y2 = Math.max(min.y, max.y);
+        if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
+            tempG.drawRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
 
-	/**
-	 * In addition to the base class funcitonality, this keep trak of the autoscale
-	 * feature.
-	 */
-	@Override public void zoomTo(EastNorth newCenter, double scale) {
-		EastNorth oldCenter = center;
-		double oldScale = this.scale;
-		super.zoomTo(newCenter, scale);
-		if ((oldCenter == null && center != null) || !oldCenter.equals(center))
-			firePropertyChange("center", oldCenter, center);
-		if (oldScale != scale)
-			firePropertyChange("scale", oldScale, scale);
-	}
-	
-	public boolean addTemporaryLayer(MapViewPaintable mvp) {
-		if (temporaryLayers.contains(mvp)) return false;
-		return temporaryLayers.add(mvp);
-	}
-	
-	public boolean removeTemporaryLayer(MapViewPaintable mvp) {
-		return temporaryLayers.remove(mvp);
-	}
+        if (playHeadMarker != null)
+            playHeadMarker.paint(tempG, this);
+
+        g.drawImage(offscreenBuffer, 0, 0, null);
+        super.paint(g);
+    }
+
+    /**
+     * Set the new dimension to the projection class. Also adjust the components
+     * scale, if in autoScale mode.
+     */
+    public void recalculateCenterScale(BoundingXYVisitor box) {
+        // -20 to leave some border
+        int w = getWidth() - 20;
+        if (w < 20)
+            w = 20;
+        int h = getHeight() - 20;
+        if (h < 20)
+            h = 20;
+
+        EastNorth oldCenter = center;
+        double oldScale = this.scale;
+
+        if (box == null || box.min == null || box.max == null || box.min.equals(box.max)) {
+            // no bounds means whole world
+            center = getProjection().latlon2eastNorth(new LatLon(0, 0));
+            EastNorth world = getProjection().latlon2eastNorth(new LatLon(Projection.MAX_LAT, Projection.MAX_LON));
+            double scaleX = world.east() * 2 / w;
+            double scaleY = world.north() * 2 / h;
+            scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
+        } else {
+            center = new EastNorth(box.min.east() / 2 + box.max.east() / 2, box.min.north() / 2 + box.max.north() / 2);
+            double scaleX = (box.max.east() - box.min.east()) / w;
+            double scaleY = (box.max.north() - box.min.north()) / h;
+            scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
+        }
+
+        if (!center.equals(oldCenter))
+            firePropertyChange("center", oldCenter, center);
+        if (oldScale != scale)
+            firePropertyChange("scale", oldScale, scale);
+        repaint();
+    }
+
+    /**
+     * Add a listener for changes of active layer.
+     * @param listener The listener that get added.
+     * @deprecated Use Layer.listener.add instead.
+     */
+    @Deprecated
+    public void addLayerChangeListener(LayerChangeListener listener) {
+        if (listener != null)
+            listeners.add(listener);
+    }
+
+    /**
+     * Remove the listener.
+     * @param listener The listener that get removed from the list.
+     * @deprecated Use Layer.listener.remove instead
+     */
+    @Deprecated
+    public void removeLayerChangeListener(LayerChangeListener listener) {
+        listeners.remove(listener);
+    }
+
+    /**
+     * @return An unmodificable list of all layers
+     */
+    public Collection<Layer> getAllLayers() {
+        return Collections.unmodifiableCollection(layers);
+    }
+
+    /**
+     * Set the active selection to the given value and raise an layerchange event.
+     */
+    public void setActiveLayer(Layer layer) {
+        if (!layers.contains(layer))
+            throw new IllegalArgumentException("Layer must be in layerlist");
+        if (layer instanceof OsmDataLayer) {
+            editLayer = (OsmDataLayer) layer;
+            Main.ds = editLayer.data;
+        } else
+            Main.ds.setSelected();
+        DataSet.fireSelectionChanged(Main.ds.getSelected());
+        Layer old = activeLayer;
+        activeLayer = layer;
+        if (old != layer) {
+            // TODO: Deprecated
+            for (LayerChangeListener l : listeners)
+                l.activeLayerChange(old, layer);
+            for (Layer.LayerChangeListener l : Layer.listeners)
+                l.activeLayerChange(old, layer);
+        }
+        repaint();
+    }
+
+    /**
+     * @return The current active layer
+     */
+    public Layer getActiveLayer() {
+        return activeLayer;
+    }
+
+    /**
+     * In addition to the base class funcitonality, this keep trak of the autoscale
+     * feature.
+     */
+    @Override
+    public void zoomTo(EastNorth newCenter, double scale) {
+        EastNorth oldCenter = center;
+        double oldScale = this.scale;
+        super.zoomTo(newCenter, scale);
+        if ((oldCenter == null && center != null) || !oldCenter.equals(center))
+            firePropertyChange("center", oldCenter, center);
+        if (oldScale != scale)
+            firePropertyChange("scale", oldScale, scale);
+    }
+
+    public boolean addTemporaryLayer(MapViewPaintable mvp) {
+        if (temporaryLayers.contains(mvp))
+            return false;
+        return temporaryLayers.add(mvp);
+    }
+
+    public boolean removeTemporaryLayer(MapViewPaintable mvp) {
+        return temporaryLayers.remove(mvp);
+    }
 }