Version 13.4, May 2012

[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 24833ce3e7be4ce8f7f288068768d155cf394ed6..eae105515fe7960c1024badaed908fea8777a970 100644 (file)
--- a/tim/prune/gui/map/MapSourceLibrary.java
+++ b/tim/prune/gui/map/MapSourceLibrary.java
@@ -39,12 +39,15 @@ public abstract class MapSourceLibrary
        private static void addFixedSources()
        {
                _sourceList.add(new OsmMapSource("Mapnik", "http://tile.openstreetmap.org/"));
-               _sourceList.add(new OsmMapSource("Osma", "http://tah.openstreetmap.org/Tiles/tile/"));
-               _sourceList.add(new OsmMapSource("Cyclemap", "http://andy.sandbox.cloudmade.com/tiles/cycle/"));
+               _sourceList.add(new OsmMapSource("Cyclemap", "http://tile.opencyclemap.org/cycle/"));
                _sourceList.add(new OsmMapSource("Reitkarte", "http://wanderreitkarte.de/hills/",
                        "http://topo2.wanderreitkarte.de/topo/", 18));
-               _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 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/",
+                       "http://tiles.openseamap.org/seamark/", 18));
                _sourceList.add(new CloudmadeMapSource("Pale Dawn", "998", 18));
        }
 
@@ -88,6 +91,23 @@ public abstract class MapSourceLibrary
                _sourceList.add(inSource);
        }
 
+       /**
+        * Edit the given MapSource object by replacing with a new one
+        * @param inOriginal existing MapSource object
+        * @param inNewSource new MapSource object
+        */
+       public static void editSource(MapSource inOriginal, MapSource inNewSource)
+       {
+               // Check whether original source is still there
+               int origPos = _sourceList.indexOf(inOriginal);
+               if (origPos < 0) {
+                       addSource(inNewSource);
+               }
+               else {
+                       _sourceList.set(origPos, inNewSource);
+               }
+       }
+
        /**
         * @param inIndex source index number
         * @return corresponding map source object