Changeset 5046 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2012-03-05T22:41:23+01:00 (12 years ago)

Author:

Don-vip

Message:

Slippy Map Chooser: Add MapQuest-OSM and MapQuest Open Aerial, fix existing tile sources URLs

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) (3 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOsmTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.Main;
@@ -104 +106 @@
         static {
             // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list
-            existingSlippyMapUrls.add("http://tile.openstreetmap.org/");
-            existingSlippyMapUrls.add("http://tah.openstreetmap.org/Tiles/tile/");
-            existingSlippyMapUrls.add("http://tile.opencyclemap.org/cycle/");
+            existingSlippyMapUrls.add("http://tile.openstreetmap.org/{zoom}/{x}/{y}.png");      // Mapnik
+            existingSlippyMapUrls.add("http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png"); // Cyclemap
+            existingSlippyMapUrls.add("http://otile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png"); // MapQuest-OSM
+            existingSlippyMapUrls.add("http://oatile{switch:1,2,3,4}.mqcdn.com/tiles/1.0.0/sat/{zoom}/{x}/{y}.png"); // MapQuest Open Aerial
         }
 
@@ -155 +158 @@
                 return Arrays.<TileSource>asList(
                         new RenamedSourceDecorator(new OsmTileSource.Mapnik(), "Mapnik"),
-                        new RenamedSourceDecorator(new OsmTileSource.CycleMap(), "Cyclemap")
+                        new RenamedSourceDecorator(new OsmTileSource.CycleMap(), "Cyclemap"),
+                        new RenamedSourceDecorator(new MapQuestOsmTileSource(), "MapQuest-OSM"),
+                        new RenamedSourceDecorator(new MapQuestOpenAerialTileSource(), "MapQuest Open Aerial")
                         );
             }