Version 19, May 2018

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

diff --git a/tim/prune/gui/map/MapSourceLibrary.java b/tim/prune/gui/map/MapSourceLibrary.java
index 5c20eacf9ba9fdc8a2da4bc4b76cf77e8f46b263..5f44d5e64d4b757b012667cd2781c912cef325f9 100644 (file)
--- a/tim/prune/gui/map/MapSourceLibrary.java
+++ b/tim/prune/gui/map/MapSourceLibrary.java
@@ -38,16 +38,21 @@ public abstract class MapSourceLibrary
         */
        private static void addFixedSources()
        {
+               final String THUNDERFOREST_APIKEY = "c32212f10b13496786b98dc6c42e5c3c";
                _sourceList.add(new OsmMapSource("Mapnik", "http://[abc].tile.openstreetmap.org/"));
-               _sourceList.add(new OsmMapSource("Cyclemap", "http://[abc].tile.opencyclemap.org/cycle/"));
+               OsmMapSource cycleSource = new OsmMapSource("OpenCycleMap", "http://[abc].tile.thunderforest.com/cycle/");
+               cycleSource.setApiKey(THUNDERFOREST_APIKEY);
+               _sourceList.add(cycleSource);
+               OsmMapSource outdoorsSource = new OsmMapSource("Outdoors", "http://[abc].tile.thunderforest.com/outdoors/");
+               outdoorsSource.setApiKey(THUNDERFOREST_APIKEY);
+               _sourceList.add(outdoorsSource);
                _sourceList.add(new OsmMapSource("Reitkarte", "http://topo[234].wanderreitkarte.de/topo/"));
                _sourceList.add(new MffMapSource("Mapsforfree", "http://maps-for-free.com/layer/relief/", "jpg",
                        "http://maps-for-free.com/layer/water/", "gif", 11));
-               _sourceList.add(new OsmMapSource("Hikebikemap", "http://toolserver.org/tiles/hikebike/",
-                       "http://toolserver.org/~cmarqu/hill/", 18));
-               _sourceList.add(new OsmMapSource("Openseamap", "http://tile.openstreetmap.org/",
+               _sourceList.add(new OsmMapSource("Hikebikemap", "http://[abc].tiles.wmflabs.org/hikebike/",
+                       "http://[abc].tiles.wmflabs.org/hillshading/", 18));
+               _sourceList.add(new OsmMapSource("OpenSeaMap", "http://tile.openstreetmap.org/",
                        "http://tiles.openseamap.org/seamark/", 18));
-               _sourceList.add(new CloudmadeMapSource("Pale Dawn", "998", 18));
        }
 
        /**
@@ -64,7 +69,6 @@ public abstract class MapSourceLibrary
                        {
                                String sourceString = configString.substring(0, splitPos);
                                MapSource source = OsmMapSource.fromConfig(sourceString);
-                               if (source == null) {source = CloudmadeMapSource.fromConfig(sourceString);}
                                if (source != null) {
                                        _sourceList.add(source);
                                }