Version 19, May 2018

[GpsPrune.git] / tim / prune / gui / map / OsmMapSource.java

diff --git a/tim/prune/gui/map/OsmMapSource.java b/tim/prune/gui/map/OsmMapSource.java
index 2f8d0ba97980c366ebaf824a515c0912e12f2174..925fcf623ea456154c512c5e5e89454eb5b46bf8 100644 (file)
--- a/tim/prune/gui/map/OsmMapSource.java
+++ b/tim/prune/gui/map/OsmMapSource.java
@@ -19,6 +19,9 @@ public class OsmMapSource extends MapSource
        private String[] _siteNames = null;
        /** Maximum zoom level */
        private int _maxZoom = 0;
+       /** API key, usually remains empty */
+       private String _apiKey = null;
+
 
        /**
         * Constructor giving single name and url
@@ -40,9 +43,9 @@ public class OsmMapSource extends MapSource
        public OsmMapSource(String inName, String inStr1, String inStr2, int inMaxZoom)
        {
                if (inStr2 != null && inStr2.length() == 3)
-                       init(inName, inStr1, inStr2, null, null, 18);
+                       init(inName, inStr1, inStr2, null, null, inMaxZoom);
                else
-                       init(inName, inStr1, "png", inStr2, "png", 18);
+                       init(inName, inStr1, "png", inStr2, "png", inMaxZoom);
        }
 
        /**
@@ -93,6 +96,12 @@ public class OsmMapSource extends MapSource
                _maxZoom = inMaxZoom;
        }
 
+       /** Set the API key (if required) */
+       public void setApiKey(String inKey)
+       {
+               _apiKey = inKey;
+       }
+
        /**
         * Construct a new map source from its config string
         * @param inConfigString string from Config, separated by semicolons
@@ -147,8 +156,15 @@ public class OsmMapSource extends MapSource
        public String makeURL(int inLayerNum, int inZoom, int inX, int inY)
        {
                // Check if the base url has a [1234], if so replace at random
-               return pickServerUrl(_baseUrls[inLayerNum])
-                       + inZoom + "/" + inX + "/" + inY + "." + getFileExtension(inLayerNum);
+               StringBuffer url = new StringBuffer();
+               url.append(pickServerUrl(_baseUrls[inLayerNum]));
+               url.append(inZoom).append('/').append(inX).append('/').append(inY);
+               url.append('.').append(getFileExtension(inLayerNum));
+               if (_apiKey != null)
+               {
+                       url.append("?apikey=").append(_apiKey);
+               }
+               return url.toString();
        }
 
        /**