Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 27990)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java	(revision 27992)
@@ -22,4 +22,6 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOsmTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 
@@ -82,5 +84,5 @@
         });
         JComboBox tileSourceSelector = new JComboBox(new TileSource[] { new OsmTileSource.Mapnik(),
-                new OsmTileSource.CycleMap(), new BingAerialTileSource() });
+                new OsmTileSource.CycleMap(), new BingAerialTileSource(), new MapQuestOsmTileSource(), new MapQuestOpenAerialTileSource() });
         tileSourceSelector.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java	(revision 27992)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java	(revision 27992)
@@ -0,0 +1,70 @@
+package org.openstreetmap.gui.jmapviewer.tilesources;
+
+import java.awt.Image;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.xml.bind.DatatypeConverter;
+
+public class AbstractMapQuestTileSource extends AbstractOsmTileSource {
+
+    // MapQuest logo in base64: http://developer.mapquest.com/content/osm/mq_logo.png
+    private static final String LOGO_BASE64 = 
+            "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJl"+
+            "YWR5ccllPAAAAZtJREFUeNpi/P//P0PPcYf/DGSAEssDjIzdx+zJ0gwDLMQqVBWyZVAStGRgBMK33x8wnH62"+
+            "kngD+DmkGBwUshn42SXA/P8M/xg+/3rDcOPNPuIMMJeKAmv+8OMpw7ffHxikeLUZXBTzgez3DEzEGMDGzAmm"+
+            "jz5ewLDqWiHE6UwcDHxsYhAXsLPwMFhKxzIIccozPP18ieHhx3MMGsKOYP7td4fBzgUBN+ViBkeFLDD7zbf7"+
+            "DK++3WFgAMXC448X/uMDV17t+H/r7UEM8VNPl/8Hu0CGTx9s6tXXOxhEuJQYxLnVgK44w/Dzz1cGNWF7BlGg"+
+            "2KJLqQzCQBcxMbEw/P77g0FTxBkYJs8gXgCFKiMwOLbf6WDQF/djcFUqAvv33fdHYAM4WPjAFrz9/hAeLsef"+
+            "LALT4EBkhIYlMxMrAxerIJjNCdTExy4OZv/59xNnAKPEAh+bBNAQSMwKcsgAQ5odzBbilGNghcYE1pS4+14f"+
+            "MKq4GP79/w1OHCC/v/x6Exzv+x9MhbiOEeh3LAZQnBeYGCgEjJRmZ4AAAwCE6rplT3Ba/gAAAABJRU5ErkJg"+
+            "gg==";
+
+    protected static final String MAPQUEST_ATTRIBUTION = "Tiles Courtesy of MapQuest ";
+
+    protected static final String MAPQUEST_WEBSITE = "http://www.mapquest.com";
+
+    private static final int NUMBER_OF_SERVERS = 4;
+    
+    private int SERVER_NUM = 1;
+
+    public AbstractMapQuestTileSource(String name, String base_url) {
+        super(name, base_url);
+    }
+
+    @Override
+    public String getBaseUrl() {
+        String url = String.format(this.baseUrl, SERVER_NUM);
+        SERVER_NUM = (SERVER_NUM % NUMBER_OF_SERVERS) + 1;
+        return url;
+    }
+
+    @Override
+    public TileUpdate getTileUpdate() {
+        return TileUpdate.IfModifiedSince;
+    }
+
+    @Override
+    public Image getAttributionImage() {
+        try {
+            return ImageIO.read(new ByteArrayInputStream(DatatypeConverter.parseBase64Binary(LOGO_BASE64)));
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public String getAttributionImageURL() {
+        return MAPQUEST_WEBSITE;
+    }
+
+    /* (non-Javadoc)
+     * @see org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource#getTermsOfUseURL()
+     */
+    @Override
+    public String getTermsOfUseURL() {
+        return "http://developer.mapquest.com/web/products/open/map#terms";
+    }
+}
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java	(revision 27992)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java	(revision 27992)
@@ -0,0 +1,22 @@
+package org.openstreetmap.gui.jmapviewer.tilesources;
+
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+
+public class MapQuestOpenAerialTileSource extends AbstractMapQuestTileSource {
+
+    private static final String PATTERN = "http://oatile%d.mqcdn.com/tiles/1.0.0/sat";
+
+    public MapQuestOpenAerialTileSource() {
+        super("MapQuest Open Aerial", PATTERN);
+    }
+
+    @Override
+    public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
+        return "Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency - "+MAPQUEST_ATTRIBUTION;
+    }
+
+    @Override
+    public String getAttributionLinkURL() {
+        return MAPQUEST_WEBSITE;
+    }
+}
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java	(revision 27992)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java	(revision 27992)
@@ -0,0 +1,18 @@
+package org.openstreetmap.gui.jmapviewer.tilesources;
+
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+
+public class MapQuestOsmTileSource extends AbstractMapQuestTileSource {
+
+    private static final String PATTERN = "http://otile%d.mqcdn.com/tiles/1.0.0/osm";
+
+    public MapQuestOsmTileSource() {
+        super("MapQuest-OSM", PATTERN);
+    }
+    
+    @Override
+    public String getAttributionText(int zoom, Coordinate topLeft,
+            Coordinate botRight) {
+        return super.getAttributionText(zoom, topLeft, botRight)+"- "+MAPQUEST_ATTRIBUTION;
+    }
+}