Change map.Map to map.LegacyMap for #247

Author: Martin Journois

folium/folium.py

@@ -13,8 +13,7 @@
 import json
 
 from folium.six import text_type, binary_type
-from .map import Map as _Map
-from .map import Icon, Marker, Popup, FitBounds
+from .map import LegacyMap, Icon, Marker, Popup, FitBounds
 from .features import (WmsTileLayer, RegularPolygonMarker, Vega, GeoJson,
                        CircleMarker, LatLngPopup,
                        ClickForMarker, TopoJson, PolyLine, MultiPolyLine,
@@ -31,7 +30,7 @@ def initialize_notebook():
     pass
 
 
-class Map(_Map):
+class Map(LegacyMap):
     """This class inherits from the map.Map object in order to provide
     bindings to former folium API.
     """

folium/map.py

@@ -20,7 +20,7 @@
 from .element import Element, Figure, MacroElement, Html
 
 
-class Map(MacroElement):
+class LegacyMap(MacroElement):
     def __init__(self, location=None, width='100%', height='100%',
                  left="0%", top="0%", position='relative',
                  tiles='OpenStreetMap', API_key=None, max_zoom=18, min_zoom=1,
@@ -85,22 +85,22 @@ def __init__(self, location=None, width='100%', height='100%',
 
         Returns
         -------
-        Folium Map Object
+        Folium LegacyMap Object
 
         Examples
         --------
-        >>>map = folium.Map(location=[45.523, -122.675], width=750, height=500)
-        >>>map = folium.Map(location=[45.523, -122.675],
+        >>>map = folium.LegacyMap(location=[45.523, -122.675], width=750, height=500)
+        >>>map = folium.LegacyMap(location=[45.523, -122.675],
                             tiles='Mapbox Control Room')
-        >>>map = folium.Map(location=(45.523, -122.675), max_zoom=20,
+        >>>map = folium.LegacyMap(location=(45.523, -122.675), max_zoom=20,
                             tiles='Cloudmade', API_key='YourKey')
-        >>>map = folium.Map(location=[45.523, -122.675], zoom_start=2,
+        >>>map = folium.LegacyMap(location=[45.523, -122.675], zoom_start=2,
                             tiles=('http://{s}.tiles.mapbox.com/v3/'
                                     'mapbox.control-room/{z}/{x}/{y}.png'),
                             attr='Mapbox attribution')
 
         """
-        super(Map, self).__init__()
+        super(LegacyMap, self).__init__()
         self._name = 'Map'
 
         if not location: