Merge pull request #562 from HashCode55/master

Removed mapquest references/files

Author: ocefpaf

README.rst

@@ -28,8 +28,8 @@ map for choropleth visualizations as well as passing Vincent/Vega
 visualizations as markers on the map.
 
 The library has a number of built-in tilesets from OpenStreetMap,
-MapQuest Open, MapQuest Open Aerial, Mapbox, and Stamen, and supports
-custom tilesets with Mapbox or Cloudmade API keys. Folium supports both
+Mapbox, and Stamen, and supports custom tilesets with Mapbox 
+or Cloudmade API keys. Folium supports both
 GeoJSON and TopoJSON overlays, as well as the binding of data to those
 overlays to create choropleth maps with color-brewer color schemes.
 

folium/folium.py

@@ -24,8 +24,6 @@ class Map(LegacyMap):
     to Folium. Pass any of the following to the "tiles" keyword:
 
         - "OpenStreetMap"
-        - "MapQuest Open"
-        - "MapQuest Open Aerial"
         - "Mapbox Bright" (Limited levels of zoom for free tiles)
         - "Mapbox Control Room" (Limited levels of zoom for free tiles)
         - "Stamen" (Terrain, Toner, and Watercolor)

folium/map.py

@@ -65,8 +65,6 @@ class LegacyMap(MacroElement):
     to Folium. Pass any of the following to the "tiles" keyword:
 
         - "OpenStreetMap"
-        - "MapQuest Open"
-        - "MapQuest Open Aerial"
         - "Mapbox Bright" (Limited levels of zoom for free tiles)
         - "Mapbox Control Room" (Limited levels of zoom for free tiles)
         - "Stamen" (Terrain, Toner, and Watercolor)
@@ -348,8 +346,6 @@ class TileLayer(Layer):
     tiles: str, default 'OpenStreetMap'
         Map tileset to use. Can choose from this list of built-in tiles:
             - "OpenStreetMap"
-            - "MapQuest Open"
-            - "MapQuest Open Aerial"
             - "Mapbox Bright" (Limited levels of zoom for free tiles)
             - "Mapbox Control Room" (Limited levels of zoom for free tiles)
             - "Stamen" (Terrain, Toner, and Watercolor)

folium/templates/tiles/mapquestopen/attr.txt

@@ -413,11 +413,11 @@ def test_custom_icon(self):
 
     def test_tile_layer(self):
         mapa = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
-        layer = 'http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png'
-        mapa.add_child(folium.map.TileLayer(layer, name='MapQuest',
+        layer = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+        mapa.add_child(folium.map.TileLayer(layer, name='OpenStreetMap',
                                             attr='attribution'))
         mapa.add_child(folium.map.TileLayer(layer,
-                                            name='MapQuest2',
+                                            name='OpenStreetMap2',
                                             attr='attribution2',
                                             overlay=True))
         mapa.add_child(folium.map.LayerControl())