X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapSource.java;h=e3ac2ed2227a1825d01526c87800c3abdd9819d4;hp=35590a6e9a44964179050986d7ce6dc7c8475386;hb=f1b92378a792131ac8fb33a869405851d5b2d1f7;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d

diff --git a/tim/prune/gui/map/MapSource.java b/tim/prune/gui/map/MapSource.java
index 35590a6..e3ac2ed 100644
--- a/tim/prune/gui/map/MapSource.java
+++ b/tim/prune/gui/map/MapSource.java
@@ -11,6 +11,10 @@ import java.net.URL;
  */
 public abstract class MapSource
 {
+	/** File extensions */
+	protected String[] _extensions = null;
+
+
 	/**
 	 * @return the number of layers used in this source
 	 */
@@ -34,7 +38,9 @@ public abstract class MapSource
 	/**
 	 * @return the file extension for the specified layer
 	 */
-	public abstract String getFileExtension(int inLayerNum);
+	public final String getFileExtension(int inLayerNum) {
+		return _extensions[inLayerNum];
+	}
 
 	/**
 	 * Make the URL to get the specified tile
@@ -61,7 +67,7 @@ public abstract class MapSource
 	 */
 	public String makeFilePath(int inLayerNum, int inZoom, int inX, int inY)
 	{
-		return getSiteName(inLayerNum) + inZoom + "/" + inX + "/" + inY + getFileExtension(inLayerNum);
+		return getSiteName(inLayerNum) + inZoom + "/" + inX + "/" + inY + "." + getFileExtension(inLayerNum);
 	}
 
 	/**
@@ -121,16 +127,20 @@ public abstract class MapSource
 	public abstract String getConfigString();
 
 	/**
-	 * @return semicolon-separated list of base urls in order
+	 * @return semicolon-separated list of base urls and extensions in order
 	 */
 	public String getSiteStrings()
 	{
 		StringBuilder sb = new StringBuilder();
-		for (int i=0; i<getNumLayers(); i++) {
+		for (int i=0; i<getNumLayers(); i++)
+		{
 			String url = getBaseUrl(i);
-			if (url != null) {
+			if (url != null)
+			{
 				sb.append(url);
 				sb.append(';');
+				sb.append(getFileExtension(i));
+				sb.append(';');
 			}
 		}
 		return sb.toString();