Changeset 8526 in josm for trunk/src/org

Timestamp:

2015-06-24T20:57:43+02:00 (10 years ago)

Author:

wiktorn

Message:

Introduce WMS layer based on TMS. (closes: #11255)

HEADS UP: After this patch you need to manually remove JAX-B generated file/class: org/w3/_2001/xmlschema/Adapter1.java to compile the tree again.

• create AbstractTileSourceLayer based on TMSLayer as a base for TMS, WMS and (future) WMTS layers, (addresses #11459)
• WMS layer now uses JCS Caching (closes: #7363)
• introduce new conversion methods in TileSource, that convert both X and Y (lat and lon) in one call. This is necessary for other than PseudoMercator projections
  • introduce TileXY class that represents X and Y indexes of tile in tile matrix/space
  • mark old conversion methods as deprecated
  • refactor JMapViewer and JOSM to new methods
  • change use of Coordinate class to ICoordinate where appropiate
• extract CachedAttributionBingAerialTileSource to separate file
• create TemplatedWMSTileSource that provides the WMS Layer with square (according to current projection) tiles (closes: #11572, closes: #7682, addresses: #5454)
• implemented precaching imagery along GPX track for AbstractTileSourceLayer, so now it work for both - WMS and TMS (closes: #9154)
• implemented common righ-click menu on map view, as well on layer list (closes #3591)
• create separate build commands for JMapViewer classes to easily spot, when josm classes are used within JMapViewer
• remove unnecessary classes of previous WMS implementation - GeorefImage, wms-cache.xsd (and JAXB task from build), WMSCache, WMSRequest, WMSGrabber, HTMLGrabber, WMSException

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)
• data/coor/LatLon.java (modified) (3 diffs)
• data/imagery/CachedAttributionBingAerialTileSource.java (added)
• data/imagery/CachedTileLoaderFactory.java (added)
• data/imagery/GeorefImage.java (deleted)
• data/imagery/ImageryInfo.java (modified) (2 diffs)
• data/imagery/TMSCachedTileLoader.java (modified) (4 diffs)
• data/imagery/TemplatedWMSTileSource.java (added)
• data/imagery/TileLoaderFactory.java (added)
• data/imagery/WMSCachedTileLoader.java (added)
• data/imagery/WMSCachedTileLoaderJob.java (added)
• data/imagery/WmsCache.java (deleted)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (3 diffs)
• gui/layer/AbstractTileSourceLayer.java (copied) (copied from trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java ) (45 diffs)
• gui/layer/TMSLayer.java (modified) (4 diffs)
• gui/layer/WMSLayer.java (modified) (5 diffs)
• gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified) (6 diffs)
• gui/preferences/imagery/TMSSettingsPanel.java (modified) (4 diffs)
• gui/preferences/imagery/WMSSettingsPanel.java (modified) (7 diffs)
• io/WMSLayerExporter.java (modified) (3 diffs)
• io/WMSLayerImporter.java (modified) (3 diffs)
• io/imagery/HTMLGrabber.java (deleted)
• io/imagery/WMSException.java (deleted)
• io/imagery/WMSGrabber.java (deleted)
• io/imagery/WMSRequest.java (deleted)
• io/session/ImagerySessionExporter.java (modified) (2 diffs)
• io/session/ImagerySessionImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -193 +193 @@
             }
             // object not in cache, so submit work to separate thread
-            getDownloadExecutor().execute(this);
+            downloadJobExecutor.execute(this);
         }
     }
@@ -230 +230 @@
     protected String getServerKey() {
         return getUrl().getHost();
-    }
-
-    /**
-     * this needs to be non-static, so it can be overridden by subclasses
-     */
-    protected ThreadPoolExecutor getDownloadExecutor() {
-        return downloadJobExecutor;
     }
 
@@ -506 +499 @@
      */
     public void cancelOutstandingTasks() {
-        ThreadPoolExecutor downloadExecutor = getDownloadExecutor();
-        for (Runnable r: downloadExecutor.getQueue()) {
-            if (downloadExecutor.remove(r)) {
-                if (r instanceof JCSCachedTileLoaderJob) {
-                    ((JCSCachedTileLoaderJob<?, ?>) r).handleJobCancellation();
-                }
+        for(Runnable r: downloadJobExecutor.getQueue()) {
+            if (downloadJobExecutor.remove(r) && r instanceof JCSCachedTileLoaderJob) {
+                ((JCSCachedTileLoaderJob<?, ?>) r).handleJobCancellation();
             }
         }

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -17 +17 @@
 import java.util.Locale;
 
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -188 +189 @@
     }
 
+    public LatLon(ICoordinate coor) {
+        this(coor.getLat(), coor.getLon());
+    }
+
+
     /**
      * Returns the latitude, i.e., the north-south position in degrees.
@@ -434 +440 @@
         return true;
     }
+
+    public ICoordinate toCoordinate() {
+        return new org.openstreetmap.gui.jmapviewer.Coordinate(lat(), lon());
+    }
 }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -19 +19 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.interfaces.Attributed;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
@@ -575 +575 @@
 
     @Override
-    public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
+    public String getAttributionText(int zoom, ICoordinate topLeft, ICoordinate botRight) {
         return attributionText;
     }

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -29 +29 @@
 public class TMSCachedTileLoader implements TileLoader, CachedTileLoader, TileCache {
 
-    private final ICacheAccess<String, BufferedImageCacheEntry> cache;
-    private final int connectTimeout;
-    private final int readTimeout;
-    private final Map<String, String> headers;
-    private final TileLoaderListener listener;
+    protected final ICacheAccess<String, BufferedImageCacheEntry> cache;
+    protected final int connectTimeout;
+    protected final int readTimeout;
+    protected final Map<String, String> headers;
+    protected final TileLoaderListener listener;
     private static final String PREFERENCE_PREFIX   = "imagery.tms.cache.";
 
@@ -55 +55 @@
      * and for TMS imagery
      */
-    private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getThreadPoolExecutor();
+    private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS downloader");
 
-    private final ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
-
-    private static ThreadPoolExecutor getThreadPoolExecutor() {
-        return new ThreadPoolExecutor(
-                THREAD_LIMIT.get().intValue(), // keep the thread number constant
-                THREAD_LIMIT.get().intValue(), // do not this number of threads
-                30, // keepalive for thread
-                TimeUnit.SECONDS,
-                new HostLimitQueue(HOST_LIMIT.get().intValue()),
-                JCSCachedTileLoaderJob.getNamedThreadFactory("TMS downloader")
-                );
-    }
+    private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
 
     /**
@@ -92 +81 @@
     }
 
+    /**
+     * @param name name of the threads
+     * @param workers number of worker thread to keep
+     * @return new ThreadPoolExecutor that will use a @see HostLimitQueue based queue
+     */
+    public static ThreadPoolExecutor getNewThreadPoolExecutor(String name, int workers) {
+        return new ThreadPoolExecutor(
+                workers, // keep the thread number constant
+                workers, // do not this number of threads
+                30, // keepalive for thread
+                TimeUnit.SECONDS,
+                new HostLimitQueue(HOST_LIMIT.get().intValue()),
+                JCSCachedTileLoaderJob.getNamedThreadFactory(name)
+                );
+    }
+
+    /**
+     * @param name name of threads
+     * @return new ThreadPoolExecutor that will use a @see HostLimitQueue based queue, with default number of threads
+     */
+    public static ThreadPoolExecutor getNewThreadPoolExecutor(String name) {
+        return getNewThreadPoolExecutor(name, THREAD_LIMIT.get().intValue());
+    }
+
     @Override
     public TileJob createTileLoaderJob(Tile tile) {
         return new TMSCachedTileLoaderJob(listener, tile, cache,
-                connectTimeout, readTimeout, headers, downloadExecutor);
+                connectTimeout, readTimeout, headers, getDownloadExecutor());
     }
 
@@ -141 +154 @@
         }
     }
+
+    /**
+     * Sets the download executor that will be used to download tiles instead of default one.
+     * You can use {@link #getNewThreadPoolExecutor} to create a new download executor with separate
+     * queue from default.
+     *
+     * @param downloadExecutor
+     */
+    public void setDownloadExecutor(ThreadPoolExecutor downloadExecutor) {
+        this.downloadExecutor = downloadExecutor;
+    }
+
+    /**
+     * @return download executor that is used by this factory
+     */
+    public ThreadPoolExecutor getDownloadExecutor() {
+        return downloadExecutor;
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -27 +27 @@
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -70 +71 @@
                 }
                 try {
-                    TileSource source = TMSLayer.getTileSource(info);
+                    TileSource source = TMSLayer.getTileSourceStatic(info);
                     if (source != null) {
                         sources.add(source);
@@ -124 +125 @@
 
     // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX)
-    private Coordinate iSelectionRectStart;
-    private Coordinate iSelectionRectEnd;
+    private ICoordinate iSelectionRectStart;
+    private ICoordinate iSelectionRectEnd;
 
     /**

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Font;
 import java.awt.Graphics;
@@ -19 +20 @@
 import java.io.File;
 import java.io.IOException;
-import java.io.StringReader;
-import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -26 +25 @@
 import java.util.Comparator;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Scanner;
-import java.util.concurrent.Callable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 import javax.swing.AbstractAction;
@@ -52 +48 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.ScanexTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.preferences.StringProperty;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -84 +76 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.CacheCustomContent;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.io.WMSLayerImporter;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
- * Class that displays a slippy map layer.
  *
- * @author Frederik Ramm
- * @author LuVar <lubomir.varga@freemap.sk>
- * @author Dave Hansen <dave@sr71.net>
- * @author Upliner <upliner@gmail.com>
+ * Base abstract class that supports displaying images provided by TileSource. It might be TMS source, WMS or WMTS
+ *
+ * It implements all standard functions of tilesource based layers: autozoom,  tile reloads, layer saving, loading,etc.
+ *
+ * @author Wiktor Niesiobędzki
+ * @since TODO
  *
  */
-public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
-    public static final String PREFERENCE_PREFIX   = "imagery.tms";
-
+public abstract class AbstractTileSourceLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
+    private static final String PREFERENCE_PREFIX   = "imagery.generic";
+
+    /** maximum zoom level supported */
     public static final int MAX_ZOOM = 30;
+    /** minium zoom level supported */
     public static final int MIN_ZOOM = 2;
-    public static final int DEFAULT_MAX_ZOOM = 20;
-    public static final int DEFAULT_MIN_ZOOM = 2;
-
+    private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
+
+    /** do set autozoom when creating a new layer */
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty(PREFERENCE_PREFIX + ".default_autozoom", true);
+    /** do set autoload when creating a new layer */
     public static final BooleanProperty PROP_DEFAULT_AUTOLOAD = new BooleanProperty(PREFERENCE_PREFIX + ".default_autoload", true);
+    /** do set showerrors when creating a new layer */
     public static final BooleanProperty PROP_DEFAULT_SHOWERRORS = new BooleanProperty(PREFERENCE_PREFIX + ".default_showerrors", true);
-    public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", DEFAULT_MIN_ZOOM);
-    public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", DEFAULT_MAX_ZOOM);
-    public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX +
-            ".add_to_slippymap_chooser", true);
-    public static final StringProperty PROP_TILECACHE_DIR;
-    static {
-        String defPath = null;
-        try {
-            defPath = new File(Main.pref.getCacheDirectory(), "tms").getAbsolutePath();
-        } catch (SecurityException e) {
-            Main.warn(e);
-        }
-        PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache", defPath);
-    }
-
-    private final class ShowTileInfoAction extends AbstractAction {
-        private ShowTileInfoAction() {
-            super(tr("Show Tile Info"));
-        }
-
-        private String getSizeString(int size) {
-            return new StringBuilder().append(size).append("x").append(size).toString();
-        }
-
-        private JTextField createTextField(String text) {
-            JTextField ret = new JTextField(text);
-            ret.setEditable(false);
-            ret.setBorder(BorderFactory.createEmptyBorder());
-            return ret;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ae) {
-            if (clickedTile != null) {
-                ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Tile Info"), new String[]{tr("OK")});
-                JPanel panel = new JPanel(new GridBagLayout());
-                Rectangle displaySize = tileToRect(clickedTile);
-                String url = "";
-                try {
-                    url = clickedTile.getUrl();
-                } catch (IOException e) {
-                    // silence exceptions
-                    if (Main.isTraceEnabled()) {
-                        Main.trace(e.getMessage());
-                    }
-                }
-
-                String[][] content = {
-                        {"Tile name", clickedTile.getKey()},
-                        {"Tile url", url},
-                        {"Tile size", getSizeString(clickedTile.getTileSource().getTileSize()) },
-                        {"Tile display size", new StringBuilder().append(displaySize.width).append("x").append(displaySize.height).toString()},
-                };
-
-                for (String[] entry: content) {
-                    panel.add(new JLabel(tr(entry[0]) + ":"), GBC.std());
-                    panel.add(GBC.glue(5, 0), GBC.std());
-                    panel.add(createTextField(entry[1]), GBC.eol().fill(GBC.HORIZONTAL));
-                }
-
-                for (Entry<String, String> e: clickedTile.getMetadata().entrySet()) {
-                    panel.add(new JLabel(tr("Metadata ") + tr(e.getKey()) + ":"), GBC.std());
-                    panel.add(GBC.glue(5, 0), GBC.std());
-                    String value = e.getValue();
-                    if ("lastModification".equals(e.getKey()) || "expirationTime".equals(e.getKey())) {
-                        value = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.parseLong(value)));
-                    }
-                    panel.add(createTextField(value), GBC.eol().fill(GBC.HORIZONTAL));
-                }
-                ed.setIcon(JOptionPane.INFORMATION_MESSAGE);
-                ed.setContent(panel);
-                ed.showDialog();
-            }
-        }
-    }
-
-    /**
-     * Interface for creating TileLoaders, ie. classes responsible for loading tiles on map
-     *
-     */
-    public interface TileLoaderFactory {
-        /**
-         * @param listener object that will be notified, when tile has finished loading
-         * @return TileLoader that will notify the listener
-         */
-        TileLoader makeTileLoader(TileLoaderListener listener);
-
-        /**
-         * @param listener object that will be notified, when tile has finished loading
-         * @param headers HTTP headers that should be sent by TileLoader to tile server
-         * @return TileLoader that will notify the listener
-         */
-        TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers);
-    }
+    /** minimum zoom level to show to user */
+    public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", 2);
+    /** maximum zoom level to show to user */
+    public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", 20);
+
+    //public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false);
+    /**
+     * Zoomlevel at which tiles is currently downloaded.
+     * Initial zoom lvl is set to bestZoom
+     */
+    public int currentZoomLevel;
+    private boolean needRedraw;
+
+    private AttributionSupport attribution = new AttributionSupport();
+    Tile showMetadataTile;
+
+    // needed public access for session exporter
+    /** if layers changes automatically, when user zooms in */
+    public boolean autoZoom;
+    /** if layer automatically loads new tiles */
+    public boolean autoLoad;
+    /** if layer should show errors on tiles */
+    public boolean showErrors;
 
     protected TileCache tileCache;
     protected TileSource tileSource;
+    //protected  tileMatrix;
     protected TileLoader tileLoader;
 
-
-    public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
-        @Override
-        public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) {
-            Map<String, String> headers = new HashMap<>();
-            headers.put("User-Agent", Version.getInstance().getFullAgentString());
-            headers.put("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
-            if (inputHeaders != null)
-                headers.putAll(inputHeaders);
-
-            try {
-                return new TMSCachedTileLoader(listener, "TMS",
-                        Main.pref.getInteger("socket.timeout.connect", 15) * 1000,
-                        Main.pref.getInteger("socket.timeout.read", 30) * 1000,
-                        headers,
-                        PROP_TILECACHE_DIR.get());
-            } catch (IOException e) {
-                Main.warn(e);
-            }
-            return null;
-        }
-
-        @Override
-        public TileLoader makeTileLoader(TileLoaderListener listener) {
-            return makeTileLoader(listener, null);
-        }
-    };
-
-    /**
-     * Plugins that wish to set custom tile loader should call this method
-     */
-
-    public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
-        TMSLayer.loaderFactory = loaderFactory;
-    }
+    /**
+     * Creates Tile Source based Imagery Layer based on Imagery Info
+     * @param info
+     * @param tileSource
+     */
+    public AbstractTileSourceLayer(ImageryInfo info) {
+        super(info);
+
+        if(!isProjectionSupported(Main.getProjection())) {
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("This layer do not support the projection {0}.\n{1}\n"
+                            + "Change the projection or remove the layer.",
+                            Main.getProjection().toCode(), nameSupportedProjections()),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE);
+        }
+        setBackgroundLayer(true);
+        this.setVisible(true);
+
+        initTileSource(getTileSource(info));
+        MapView.addZoomChangeListener(this);
+    }
+
+    protected abstract TileLoaderFactory getTileLoaderFactory();
+
+    /**
+     *
+     * @param info
+     * @return TileSource for specified ImageryInfo
+     * @throws IllegalArgumentException when Imagery is not supported by layer
+     */
+    protected abstract TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException;
+
+    protected abstract Map<String, String> getHeaders(TileSource tileSource);
+
+    protected void initTileSource(TileSource tileMatrix) {
+        this.tileSource = tileMatrix;
+        attribution.initialize(tileMatrix);
+
+        currentZoomLevel = getBestZoom();
+
+        Map<String, String> headers = getHeaders(tileMatrix);
+
+        tileLoader = getTileLoaderFactory().makeTileLoader(this, headers);
+        if (tileLoader instanceof TMSCachedTileLoader) {
+            tileCache = (TileCache) tileLoader;
+        } else {
+            tileCache = new MemoryTileCache();
+        }
+        if (tileLoader == null)
+            tileLoader = new OsmTileLoader(this);
+    }
+
+
 
     @Override
@@ -279 +219 @@
         tileCache.clear();
         if (tileLoader instanceof CachedTileLoader) {
-            ((CachedTileLoader) tileLoader).clearCache(tileSource);
-        }
-        redraw();
-    }
-
-    /**
-     * Zoomlevel at which tiles is currently downloaded.
-     * Initial zoom lvl is set to bestZoom
-     */
-    public int currentZoomLevel;
-
-    private Tile clickedTile;
-    private boolean needRedraw;
-    private JPopupMenu tileOptionMenu;
-    private Tile showMetadataTile;
-    private AttributionSupport attribution = new AttributionSupport();
-    private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
-
-    protected boolean autoZoom;
-    protected boolean autoLoad;
-    protected boolean showErrors;
+            ((CachedTileLoader)tileLoader).clearCache(tileSource);
+        }
+    }
+
 
     /**
@@ -312 +235 @@
     }
 
-    protected static int checkMaxZoomLvl(int maxZoomLvl, TileSource ts) {
-        if (maxZoomLvl > MAX_ZOOM) {
-            maxZoomLvl = MAX_ZOOM;
-        }
-        if (maxZoomLvl < PROP_MIN_ZOOM_LVL.get()) {
-            maxZoomLvl = PROP_MIN_ZOOM_LVL.get();
-        }
-        if (ts != null && ts.getMaxZoom() != 0 && ts.getMaxZoom() < maxZoomLvl) {
-            maxZoomLvl = ts.getMaxZoom();
-        }
-        return maxZoomLvl;
-    }
-
-    public static int getMaxZoomLvl(TileSource ts) {
-        return checkMaxZoomLvl(PROP_MAX_ZOOM_LVL.get(), ts);
-    }
-
-    public static void setMaxZoomLvl(int maxZoomLvl) {
-        Integer newMaxZoom = Integer.valueOf(checkMaxZoomLvl(maxZoomLvl, null));
-        PROP_MAX_ZOOM_LVL.put(newMaxZoom);
-    }
-
-    static int checkMinZoomLvl(int minZoomLvl, TileSource ts) {
-        if (minZoomLvl < MIN_ZOOM) {
-            /*Main.debug("Min. zoom level should not be less than "+MIN_ZOOM+"! Setting to that.");*/
-            minZoomLvl = MIN_ZOOM;
-        }
-        if (minZoomLvl > PROP_MAX_ZOOM_LVL.get()) {
-            /*Main.debug("Min. zoom level should not be more than Max. zoom level! Setting to Max.");*/
-            minZoomLvl = getMaxZoomLvl(ts);
-        }
-        if (ts != null && ts.getMinZoom() > minZoomLvl) {
-            /*Main.debug("Increasing min. zoom level to match tile source");*/
-            minZoomLvl = ts.getMinZoom();
-        }
-        return minZoomLvl;
-    }
-
-    public static int getMinZoomLvl(TileSource ts) {
-        return checkMinZoomLvl(PROP_MIN_ZOOM_LVL.get(), ts);
-    }
-
-    public static void setMinZoomLvl(int minZoomLvl) {
-        minZoomLvl = checkMinZoomLvl(minZoomLvl, null);
-        PROP_MIN_ZOOM_LVL.put(minZoomLvl);
-    }
-
-    private static class CachedAttributionBingAerialTileSource extends BingAerialTileSource {
-
-        public CachedAttributionBingAerialTileSource(ImageryInfo info) {
-            super(info);
-        }
-
-        class BingAttributionData extends CacheCustomContent<IOException> {
-
-            public BingAttributionData() {
-                super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY);
-            }
-
-            @Override
-            protected byte[] updateData() throws IOException {
-                URL u = getAttributionUrl();
-                try (Scanner scanner = new Scanner(UTFInputStreamReader.create(Utils.openURL(u)))) {
-                    String r = scanner.useDelimiter("\\A").next();
-                    Main.info("Successfully loaded Bing attribution data.");
-                    return r.getBytes("UTF-8");
-                }
-            }
-        }
-
-        @Override
-        protected Callable<List<Attribution>> getAttributionLoaderCallable() {
-            return new Callable<List<Attribution>>() {
-
-                @Override
-                public List<Attribution> call() throws Exception {
-                    BingAttributionData attributionLoader = new BingAttributionData();
-                    int waitTimeSec = 1;
-                    while (true) {
-                        try {
-                            String xml = attributionLoader.updateIfRequiredString();
-                            return parseAttributionText(new InputSource(new StringReader(xml)));
-                        } catch (IOException ex) {
-                            Main.warn("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
-                            Thread.sleep(waitTimeSec * 1000L);
-                            waitTimeSec *= 2;
-                        }
-                    }
-                }
-            };
-        }
-    }
-
-    /**
-     * Creates and returns a new TileSource instance depending on the {@link ImageryType}
-     * of the passed ImageryInfo object.
-     *
-     * If no appropriate TileSource is found, null is returned.
-     * Currently supported ImageryType are {@link ImageryType#TMS},
-     * {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
-     *
-     * @param info imagery info
-     * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
-     * @throws IllegalArgumentException if url from imagery info is null or invalid
-     */
-    public static TileSource getTileSource(ImageryInfo info) {
-        if (info.getImageryType() == ImageryType.TMS) {
-            checkUrl(info.getUrl());
-            TMSTileSource t = new TemplatedTMSTileSource(info);
-            info.setAttribution(t);
-            return t;
-        } else if (info.getImageryType() == ImageryType.BING) {
-            return new CachedAttributionBingAerialTileSource(info);
-        } else if (info.getImageryType() == ImageryType.SCANEX) {
-            return new ScanexTileSource(info);
-        }
-        return null;
-    }
-
-    /**
-     * Checks validity of given URL.
-     * @param url URL to check
-     * @throws IllegalArgumentException if url is null or invalid
-     */
-    public static void checkUrl(String url) {
-        CheckParameterUtil.ensureParameterNotNull(url, "url");
-        Matcher m = Pattern.compile("\\{[^}]*\\}").matcher(url);
-        while (m.find()) {
-            boolean isSupportedPattern = false;
-            for (String pattern : TemplatedTMSTileSource.ALL_PATTERNS) {
-                if (m.group().matches(pattern)) {
-                    isSupportedPattern = true;
-                    break;
-                }
-            }
-            if (!isSupportedPattern) {
-                throw new IllegalArgumentException(
-                        tr("{0} is not a valid TMS argument. Please check this server URL:\n{1}", m.group(), url));
-            }
-        }
-    }
-
-    private void initTileSource(TileSource tileSource) {
-        this.tileSource = tileSource;
-        attribution.initialize(tileSource);
-
-        currentZoomLevel = getBestZoom();
-
-        Map<String, String> headers = null;
-        if (tileSource instanceof TemplatedTMSTileSource) {
-            headers = (((TemplatedTMSTileSource) tileSource).getHeaders());
-        }
-
-        tileLoader = loaderFactory.makeTileLoader(this, headers);
-        if (tileLoader instanceof TMSCachedTileLoader) {
-            tileCache = (TileCache) tileLoader;
-        } else {
-            tileCache = new MemoryTileCache();
-        }
-        if (tileLoader == null)
-            tileLoader = new OsmTileLoader(this);
-    }
-
     /**
      * Marks layer as needing redraw on offset change
@@ -483 +243 @@
         needRedraw = true;
     }
+
+
     /**
      * Returns average number of screen pixels per tile pixel for current mapview
@@ -491 +253 @@
         LatLon topLeft = mv.getLatLon(0, 0);
         LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
-        double x1 = tileSource.lonToTileX(topLeft.lon(), zoom);
-        double y1 = tileSource.latToTileY(topLeft.lat(), zoom);
-        double x2 = tileSource.lonToTileX(botRight.lon(), zoom);
-        double y2 = tileSource.latToTileY(botRight.lat(), zoom);
+        TileXY t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
+        TileXY t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
 
         int screenPixels = mv.getWidth()*mv.getHeight();
-        double tilePixels = Math.abs((y2-y1)*(x2-x1)*tileSource.getTileSize()*tileSource.getTileSize());
+        double tilePixels = Math.abs((t2.getY()-t1.getY())*(t2.getX()-t1.getX())*tileSource.getTileSize()*tileSource.getTileSize());
         if (screenPixels == 0 || tilePixels == 0) return 1;
         return screenPixels/tilePixels;
     }
 
-    private int getBestZoom() {
+    private final int getBestZoom() {
         double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
         double result = Math.log(factor)/Math.log(2)/2+1;
@@ -515 +275 @@
          * getScaleFactor(...) is supposed to be between 0.75 and 3
          */
-        int intResult = (int) Math.floor(result);
+        int intResult = (int)Math.floor(result);
         if (intResult > getMaxZoomLvl())
             return getMaxZoomLvl();
@@ -523 +283 @@
     }
 
-    @SuppressWarnings("serial")
-    public TMSLayer(ImageryInfo info) {
-        super(info);
-
-        if (!isProjectionSupported(Main.getProjection())) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("TMS layers do not support the projection {0}.\n{1}\n"
-                            + "Change the projection or remove the layer.",
-                            Main.getProjection().toCode(), nameSupportedProjections()),
-                            tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE);
-        }
-
-        setBackgroundLayer(true);
-        this.setVisible(true);
-
-        TileSource source = getTileSource(info);
-        if (source == null)
-            throw new IllegalStateException("Cannot create TMSLayer with non-TMS ImageryInfo");
-        initTileSource(source);
-
-        MapView.addZoomChangeListener(this);
-    }
-
-    /**
-     * Adds a context menu to the mapView.
+
+    private final static boolean actionSupportLayers(List<Layer> layers) {
+        return layers.size() == 1 && layers.get(0) instanceof TMSLayer;
+    }
+
+    private class AutoZoomAction extends AbstractAction implements LayerAction {
+        public AutoZoomAction() {
+            super(tr("Auto Zoom"));
+        }
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            autoZoom = !autoZoom;
+        }
+
+        public Component createMenuComponent() {
+            JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+            item.setSelected(autoZoom);
+            return item;
+        }
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            return actionSupportLayers(layers);
+        }
+
+    }
+
+    private class AutoLoadTilesAction extends AbstractAction implements LayerAction {
+        public AutoLoadTilesAction() {
+            super(tr("Auto load tiles"));
+        }
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            autoLoad= !autoLoad;
+        }
+
+        public Component createMenuComponent() {
+            JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+            item.setSelected(autoLoad);
+            return item;
+        }
+        @Override
+        public boolean supportLayers(List<Layer> layers) {
+            return actionSupportLayers(layers);
+        }
+    }
+
+    private class LoadAllTilesAction extends AbstractAction {
+        public LoadAllTilesAction() {
+            super(tr("Load All Tiles"));
+        }
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            loadAllTiles(true);
+            redraw();
+        }
+    }
+
+    private class LoadErroneusTilesAction extends AbstractAction {
+        public LoadErroneusTilesAction() {
+            super(tr("Load All Error Tiles"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            loadAllErrorTiles(true);
+            redraw();
+        }
+    }
+
+    private class ZoomToNativeLevelAction extends AbstractAction {
+        public ZoomToNativeLevelAction() {
+            super(tr("Zoom to native resolution"));
+        }
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            double new_factor = Math.sqrt(getScaleFactor(currentZoomLevel));
+            Main.map.mapView.zoomToFactor(new_factor);
+            redraw();
+        }
+    }
+
+    private class ZoomToBestAction extends AbstractAction {
+        public ZoomToBestAction() {
+            super(tr("Change resolution"));
+        }
+        @Override
+        public void actionPerformed(ActionEvent ae) {
+            setZoomLevel(getBestZoom());
+        }
+    }
+
+    /*
+     * Simple class to keep clickedTile within hookUpMapView
+     */
+    private class TileHolder {
+        private Tile t = null;
+
+        public Tile getTile() {
+            return t;
+        }
+
+        public void setTile(Tile t) {
+            this.t = t;
+        }
+    }
+
+    /**
+     * Creates popup menu items and binds to mouse actions
      */
     @Override
     public void hookUpMapView() {
-        tileOptionMenu = new JPopupMenu();
+        // keep them final here, so we avoid namespace clutter in the class
+        final JPopupMenu tileOptionMenu = new JPopupMenu();
+        final TileHolder clickedTileHolder = new TileHolder();
 
         autoZoom = PROP_DEFAULT_AUTOZOOM.get();
         JCheckBoxMenuItem autoZoomPopup = new JCheckBoxMenuItem();
-        autoZoomPopup.setAction(new AbstractAction(tr("Auto Zoom")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                autoZoom = !autoZoom;
-            }
-        });
+        autoZoomPopup.setAction(new AutoZoomAction());
         autoZoomPopup.setSelected(autoZoom);
         tileOptionMenu.add(autoZoomPopup);
@@ -567 +406 @@
         autoLoad = PROP_DEFAULT_AUTOLOAD.get();
         JCheckBoxMenuItem autoLoadPopup = new JCheckBoxMenuItem();
-        autoLoadPopup.setAction(new AbstractAction(tr("Auto load tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                autoLoad = !autoLoad;
-            }
-        });
+        autoLoadPopup.setAction(new AutoLoadTilesAction());
         autoLoadPopup.setSelected(autoLoad);
         tileOptionMenu.add(autoLoadPopup);
@@ -590 +424 @@
             @Override
             public void actionPerformed(ActionEvent ae) {
+                Tile clickedTile = clickedTileHolder.getTile();
                 if (clickedTile != null) {
                     loadTile(clickedTile, true);
@@ -597 +432 @@
         }));
 
-        tileOptionMenu.add(new JMenuItem(new ShowTileInfoAction()));
-
         tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Request Update")) {
+                tr("Show Tile Info")) {
+            private String getSizeString(int size) {
+                StringBuilder ret = new StringBuilder();
+                return ret.append(size).append("x").append(size).toString();
+            }
+
+            private JTextField createTextField(String text) {
+                JTextField ret = new JTextField(text);
+                ret.setEditable(false);
+                ret.setBorder(BorderFactory.createEmptyBorder());
+                return ret;
+            }
+
             @Override
             public void actionPerformed(ActionEvent ae) {
+                Tile clickedTile = clickedTileHolder.getTile();
                 if (clickedTile != null) {
-                    clickedTile.setLoaded(false);
-                    tileLoader.createTileLoaderJob(clickedTile).submit(true);
+                    ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Tile Info"), new String[]{tr("OK")});
+                    JPanel panel = new JPanel(new GridBagLayout());
+                    Rectangle displaySize = tileToRect(clickedTile);
+                    String url = "";
+                    try {
+                        url = clickedTile.getUrl();
+                    } catch (IOException e) {
+                        // silence exceptions
+                    }
+
+                    String[][] content = {
+                            {"Tile name", clickedTile.getKey()},
+                            {"Tile url", url},
+                            {"Tile size", getSizeString(clickedTile.getTileSource().getTileSize()) },
+                            {"Tile display size", new StringBuilder().append(displaySize.width).append("x").append(displaySize.height).toString()},
+                    };
+
+                    for (String[] entry: content) {
+                        panel.add(new JLabel(tr(entry[0]) + ":"), GBC.std());
+                        panel.add(GBC.glue(5,0), GBC.std());
+                        panel.add(createTextField(entry[1]), GBC.eol().fill(GBC.HORIZONTAL));
+                    }
+
+                    for (Entry<String, String> e: clickedTile.getMetadata().entrySet()) {
+                        panel.add(new JLabel(tr("Metadata ") + tr(e.getKey()) + ":"), GBC.std());
+                        panel.add(GBC.glue(5,0), GBC.std());
+                        String value = e.getValue();
+                        if ("lastModification".equals(e.getKey()) || "expirationTime".equals(e.getKey())) {
+                            value = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.parseLong(value)));
+                        }
+                        panel.add(createTextField(value), GBC.eol().fill(GBC.HORIZONTAL));
+
+                    }
+                    ed.setIcon(JOptionPane.INFORMATION_MESSAGE);
+                    ed.setContent(panel);
+                    ed.showDialog();
                 }
             }
         }));
 
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Load All Tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                loadAllTiles(true);
-                redraw();
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Load All Error Tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                loadAllErrorTiles(true);
-                redraw();
-            }
-        }));
+        tileOptionMenu.add(new JMenuItem(new LoadAllTilesAction()));
+        tileOptionMenu.add(new JMenuItem(new LoadErroneusTilesAction()));
 
         // increase and decrease commands
@@ -663 +528 @@
                 new PleaseWaitRunnable(tr("Flush Tile Cache")) {
                     @Override
-                    protected void realRun() throws SAXException, IOException,
-                            OsmTransferException {
+                    protected void realRun() {
                         clearTileCache(getProgressMonitor());
                     }
@@ -684 +548 @@
                 if (!isVisible()) return;
                 if (e.getButton() == MouseEvent.BUTTON3) {
-                    clickedTile = getTileForPixelpos(e.getX(), e.getY());
+                    clickedTileHolder.setTile(getTileForPixelpos(e.getX(), e.getY()));
                     tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
                 } else if (e.getButton() == MouseEvent.BUTTON1) {
@@ -706 +570 @@
             @Override
             public void layerRemoved(Layer oldLayer) {
-                if (oldLayer == TMSLayer.this) {
+                if (oldLayer == AbstractTileSourceLayer.this) {
                     Main.map.mapView.removeMouseListener(adapter);
-                    MapView.removeZoomChangeListener(TMSLayer.this);
                     MapView.removeLayerChangeListener(this);
+                    MapView.removeZoomChangeListener(AbstractTileSourceLayer.this);
                 }
             }
         });
     }
+
+    /**
+     * Checks zoom level against settings
+     * @param maxZoomLvl zoom level to check
+     * @param ts tile source to crosscheck with
+     * @return maximum zoom level, not higher than supported by tilesource nor set by the user
+     */
+    public static int checkMaxZoomLvl(int maxZoomLvl, TileSource ts) {
+        if(maxZoomLvl > MAX_ZOOM) {
+            maxZoomLvl = MAX_ZOOM;
+        }
+        if(maxZoomLvl < PROP_MIN_ZOOM_LVL.get()) {
+            maxZoomLvl = PROP_MIN_ZOOM_LVL.get();
+        }
+        if (ts != null && ts.getMaxZoom() != 0 && ts.getMaxZoom() < maxZoomLvl) {
+            maxZoomLvl = ts.getMaxZoom();
+        }
+        return maxZoomLvl;
+    }
+
+    /**
+     * Checks zoom level against settings
+     * @param minZoomLvl zoom level to check
+     * @param ts tile source to crosscheck with
+     * @return minimum zoom level, not higher than supported by tilesource nor set by the user
+     */
+    public static int checkMinZoomLvl(int minZoomLvl, TileSource ts) {
+        if(minZoomLvl < MIN_ZOOM) {
+            minZoomLvl = MIN_ZOOM;
+        }
+        if(minZoomLvl > PROP_MAX_ZOOM_LVL.get()) {
+            minZoomLvl = getMaxZoomLvl(ts);
+        }
+        if (ts != null && ts.getMinZoom() > minZoomLvl) {
+            minZoomLvl = ts.getMinZoom();
+        }
+        return minZoomLvl;
+    }
+
+
+    /**
+     * @param ts TileSource for which we want to know maximum zoom level
+     * @return maximum max zoom level, that will be shown on layer
+     */
+    public static int getMaxZoomLvl(TileSource ts) {
+        return checkMaxZoomLvl(PROP_MAX_ZOOM_LVL.get(), ts);
+    }
+
+    /**
+     * @param ts TileSource for which we want to know minimum zoom level
+     * @return minimum zoom level, that will be shown on layer
+     */
+    public static int getMinZoomLvl(TileSource ts) {
+        return checkMinZoomLvl(PROP_MIN_ZOOM_LVL.get(), ts);
+    }
+
+
+    /**
+     * Sets maximum zoom level, that layer will attempt show
+     * @param maxZoomLvl
+     */
+    public static void setMaxZoomLvl(int maxZoomLvl) {
+        maxZoomLvl = checkMaxZoomLvl(maxZoomLvl, null);
+        PROP_MAX_ZOOM_LVL.put(maxZoomLvl);
+    }
+
+    /**
+     * Sets minimum zoom level, that layer will attempt show
+     * @param minZoomLvl
+     */
+    public static void setMinZoomLvl(int minZoomLvl) {
+        minZoomLvl = checkMinZoomLvl(minZoomLvl, null);
+        PROP_MIN_ZOOM_LVL.put(minZoomLvl);
+    }
+
 
     /**
@@ -724 +663 @@
             Main.debug("zoomChanged(): " + currentZoomLevel);
         }
+        if (tileLoader instanceof TMSCachedTileLoader) {
+            ((TMSCachedTileLoader)tileLoader).cancelOutstandingTasks();
+        }
         needRedraw = true;
-        if (tileLoader instanceof TMSCachedTileLoader) {
-            ((TMSCachedTileLoader) tileLoader).cancelOutstandingTasks();
-        }
     }
 
@@ -742 +681 @@
 
     /**
+     *
+     * @return if its allowed to zoom in
+     */
+    public boolean zoomIncreaseAllowed() {
+        boolean zia = currentZoomLevel < this.getMaxZoomLvl();
+        if (Main.isDebugEnabled()) {
+            Main.debug("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl() );
+        }
+        return zia;
+    }
+
+    /**
      * Zoom in, go closer to map.
      *
      * @return    true, if zoom increasing was successful, false otherwise
      */
-    public boolean zoomIncreaseAllowed() {
-        boolean zia = currentZoomLevel < this.getMaxZoomLvl();
-        if (Main.isDebugEnabled()) {
-            Main.debug("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl());
-        }
-        return zia;
-    }
-
     public boolean increaseZoomLevel() {
         if (zoomIncreaseAllowed()) {
@@ -769 +712 @@
     }
 
+    /**
+     * Sets the zoom level of the layer
+     * @param zoom zoom level
+     * @return true, when zoom has changed to desired value, false if it was outside supported zoom levels
+     */
     public boolean setZoomLevel(int zoom) {
         if (zoom == currentZoomLevel) return true;
@@ -837 +785 @@
      */
     private Tile getTile(int x, int y, int zoom) {
-        int max = 1 << zoom;
+        int max = (1 << zoom);
         if (x < 0 || x >= max || y < 0 || y >= max)
             return null;
@@ -850 +798 @@
         if (tile.isLoading())
             return false;
-        tileLoader.createTileLoaderJob(tile).submit(force);
+        tileLoader.createTileLoaderJob(tile).submit();
         return true;
     }
 
-    private void loadAllTiles(boolean force) {
+    private TileSet getVisibleTileSet() {
         MapView mv = Main.map.mapView;
         EastNorth topLeft = mv.getEastNorth(0, 0);
         EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-
-        TileSet ts = new TileSet(topLeft, botRight, currentZoomLevel);
+        return new TileSet(topLeft, botRight, currentZoomLevel);
+    }
+
+    private void loadAllTiles(boolean force) {
+        TileSet ts = getVisibleTileSet();
 
         // if there is more than 18 tiles on screen in any direction, do not
@@ -871 +822 @@
 
     private void loadAllErrorTiles(boolean force) {
-        MapView mv = Main.map.mapView;
-        EastNorth topLeft = mv.getEastNorth(0, 0);
-        EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-
-        TileSet ts = new TileSet(topLeft, botRight, currentZoomLevel);
-
+        TileSet ts = getVisibleTileSet();
         ts.loadAllErrorTiles(force);
     }
@@ -914 +860 @@
             return null;
         return img;
-    }
-
-    private LatLon tileLatLon(Tile t) {
-        int zoom = t.getZoom();
-        return new LatLon(tileSource.tileYToLat(t.getYtile(), zoom),
-                tileSource.tileXToLon(t.getXtile(), zoom));
     }
 
@@ -968 +908 @@
         // And how many pixels into the image itself does that
         // correlate to?
-        int img_x_offset = (int) (screen_x_offset * imageXScaling + 0.5);
-        int img_y_offset = (int) (screen_y_offset * imageYScaling + 0.5);
+        int img_x_offset = (int)(screen_x_offset * imageXScaling + 0.5);
+        int img_y_offset = (int)(screen_y_offset * imageYScaling + 0.5);
         // Now calculate the other corner of the image that we need
         // by scaling the 'target' rectangle's dimensions.
-        int img_x_end = img_x_offset + (int) (target.getWidth() * imageXScaling + 0.5);
-        int img_y_end = img_y_offset + (int) (target.getHeight() * imageYScaling + 0.5);
+        int img_x_end = img_x_offset + (int)(target.getWidth() * imageXScaling + 0.5);
+        int img_y_end = img_y_offset + (int)(target.getHeight() * imageYScaling + 0.5);
 
         if (Main.isDebugEnabled()) {
@@ -1035 +975 @@
         Color oldColor = g.getColor();
         g.setColor(Color.black);
-        g.drawString(text, x+1, y+1);
+        g.drawString(text,x+1,y+1);
         g.setColor(oldColor);
-        g.drawString(text, x, y);
+        g.drawString(text,x,y);
     }
 
@@ -1055 +995 @@
             }
         }*/
-
-        if (tile == showMetadataTile) {
-            String md = tile.toString();
-            if (md != null) {
-                myDrawString(g, md, p.x + 2, texty);
-                texty += 1 + fontHeight;
-            }
-            Map<String, String> meta = tile.getMetadata();
-            if (meta != null) {
-                for (Map.Entry<String, String> entry : meta.entrySet()) {
-                    myDrawString(g, entry.getKey() + ": " + entry.getValue(), p.x + 2, texty);
-                    texty += 1 + fontHeight;
-                }
-            }
-        }
 
         /*String tileStatus = tile.getStatus();
@@ -1113 +1038 @@
 
     private Point pixelPos(Tile t) {
-        double lon = tileSource.tileXToLon(t.getXtile(), t.getZoom());
-        LatLon tmpLL = new LatLon(tileSource.tileYToLat(t.getYtile(), t.getZoom()), lon);
-        return pixelPos(tmpLL);
+        ICoordinate coord = tileSource.tileXYToLatLon(t);
+        return pixelPos(new LatLon(coord));
     }
 
@@ -1124 +1048 @@
     private Coordinate getShiftedCoord(EastNorth en) {
         LatLon ll = getShiftedLatLon(en);
-        return new Coordinate(ll.lat(), ll.lon());
-    }
-
-    private final TileSet nullTileSet = new TileSet((LatLon) null, (LatLon) null, 0);
-
+        return new Coordinate(ll.lat(),ll.lon());
+    }
+
+    private final TileSet nullTileSet = new TileSet((LatLon)null, (LatLon)null, 0);
     private final class TileSet {
-        private int x0, x1, y0, y1;
-        private int zoom;
-        private int tileMax = -1;
+        int x0, x1, y0, y1;
+        int zoom;
 
         /**
@@ -1138 +1060 @@
          */
         private TileSet(EastNorth topLeft, EastNorth botRight, int zoom) {
-            this(getShiftedLatLon(topLeft), getShiftedLatLon(botRight), zoom);
+            this(getShiftedLatLon(topLeft), getShiftedLatLon(botRight),zoom);
         }
 
@@ -1149 +1071 @@
                 return;
 
-            x0 = (int) tileSource.lonToTileX(topLeft.lon(),  zoom);
-            y0 = (int) tileSource.latToTileY(topLeft.lat(),  zoom);
-            x1 = (int) tileSource.lonToTileX(botRight.lon(), zoom);
-            y1 = (int) tileSource.latToTileY(botRight.lat(), zoom);
+            TileXY t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
+            TileXY t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
+
+            x0 = t1.getXIndex();
+            y0 = t1.getYIndex();
+            x1 = t2.getXIndex();
+            y1 = t2.getYIndex();
+
             if (x0 > x1) {
                 int tmp = x0;
@@ -1163 +1089 @@
                 y1 = tmp;
             }
-            tileMax = (int) Math.pow(2.0, zoom);
-            if (x0 < 0) {
-                x0 = 0;
-            }
-            if (y0 < 0) {
-                y0 = 0;
-            }
-            if (x1 > tileMax) {
-                x1 = tileMax;
-            }
-            if (y1 > tileMax) {
-                y1 = tileMax;
+
+            if (x0 < tileSource.getTileXMin(zoom)) {
+                x0 = tileSource.getTileXMin(zoom);
+            }
+            if (y0 < tileSource.getTileYMin(zoom)) {
+                y0 = tileSource.getTileYMin(zoom);
+            }
+            if (x1 > tileSource.getTileXMax(zoom)) {
+                x1 = tileSource.getTileXMax(zoom);
+            }
+            if (y1 > tileSource.getTileYMax(zoom)) {
+                y1 = tileSource.getTileYMax(zoom);
             }
         }
@@ -1221 +1147 @@
                     Tile t;
                     if (create) {
-                        t = getOrCreateTile(x % tileMax, y % tileMax, zoom);
+                        t = getOrCreateTile(x, y , zoom);
                     } else {
-                        t = getTile(x % tileMax, y % tileMax, zoom);
+                        t = getTile(x, y, zoom);
                     }
                     if (t != null) {
@@ -1242 +1168 @@
         }
 
+        /**
+         * @return comparator, that sorts the tiles from the center to the edge of the current screen
+         */
         private Comparator<Tile> getTileDistanceComparator() {
-            final int centerX = (int) Math.ceil((x0 + x1) / 2);
-            final int centerY = (int) Math.ceil((y0 + y1) / 2);
+            final int centerX = (int) Math.ceil((x0 + x1) / 2d);
+            final int centerY = (int) Math.ceil((y0 + y1) / 2d);
             return new Comparator<Tile>() {
                 private int getDistance(Tile t) {
                     return Math.abs(t.getXtile() - centerX) + Math.abs(t.getYtile() - centerY);
                 }
-
                 @Override
                 public int compare(Tile o1, Tile o2) {
@@ -1258 +1186 @@
             };
         }
+
 
         private void loadAllTiles(boolean force) {
@@ -1279 +1208 @@
         }
     }
+
 
     private static class TileSetInfo {
@@ -1310 +1240 @@
         private final TileSet[] tileSets;
         private final TileSetInfo[] tileSetInfos;
-
         public DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {
             this.topLeft = topLeft;
@@ -1319 +1248 @@
             this.tileSetInfos = new TileSetInfo[maxZoom - minZoom + 1];
         }
-
         public TileSet getTileSet(int zoom) {
             if (zoom < minZoom)
@@ -1339 +1267 @@
                 TileSetInfo tsi = tileSetInfos[zoom-minZoom];
                 if (tsi == null) {
-                    tsi = TMSLayer.getTileSetInfo(getTileSet(zoom));
+                    tsi = AbstractTileSourceLayer.getTileSetInfo(getTileSet(zoom));
                     tileSetInfos[zoom-minZoom] = tsi;
                 }
@@ -1388 +1316 @@
             }
             // Do binary search between currentZoomLevel and displayZoomLevel
-            while (zoom > displayZoomLevel && !tsi.hasVisibleTiles && tsi.hasOverzoomedTiles) {
+            while (zoom > displayZoomLevel && !tsi.hasVisibleTiles && tsi.hasOverzoomedTiles){
                 zoom = (zoom + displayZoomLevel)/2;
                 tsi = dts.getTileSetInfo(zoom);
@@ -1445 +1373 @@
                 }
                 Tile t2 = tempCornerTile(missed);
-                LatLon topLeft2  = tileLatLon(missed);
-                LatLon botRight2 = tileLatLon(t2);
+                LatLon topLeft2  = new LatLon(tileSource.tileXYToLatLon(missed));
+                LatLon botRight2 = new LatLon(tileSource.tileXYToLatLon(t2));
                 TileSet ts2 = new TileSet(topLeft2, botRight2, newzoom);
                 // Instantiating large TileSets is expensive.  If there
@@ -1494 +1422 @@
             myDrawString(g, tr("Pixel scale: {0}", getScaleFactor(currentZoomLevel)), 50, 170);
             myDrawString(g, tr("Best zoom: {0}", getBestZoom()), 50, 185);
-            if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
+            if(tileLoader instanceof TMSCachedTileLoader) {
+                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader)tileLoader;
                 int offset = 185;
-                for (String part: cachedTileLoader.getStats().split("\n")) {
-                    myDrawString(g, tr("Cache stats: {0}", part), 50, offset += 15);
-                }
+                for(String part: cachedTileLoader.getStats().split("\n")) {
+                    myDrawString(g, tr("Cache stats: {0}", part), 50, offset+=15);
+                }
+
             }
         }
@@ -1546 +1475 @@
     public Action[] getMenuEntries() {
         return new Action[] {
+                LayerListDialog.getInstance().createActivateLayerAction(this),
                 LayerListDialog.getInstance().createShowHideLayerAction(),
                 LayerListDialog.getInstance().createDeleteLayerAction(),
@@ -1553 +1483 @@
                 new RenameLayerAction(this.getAssociatedFile(), this),
                 SeparatorLayerAction.INSTANCE,
-                new LayerListPopup.InfoAction(this) };
+                new AutoLoadTilesAction(),
+                new AutoZoomAction(),
+                new ZoomToBestAction(),
+                new ZoomToNativeLevelAction(),
+                new LoadErroneusTilesAction(),
+                new LoadAllTilesAction(),
+                new LayerListPopup.InfoAction(this)
+        };
     }
 
     @Override
     public String getToolTipText() {
-        return tr("TMS layer ({0}), downloading in zoom {1}", getName(), currentZoomLevel);
+        if(autoLoad) {
+            return tr("{0} ({1}), automatically downloading in zoom {2}", this.getClass().getSimpleName(), getName(), currentZoomLevel);
+        } else {
+            return tr("{0} ({1}), downloading in zoom {2}", this.getClass().getSimpleName(), getName(), currentZoomLevel);
+        }
     }
 
@@ -1570 +1511 @@
     }
 
+    /**
+     * Task responsible for precaching imagery along the gpx track
+     *
+     */
+    public class PrecacheTask implements TileLoaderListener {
+        private final ProgressMonitor progressMonitor;
+        private volatile int totalCount;
+        private volatile int processedCount = 0;
+        private TileLoader tileLoader;
+
+        /**
+         * @param progressMonitor that will be notified about progess of the task
+         */
+        public PrecacheTask(ProgressMonitor progressMonitor) {
+            this.progressMonitor = progressMonitor;
+            this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource));
+            if (this.tileLoader instanceof TMSCachedTileLoader) {
+                ((TMSCachedTileLoader) this.tileLoader).setDownloadExecutor(
+                        TMSCachedTileLoader.getNewThreadPoolExecutor("Precache downloader"));
+            }
+
+        }
+
+        /**
+         * @return true, if all is done
+         */
+        public boolean isFinished() {
+            return processedCount >= totalCount;
+        }
+
+        /**
+         * @return total number of tiles to download
+         */
+        public int getTotalCount() {
+            return totalCount;
+        }
+
+        /**
+         * cancel the task
+         */
+        public void cancel() {
+            if (tileLoader instanceof TMSCachedTileLoader) {
+                ((TMSCachedTileLoader)tileLoader).cancelOutstandingTasks();
+            }
+        }
+
+
+        @Override
+        public void tileLoadingFinished(Tile tile, boolean success) {
+            if (success) {
+                this.processedCount++;
+                this.progressMonitor.worked(1);
+                this.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", processedCount, totalCount));
+            }
+        }
+
+        /**
+         * @return tile loader that is used to load the tiles
+         */
+        public TileLoader getTileLoader() {
+            return tileLoader;
+        }
+    }
+
+    /**
+     * Calculates tiles, that needs to be downloaded to cache, gets a current tile loader and creates a task to download
+     * all of the tiles. Buffer contains at least one tile.
+     *
+     * To prevent accidental clear of the queue, new download executor is created with separate queue
+     *
+     * @param precacheTask
+     * @param points
+     * @param bufferX how many units in current Coordinate Reference System to cover in X axis in both sides
+     * @param bufferY how many units in current Coordinate Reference System to cover in Y axis in both sides
+     */
+    public void downloadAreaToCache(final PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {
+        final Set<Tile> requestedTiles = new ConcurrentSkipListSet <>(new Comparator<Tile>() {
+            public int compare(Tile o1, Tile o2) {
+                return String.CASE_INSENSITIVE_ORDER.compare(o1.getKey(), o2.getKey());
+            }
+        });
+        for (LatLon point: points) {
+
+            TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel);
+            TileXY curTile = tileSource.latLonToTileXY(point.toCoordinate(), currentZoomLevel);
+            TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
+
+            // take at least one tile of buffer
+            int minY = Math.min(curTile.getYIndex() - 1, minTile.getYIndex());
+            int maxY = Math.max(curTile.getYIndex() + 1, maxTile.getYIndex());
+            int minX = Math.min(curTile.getXIndex() - 1, minTile.getXIndex());
+            int maxX = Math.min(curTile.getXIndex() + 1, minTile.getXIndex());
+
+            for (int x= minX; x<=maxX; x++) {
+                for (int y= minY; y<=maxY; y++) {
+                    requestedTiles.add(new Tile(tileSource, x, y, currentZoomLevel));
+                }
+            }
+        }
+
+        precacheTask.totalCount = requestedTiles.size();
+        precacheTask.progressMonitor.setTicksCount(requestedTiles.size());
+
+        TileLoader loader = precacheTask.getTileLoader();
+        for (Tile t: requestedTiles) {
+            loader.createTileLoaderJob(t).submit();
+        }
+    }
+
     @Override
-    public final boolean isProjectionSupported(Projection proj) {
-        return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode());
+    public boolean isSavable() {
+        return true; // With WMSLayerExporter
     }
 
     @Override
-    public final String nameSupportedProjections() {
-        return tr("EPSG:4326 and Mercator projection are supported");
+    public File createAndOpenSaveFileChooser() {
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save WMS file"), WMSLayerImporter.FILE_FILTER);
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.image.ImageObserver;
-import java.io.File;
 import java.io.IOException;
-import java.io.StringReader;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Scanner;
-import java.util.concurrent.Callable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTextField;
-
-import org.openstreetmap.gui.jmapviewer.AttributionSupport;
-import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
-import org.openstreetmap.gui.jmapviewer.Tile;
-import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.ScanexTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.RenameLayerAction;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.CachedAttributionBingAerialTileSource;
+import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.CacheCustomContent;
-import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.io.UTFInputStreamReader;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+
 
 /**
@@ -102 +33 @@
  *
  */
-public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
-    public static final String PREFERENCE_PREFIX   = "imagery.tms";
+public class TMSLayer extends AbstractTileSourceLayer {
+    private static final String PREFERENCE_PREFIX   = "imagery.tms";
 
-    public static final int MAX_ZOOM = 30;
-    public static final int MIN_ZOOM = 2;
-    public static final int DEFAULT_MAX_ZOOM = 20;
-    public static final int DEFAULT_MIN_ZOOM = 2;
+    /** minimum zoom level for TMS layer */
+    public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", AbstractTileSourceLayer.PROP_MIN_ZOOM_LVL.get());
+    /** maximum zoom level for TMS layer */
+    public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", AbstractTileSourceLayer.PROP_MAX_ZOOM_LVL.get());
+    /** shall TMS layers be added to download dialog */
+    public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser", true);
 
-    public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty(PREFERENCE_PREFIX + ".default_autozoom", true);
-    public static final BooleanProperty PROP_DEFAULT_AUTOLOAD = new BooleanProperty(PREFERENCE_PREFIX + ".default_autoload", true);
-    public static final BooleanProperty PROP_DEFAULT_SHOWERRORS = new BooleanProperty(PREFERENCE_PREFIX + ".default_showerrors", true);
-    public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", DEFAULT_MIN_ZOOM);
-    public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", DEFAULT_MAX_ZOOM);
-    public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX +
-            ".add_to_slippymap_chooser", true);
-    public static final StringProperty PROP_TILECACHE_DIR;
-    static {
-        String defPath = null;
-        try {
-            defPath = new File(Main.pref.getCacheDirectory(), "tms").getAbsolutePath();
-        } catch (SecurityException e) {
-            Main.warn(e);
-        }
-        PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache", defPath);
-    }
+    /** loader factory responsible for loading tiles for this layer */
+    public static TileLoaderFactory loaderFactory = new CachedTileLoaderFactory("TMS"){
 
-    private final class ShowTileInfoAction extends AbstractAction {
-        private ShowTileInfoAction() {
-            super(tr("Show Tile Info"));
+        @Override
+        protected TileLoader getLoader(TileLoaderListener listener, String cacheName, int connectTimeout,
+                int readTimeout, Map<String, String> headers, String cacheDir) throws IOException {
+            return new TMSCachedTileLoader(listener, cacheName, connectTimeout, readTimeout, headers, cacheDir);
         }
 
-        private String getSizeString(int size) {
-            return new StringBuilder().append(size).append("x").append(size).toString();
-        }
+    };
 
-        private JTextField createTextField(String text) {
-            JTextField ret = new JTextField(text);
-            ret.setEditable(false);
-            ret.setBorder(BorderFactory.createEmptyBorder());
-            return ret;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ae) {
-            if (clickedTile != null) {
-                ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Tile Info"), new String[]{tr("OK")});
-                JPanel panel = new JPanel(new GridBagLayout());
-                Rectangle displaySize = tileToRect(clickedTile);
-                String url = "";
-                try {
-                    url = clickedTile.getUrl();
-                } catch (IOException e) {
-                    // silence exceptions
-                    if (Main.isTraceEnabled()) {
-                        Main.trace(e.getMessage());
-                    }
-                }
-
-                String[][] content = {
-                        {"Tile name", clickedTile.getKey()},
-                        {"Tile url", url},
-                        {"Tile size", getSizeString(clickedTile.getTileSource().getTileSize()) },
-                        {"Tile display size", new StringBuilder().append(displaySize.width).append("x").append(displaySize.height).toString()},
-                };
-
-                for (String[] entry: content) {
-                    panel.add(new JLabel(tr(entry[0]) + ":"), GBC.std());
-                    panel.add(GBC.glue(5, 0), GBC.std());
-                    panel.add(createTextField(entry[1]), GBC.eol().fill(GBC.HORIZONTAL));
-                }
-
-                for (Entry<String, String> e: clickedTile.getMetadata().entrySet()) {
-                    panel.add(new JLabel(tr("Metadata ") + tr(e.getKey()) + ":"), GBC.std());
-                    panel.add(GBC.glue(5, 0), GBC.std());
-                    String value = e.getValue();
-                    if ("lastModification".equals(e.getKey()) || "expirationTime".equals(e.getKey())) {
-                        value = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(Long.parseLong(value)));
-                    }
-                    panel.add(createTextField(value), GBC.eol().fill(GBC.HORIZONTAL));
-                }
-                ed.setIcon(JOptionPane.INFORMATION_MESSAGE);
-                ed.setContent(panel);
-                ed.showDialog();
-            }
-        }
+    /**
+     * Create a layer based on ImageryInfo
+     * @param info description of the layer
+     */
+    public TMSLayer(ImageryInfo info) {
+        super(info);
     }
 
     /**
-     * Interface for creating TileLoaders, ie. classes responsible for loading tiles on map
-     *
-     */
-    public interface TileLoaderFactory {
-        /**
-         * @param listener object that will be notified, when tile has finished loading
-         * @return TileLoader that will notify the listener
-         */
-        TileLoader makeTileLoader(TileLoaderListener listener);
-
-        /**
-         * @param listener object that will be notified, when tile has finished loading
-         * @param headers HTTP headers that should be sent by TileLoader to tile server
-         * @return TileLoader that will notify the listener
-         */
-        TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers);
-    }
-
-    protected TileCache tileCache;
-    protected TileSource tileSource;
-    protected TileLoader tileLoader;
-
-
-    public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
-        @Override
-        public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) {
-            Map<String, String> headers = new HashMap<>();
-            headers.put("User-Agent", Version.getInstance().getFullAgentString());
-            headers.put("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
-            if (inputHeaders != null)
-                headers.putAll(inputHeaders);
-
-            try {
-                return new TMSCachedTileLoader(listener, "TMS",
-                        Main.pref.getInteger("socket.timeout.connect", 15) * 1000,
-                        Main.pref.getInteger("socket.timeout.read", 30) * 1000,
-                        headers,
-                        PROP_TILECACHE_DIR.get());
-            } catch (IOException e) {
-                Main.warn(e);
-            }
-            return null;
-        }
-
-        @Override
-        public TileLoader makeTileLoader(TileLoaderListener listener) {
-            return makeTileLoader(listener, null);
-        }
-    };
-
-    /**
      * Plugins that wish to set custom tile loader should call this method
+     * @param newLoaderFactory that will be used to load tiles
      */
 
-    public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
-        TMSLayer.loaderFactory = loaderFactory;
+    public static void setTileLoaderFactory(TileLoaderFactory newLoaderFactory) {
+        loaderFactory = newLoaderFactory;
     }
 
     @Override
-    public synchronized void tileLoadingFinished(Tile tile, boolean success) {
-        if (tile.hasError()) {
-            success = false;
-            tile.setImage(null);
+    protected TileLoaderFactory getTileLoaderFactory() {
+        return loaderFactory;
+    }
+
+    @Override
+    protected Map<String, String> getHeaders(TileSource tileSource) {
+        if (tileSource instanceof TemplatedTMSTileSource) {
+            return ((TemplatedTMSTileSource)tileSource).getHeaders();
         }
-        if (sharpenLevel != 0 && success) {
-            tile.setImage(sharpenImage(tile.getImage()));
-        }
-        tile.setLoaded(success);
-        needRedraw = true;
-        if (Main.map != null) {
-            Main.map.repaint(100);
-        }
-        if (Main.isDebugEnabled()) {
-            Main.debug("tileLoadingFinished() tile: " + tile + " success: " + success);
-        }
+        return null;
     }
 
     /**
-     * Clears the tile cache.
+     * Creates and returns a new TileSource instance depending on the {@link ImageryType}
+     * of the passed ImageryInfo object.
      *
-     * If the current tileLoader is an instance of OsmTileLoader, a new
-     * TmsTileClearController is created and passed to the according clearCache
-     * method.
+     * If no appropriate TileSource is found, null is returned.
+     * Currently supported ImageryType are {@link ImageryType#TMS},
+     * {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
      *
-     * @param monitor not used in this implementation - as cache clear is instaneus
+     *
+     * @param info imagery info
+     * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
+     * @throws IllegalArgumentException if url from imagery info is null or invalid
      */
-    public void clearTileCache(ProgressMonitor monitor) {
-        tileCache.clear();
-        if (tileLoader instanceof CachedTileLoader) {
-            ((CachedTileLoader) tileLoader).clearCache(tileSource);
-        }
-        redraw();
+    @Override
+    protected TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
+        return getTileSourceStatic(info);
     }
 
     /**
-     * Zoomlevel at which tiles is currently downloaded.
-     * Initial zoom lvl is set to bestZoom
+     * Adds a context menu to the mapView.
      */
-    public int currentZoomLevel;
 
-    private Tile clickedTile;
-    private boolean needRedraw;
-    private JPopupMenu tileOptionMenu;
-    private Tile showMetadataTile;
-    private AttributionSupport attribution = new AttributionSupport();
-    private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
-
-    protected boolean autoZoom;
-    protected boolean autoLoad;
-    protected boolean showErrors;
-
-    /**
-     * Initiates a repaint of Main.map
-     *
-     * @see Main#map
-     * @see MapFrame#repaint()
-     */
-    protected void redraw() {
-        needRedraw = true;
-        Main.map.repaint();
+    @Override
+    public final boolean isProjectionSupported(Projection proj) {
+        return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode());
     }
 
-    protected static int checkMaxZoomLvl(int maxZoomLvl, TileSource ts) {
-        if (maxZoomLvl > MAX_ZOOM) {
-            maxZoomLvl = MAX_ZOOM;
-        }
-        if (maxZoomLvl < PROP_MIN_ZOOM_LVL.get()) {
-            maxZoomLvl = PROP_MIN_ZOOM_LVL.get();
-        }
-        if (ts != null && ts.getMaxZoom() != 0 && ts.getMaxZoom() < maxZoomLvl) {
-            maxZoomLvl = ts.getMaxZoom();
-        }
-        return maxZoomLvl;
-    }
-
-    public static int getMaxZoomLvl(TileSource ts) {
-        return checkMaxZoomLvl(PROP_MAX_ZOOM_LVL.get(), ts);
-    }
-
-    public static void setMaxZoomLvl(int maxZoomLvl) {
-        Integer newMaxZoom = Integer.valueOf(checkMaxZoomLvl(maxZoomLvl, null));
-        PROP_MAX_ZOOM_LVL.put(newMaxZoom);
-    }
-
-    static int checkMinZoomLvl(int minZoomLvl, TileSource ts) {
-        if (minZoomLvl < MIN_ZOOM) {
-            /*Main.debug("Min. zoom level should not be less than "+MIN_ZOOM+"! Setting to that.");*/
-            minZoomLvl = MIN_ZOOM;
-        }
-        if (minZoomLvl > PROP_MAX_ZOOM_LVL.get()) {
-            /*Main.debug("Min. zoom level should not be more than Max. zoom level! Setting to Max.");*/
-            minZoomLvl = getMaxZoomLvl(ts);
-        }
-        if (ts != null && ts.getMinZoom() > minZoomLvl) {
-            /*Main.debug("Increasing min. zoom level to match tile source");*/
-            minZoomLvl = ts.getMinZoom();
-        }
-        return minZoomLvl;
-    }
-
-    public static int getMinZoomLvl(TileSource ts) {
-        return checkMinZoomLvl(PROP_MIN_ZOOM_LVL.get(), ts);
-    }
-
-    public static void setMinZoomLvl(int minZoomLvl) {
-        minZoomLvl = checkMinZoomLvl(minZoomLvl, null);
-        PROP_MIN_ZOOM_LVL.put(minZoomLvl);
-    }
-
-    private static class CachedAttributionBingAerialTileSource extends BingAerialTileSource {
-
-        public CachedAttributionBingAerialTileSource(ImageryInfo info) {
-            super(info);
-        }
-
-        class BingAttributionData extends CacheCustomContent<IOException> {
-
-            public BingAttributionData() {
-                super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY);
-            }
-
-            @Override
-            protected byte[] updateData() throws IOException {
-                URL u = getAttributionUrl();
-                try (Scanner scanner = new Scanner(UTFInputStreamReader.create(Utils.openURL(u)))) {
-                    String r = scanner.useDelimiter("\\A").next();
-                    Main.info("Successfully loaded Bing attribution data.");
-                    return r.getBytes("UTF-8");
-                }
-            }
-        }
-
-        @Override
-        protected Callable<List<Attribution>> getAttributionLoaderCallable() {
-            return new Callable<List<Attribution>>() {
-
-                @Override
-                public List<Attribution> call() throws Exception {
-                    BingAttributionData attributionLoader = new BingAttributionData();
-                    int waitTimeSec = 1;
-                    while (true) {
-                        try {
-                            String xml = attributionLoader.updateIfRequiredString();
-                            return parseAttributionText(new InputSource(new StringReader(xml)));
-                        } catch (IOException ex) {
-                            Main.warn("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
-                            Thread.sleep(waitTimeSec * 1000L);
-                            waitTimeSec *= 2;
-                        }
-                    }
-                }
-            };
-        }
+    @Override
+    public final String nameSupportedProjections() {
+        return tr("EPSG:4326 and Mercator projection are supported");
     }
 
@@ -417 +128 @@
      * @throws IllegalArgumentException if url from imagery info is null or invalid
      */
-    public static TileSource getTileSource(ImageryInfo info) {
+    public static TileSource getTileSourceStatic(ImageryInfo info) throws IllegalArgumentException {
         if (info.getImageryType() == ImageryType.TMS) {
-            checkUrl(info.getUrl());
+            TemplatedTMSTileSource.checkUrl(info.getUrl());
             TMSTileSource t = new TemplatedTMSTileSource(info);
             info.setAttribution(t);
             return t;
-        } else if (info.getImageryType() == ImageryType.BING) {
+        } else if (info.getImageryType() == ImageryType.BING)
             return new CachedAttributionBingAerialTileSource(info);
-        } else if (info.getImageryType() == ImageryType.SCANEX) {
+        else if (info.getImageryType() == ImageryType.SCANEX) {
             return new ScanexTileSource(info);
         }
@@ -431 +142 @@
     }
 
-    /**
-     * Checks validity of given URL.
-     * @param url URL to check
-     * @throws IllegalArgumentException if url is null or invalid
-     */
-    public static void checkUrl(String url) {
-        CheckParameterUtil.ensureParameterNotNull(url, "url");
-        Matcher m = Pattern.compile("\\{[^}]*\\}").matcher(url);
-        while (m.find()) {
-            boolean isSupportedPattern = false;
-            for (String pattern : TemplatedTMSTileSource.ALL_PATTERNS) {
-                if (m.group().matches(pattern)) {
-                    isSupportedPattern = true;
-                    break;
-                }
-            }
-            if (!isSupportedPattern) {
-                throw new IllegalArgumentException(
-                        tr("{0} is not a valid TMS argument. Please check this server URL:\n{1}", m.group(), url));
-            }
-        }
-    }
 
-    private void initTileSource(TileSource tileSource) {
-        this.tileSource = tileSource;
-        attribution.initialize(tileSource);
 
-        currentZoomLevel = getBestZoom();
-
-        Map<String, String> headers = null;
-        if (tileSource instanceof TemplatedTMSTileSource) {
-            headers = (((TemplatedTMSTileSource) tileSource).getHeaders());
-        }
-
-        tileLoader = loaderFactory.makeTileLoader(this, headers);
-        if (tileLoader instanceof TMSCachedTileLoader) {
-            tileCache = (TileCache) tileLoader;
-        } else {
-            tileCache = new MemoryTileCache();
-        }
-        if (tileLoader == null)
-            tileLoader = new OsmTileLoader(this);
-    }
-
-    /**
-     * Marks layer as needing redraw on offset change
-     */
-    @Override
-    public void setOffset(double dx, double dy) {
-        super.setOffset(dx, dy);
-        needRedraw = true;
-    }
-    /**
-     * Returns average number of screen pixels per tile pixel for current mapview
-     */
-    private double getScaleFactor(int zoom) {
-        if (!Main.isDisplayingMapView()) return 1;
-        MapView mv = Main.map.mapView;
-        LatLon topLeft = mv.getLatLon(0, 0);
-        LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
-        double x1 = tileSource.lonToTileX(topLeft.lon(), zoom);
-        double y1 = tileSource.latToTileY(topLeft.lat(), zoom);
-        double x2 = tileSource.lonToTileX(botRight.lon(), zoom);
-        double y2 = tileSource.latToTileY(botRight.lat(), zoom);
-
-        int screenPixels = mv.getWidth()*mv.getHeight();
-        double tilePixels = Math.abs((y2-y1)*(x2-x1)*tileSource.getTileSize()*tileSource.getTileSize());
-        if (screenPixels == 0 || tilePixels == 0) return 1;
-        return screenPixels/tilePixels;
-    }
-
-    private int getBestZoom() {
-        double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
-        double result = Math.log(factor)/Math.log(2)/2+1;
-        /*
-         * Math.log(factor)/Math.log(2) - gives log base 2 of factor
-         * We divide result by 2, as factor contains ratio between areas. We could do Math.sqrt before log, or just divide log by 2
-         * In general, smaller zoom levels are more readable.  We prefer big,
-         * block, pixelated (but readable) map text to small, smeared,
-         * unreadable underzoomed text.  So, use .floor() instead of rounding
-         * to skew things a bit toward the lower zooms.
-         * Remember, that result here, should correspond to TMSLayer.paint(...)
-         * getScaleFactor(...) is supposed to be between 0.75 and 3
-         */
-        int intResult = (int) Math.floor(result);
-        if (intResult > getMaxZoomLvl())
-            return getMaxZoomLvl();
-        if (intResult < getMinZoomLvl())
-            return getMinZoomLvl();
-        return intResult;
-    }
-
-    @SuppressWarnings("serial")
-    public TMSLayer(ImageryInfo info) {
-        super(info);
-
-        if (!isProjectionSupported(Main.getProjection())) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("TMS layers do not support the projection {0}.\n{1}\n"
-                            + "Change the projection or remove the layer.",
-                            Main.getProjection().toCode(), nameSupportedProjections()),
-                            tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE);
-        }
-
-        setBackgroundLayer(true);
-        this.setVisible(true);
-
-        TileSource source = getTileSource(info);
-        if (source == null)
-            throw new IllegalStateException("Cannot create TMSLayer with non-TMS ImageryInfo");
-        initTileSource(source);
-
-        MapView.addZoomChangeListener(this);
-    }
-
-    /**
-     * Adds a context menu to the mapView.
-     */
-    @Override
-    public void hookUpMapView() {
-        tileOptionMenu = new JPopupMenu();
-
-        autoZoom = PROP_DEFAULT_AUTOZOOM.get();
-        JCheckBoxMenuItem autoZoomPopup = new JCheckBoxMenuItem();
-        autoZoomPopup.setAction(new AbstractAction(tr("Auto Zoom")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                autoZoom = !autoZoom;
-            }
-        });
-        autoZoomPopup.setSelected(autoZoom);
-        tileOptionMenu.add(autoZoomPopup);
-
-        autoLoad = PROP_DEFAULT_AUTOLOAD.get();
-        JCheckBoxMenuItem autoLoadPopup = new JCheckBoxMenuItem();
-        autoLoadPopup.setAction(new AbstractAction(tr("Auto load tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                autoLoad = !autoLoad;
-            }
-        });
-        autoLoadPopup.setSelected(autoLoad);
-        tileOptionMenu.add(autoLoadPopup);
-
-        showErrors = PROP_DEFAULT_SHOWERRORS.get();
-        JCheckBoxMenuItem showErrorsPopup = new JCheckBoxMenuItem();
-        showErrorsPopup.setAction(new AbstractAction(tr("Show Errors")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                showErrors = !showErrors;
-            }
-        });
-        showErrorsPopup.setSelected(showErrors);
-        tileOptionMenu.add(showErrorsPopup);
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Load Tile")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                if (clickedTile != null) {
-                    loadTile(clickedTile, true);
-                    redraw();
-                }
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new ShowTileInfoAction()));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Request Update")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                if (clickedTile != null) {
-                    clickedTile.setLoaded(false);
-                    tileLoader.createTileLoaderJob(clickedTile).submit(true);
-                }
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Load All Tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                loadAllTiles(true);
-                redraw();
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Load All Error Tiles")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                loadAllErrorTiles(true);
-                redraw();
-            }
-        }));
-
-        // increase and decrease commands
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Increase zoom")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                increaseZoomLevel();
-                redraw();
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Decrease zoom")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                decreaseZoomLevel();
-                redraw();
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Snap to tile size")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                double newFactor = Math.sqrt(getScaleFactor(currentZoomLevel));
-                Main.map.mapView.zoomToFactor(newFactor);
-                redraw();
-            }
-        }));
-
-        tileOptionMenu.add(new JMenuItem(new AbstractAction(
-                tr("Flush Tile Cache")) {
-            @Override
-            public void actionPerformed(ActionEvent ae) {
-                new PleaseWaitRunnable(tr("Flush Tile Cache")) {
-                    @Override
-                    protected void realRun() throws SAXException, IOException,
-                            OsmTransferException {
-                        clearTileCache(getProgressMonitor());
-                    }
-
-                    @Override
-                    protected void finish() {
-                    }
-
-                    @Override
-                    protected void cancel() {
-                    }
-                }.run();
-            }
-        }));
-
-        final MouseAdapter adapter = new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                if (!isVisible()) return;
-                if (e.getButton() == MouseEvent.BUTTON3) {
-                    clickedTile = getTileForPixelpos(e.getX(), e.getY());
-                    tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
-                } else if (e.getButton() == MouseEvent.BUTTON1) {
-                    attribution.handleAttribution(e.getPoint(), true);
-                }
-            }
-        };
-        Main.map.mapView.addMouseListener(adapter);
-
-        MapView.addLayerChangeListener(new LayerChangeListener() {
-            @Override
-            public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                //
-            }
-
-            @Override
-            public void layerAdded(Layer newLayer) {
-                //
-            }
-
-            @Override
-            public void layerRemoved(Layer oldLayer) {
-                if (oldLayer == TMSLayer.this) {
-                    Main.map.mapView.removeMouseListener(adapter);
-                    MapView.removeZoomChangeListener(TMSLayer.this);
-                    MapView.removeLayerChangeListener(this);
-                }
-            }
-        });
-    }
-
-    /**
-     * This fires every time the user changes the zoom, but also (due to ZoomChangeListener) - on all
-     * changes to visible map (panning/zooming)
-     */
-    @Override
-    public void zoomChanged() {
-        if (Main.isDebugEnabled()) {
-            Main.debug("zoomChanged(): " + currentZoomLevel);
-        }
-        needRedraw = true;
-        if (tileLoader instanceof TMSCachedTileLoader) {
-            ((TMSCachedTileLoader) tileLoader).cancelOutstandingTasks();
-        }
-    }
-
-    protected int getMaxZoomLvl() {
-        if (info.getMaxZoom() != 0)
-            return checkMaxZoomLvl(info.getMaxZoom(), tileSource);
-        else
-            return getMaxZoomLvl(tileSource);
-    }
-
-    protected int getMinZoomLvl() {
-        return getMinZoomLvl(tileSource);
-    }
-
-    /**
-     * Zoom in, go closer to map.
-     *
-     * @return    true, if zoom increasing was successful, false otherwise
-     */
-    public boolean zoomIncreaseAllowed() {
-        boolean zia = currentZoomLevel < this.getMaxZoomLvl();
-        if (Main.isDebugEnabled()) {
-            Main.debug("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl());
-        }
-        return zia;
-    }
-
-    public boolean increaseZoomLevel() {
-        if (zoomIncreaseAllowed()) {
-            currentZoomLevel++;
-            if (Main.isDebugEnabled()) {
-                Main.debug("increasing zoom level to: " + currentZoomLevel);
-            }
-            zoomChanged();
-        } else {
-            Main.warn("Current zoom level ("+currentZoomLevel+") could not be increased. "+
-                    "Max.zZoom Level "+this.getMaxZoomLvl()+" reached.");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean setZoomLevel(int zoom) {
-        if (zoom == currentZoomLevel) return true;
-        if (zoom > this.getMaxZoomLvl()) return false;
-        if (zoom < this.getMinZoomLvl()) return false;
-        currentZoomLevel = zoom;
-        zoomChanged();
-        return true;
-    }
-
-    /**
-     * Check if zooming out is allowed
-     *
-     * @return    true, if zooming out is allowed (currentZoomLevel &gt; minZoomLevel)
-     */
-    public boolean zoomDecreaseAllowed() {
-        return currentZoomLevel > this.getMinZoomLvl();
-    }
-
-    /**
-     * Zoom out from map.
-     *
-     * @return    true, if zoom increasing was successfull, false othervise
-     */
-    public boolean decreaseZoomLevel() {
-        //int minZoom = this.getMinZoomLvl();
-        if (zoomDecreaseAllowed()) {
-            if (Main.isDebugEnabled()) {
-                Main.debug("decreasing zoom level to: " + currentZoomLevel);
-            }
-            currentZoomLevel--;
-            zoomChanged();
-        } else {
-            /*Main.debug("Current zoom level could not be decreased. Min. zoom level "+minZoom+" reached.");*/
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * We use these for quick, hackish calculations.  They
-     * are temporary only and intentionally not inserted
-     * into the tileCache.
-     */
-    private Tile tempCornerTile(Tile t) {
-        int x = t.getXtile() + 1;
-        int y = t.getYtile() + 1;
-        int zoom = t.getZoom();
-        Tile tile = getTile(x, y, zoom);
-        if (tile != null)
-            return tile;
-        return new Tile(tileSource, x, y, zoom);
-    }
-
-    private Tile getOrCreateTile(int x, int y, int zoom) {
-        Tile tile = getTile(x, y, zoom);
-        if (tile == null) {
-            tile = new Tile(tileSource, x, y, zoom);
-            tileCache.addTile(tile);
-            tile.loadPlaceholderFromCache(tileCache);
-        }
-        return tile;
-    }
-
-    /*
-     * This can and will return null for tiles that are not
-     * already in the cache.
-     */
-    private Tile getTile(int x, int y, int zoom) {
-        int max = 1 << zoom;
-        if (x < 0 || x >= max || y < 0 || y >= max)
-            return null;
-        return tileCache.getTile(tileSource, x, y, zoom);
-    }
-
-    private boolean loadTile(Tile tile, boolean force) {
-        if (tile == null)
-            return false;
-        if (!force && (tile.isLoaded() || tile.hasError()))
-            return false;
-        if (tile.isLoading())
-            return false;
-        tileLoader.createTileLoaderJob(tile).submit(force);
-        return true;
-    }
-
-    private void loadAllTiles(boolean force) {
-        MapView mv = Main.map.mapView;
-        EastNorth topLeft = mv.getEastNorth(0, 0);
-        EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-
-        TileSet ts = new TileSet(topLeft, botRight, currentZoomLevel);
-
-        // if there is more than 18 tiles on screen in any direction, do not
-        // load all tiles!
-        if (ts.tooLarge()) {
-            Main.warn("Not downloading all tiles because there is more than 18 tiles on an axis!");
-            return;
-        }
-        ts.loadAllTiles(force);
-    }
-
-    private void loadAllErrorTiles(boolean force) {
-        MapView mv = Main.map.mapView;
-        EastNorth topLeft = mv.getEastNorth(0, 0);
-        EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-
-        TileSet ts = new TileSet(topLeft, botRight, currentZoomLevel);
-
-        ts.loadAllErrorTiles(force);
-    }
-
-    @Override
-    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
-        boolean done = (infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0;
-        needRedraw = true;
-        if (Main.isDebugEnabled()) {
-            Main.debug("imageUpdate() done: " + done + " calling repaint");
-        }
-        Main.map.repaint(done ? 0 : 100);
-        return !done;
-    }
-
-    private boolean imageLoaded(Image i) {
-        if (i == null)
-            return false;
-        int status = Toolkit.getDefaultToolkit().checkImage(i, -1, -1, this);
-        if ((status & ALLBITS) != 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Returns the image for the given tile if both tile and image are loaded.
-     * Otherwise returns  null.
-     *
-     * @param tile the Tile for which the image should be returned
-     * @return  the image of the tile or null.
-     */
-    private Image getLoadedTileImage(Tile tile) {
-        if (!tile.isLoaded())
-            return null;
-        Image img = tile.getImage();
-        if (!imageLoaded(img))
-            return null;
-        return img;
-    }
-
-    private LatLon tileLatLon(Tile t) {
-        int zoom = t.getZoom();
-        return new LatLon(tileSource.tileYToLat(t.getYtile(), zoom),
-                tileSource.tileXToLon(t.getXtile(), zoom));
-    }
-
-    private Rectangle tileToRect(Tile t1) {
-        /*
-         * We need to get a box in which to draw, so advance by one tile in
-         * each direction to find the other corner of the box.
-         * Note: this somewhat pollutes the tile cache
-         */
-        Tile t2 = tempCornerTile(t1);
-        Rectangle rect = new Rectangle(pixelPos(t1));
-        rect.add(pixelPos(t2));
-        return rect;
-    }
-
-    // 'source' is the pixel coordinates for the area that
-    // the img is capable of filling in.  However, we probably
-    // only want a portion of it.
-    //
-    // 'border' is the screen cordinates that need to be drawn.
-    //  We must not draw outside of it.
-    private void drawImageInside(Graphics g, Image sourceImg, Rectangle source, Rectangle border) {
-        Rectangle target = source;
-
-        // If a border is specified, only draw the intersection
-        // if what we have combined with what we are supposed
-        // to draw.
-        if (border != null) {
-            target = source.intersection(border);
-            if (Main.isDebugEnabled()) {
-                Main.debug("source: " + source + "\nborder: " + border + "\nintersection: " + target);
-            }
-        }
-
-        // All of the rectangles are in screen coordinates.  We need
-        // to how these correlate to the sourceImg pixels.  We could
-        // avoid doing this by scaling the image up to the 'source' size,
-        // but this should be cheaper.
-        //
-        // In some projections, x any y are scaled differently enough to
-        // cause a pixel or two of fudge.  Calculate them separately.
-        double imageYScaling = sourceImg.getHeight(this) / source.getHeight();
-        double imageXScaling = sourceImg.getWidth(this) / source.getWidth();
-
-        // How many pixels into the 'source' rectangle are we drawing?
-        int screen_x_offset = target.x - source.x;
-        int screen_y_offset = target.y - source.y;
-        // And how many pixels into the image itself does that
-        // correlate to?
-        int img_x_offset = (int) (screen_x_offset * imageXScaling + 0.5);
-        int img_y_offset = (int) (screen_y_offset * imageYScaling + 0.5);
-        // Now calculate the other corner of the image that we need
-        // by scaling the 'target' rectangle's dimensions.
-        int img_x_end = img_x_offset + (int) (target.getWidth() * imageXScaling + 0.5);
-        int img_y_end = img_y_offset + (int) (target.getHeight() * imageYScaling + 0.5);
-
-        if (Main.isDebugEnabled()) {
-            Main.debug("drawing image into target rect: " + target);
-        }
-        g.drawImage(sourceImg,
-                target.x, target.y,
-                target.x + target.width, target.y + target.height,
-                img_x_offset, img_y_offset,
-                img_x_end, img_y_end,
-                this);
-        if (PROP_FADE_AMOUNT.get() != 0) {
-            // dimm by painting opaque rect...
-            g.setColor(getFadeColorWithAlpha());
-            g.fillRect(target.x, target.y,
-                    target.width, target.height);
-        }
-    }
-
-    // This function is called for several zoom levels, not just
-    // the current one.  It should not trigger any tiles to be
-    // downloaded.  It should also avoid polluting the tile cache
-    // with any tiles since these tiles are not mandatory.
-    //
-    // The "border" tile tells us the boundaries of where we may
-    // draw.  It will not be from the zoom level that is being
-    // drawn currently.  If drawing the displayZoomLevel,
-    // border is null and we draw the entire tile set.
-    private List<Tile> paintTileImages(Graphics g, TileSet ts, int zoom, Tile border) {
-        if (zoom <= 0) return Collections.emptyList();
-        Rectangle borderRect = null;
-        if (border != null) {
-            borderRect = tileToRect(border);
-        }
-        List<Tile> missedTiles = new LinkedList<>();
-        // The callers of this code *require* that we return any tiles
-        // that we do not draw in missedTiles.  ts.allExistingTiles() by
-        // default will only return already-existing tiles.  However, we
-        // need to return *all* tiles to the callers, so force creation
-        // here.
-        //boolean forceTileCreation = true;
-        for (Tile tile : ts.allTilesCreate()) {
-            Image img = getLoadedTileImage(tile);
-            if (img == null || tile.hasError()) {
-                if (Main.isDebugEnabled()) {
-                    Main.debug("missed tile: " + tile);
-                }
-                missedTiles.add(tile);
-                continue;
-            }
-            Rectangle sourceRect = tileToRect(tile);
-            if (borderRect != null && !sourceRect.intersects(borderRect)) {
-                continue;
-            }
-            drawImageInside(g, img, sourceRect, borderRect);
-        }
-        return missedTiles;
-    }
-
-    private void myDrawString(Graphics g, String text, int x, int y) {
-        Color oldColor = g.getColor();
-        g.setColor(Color.black);
-        g.drawString(text, x+1, y+1);
-        g.setColor(oldColor);
-        g.drawString(text, x, y);
-    }
-
-    private void paintTileText(TileSet ts, Tile tile, Graphics g, MapView mv, int zoom, Tile t) {
-        int fontHeight = g.getFontMetrics().getHeight();
-        if (tile == null)
-            return;
-        Point p = pixelPos(t);
-        int texty = p.y + 2 + fontHeight;
-
-        /*if (PROP_DRAW_DEBUG.get()) {
-            myDrawString(g, "x=" + t.getXtile() + " y=" + t.getYtile() + " z=" + zoom + "", p.x + 2, texty);
-            texty += 1 + fontHeight;
-            if ((t.getXtile() % 32 == 0) && (t.getYtile() % 32 == 0)) {
-                myDrawString(g, "x=" + t.getXtile() / 32 + " y=" + t.getYtile() / 32 + " z=7", p.x + 2, texty);
-                texty += 1 + fontHeight;
-            }
-        }*/
-
-        if (tile == showMetadataTile) {
-            String md = tile.toString();
-            if (md != null) {
-                myDrawString(g, md, p.x + 2, texty);
-                texty += 1 + fontHeight;
-            }
-            Map<String, String> meta = tile.getMetadata();
-            if (meta != null) {
-                for (Map.Entry<String, String> entry : meta.entrySet()) {
-                    myDrawString(g, entry.getKey() + ": " + entry.getValue(), p.x + 2, texty);
-                    texty += 1 + fontHeight;
-                }
-            }
-        }
-
-        /*String tileStatus = tile.getStatus();
-        if (!tile.isLoaded() && PROP_DRAW_DEBUG.get()) {
-            myDrawString(g, tr("image " + tileStatus), p.x + 2, texty);
-            texty += 1 + fontHeight;
-        }*/
-
-        if (tile.hasError() && showErrors) {
-            myDrawString(g, tr("Error") + ": " + tr(tile.getErrorMessage()), p.x + 2, texty);
-            texty += 1 + fontHeight;
-        }
-
-        /*int xCursor = -1;
-        int yCursor = -1;
-        if (PROP_DRAW_DEBUG.get()) {
-            if (yCursor < t.getYtile()) {
-                if (t.getYtile() % 32 == 31) {
-                    g.fillRect(0, p.y - 1, mv.getWidth(), 3);
-                } else {
-                    g.drawLine(0, p.y, mv.getWidth(), p.y);
-                }
-                yCursor = t.getYtile();
-            }
-            // This draws the vertical lines for the entire
-            // column. Only draw them for the top tile in
-            // the column.
-            if (xCursor < t.getXtile()) {
-                if (t.getXtile() % 32 == 0) {
-                    // level 7 tile boundary
-                    g.fillRect(p.x - 1, 0, 3, mv.getHeight());
-                } else {
-                    g.drawLine(p.x, 0, p.x, mv.getHeight());
-                }
-                xCursor = t.getXtile();
-            }
-        }*/
-    }
-
-    private Point pixelPos(LatLon ll) {
-        return Main.map.mapView.getPoint(Main.getProjection().latlon2eastNorth(ll).add(getDx(), getDy()));
-    }
-
-    private Point pixelPos(Tile t) {
-        double lon = tileSource.tileXToLon(t.getXtile(), t.getZoom());
-        LatLon tmpLL = new LatLon(tileSource.tileYToLat(t.getYtile(), t.getZoom()), lon);
-        return pixelPos(tmpLL);
-    }
-
-    private LatLon getShiftedLatLon(EastNorth en) {
-        return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
-    }
-
-    private Coordinate getShiftedCoord(EastNorth en) {
-        LatLon ll = getShiftedLatLon(en);
-        return new Coordinate(ll.lat(), ll.lon());
-    }
-
-    private final TileSet nullTileSet = new TileSet((LatLon) null, (LatLon) null, 0);
-
-    private final class TileSet {
-        private int x0, x1, y0, y1;
-        private int zoom;
-        private int tileMax = -1;
-
-        /**
-         * Create a TileSet by EastNorth bbox taking a layer shift in account
-         */
-        private TileSet(EastNorth topLeft, EastNorth botRight, int zoom) {
-            this(getShiftedLatLon(topLeft), getShiftedLatLon(botRight), zoom);
-        }
-
-        /**
-         * Create a TileSet by known LatLon bbox without layer shift correction
-         */
-        private TileSet(LatLon topLeft, LatLon botRight, int zoom) {
-            this.zoom = zoom;
-            if (zoom == 0)
-                return;
-
-            x0 = (int) tileSource.lonToTileX(topLeft.lon(),  zoom);
-            y0 = (int) tileSource.latToTileY(topLeft.lat(),  zoom);
-            x1 = (int) tileSource.lonToTileX(botRight.lon(), zoom);
-            y1 = (int) tileSource.latToTileY(botRight.lat(), zoom);
-            if (x0 > x1) {
-                int tmp = x0;
-                x0 = x1;
-                x1 = tmp;
-            }
-            if (y0 > y1) {
-                int tmp = y0;
-                y0 = y1;
-                y1 = tmp;
-            }
-            tileMax = (int) Math.pow(2.0, zoom);
-            if (x0 < 0) {
-                x0 = 0;
-            }
-            if (y0 < 0) {
-                y0 = 0;
-            }
-            if (x1 > tileMax) {
-                x1 = tileMax;
-            }
-            if (y1 > tileMax) {
-                y1 = tileMax;
-            }
-        }
-
-        private boolean tooSmall() {
-            return this.tilesSpanned() < 2.1;
-        }
-
-        private boolean tooLarge() {
-            return this.tilesSpanned() > 10;
-        }
-
-        private boolean insane() {
-            return this.tilesSpanned() > 100;
-        }
-
-        private double tilesSpanned() {
-            return Math.sqrt(1.0 * this.size());
-        }
-
-        private int size() {
-            int x_span = x1 - x0 + 1;
-            int y_span = y1 - y0 + 1;
-            return x_span * y_span;
-        }
-
-        /*
-         * Get all tiles represented by this TileSet that are
-         * already in the tileCache.
-         */
-        private List<Tile> allExistingTiles() {
-            return this.__allTiles(false);
-        }
-
-        private List<Tile> allTilesCreate() {
-            return this.__allTiles(true);
-        }
-
-        private List<Tile> __allTiles(boolean create) {
-            // Tileset is either empty or too large
-            if (zoom == 0 || this.insane())
-                return Collections.emptyList();
-            List<Tile> ret = new ArrayList<>();
-            for (int x = x0; x <= x1; x++) {
-                for (int y = y0; y <= y1; y++) {
-                    Tile t;
-                    if (create) {
-                        t = getOrCreateTile(x % tileMax, y % tileMax, zoom);
-                    } else {
-                        t = getTile(x % tileMax, y % tileMax, zoom);
-                    }
-                    if (t != null) {
-                        ret.add(t);
-                    }
-                }
-            }
-            return ret;
-        }
-
-        private List<Tile> allLoadedTiles() {
-            List<Tile> ret = new ArrayList<>();
-            for (Tile t : this.allExistingTiles()) {
-                if (t.isLoaded())
-                    ret.add(t);
-            }
-            return ret;
-        }
-
-        private Comparator<Tile> getTileDistanceComparator() {
-            final int centerX = (int) Math.ceil((x0 + x1) / 2);
-            final int centerY = (int) Math.ceil((y0 + y1) / 2);
-            return new Comparator<Tile>() {
-                private int getDistance(Tile t) {
-                    return Math.abs(t.getXtile() - centerX) + Math.abs(t.getYtile() - centerY);
-                }
-
-                @Override
-                public int compare(Tile o1, Tile o2) {
-                    int distance1 = getDistance(o1);
-                    int distance2 = getDistance(o2);
-                    return Integer.compare(distance1, distance2);
-                }
-            };
-        }
-
-        private void loadAllTiles(boolean force) {
-            if (!autoLoad && !force)
-                return;
-            List<Tile> allTiles = allTilesCreate();
-            Collections.sort(allTiles, getTileDistanceComparator());
-            for (Tile t : allTiles) {
-                loadTile(t, force);
-            }
-        }
-
-        private void loadAllErrorTiles(boolean force) {
-            if (!autoLoad && !force)
-                return;
-            for (Tile t : this.allTilesCreate()) {
-                if (t.hasError()) {
-                    loadTile(t, true);
-                }
-            }
-        }
-    }
-
-    private static class TileSetInfo {
-        public boolean hasVisibleTiles = false;
-        public boolean hasOverzoomedTiles = false;
-        public boolean hasLoadingTiles = false;
-    }
-
-    private static TileSetInfo getTileSetInfo(TileSet ts) {
-        List<Tile> allTiles = ts.allExistingTiles();
-        TileSetInfo result = new TileSetInfo();
-        result.hasLoadingTiles = allTiles.size() < ts.size();
-        for (Tile t : allTiles) {
-            if (t.isLoaded()) {
-                if (!t.hasError()) {
-                    result.hasVisibleTiles = true;
-                }
-                if ("no-tile".equals(t.getValue("tile-info"))) {
-                    result.hasOverzoomedTiles = true;
-                }
-            } else {
-                result.hasLoadingTiles = true;
-            }
-        }
-        return result;
-    }
-
-    private class DeepTileSet {
-        private final EastNorth topLeft, botRight;
-        private final int minZoom, maxZoom;
-        private final TileSet[] tileSets;
-        private final TileSetInfo[] tileSetInfos;
-
-        public DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {
-            this.topLeft = topLeft;
-            this.botRight = botRight;
-            this.minZoom = minZoom;
-            this.maxZoom = maxZoom;
-            this.tileSets = new TileSet[maxZoom - minZoom + 1];
-            this.tileSetInfos = new TileSetInfo[maxZoom - minZoom + 1];
-        }
-
-        public TileSet getTileSet(int zoom) {
-            if (zoom < minZoom)
-                return nullTileSet;
-            synchronized (tileSets) {
-                TileSet ts = tileSets[zoom-minZoom];
-                if (ts == null) {
-                    ts = new TileSet(topLeft, botRight, zoom);
-                    tileSets[zoom-minZoom] = ts;
-                }
-                return ts;
-            }
-        }
-
-        public TileSetInfo getTileSetInfo(int zoom) {
-            if (zoom < minZoom)
-                return new TileSetInfo();
-            synchronized (tileSetInfos) {
-                TileSetInfo tsi = tileSetInfos[zoom-minZoom];
-                if (tsi == null) {
-                    tsi = TMSLayer.getTileSetInfo(getTileSet(zoom));
-                    tileSetInfos[zoom-minZoom] = tsi;
-                }
-                return tsi;
-            }
-        }
-    }
-
-    @Override
-    public void paint(Graphics2D g, MapView mv, Bounds bounds) {
-        EastNorth topLeft = mv.getEastNorth(0, 0);
-        EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-
-        if (botRight.east() == 0 || botRight.north() == 0) {
-            /*Main.debug("still initializing??");*/
-            // probably still initializing
-            return;
-        }
-
-        needRedraw = false;
-
-        int zoom = currentZoomLevel;
-        if (autoZoom) {
-            double pixelScaling = getScaleFactor(zoom);
-            if (pixelScaling > 3 || pixelScaling < 0.7) {
-                zoom = getBestZoom();
-            }
-        }
-
-        DeepTileSet dts = new DeepTileSet(topLeft, botRight, getMinZoomLvl(), zoom);
-        TileSet ts = dts.getTileSet(zoom);
-
-        int displayZoomLevel = zoom;
-
-        boolean noTilesAtZoom = false;
-        if (autoZoom && autoLoad) {
-            // Auto-detection of tilesource maxzoom (currently fully works only for Bing)
-            TileSetInfo tsi = dts.getTileSetInfo(zoom);
-            if (!tsi.hasVisibleTiles && (!tsi.hasLoadingTiles || tsi.hasOverzoomedTiles)) {
-                noTilesAtZoom = true;
-            }
-            // Find highest zoom level with at least one visible tile
-            for (int tmpZoom = zoom; tmpZoom > dts.minZoom; tmpZoom--) {
-                if (dts.getTileSetInfo(tmpZoom).hasVisibleTiles) {
-                    displayZoomLevel = tmpZoom;
-                    break;
-                }
-            }
-            // Do binary search between currentZoomLevel and displayZoomLevel
-            while (zoom > displayZoomLevel && !tsi.hasVisibleTiles && tsi.hasOverzoomedTiles) {
-                zoom = (zoom + displayZoomLevel)/2;
-                tsi = dts.getTileSetInfo(zoom);
-            }
-
-            setZoomLevel(zoom);
-
-            // If all tiles at displayZoomLevel is loaded, load all tiles at next zoom level
-            // to make sure there're really no more zoom levels
-            if (zoom == displayZoomLevel && !tsi.hasLoadingTiles && zoom < dts.maxZoom) {
-                zoom++;
-                tsi = dts.getTileSetInfo(zoom);
-            }
-            // When we have overzoomed tiles and all tiles at current zoomlevel is loaded,
-            // load tiles at previovus zoomlevels until we have all tiles on screen is loaded.
-            while (zoom > dts.minZoom && tsi.hasOverzoomedTiles && !tsi.hasLoadingTiles) {
-                zoom--;
-                tsi = dts.getTileSetInfo(zoom);
-            }
-            ts = dts.getTileSet(zoom);
-        } else if (autoZoom) {
-            setZoomLevel(zoom);
-        }
-
-        // Too many tiles... refuse to download
-        if (!ts.tooLarge()) {
-            //Main.debug("size: " + ts.size() + " spanned: " + ts.tilesSpanned());
-            ts.loadAllTiles(false);
-        }
-
-        if (displayZoomLevel != zoom) {
-            ts = dts.getTileSet(displayZoomLevel);
-        }
-
-        g.setColor(Color.DARK_GRAY);
-
-        List<Tile> missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null);
-        int[] otherZooms = {-1, 1, -2, 2, -3, -4, -5};
-        for (int zoomOffset : otherZooms) {
-            if (!autoZoom) {
-                break;
-            }
-            int newzoom = displayZoomLevel + zoomOffset;
-            if (newzoom < MIN_ZOOM) {
-                continue;
-            }
-            if (missedTiles.isEmpty()) {
-                break;
-            }
-            List<Tile> newlyMissedTiles = new LinkedList<>();
-            for (Tile missed : missedTiles) {
-                if ("no-tile".equals(missed.getValue("tile-info")) && zoomOffset > 0) {
-                    // Don't try to paint from higher zoom levels when tile is overzoomed
-                    newlyMissedTiles.add(missed);
-                    continue;
-                }
-                Tile t2 = tempCornerTile(missed);
-                LatLon topLeft2  = tileLatLon(missed);
-                LatLon botRight2 = tileLatLon(t2);
-                TileSet ts2 = new TileSet(topLeft2, botRight2, newzoom);
-                // Instantiating large TileSets is expensive.  If there
-                // are no loaded tiles, don't bother even trying.
-                if (ts2.allLoadedTiles().isEmpty()) {
-                    newlyMissedTiles.add(missed);
-                    continue;
-                }
-                if (ts2.tooLarge()) {
-                    continue;
-                }
-                newlyMissedTiles.addAll(this.paintTileImages(g, ts2, newzoom, missed));
-            }
-            missedTiles = newlyMissedTiles;
-        }
-        if (Main.isDebugEnabled() && !missedTiles.isEmpty()) {
-            Main.debug("still missed "+missedTiles.size()+" in the end");
-        }
-        g.setColor(Color.red);
-        g.setFont(InfoFont);
-
-        // The current zoom tileset should have all of its tiles
-        // due to the loadAllTiles(), unless it to tooLarge()
-        for (Tile t : ts.allExistingTiles()) {
-            this.paintTileText(ts, t, g, mv, displayZoomLevel, t);
-        }
-
-        attribution.paintAttribution(g, mv.getWidth(), mv.getHeight(), getShiftedCoord(topLeft), getShiftedCoord(botRight), displayZoomLevel, this);
-
-        //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120);
-        g.setColor(Color.lightGray);
-        if (!autoZoom) {
-            if (ts.insane()) {
-                myDrawString(g, tr("zoom in to load any tiles"), 120, 120);
-            } else if (ts.tooLarge()) {
-                myDrawString(g, tr("zoom in to load more tiles"), 120, 120);
-            } else if (ts.tooSmall()) {
-                myDrawString(g, tr("increase zoom level to see more detail"), 120, 120);
-            }
-        }
-        if (noTilesAtZoom) {
-            myDrawString(g, tr("No tiles at this zoom level"), 120, 120);
-        }
-        if (Main.isDebugEnabled()) {
-            myDrawString(g, tr("Current zoom: {0}", currentZoomLevel), 50, 140);
-            myDrawString(g, tr("Display zoom: {0}", displayZoomLevel), 50, 155);
-            myDrawString(g, tr("Pixel scale: {0}", getScaleFactor(currentZoomLevel)), 50, 170);
-            myDrawString(g, tr("Best zoom: {0}", getBestZoom()), 50, 185);
-            if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
-                int offset = 185;
-                for (String part: cachedTileLoader.getStats().split("\n")) {
-                    myDrawString(g, tr("Cache stats: {0}", part), 50, offset += 15);
-                }
-            }
-        }
-    }
-
-    /**
-     * This isn't very efficient, but it is only used when the
-     * user right-clicks on the map.
-     */
-    private Tile getTileForPixelpos(int px, int py) {
-        if (Main.isDebugEnabled()) {
-            Main.debug("getTileForPixelpos("+px+", "+py+")");
-        }
-        MapView mv = Main.map.mapView;
-        Point clicked = new Point(px, py);
-        EastNorth topLeft = mv.getEastNorth(0, 0);
-        EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
-        int z = currentZoomLevel;
-        TileSet ts = new TileSet(topLeft, botRight, z);
-
-        if (!ts.tooLarge()) {
-            ts.loadAllTiles(false); // make sure there are tile objects for all tiles
-        }
-        Tile clickedTile = null;
-        for (Tile t1 : ts.allExistingTiles()) {
-            Tile t2 = tempCornerTile(t1);
-            Rectangle r = new Rectangle(pixelPos(t1));
-            r.add(pixelPos(t2));
-            if (Main.isDebugEnabled()) {
-                Main.debug("r: " + r + " clicked: " + clicked);
-            }
-            if (!r.contains(clicked)) {
-                continue;
-            }
-            clickedTile  = t1;
-            break;
-        }
-        if (clickedTile == null)
-            return null;
-        /*Main.debug("Clicked on tile: " + clickedTile.getXtile() + " " + clickedTile.getYtile() +
-                " currentZoomLevel: " + currentZoomLevel);*/
-        return clickedTile;
-    }
-
-    @Override
-    public Action[] getMenuEntries() {
-        return new Action[] {
-                LayerListDialog.getInstance().createShowHideLayerAction(),
-                LayerListDialog.getInstance().createDeleteLayerAction(),
-                SeparatorLayerAction.INSTANCE,
-                // color,
-                new OffsetAction(),
-                new RenameLayerAction(this.getAssociatedFile(), this),
-                SeparatorLayerAction.INSTANCE,
-                new LayerListPopup.InfoAction(this) };
-    }
-
-    @Override
-    public String getToolTipText() {
-        return tr("TMS layer ({0}), downloading in zoom {1}", getName(), currentZoomLevel);
-    }
-
-    @Override
-    public void visitBoundingBox(BoundingXYVisitor v) {
-    }
-
-    @Override
-    public boolean isChanged() {
-        return needRedraw;
-    }
-
-    @Override
-    public final boolean isProjectionSupported(Projection proj) {
-        return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode());
-    }
-
-    @Override
-    public final String nameSupportedProjections() {
-        return tr("EPSG:4326 and Mercator projection are supported");
-    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.io.Externalizable;
-import java.io.File;
 import java.io.IOException;
-import java.io.InvalidClassException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.Map;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 
-import org.openstreetmap.gui.jmapviewer.AttributionSupport;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.SaveActionBase;
-import org.openstreetmap.josm.data.Bounds;
-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.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.imagery.GeorefImage;
-import org.openstreetmap.josm.data.imagery.GeorefImage.State;
+import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
-import org.openstreetmap.josm.data.imagery.WmsCache;
-import org.openstreetmap.josm.data.imagery.types.ObjectFactory;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.imagery.TemplatedWMSTileSource;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
+import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.WMSLayerImporter;
-import org.openstreetmap.josm.io.imagery.HTMLGrabber;
-import org.openstreetmap.josm.io.imagery.WMSException;
-import org.openstreetmap.josm.io.imagery.WMSGrabber;
-import org.openstreetmap.josm.io.imagery.WMSRequest;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
  * This is a layer that grabs the current screen from an WMS server. The data
  * fetched this way is tiled and managed to the disc to reduce server load.
+ *
  */
-public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceChangedListener, Externalizable {
-
-    public static class PrecacheTask {
-        private final ProgressMonitor progressMonitor;
-        private volatile int totalCount;
-        private volatile int processedCount;
-        private volatile boolean isCancelled;
-
-        public PrecacheTask(ProgressMonitor progressMonitor) {
-            this.progressMonitor = progressMonitor;
-        }
-
-        public boolean isFinished() {
-            return totalCount == processedCount;
-        }
-
-        public int getTotalCount() {
-            return totalCount;
-        }
-
-        public void cancel() {
-            isCancelled = true;
-        }
-    }
-
-    // Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
-    @SuppressWarnings("unused")
-    private static final ObjectFactory OBJECT_FACTORY = null;
-
-    // these values correspond to the zoom levels used throughout OSM and are in meters/pixel from zoom level 0 to 18.
-    // taken from http://wiki.openstreetmap.org/wiki/Zoom_levels
-    private static final Double[] snapLevels = {156412.0, 78206.0, 39103.0, 19551.0, 9776.0, 4888.0,
-        2444.0, 1222.0, 610.984, 305.492, 152.746, 76.373, 38.187, 19.093, 9.547, 4.773, 2.387, 1.193, 0.596};
-
-    public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true);
-    public static final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("imagery.wms.simultaneousConnections", 3);
-    public static final BooleanProperty PROP_OVERLAP = new BooleanProperty("imagery.wms.overlap", false);
-    public static final IntegerProperty PROP_OVERLAP_EAST = new IntegerProperty("imagery.wms.overlapEast", 14);
-    public static final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("imagery.wms.overlapNorth", 4);
-    public static final IntegerProperty PROP_IMAGE_SIZE = new IntegerProperty("imagery.wms.imageSize", 500);
+public class WMSLayer extends AbstractTileSourceLayer {
+    /** default tile size for WMS Layer */
+    public static final IntegerProperty PROP_IMAGE_SIZE = new IntegerProperty("imagery.wms.imageSize", 512);
+    /** should WMS layer autozoom in default mode */
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wms.default_autozoom", true);
-
-    public int messageNum = 5; //limit for messages per layer
-    protected double resolution;
-    protected String resolutionText;
-    protected int imageSize;
-    protected int dax = 10;
-    protected int day = 10;
-    protected int daStep = 5;
-    protected int minZoom = 3;
-
-    protected GeorefImage[][] images;
-    protected static final int serializeFormatVersion = 5;
-    protected boolean autoDownloadEnabled = true;
-    protected boolean autoResolutionEnabled = PROP_DEFAULT_AUTOZOOM.get();
-    protected boolean settingsChanged;
-    public transient WmsCache cache;
-    private transient AttributionSupport attribution = new AttributionSupport();
-
-    // Image index boundary for current view
-    private volatile int bminx;
-    private volatile int bminy;
-    private volatile int bmaxx;
-    private volatile int bmaxy;
-    private volatile int leftEdge;
-    private volatile int bottomEdge;
-
-    // Request queue
-    private final transient List<WMSRequest> requestQueue = new ArrayList<>();
-    private final transient List<WMSRequest> finishedRequests = new ArrayList<>();
-    /**
-     * List of request currently being processed by download threads
-     */
-    private final transient List<WMSRequest> processingRequests = new ArrayList<>();
-    private final transient Lock requestQueueLock = new ReentrantLock();
-    private final transient Condition queueEmpty = requestQueueLock.newCondition();
-    private final transient List<WMSGrabber> grabbers = new ArrayList<>();
-    private final transient List<Thread> grabberThreads = new ArrayList<>();
-    private boolean canceled;
-
-    /** set to true if this layer uses an invalid base url */
-    private boolean usesInvalidUrl = false;
-    /** set to true if the user confirmed to use an potentially invalid WMS base url */
-    private boolean isInvalidUrlConfirmed = false;
 
     /**
      * Constructs a new {@code WMSLayer}.
-     */
-    public WMSLayer() {
-        this(new ImageryInfo(tr("Blank Layer")));
-    }
-
-    /**
-     * Constructs a new {@code WMSLayer}.
+     * @param info ImageryInfo description of the layer
      */
     public WMSLayer(ImageryInfo info) {
         super(info);
-        imageSize = PROP_IMAGE_SIZE.get();
-        setBackgroundLayer(true); /* set global background variable */
-        initializeImages();
-
-        attribution.initialize(this.info);
-
-        Main.pref.addPreferenceChangeListener(this);
     }
 
     @Override
     public void hookUpMapView() {
-        if (info.getUrl() != null) {
-            startGrabberThreads();
+        super.hookUpMapView();
+        final ProjectionChangeListener listener = new ProjectionChangeListener() {
+            @Override
+            public void projectionChanged(Projection oldValue, Projection newValue) {
+                if (!oldValue.equals(newValue) && tileSource instanceof TemplatedWMSTileSource) {
+                    ((TemplatedWMSTileSource)tileSource).initProjection(newValue);
+                }
 
-            for (WMSLayer layer: Main.map.mapView.getLayersOfType(WMSLayer.class)) {
-                if (layer.getInfo().getUrl().equals(info.getUrl())) {
-                    cache = layer.cache;
-                    break;
-                }
-            }
-            if (cache == null) {
-                cache = new WmsCache(info.getUrl(), imageSize);
-                cache.loadIndex();
-            }
-        }
-
-        // if automatic resolution is enabled, ensure that the first zoom level
-        // is already snapped. Otherwise it may load tiles that will never get
-        // used again when zooming.
-        updateResolutionSetting(this, autoResolutionEnabled);
-
-        final MouseAdapter adapter = new MouseAdapter() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                if (!isVisible()) return;
-                if (e.getButton() == MouseEvent.BUTTON1) {
-                    attribution.handleAttribution(e.getPoint(), true);
-                }
             }
         };
-        Main.map.mapView.addMouseListener(adapter);
+        Main.addProjectionChangeListener(listener);
 
         MapView.addLayerChangeListener(new LayerChangeListener() {
             @Override
             public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                //
+                // empty
             }
 
             @Override
             public void layerAdded(Layer newLayer) {
-                //
+                // empty
             }
 
@@ -227 +79 @@
             public void layerRemoved(Layer oldLayer) {
                 if (oldLayer == WMSLayer.this) {
-                    Main.map.mapView.removeMouseListener(adapter);
-                    MapView.removeLayerChangeListener(this);
+                    Main.removeProjectionChangeListener(listener);
                 }
             }
@@ -234 +85 @@
     }
 
-    public void doSetName(String name) {
-        setName(name);
-        info.setName(name);
+    @Override
+    public Action[] getMenuEntries() {
+        List<Action> ret = new ArrayList<>();
+        ret.addAll(Arrays.asList(super.getMenuEntries()));
+        ret.add(SeparatorLayerAction.INSTANCE);
+        ret.add(new LayerSaveAction(this));
+        ret.add(new LayerSaveAsAction(this));
+        ret.add(new BookmarkWmsAction());
+        return ret.toArray(new Action[]{});
     }
 
-    public boolean hasAutoDownload() {
-        return autoDownloadEnabled;
-    }
-
-    public void setAutoDownload(boolean val) {
-        autoDownloadEnabled = val;
-    }
-
-    public boolean isAutoResolution() {
-        return autoResolutionEnabled;
-    }
-
-    public void setAutoResolution(boolean val) {
-        autoResolutionEnabled = val;
-    }
-
-    public void downloadAreaToCache(PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {
-        Set<Point> requestedTiles = new HashSet<>();
-        for (LatLon point: points) {
-            EastNorth minEn = Main.getProjection().latlon2eastNorth(new LatLon(point.lat() - bufferY, point.lon() - bufferX));
-            EastNorth maxEn = Main.getProjection().latlon2eastNorth(new LatLon(point.lat() + bufferY, point.lon() + bufferX));
-            int minX = getImageXIndex(minEn.east());
-            int maxX = getImageXIndex(maxEn.east());
-            int minY = getImageYIndex(minEn.north());
-            int maxY = getImageYIndex(maxEn.north());
-
-            for (int x = minX; x <= maxX; x++) {
-                for (int y = minY; y <= maxY; y++) {
-                    requestedTiles.add(new Point(x, y));
-                }
-            }
-        }
-
-        for (Point p: requestedTiles) {
-            addRequest(new WMSRequest(p.x, p.y, info.getPixelPerDegree(), true, false, precacheTask));
-        }
-
-        precacheTask.progressMonitor.setTicksCount(precacheTask.getTotalCount());
-        precacheTask.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", 0, precacheTask.totalCount));
-    }
 
     @Override
-    public void destroy() {
-        super.destroy();
-        cancelGrabberThreads(false);
-        Main.pref.removePreferenceChangeListener(this);
-        if (cache != null) {
-            cache.saveIndex();
+    protected TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
+        if (info.getImageryType() == ImageryType.WMS && info.getUrl() != null) {
+            TemplatedWMSTileSource.checkUrl(info.getUrl());
+            TemplatedWMSTileSource tileSource = new TemplatedWMSTileSource(info);
+            info.setAttribution(tileSource);
+            return tileSource;
         }
-    }
-
-    public final void initializeImages() {
-        GeorefImage[][] old = images;
-        images = new GeorefImage[dax][day];
-        if (old != null) {
-            for (GeorefImage[] row : old) {
-                for (GeorefImage image : row) {
-                    images[modulo(image.getXIndex(), dax)][modulo(image.getYIndex(), day)] = image;
-                }
-            }
-        }
-        for (int x = 0; x < dax; ++x) {
-            for (int y = 0; y < day; ++y) {
-                if (images[x][y] == null) {
-                    images[x][y] = new GeorefImage(this);
-                }
-            }
-        }
-    }
-
-    @Override public ImageryInfo getInfo() {
-        return info;
-    }
-
-    @Override public String getToolTipText() {
-        if (autoDownloadEnabled)
-            return tr("WMS layer ({0}), automatically downloading in zoom {1}", getName(), resolutionText);
-        else
-            return tr("WMS layer ({0}), downloading in zoom {1}", getName(), resolutionText);
-    }
-
-    private int modulo(int a, int b) {
-        return a % b >= 0 ? a % b : a % b+b;
-    }
-
-    private boolean zoomIsTooBig() {
-        //don't download when it's too outzoomed
-        return info.getPixelPerDegree() / getPPD() > minZoom;
-    }
-
-    @Override
-    public void paint(Graphics2D g, final MapView mv, Bounds b) {
-        if (info.getUrl() == null || (usesInvalidUrl && !isInvalidUrlConfirmed)) return;
-
-        if (autoResolutionEnabled && !Utils.equalsEpsilon(getBestZoom(), mv.getDist100Pixel())) {
-            changeResolution(this, true);
-        }
-
-        settingsChanged = false;
-
-        ProjectionBounds bounds = mv.getProjectionBounds();
-        bminx = getImageXIndex(bounds.minEast);
-        bminy = getImageYIndex(bounds.minNorth);
-        bmaxx = getImageXIndex(bounds.maxEast);
-        bmaxy = getImageYIndex(bounds.maxNorth);
-
-        leftEdge = (int) (bounds.minEast * getPPD());
-        bottomEdge = (int) (bounds.minNorth * getPPD());
-
-        if (zoomIsTooBig()) {
-            for (int x = 0; x < images.length; ++x) {
-                for (int y = 0; y < images[0].length; ++y) {
-                    GeorefImage image = images[x][y];
-                    image.paint(g, mv, image.getXIndex(), image.getYIndex(), leftEdge, bottomEdge);
-                }
-            }
-        } else {
-            downloadAndPaintVisible(g, mv, false);
-        }
-
-        attribution.paintAttribution(g, mv.getWidth(), mv.getHeight(), null, null, 0, this);
-    }
-
-    @Override
-    public void setOffset(double dx, double dy) {
-        super.setOffset(dx, dy);
-        settingsChanged = true;
-    }
-
-    public int getImageXIndex(double coord) {
-        return (int) Math.floor(((coord - dx) * info.getPixelPerDegree()) / imageSize);
-    }
-
-    public int getImageYIndex(double coord) {
-        return (int) Math.floor(((coord - dy) * info.getPixelPerDegree()) / imageSize);
-    }
-
-    public int getImageX(int imageIndex) {
-        return (int) (imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dx * getPPD());
-    }
-
-    public int getImageY(int imageIndex) {
-        return (int) (imageIndex * imageSize * (getPPD() / info.getPixelPerDegree()) + dy * getPPD());
-    }
-
-    public int getImageWidth(int xIndex) {
-        return getImageX(xIndex + 1) - getImageX(xIndex);
-    }
-
-    public int getImageHeight(int yIndex) {
-        return getImageY(yIndex + 1) - getImageY(yIndex);
-    }
-
-    /**
-     *
-     * @return Size of image in original zoom
-     */
-    public int getBaseImageWidth() {
-        int overlap = PROP_OVERLAP.get() ? PROP_OVERLAP_EAST.get() * imageSize / 100 : 0;
-        return imageSize + overlap;
-    }
-
-    /**
-     *
-     * @return Size of image in original zoom
-     */
-    public int getBaseImageHeight() {
-        int overlap = PROP_OVERLAP.get() ? PROP_OVERLAP_NORTH.get() * imageSize / 100 : 0;
-        return imageSize + overlap;
-    }
-
-    public int getImageSize() {
-        return imageSize;
-    }
-
-    public boolean isOverlapEnabled() {
-        return WMSLayer.PROP_OVERLAP.get() && (WMSLayer.PROP_OVERLAP_EAST.get() > 0 || WMSLayer.PROP_OVERLAP_NORTH.get() > 0);
-    }
-
-    /**
-     *
-     * @return When overlapping is enabled, return visible part of tile. Otherwise return original image
-     */
-    public BufferedImage normalizeImage(BufferedImage img) {
-        if (isOverlapEnabled()) {
-            BufferedImage copy = img;
-            img = new BufferedImage(imageSize, imageSize, copy.getType());
-            img.createGraphics().drawImage(copy, 0, 0, imageSize, imageSize,
-                    0, copy.getHeight() - imageSize, imageSize, copy.getHeight(), null);
-        }
-        return img;
-    }
-
-    /**
-     * Returns east/north for a x/y couple.
-     * @param xIndex x index
-     * @param yIndex y index
-     * @return Real EastNorth of given tile. dx/dy is not counted in
-     */
-    public EastNorth getEastNorth(int xIndex, int yIndex) {
-        return new EastNorth((xIndex * imageSize) / info.getPixelPerDegree(), (yIndex * imageSize) / info.getPixelPerDegree());
-    }
-
-    protected void downloadAndPaintVisible(Graphics g, final MapView mv, boolean real) {
-
-        int newDax = dax;
-        int newDay = day;
-
-        if (bmaxx - bminx >= dax || bmaxx - bminx < dax - 2 * daStep) {
-            newDax = ((bmaxx - bminx) / daStep + 1) * daStep;
-        }
-
-        if (bmaxy - bminy >= day || bmaxy - bminx < day - 2 * daStep) {
-            newDay = ((bmaxy - bminy) / daStep + 1) * daStep;
-        }
-
-        if (newDax != dax || newDay != day) {
-            dax = newDax;
-            day = newDay;
-            initializeImages();
-        }
-
-        for (int x = bminx; x <= bmaxx; ++x) {
-            for (int y = bminy; y <= bmaxy; ++y) {
-                images[modulo(x, dax)][modulo(y, day)].changePosition(x, y);
-            }
-        }
-
-        gatherFinishedRequests();
-        Set<ProjectionBounds> areaToCache = new HashSet<>();
-
-        for (int x = bminx; x <= bmaxx; ++x) {
-            for (int y = bminy; y <= bmaxy; ++y) {
-                GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
-                if (!img.paint(g, mv, x, y, leftEdge, bottomEdge)) {
-                    addRequest(new WMSRequest(x, y, info.getPixelPerDegree(), real, true));
-                    areaToCache.add(new ProjectionBounds(getEastNorth(x, y), getEastNorth(x + 1, y + 1)));
-                } else if (img.getState() == State.PARTLY_IN_CACHE && autoDownloadEnabled) {
-                    addRequest(new WMSRequest(x, y, info.getPixelPerDegree(), real, false));
-                    areaToCache.add(new ProjectionBounds(getEastNorth(x, y), getEastNorth(x + 1, y + 1)));
-                }
-            }
-        }
-        if (cache != null) {
-            cache.setAreaToCache(areaToCache);
-        }
-    }
-
-    @Override
-    public void visitBoundingBox(BoundingXYVisitor v) {
-        for (int x = 0; x < dax; ++x) {
-            for (int y = 0; y < day; ++y) {
-                if (images[x][y].getImage() != null) {
-                    v.visit(images[x][y].getMin());
-                    v.visit(images[x][y].getMax());
-                }
-            }
-        }
-    }
-
-    @Override
-    public Action[] getMenuEntries() {
-        return new Action[]{
-                LayerListDialog.getInstance().createActivateLayerAction(this),
-                LayerListDialog.getInstance().createShowHideLayerAction(),
-                LayerListDialog.getInstance().createDeleteLayerAction(),
-                SeparatorLayerAction.INSTANCE,
-                new OffsetAction(),
-                new LayerSaveAction(this),
-                new LayerSaveAsAction(this),
-                new BookmarkWmsAction(),
-                SeparatorLayerAction.INSTANCE,
-                new StartStopAction(),
-                new ToggleAlphaAction(),
-                new ToggleAutoResolutionAction(),
-                new ChangeResolutionAction(),
-                new ZoomToNativeResolution(),
-                new ReloadErrorTilesAction(),
-                new DownloadAction(),
-                SeparatorLayerAction.INSTANCE,
-                new LayerListPopup.InfoAction(this)
-        };
-    }
-
-    public GeorefImage findImage(EastNorth eastNorth) {
-        int xIndex = getImageXIndex(eastNorth.east());
-        int yIndex = getImageYIndex(eastNorth.north());
-        GeorefImage result = images[modulo(xIndex, dax)][modulo(yIndex, day)];
-        if (result.getXIndex() == xIndex && result.getYIndex() == yIndex)
-            return result;
-        else
-            return null;
-    }
-
-    /**
-     * Replies request priority.
-     * @param request WMS request
-     * @return -1 if request is no longer needed, otherwise priority of request (lower number &lt;=&gt; more important request)
-     */
-    private int getRequestPriority(WMSRequest request) {
-        if (!Utils.equalsEpsilon(request.getPixelPerDegree(), info.getPixelPerDegree()))
-            return -1;
-        if (bminx > request.getXIndex()
-                || bmaxx < request.getXIndex()
-                || bminy > request.getYIndex()
-                || bmaxy < request.getYIndex())
-            return -1;
-
-        MouseEvent lastMEvent = Main.map.mapView.lastMEvent;
-        EastNorth cursorEastNorth = Main.map.mapView.getEastNorth(lastMEvent.getX(), lastMEvent.getY());
-        int mouseX = getImageXIndex(cursorEastNorth.east());
-        int mouseY = getImageYIndex(cursorEastNorth.north());
-        int dx = request.getXIndex() - mouseX;
-        int dy = request.getYIndex() - mouseY;
-
-        return 1 + dx * dx + dy * dy;
-    }
-
-    private void sortRequests(boolean localOnly) {
-        Iterator<WMSRequest> it = requestQueue.iterator();
-        while (it.hasNext()) {
-            WMSRequest item = it.next();
-
-            if (item.getPrecacheTask() != null && item.getPrecacheTask().isCancelled) {
-                it.remove();
-                continue;
-            }
-
-            int priority = getRequestPriority(item);
-            if (priority == -1 && item.isPrecacheOnly()) {
-                priority = Integer.MAX_VALUE; // Still download, but prefer requests in current view
-            }
-
-            if (localOnly && !item.hasExactMatch()) {
-                priority = Integer.MAX_VALUE; // Only interested in tiles that can be loaded from file immediately
-            }
-
-            if (priority == -1
-                    || finishedRequests.contains(item)
-                    || processingRequests.contains(item)) {
-                it.remove();
-            } else {
-                item.setPriority(priority);
-            }
-        }
-        Collections.sort(requestQueue);
-    }
-
-    public WMSRequest getRequest(boolean localOnly) {
-        requestQueueLock.lock();
-        try {
-            sortRequests(localOnly);
-            while (!canceled && (requestQueue.isEmpty() || (localOnly && !requestQueue.get(0).hasExactMatch()))) {
-                try {
-                    queueEmpty.await();
-                    sortRequests(localOnly);
-                } catch (InterruptedException e) {
-                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" during WMS request");
-                }
-            }
-
-            if (canceled)
-                return null;
-            else {
-                WMSRequest request = requestQueue.remove(0);
-                processingRequests.add(request);
-                return request;
-            }
-
-        } finally {
-            requestQueueLock.unlock();
-        }
-    }
-
-    public void finishRequest(WMSRequest request) {
-        requestQueueLock.lock();
-        try {
-            PrecacheTask task = request.getPrecacheTask();
-            if (task != null) {
-                task.processedCount++;
-                if (!task.progressMonitor.isCanceled()) {
-                    task.progressMonitor.worked(1);
-                    task.progressMonitor.setCustomText(tr("Downloaded {0}/{1} tiles", task.processedCount, task.totalCount));
-                }
-            }
-            processingRequests.remove(request);
-            if (request.getState() != null && !request.isPrecacheOnly()) {
-                finishedRequests.add(request);
-                if (Main.isDisplayingMapView()) {
-                    Main.map.mapView.repaint();
-                }
-            }
-        } finally {
-            requestQueueLock.unlock();
-        }
-    }
-
-    public void addRequest(WMSRequest request) {
-        requestQueueLock.lock();
-        try {
-
-            if (cache != null) {
-                ProjectionBounds b = getBounds(request);
-                // Checking for exact match is fast enough, no need to do it in separated thread
-                request.setHasExactMatch(cache.hasExactMatch(Main.getProjection(), request.getPixelPerDegree(), b.minEast, b.minNorth));
-                if (request.isPrecacheOnly() && request.hasExactMatch())
-                    return; // We already have this tile cached
-            }
-
-            if (!requestQueue.contains(request) && !finishedRequests.contains(request) && !processingRequests.contains(request)) {
-                requestQueue.add(request);
-                if (request.getPrecacheTask() != null) {
-                    request.getPrecacheTask().totalCount++;
-                }
-                queueEmpty.signalAll();
-            }
-        } finally {
-            requestQueueLock.unlock();
-        }
-    }
-
-    public boolean requestIsVisible(WMSRequest request) {
-        return bminx <= request.getXIndex() && bmaxx >= request.getXIndex() && bminy <= request.getYIndex() && bmaxy >= request.getYIndex();
-    }
-
-    private void gatherFinishedRequests() {
-        requestQueueLock.lock();
-        try {
-            for (WMSRequest request: finishedRequests) {
-                GeorefImage img = images[modulo(request.getXIndex(), dax)][modulo(request.getYIndex(), day)];
-                if (img.equalPosition(request.getXIndex(), request.getYIndex())) {
-                    WMSException we = request.getException();
-                    img.changeImage(request.getState(), request.getImage(), we != null ? we.getMessage() : null);
-                }
-            }
-        } finally {
-            requestQueueLock.unlock();
-            finishedRequests.clear();
-        }
-    }
-
-    public class DownloadAction extends AbstractAction {
-        /**
-         * Constructs a new {@code DownloadAction}.
-         */
-        public DownloadAction() {
-            super(tr("Download visible tiles"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            if (zoomIsTooBig()) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("The requested area is too big. Please zoom in a little, or change resolution"),
-                        tr("Error"),
-                        JOptionPane.ERROR_MESSAGE
-                        );
-            } else {
-                downloadAndPaintVisible(Main.map.mapView.getGraphics(), Main.map.mapView, true);
-            }
-        }
-    }
-
-    /**
-     * Finds the most suitable resolution for the current zoom level, but prefers
-     * higher resolutions. Snaps to values defined in snapLevels.
-     * @return best zoom level
-     */
-    private static double getBestZoom() {
-        // not sure why getDist100Pixel returns values corresponding to
-        // the snapLevels, which are in meters per pixel. It works, though.
-        double dist = Main.map.mapView.getDist100Pixel();
-        for (int i = snapLevels.length-2; i >= 0; i--) {
-            if (snapLevels[i+1]/3 + snapLevels[i]*2/3 > dist)
-                return snapLevels[i+1];
-        }
-        return snapLevels[0];
-    }
-
-    /**
-     * Updates the given layer’s resolution settings to the current zoom level. Does
-     * not update existing tiles, only new ones will be subject to the new settings.
-     *
-     * @param layer WMS layer
-     * @param snap  Set to true if the resolution should snap to certain values instead of
-     *              matching the current zoom level perfectly
-     */
-    private static void updateResolutionSetting(WMSLayer layer, boolean snap) {
-        if (snap) {
-            layer.resolution = getBestZoom();
-            layer.resolutionText = MapView.getDistText(layer.resolution);
-        } else {
-            layer.resolution = Main.map.mapView.getDist100Pixel();
-            layer.resolutionText = Main.map.mapView.getDist100PixelText();
-        }
-        layer.info.setPixelPerDegree(layer.getPPD());
-    }
-
-    /**
-     * Updates the given layer’s resolution settings to the current zoom level and
-     * updates existing tiles. If round is true, tiles will be updated gradually, if
-     * false they will be removed instantly (and redrawn only after the new resolution
-     * image has been loaded).
-     * @param layer WMS layer
-     * @param snap  Set to true if the resolution should snap to certain values instead of
-     *              matching the current zoom level perfectly
-     */
-    private static void changeResolution(WMSLayer layer, boolean snap) {
-        updateResolutionSetting(layer, snap);
-
-        layer.settingsChanged = true;
-
-        // Don’t move tiles off screen when the resolution is rounded. This
-        // prevents some flickering when zooming with auto-resolution enabled
-        // and instead gradually updates each tile.
-        if (!snap) {
-            for (int x = 0; x < layer.dax; ++x) {
-                for (int y = 0; y < layer.day; ++y) {
-                    layer.images[x][y].changePosition(-1, -1);
-                }
-            }
-        }
-    }
-
-    public static class ChangeResolutionAction extends AbstractAction implements LayerAction {
-
-        /**
-         * Constructs a new {@code ChangeResolutionAction}
-         */
-        public ChangeResolutionAction() {
-            super(tr("Change resolution"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
-            for (Layer l: layers) {
-                changeResolution((WMSLayer) l, false);
-            }
-            Main.map.mapView.repaint();
-        }
-
-        @Override
-        public boolean supportLayers(List<Layer> layers) {
-            for (Layer l: layers) {
-                if (!(l instanceof WMSLayer))
-                    return false;
-            }
-            return true;
-        }
-
-        @Override
-        public Component createMenuComponent() {
-            return new JMenuItem(this);
-        }
-    }
-
-    public class ReloadErrorTilesAction extends AbstractAction {
-        /**
-         * Constructs a new {@code ReloadErrorTilesAction}.
-         */
-        public ReloadErrorTilesAction() {
-            super(tr("Reload erroneous tiles"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            // Delete small files, because they're probably blank tiles.
-            // See #2307
-            cache.cleanSmallFiles(4096);
-
-            for (int x = 0; x < dax; ++x) {
-                for (int y = 0; y < day; ++y) {
-                    GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
-                    if (img.getState() == State.FAILED) {
-                        addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), true, false));
-                    }
-                }
-            }
-        }
-    }
-
-    public class ToggleAlphaAction extends AbstractAction implements LayerAction {
-        /**
-         * Constructs a new {@code ToggleAlphaAction}.
-         */
-        public ToggleAlphaAction() {
-            super(tr("Alpha channel"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            JCheckBoxMenuItem checkbox = (JCheckBoxMenuItem) ev.getSource();
-            boolean alphaChannel = checkbox.isSelected();
-            PROP_ALPHA_CHANNEL.put(alphaChannel);
-            Main.info("WMS Alpha channel changed to "+alphaChannel);
-
-            // clear all resized cached instances and repaint the layer
-            for (int x = 0; x < dax; ++x) {
-                for (int y = 0; y < day; ++y) {
-                    GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
-                    img.flushResizedCachedInstance();
-                    BufferedImage bi = img.getImage();
-                    // Completely erases images for which transparency has been forced,
-                    // or images that should be forced now, as they need to be recreated
-                    if (ImageProvider.isTransparencyForced(bi) || ImageProvider.hasTransparentColor(bi)) {
-                        img.resetImage();
-                    }
-                }
-            }
-            Main.map.mapView.repaint();
-        }
-
-        @Override
-        public Component createMenuComponent() {
-            JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
-            item.setSelected(PROP_ALPHA_CHANNEL.get());
-            return item;
-        }
-
-        @Override
-        public boolean supportLayers(List<Layer> layers) {
-            return layers.size() == 1 && layers.get(0) instanceof WMSLayer;
-        }
-    }
-
-    public class ToggleAutoResolutionAction extends AbstractAction implements LayerAction {
-
-        /**
-         * Constructs a new {@code ToggleAutoResolutionAction}.
-         */
-        public ToggleAutoResolutionAction() {
-            super(tr("Automatically change resolution"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            JCheckBoxMenuItem checkbox = (JCheckBoxMenuItem) ev.getSource();
-            autoResolutionEnabled = checkbox.isSelected();
-        }
-
-        @Override
-        public Component createMenuComponent() {
-            JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
-            item.setSelected(autoResolutionEnabled);
-            return item;
-        }
-
-        @Override
-        public boolean supportLayers(List<Layer> layers) {
-            return layers.size() == 1 && layers.get(0) instanceof WMSLayer;
-        }
+        return null;
     }
 
@@ -913 +127 @@
     }
 
-    private class StartStopAction extends AbstractAction implements LayerAction {
-
-        public StartStopAction() {
-            super(tr("Automatic downloading"));
-        }
-
-        @Override
-        public Component createMenuComponent() {
-            JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
-            item.setSelected(autoDownloadEnabled);
-            return item;
-        }
-
-        @Override
-        public boolean supportLayers(List<Layer> layers) {
-            return layers.size() == 1 && layers.get(0) instanceof WMSLayer;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            autoDownloadEnabled = !autoDownloadEnabled;
-            if (autoDownloadEnabled) {
-                for (int x = 0; x < dax; ++x) {
-                    for (int y = 0; y < day; ++y) {
-                        GeorefImage img = images[modulo(x, dax)][modulo(y, day)];
-                        if (img.getState() == State.NOT_IN_CACHE) {
-                            addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), false, true));
-                        }
-                    }
-                }
-                Main.map.mapView.repaint();
-            }
-        }
-    }
-
-    private class ZoomToNativeResolution extends AbstractAction {
-
-        public ZoomToNativeResolution() {
-            super(tr("Zoom to native resolution"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), 1 / info.getPixelPerDegree());
-        }
-    }
-
-    private void cancelGrabberThreads(boolean wait) {
-        requestQueueLock.lock();
-        try {
-            canceled = true;
-            for (WMSGrabber grabber: grabbers) {
-                grabber.cancel();
-            }
-            queueEmpty.signalAll();
-        } finally {
-            requestQueueLock.unlock();
-        }
-        if (wait) {
-            for (Thread t: grabberThreads) {
-                try {
-                    t.join();
-                } catch (InterruptedException e) {
-                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" while cancelling grabber threads");
-                }
-            }
-        }
-    }
-
-    private void startGrabberThreads() {
-        int threadCount = PROP_SIMULTANEOUS_CONNECTIONS.get();
-        requestQueueLock.lock();
-        try {
-            canceled = false;
-            grabbers.clear();
-            grabberThreads.clear();
-            for (int i = 0; i < threadCount; i++) {
-                WMSGrabber grabber = getGrabber(i == 0 && threadCount > 1);
-                grabbers.add(grabber);
-                Thread t = new Thread(grabber, "WMS " + getName() + " " + i);
-                t.setDaemon(true);
-                t.start();
-                grabberThreads.add(t);
-            }
-        } finally {
-            requestQueueLock.unlock();
-        }
-    }
-
-    @Override
-    public boolean isChanged() {
-        requestQueueLock.lock();
-        try {
-            return !finishedRequests.isEmpty() || settingsChanged;
-        } finally {
-            requestQueueLock.unlock();
-        }
-    }
-
-    @Override
-    public void preferenceChanged(PreferenceChangeEvent event) {
-        if (event.getKey().equals(PROP_SIMULTANEOUS_CONNECTIONS.getKey()) && info.getUrl() != null) {
-            cancelGrabberThreads(true);
-            startGrabberThreads();
-        } else if (
-                event.getKey().equals(PROP_OVERLAP.getKey())
-                || event.getKey().equals(PROP_OVERLAP_EAST.getKey())
-                || event.getKey().equals(PROP_OVERLAP_NORTH.getKey())) {
-            for (int i = 0; i < images.length; i++) {
-                for (int k = 0; k < images[i].length; k++) {
-                    images[i][k] = new GeorefImage(this);
-                }
-            }
-
-            settingsChanged = true;
-        }
-    }
 
     /**
@@ -1037 +134 @@
      */
     public void checkGrabberType() {
-        ImageryType it = getInfo().getImageryType();
-        if (!ImageryType.HTML.equals(it) && !ImageryType.WMS.equals(it))
-            throw new IllegalStateException("getGrabber() called for non-WMS layer type");
     }
 
-    protected WMSGrabber getGrabber(boolean localOnly) {
-        checkGrabberType();
-        if (getInfo().getImageryType() == ImageryType.HTML)
-            return new HTMLGrabber(Main.map.mapView, this, localOnly);
-        else
-            return new WMSGrabber(Main.map.mapView, this, localOnly);
-    }
+    private static TileLoaderFactory loaderFactory = new CachedTileLoaderFactory("WMS") {
+        @Override
+        protected TileLoader getLoader(TileLoaderListener listener, String cacheName, int connectTimeout,
+                int readTimeout, Map<String, String> headers, String cacheDir) throws IOException {
+            return new WMSCachedTileLoader(listener, cacheName, connectTimeout, readTimeout, headers, cacheDir);
+        }
 
-    public ProjectionBounds getBounds(WMSRequest request) {
-        ProjectionBounds result = new ProjectionBounds(
-                getEastNorth(request.getXIndex(), request.getYIndex()),
-                getEastNorth(request.getXIndex() + 1, request.getYIndex() + 1));
+    };
 
-        if (WMSLayer.PROP_OVERLAP.get()) {
-            double eastSize =  result.maxEast - result.minEast;
-            double northSize =  result.maxNorth - result.minNorth;
-
-            double eastCoef = WMSLayer.PROP_OVERLAP_EAST.get() / 100.0;
-            double northCoef = WMSLayer.PROP_OVERLAP_NORTH.get() / 100.0;
-
-            result = new ProjectionBounds(result.getMin(),
-                    new EastNorth(result.maxEast + eastCoef * eastSize,
-                            result.maxNorth + northCoef * northSize));
-        }
-        return result;
+    @Override
+    protected TileLoaderFactory getTileLoaderFactory() {
+        return loaderFactory;
     }
 
     @Override
-    public boolean isProjectionSupported(Projection proj) {
-        List<String> serverProjections = info.getServerProjections();
-        return serverProjections.contains(proj.toCode().toUpperCase(Locale.ENGLISH))
-                || ("EPSG:3857".equals(proj.toCode()) && (serverProjections.contains("EPSG:4326") || serverProjections.contains("CRS:84")))
-                || ("EPSG:4326".equals(proj.toCode()) && serverProjections.contains("CRS:84"));
-    }
-
-    @Override
-    public String nameSupportedProjections() {
-        StringBuilder res = new StringBuilder();
-        for (String p : info.getServerProjections()) {
-            if (res.length() > 0) {
-                res.append(", ");
-            }
-            res.append(p);
+    protected Map<String, String> getHeaders(TileSource tileSource) {
+        if (tileSource instanceof TemplatedWMSTileSource) {
+            return ((TemplatedWMSTileSource)tileSource).getHeaders();
         }
-        return tr("Supported projections are: {0}", res);
-    }
-
-    @Override
-    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
-        boolean done = (infoflags & (ERROR | FRAMEBITS | ALLBITS)) != 0;
-        Main.map.repaint(done ? 0 : 100);
-        return !done;
-    }
-
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeInt(serializeFormatVersion);
-        out.writeInt(dax);
-        out.writeInt(day);
-        out.writeInt(imageSize);
-        out.writeDouble(info.getPixelPerDegree());
-        out.writeObject(info.getName());
-        out.writeObject(info.getExtendedUrl());
-        out.writeObject(images);
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        int sfv = in.readInt();
-        if (sfv != serializeFormatVersion)
-            throw new InvalidClassException(tr("Unsupported WMS file version; found {0}, expected {1}", sfv, serializeFormatVersion));
-        autoDownloadEnabled = false;
-        dax = in.readInt();
-        day = in.readInt();
-        imageSize = in.readInt();
-        info.setPixelPerDegree(in.readDouble());
-        doSetName((String) in.readObject());
-        info.setExtendedUrl((String) in.readObject());
-        images = (GeorefImage[][]) in.readObject();
-
-        for (GeorefImage[] imgs : images) {
-            for (GeorefImage img : imgs) {
-                if (img != null) {
-                    img.setLayer(WMSLayer.this);
-                }
-            }
-        }
-
-        settingsChanged = true;
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
-        }
-        if (cache != null) {
-            cache.saveIndex();
-            cache = null;
-        }
-    }
-
-    @Override
-    public void onPostLoadFromFile() {
-        if (info.getUrl() != null) {
-            cache = new WmsCache(info.getUrl(), imageSize);
-            startGrabberThreads();
-        }
-    }
-
-    @Override
-    public boolean isSavable() {
-        return true; // With WMSLayerExporter
-    }
-
-    @Override
-    public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save WMS file"), WMSLayerImporter.FILE_FILTER);
+        return null;
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.gui.layer.WMSLayer.PrecacheTask;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer.PrecacheTask;
 import org.openstreetmap.josm.gui.progress.ProgressTaskId;
 import org.openstreetmap.josm.gui.progress.ProgressTaskIds;
@@ -35 +35 @@
 import org.xml.sax.SAXException;
 
+/**
+ * Class downloading WMS and TMS along the GPX track
+ *
+ */
 public class DownloadWmsAlongTrackAction extends AbstractAction {
 
     private final transient GpxData data;
 
+    /**
+     * @param data that represents GPX track, along which data should be downloaded
+     */
     public DownloadWmsAlongTrackAction(final GpxData data) {
         super(tr("Precache imagery tiles along this track"), ImageProvider.get("downloadalongtrack"));
@@ -57 +64 @@
             points.add(p.getCoor());
         }
-        final WMSLayer layer = askWMSLayer();
+        final AbstractTileSourceLayer layer = askedLayer();
         if (layer != null) {
             PleaseWaitRunnable task = new PleaseWaitRunnable(tr("Precaching WMS")) {
@@ -64 +71 @@
                 @Override
                 protected void realRun() throws SAXException, IOException, OsmTransferException {
-                    precacheTask = new PrecacheTask(progressMonitor);
+                    precacheTask = layer.new PrecacheTask(progressMonitor);
                     layer.downloadAreaToCache(precacheTask, points, 0, 0);
                     while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
@@ -95 +102 @@
     }
 
-    protected WMSLayer askWMSLayer() {
-        Collection<WMSLayer> targetLayers = Main.map.mapView.getLayersOfType(WMSLayer.class);
+    protected AbstractTileSourceLayer askedLayer() {
+        Collection<AbstractTileSourceLayer> targetLayers = Main.map.mapView.getLayersOfType(AbstractTileSourceLayer.class);
         if (targetLayers.isEmpty()) {
             warnNoImageryLayers();
             return null;
         }
-        JosmComboBox<WMSLayer> layerList = new JosmComboBox<>(targetLayers.toArray(new WMSLayer[0]));
+        JosmComboBox<AbstractTileSourceLayer> layerList = new JosmComboBox<>(targetLayers.toArray(new AbstractTileSourceLayer[0]));
         layerList.setRenderer(new LayerListCellRenderer());
         layerList.setSelectedIndex(0);
@@ -114 +121 @@
             return null;
         }
-        return (WMSLayer) layerList.getSelectedItem();
+        return (AbstractTileSourceLayer) layerList.getSelectedItem();
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java

@@ -12 +12 @@
 import javax.swing.SpinnerNumberModel;
 
+import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob;
@@ -41 +42 @@
     public TMSSettingsPanel() {
         super(new GridBagLayout());
-        minZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MIN_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
-        maxZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MAX_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
+        minZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.PROP_MIN_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
+        maxZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.PROP_MAX_ZOOM_LVL.get().intValue(), TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1));
         maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1));
         maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1));
@@ -95 +96 @@
         this.maxZoomLvl.setValue(TMSLayer.getMaxZoomLvl(null));
         this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null));
-        this.tilecacheDir.setText(TMSLayer.PROP_TILECACHE_DIR.get());
+        this.tilecacheDir.setText(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
         this.maxElementsOnDisk.setValue(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get());
         this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get());
@@ -132 +133 @@
         }
 
-        if (!TMSLayer.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {
+        if (!CachedTileLoaderFactory.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) {
             restartRequired = true;
-            TMSLayer.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
+            CachedTileLoaderFactory.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText());
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.FlowLayout;
 import java.awt.GridBagLayout;
 
@@ -14 +13 @@
 import javax.swing.SpinnerNumberModel;
 
+import org.openstreetmap.josm.data.imagery.WMSCachedTileLoaderJob;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.io.imagery.HTMLGrabber;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -27 +25 @@
     // WMS Settings
     private final JCheckBox autozoomActive;
-    private final JosmComboBox<String> browser;
-    private final JCheckBox overlapCheckBox;
-    private final JSpinner spinEast;
-    private final JSpinner spinNorth;
     private final JSpinner spinSimConn;
+    private final JSpinner tileSize;
 
     /**
@@ -45 +40 @@
         add(autozoomActive, GBC.eol().fill(GBC.HORIZONTAL));
 
-        // Downloader
-        browser = new JosmComboBox<>(new String[] {
-                "webkit-image {0}",
-                "gnome-web-photo --mode=photo --format=png {0} /dev/stdout",
-                "gnome-web-photo-fixed {0}",
-        "webkit-image-gtk {0}"});
-        browser.setEditable(true);
-        add(new JLabel(tr("Downloader:")), GBC.std());
-        add(GBC.glue(5, 0), GBC.std());
-        add(browser, GBC.eol().fill(GBC.HORIZONTAL));
-
         // Simultaneous connections
         add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
         JLabel labelSimConn = new JLabel(tr("Simultaneous connections:"));
-        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.get().intValue(), 1, 30, 1));
+        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 1, 30, 1));
         labelSimConn.setLabelFor(spinSimConn);
         add(labelSimConn, GBC.std());
@@ -65 +49 @@
         add(spinSimConn, GBC.eol());
 
-        // Overlap
-        add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
-
-        overlapCheckBox = new JCheckBox(tr("Overlap tiles"));
-        JLabel labelEast = new JLabel(tr("% of east:"));
-        JLabel labelNorth = new JLabel(tr("% of north:"));
-        spinEast = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_EAST.get().intValue(), 1, 50, 1));
-        spinNorth = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_NORTH.get().intValue(), 1, 50, 1));
-        labelEast.setLabelFor(spinEast);
-        labelNorth.setLabelFor(spinNorth);
-
-        JPanel overlapPanel = new JPanel(new FlowLayout());
-        overlapPanel.add(overlapCheckBox);
-        overlapPanel.add(labelEast);
-        overlapPanel.add(spinEast);
-        overlapPanel.add(labelNorth);
-        overlapPanel.add(spinNorth);
-
-        add(overlapPanel, GBC.eop());
+        // Tile size
+        JLabel labelTileSize = new JLabel(tr("Tile size:"));
+        tileSize = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_IMAGE_SIZE.get().intValue(), 1, 4096, 128));
+        labelTileSize.setLabelFor(tileSize);
+        add(labelTileSize, GBC.std());
+        add(GBC.glue(5, 0), GBC.std());
+        add(tileSize, GBC.eol());
     }
 
@@ -91 +63 @@
     public void loadSettings() {
         this.autozoomActive.setSelected(WMSLayer.PROP_DEFAULT_AUTOZOOM.get());
-        this.browser.setSelectedItem(HTMLGrabber.PROP_BROWSER.get());
-        this.overlapCheckBox.setSelected(WMSLayer.PROP_OVERLAP.get());
-        this.spinEast.setValue(WMSLayer.PROP_OVERLAP_EAST.get());
-        this.spinNorth.setValue(WMSLayer.PROP_OVERLAP_NORTH.get());
-        this.spinSimConn.setValue(WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.get());
+        this.spinSimConn.setValue(WMSCachedTileLoaderJob.THREAD_LIMIT.get());
+        this.tileSize.setValue(WMSLayer.PROP_IMAGE_SIZE.get());
     }
 
@@ -104 +73 @@
     public boolean saveSettings() {
         WMSLayer.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
-        WMSLayer.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
-        WMSLayer.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());
-        WMSLayer.PROP_OVERLAP_NORTH.put((Integer) spinNorth.getModel().getValue());
-        WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.put((Integer) spinSimConn.getModel().getValue());
-
-        HTMLGrabber.PROP_BROWSER.put(browser.getEditor().getItem().toString());
+        WMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) spinSimConn.getModel().getValue());
+        WMSLayer.PROP_IMAGE_SIZE.put((Integer) this.tileSize.getModel().getValue());
 
         return false;

trunk/src/org/openstreetmap/josm/io/WMSLayerExporter.java

@@ -7 +7 @@
 import java.io.ObjectOutputStream;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -17 +20 @@
  */
 public class WMSLayerExporter extends FileExporter {
+
+    /** Which version of the file we export */
+    public static final int CURRENT_FILE_VERSION = 6;
 
     /**
@@ -29 +35 @@
         CheckParameterUtil.ensureParameterNotNull(file, "file");
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
-        if (layer instanceof WMSLayer) {
+
+        if (layer instanceof AbstractTileSourceLayer) {
             try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) {
-                ((WMSLayer) layer).writeExternal(oos);
+                oos.writeInt(CURRENT_FILE_VERSION); // file version
+                oos.writeObject(Main.map.mapView.getCenter());
+                ImageryPreferenceEntry entry = new ImageryPreferenceEntry(((AbstractTileSourceLayer) layer).getInfo());
+                oos.writeObject(Preferences.serializeStruct(entry, ImageryPreferenceEntry.class));
             }
         }
+
     }
 
     @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        setEnabled(newLayer instanceof WMSLayer);
+        setEnabled(newLayer instanceof AbstractTileSourceLayer);
     }
 }

trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java

@@ -7 +7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InvalidClassException;
 import java.io.ObjectInputStream;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -28 +34 @@
             "wms", "wms", tr("WMS Files (*.wms)"));
 
-    private final WMSLayer wmsLayer;
-
     /**
      * Constructs a new {@code WMSLayerImporter}.
      */
     public WMSLayerImporter() {
-        this(new WMSLayer());
+        super(FILE_FILTER);
     }
 
-    /**
-     * Constructs a new {@code WMSLayerImporter} that will import data to the specified WMS layer.
-     * @param wmsLayer The WMS layer.
-     */
-    public WMSLayerImporter(WMSLayer wmsLayer) {
-        super(FILE_FILTER);
-        this.wmsLayer = wmsLayer;
-    }
 
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
         CheckParameterUtil.ensureParameterNotNull(file, "file");
+        final EastNorth zoomTo;
+        ImageryInfo info = null;
+        final ImageryLayer layer;
+
         try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
-            wmsLayer.readExternal(ois);
+            int sfv = ois.readInt();
+            if (sfv < 5) {
+                throw new InvalidClassException(tr("Unsupported WMS file version; found {0}, expected {1}", sfv, 5));
+            } else if (sfv == 5) {
+                ois.readInt(); // dax - not needed
+                ois.readInt(); // day - not needed
+                zoomTo = null;
+
+                int imageSize = ois.readInt();
+                double pixelPerDegree = ois.readDouble();
+
+                String name = (String)ois.readObject();
+                String extendedUrl = (String)ois.readObject();
+
+                info = new ImageryInfo(name);
+                info.setExtendedUrl(extendedUrl);
+                info.setPixelPerDegree(pixelPerDegree);
+                info.setTileSize(imageSize);
+            } else if (sfv == WMSLayerExporter.CURRENT_FILE_VERSION){
+                zoomTo = (EastNorth) ois.readObject();
+
+                @SuppressWarnings("unchecked")
+                ImageryPreferenceEntry entry = Preferences.deserializeStruct(
+                        (Map<String, String>)ois.readObject(),
+                        ImageryPreferenceEntry.class);
+                info = new ImageryInfo(entry);
+            } else {
+                throw new InvalidClassException(tr("Unsupported WMS file version; found {0}, expected {1}", sfv, 6));
+            }
         } catch (ClassNotFoundException e) {
             throw new IllegalDataException(e);
         }
+        layer = ImageryLayer.create(info);
+
 
         // FIXME: remove UI stuff from IO subsystem
@@ -59 +89 @@
             @Override
             public void run() {
-                Main.main.addLayer(wmsLayer);
-                wmsLayer.onPostLoadFromFile();
+                Main.main.addLayer(layer);
+                if (zoomTo != null) {
+                    Main.map.mapView.zoomTo(zoomTo);
+                }
             }
         });
     }
-
-    /**
-     * Replies the imported WMS layer.
-     * @return The imported WMS layer.
-     * @see #importData(File, ProgressMonitor)
-     */
-    public final WMSLayer getWmsLayer() {
-        return wmsLayer;
-    }
 }

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -81 +82 @@
         ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo());
         Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
-        if (layer instanceof WMSLayer) {
-            WMSLayer wms = (WMSLayer) layer;
-            data.put("automatic-downloading", Boolean.toString(wms.hasAutoDownload()));
-            data.put("automatically-change-resolution", Boolean.toString(wms.isAutoResolution()));
+        if (layer instanceof AbstractTileSourceLayer) {
+            AbstractTileSourceLayer tsLayer = (AbstractTileSourceLayer) layer;
+            data.put("automatic-downloading", Boolean.toString(tsLayer.autoLoad));
+            data.put("automatically-change-resolution", Boolean.toString(tsLayer.autoZoom));
+            data.put("show-errors", Boolean.toString(tsLayer.showErrors));
         }
         for (Map.Entry<String, String> entry : data.entrySet()) {

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -46 +46 @@
         ImageryInfo i = new ImageryInfo(prefEntry);
         ImageryLayer layer = ImageryLayer.create(i);
-        if (layer instanceof WMSLayer) {
-            WMSLayer wms = (WMSLayer) layer;
-            String autoDownload = attributes.get("automatic-downloading");
-            if (autoDownload != null) {
-                wms.setAutoDownload(Boolean.parseBoolean(autoDownload));
+        if (layer instanceof AbstractTileSourceLayer) {
+            AbstractTileSourceLayer tsLayer = (AbstractTileSourceLayer) layer;
+            if (attributes.containsKey("automatic-downloading")) {
+                tsLayer.autoLoad = new Boolean(attributes.get("automatic-downloading")).booleanValue();
             }
-            String autoResolution = attributes.get("automatically-change-resolution");
-            if (autoResolution != null) {
-                wms.setAutoResolution(Boolean.parseBoolean(autoResolution));
+
+            if (attributes.containsKey("automatically-change-resolution")) {
+                tsLayer.autoZoom = new Boolean(attributes.get("automatically-change-resolution")).booleanValue();
+            }
+
+            if (attributes.containsKey("show-errors")) {
+                tsLayer.showErrors = new Boolean(attributes.get("show-errors")).booleanValue();
             }
         }