Skip to content

Commit 473d6da

Browse files
ocefpafocefpaf
authored
Merge pull request #511 from ocefpaf/remove_deprecations
Remove deprecations
2 parents 9360775 + ca938d7 commit 473d6da

6 files changed

Lines changed: 151 additions & 1052 deletions

File tree

‎folium/__init__.py‎

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,53 @@
77
from branca.colormap import (ColorMap, LinearColormap, StepColormap)
88

99

10-
from folium.folium import Map, initialize_notebook, CircleMarker
11-
from folium.map import (FeatureGroup, FitBounds, Icon, LayerControl, Marker,
12-
Popup, TileLayer)
13-
from folium.features import (ClickForMarker, CustomIcon, DivIcon,
14-
GeoJson, LatLngPopup,
15-
MarkerCluster, MultiPolyLine, PolyLine, Vega,
16-
RegularPolygonMarker, TopoJson, WmsTileLayer)
10+
from .folium import Map
11+
from .map import (
12+
FeatureGroup, FitBounds, Icon, LayerControl, Marker, Popup, TileLayer
13+
)
14+
from .features import (
15+
ClickForMarker, CustomIcon, DivIcon, GeoJson, LatLngPopup, CircleMarker,
16+
MarkerCluster, MultiPolyLine, PolyLine, Vega, RegularPolygonMarker,
17+
TopoJson, WmsTileLayer
18+
)
1719

1820
__version__ = '0.3.0.dev'
1921

20-
__all__ = ['CssLink',
21-
'Div',
22-
'Element',
23-
'Figure',
24-
'Html',
25-
'IFrame',
26-
'JavascriptLink',
27-
'Link',
28-
'MacroElement',
29-
'ColorMap',
30-
'LinearColormap',
31-
'StepColormap',
32-
'Map',
33-
'initialize_notebook',
34-
'CircleMarker',
35-
'RectangleMarker',
36-
'Polygon',
37-
'FeatureGroup',
38-
'FitBounds',
39-
'Icon',
40-
'LayerControl',
41-
'Marker',
42-
'Popup',
43-
'TileLayer',
44-
'ClickForMarker',
45-
'CustomIcon',
46-
'DivIcon',
47-
'GeoJson',
48-
'GeoJsonStyle',
49-
'LatLngPopup',
50-
'MarkerCluster',
51-
'MultiPolyLine',
52-
'PolyLine',
53-
'Vega',
54-
'RegularPolygonMarker',
55-
'TopoJson',
56-
'WmsTileLayer']
22+
__all__ = [
23+
'CssLink',
24+
'Div',
25+
'Element',
26+
'Figure',
27+
'Html',
28+
'IFrame',
29+
'JavascriptLink',
30+
'Link',
31+
'MacroElement',
32+
'ColorMap',
33+
'LinearColormap',
34+
'StepColormap',
35+
'Map',
36+
'CircleMarker',
37+
'RectangleMarker',
38+
'Polygon',
39+
'FeatureGroup',
40+
'FitBounds',
41+
'Icon',
42+
'LayerControl',
43+
'Marker',
44+
'Popup',
45+
'TileLayer',
46+
'ClickForMarker',
47+
'CustomIcon',
48+
'DivIcon',
49+
'GeoJson',
50+
'GeoJsonStyle',
51+
'LatLngPopup',
52+
'MarkerCluster',
53+
'MultiPolyLine',
54+
'PolyLine',
55+
'Vega',
56+
'RegularPolygonMarker',
57+
'TopoJson',
58+
'WmsTileLayer'
59+
]

0 commit comments

Comments
 (0)