python-visualization · ocefpaf · Mar 25, 2019 · Mar 23, 2019 · Mar 23, 2019
diff --git a/docs/installing.rst b/docs/installing.rst
@@ -5,7 +5,7 @@ Requirements
 ------------
 ::
 
- branca, jinja2, requests, and six.
+ branca, jinja2 and requests.
 
 Some functionalities may require extra dependencies
 `numpy`, `pandas`, `geopandas`, `altair`, etc.

diff --git a/examples/index.html b/examples/index.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<head>    
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+        <script>
+            L_PREFER_CANVAS = false;
+            L_NO_TOUCH = false;
+            L_DISABLE_3D = false;
+        </script>
+
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.js"></script>
+    <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"/>
+    <link rel="stylesheet" href="https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css"/>
+    <style>html, body {width: 100%;height: 100%;margin: 0;padding: 0;}</style>
+    <style>#map {position:absolute;top:0;bottom:0;right:0;left:0;}</style>
+
+            <meta name="viewport" content="width=device-width,
+                initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+            <style>
+                #map_d19ea42a01d7424e899dfb6eb4ab0d7b {
+                    position: relative;
+                    width: 100.0%;
+                    height: 100.0%;
+                    left: 0.0%;
+                    top: 0.0%;
+                }
+            </style>
+
+</head>
+<body>    
+
+            <div class="folium-map" id="map_d19ea42a01d7424e899dfb6eb4ab0d7b" ></div>
+
+</body>
+<script>    
+
+                var bounds = null;
+
+            var map_d19ea42a01d7424e899dfb6eb4ab0d7b = L.map(
+                "map_d19ea42a01d7424e899dfb6eb4ab0d7b",
+                {
+                    center: [45.5236, -122.675],
+                    zoom: 10,
+                    maxBounds: bounds,
+                    layers: [],
+                    worldCopyJump: false,
+                    crs: L.CRS.EPSG3857,
+                    zoomControl: true,
+                }
+            );
+
+
+
+
+
+            var tile_layer_872f9c8b47294f9095ed47e2fbacdd62 = L.tileLayer(
+                "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+                {"detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
+            ).addTo(map_d19ea42a01d7424e899dfb6eb4ab0d7b);
+
+</script>
diff --git a/folium/__init__.py b/folium/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 import sys
 
 import branca

diff --git a/folium/features.py b/folium/features.py
@@ -5,8 +5,6 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 import json
 import warnings
 import functools
@@ -36,8 +34,6 @@
 
 import requests
 
-from six import binary_type, text_type
-
 
 class RegularPolygonMarker(Marker):
     """
@@ -136,7 +132,7 @@ def __init__(self, data, width=None, height=None,
         super(Vega, self).__init__()
         self._name = 'Vega'
         self.data = data.to_json() if hasattr(data, 'to_json') else data
-        if isinstance(self.data, text_type) or isinstance(data, binary_type):
+        if isinstance(self.data, str):
             self.data = json.loads(self.data)
 
         # Size Parameters.
@@ -228,7 +224,7 @@ def __init__(self, data, width=None, height=None,
         super(self.__class__, self).__init__()
         self._name = 'VegaLite'
         self.data = data.to_json() if hasattr(data, 'to_json') else data
-        if isinstance(self.data, text_type) or isinstance(data, binary_type):
+        if isinstance(self.data, str):
             self.data = json.loads(self.data)
 
         self.json = json.dumps(self.data)
@@ -475,7 +471,7 @@ def process_data(self, data):
         if isinstance(data, dict):
             self.embed = True
             return data
-        elif isinstance(data, text_type) or isinstance(data, binary_type):
+        elif isinstance(data, str):
             if data.lower().startswith(('http:', 'ftp:', 'https:')):
                 if not self.embed:
                     self.embed_link = data

diff --git a/folium/folium.py b/folium/folium.py
@@ -5,8 +5,6 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 import time
 import warnings
 

diff --git a/folium/map.py b/folium/map.py
@@ -5,8 +5,6 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 from collections import OrderedDict
 
 import warnings
@@ -17,8 +15,6 @@
 
 from jinja2 import Template
 
-from six import binary_type, text_type
-
 
 class Layer(MacroElement):
     """An abstract class for everything that is a Layer on the map.
@@ -344,8 +340,8 @@ def __init__(self, html=None, parse_html=False, max_width='100%',
 
         if isinstance(html, Element):
             self.html.add_child(html)
-        elif isinstance(html, text_type) or isinstance(html, binary_type):
-            self.html.add_child(Html(text_type(html), script=script))
+        elif isinstance(html, str):
+            self.html.add_child(Html(html, script=script))
 
         self.show = show
         self.options = parse_options(

diff --git a/folium/plugins/__init__.py b/folium/plugins/__init__.py
@@ -8,8 +8,6 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 from folium.plugins.antpath import AntPath
 from folium.plugins.beautify_icon import BeautifyIcon
 from folium.plugins.boat_marker import BoatMarker

diff --git a/folium/plugins/antpath.py b/folium/plugins/antpath.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.vector_layers import path_options, BaseMultiLocation

diff --git a/folium/plugins/beautify_icon.py b/folium/plugins/beautify_icon.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from folium.utilities import parse_options

diff --git a/folium/plugins/boat_marker.py b/folium/plugins/boat_marker.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.map import Marker

diff --git a/folium/plugins/draw.py b/folium/plugins/draw.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Element, Figure, JavascriptLink, MacroElement
 
 from jinja2 import Template

diff --git a/folium/plugins/fast_marker_cluster.py b/folium/plugins/fast_marker_cluster.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from folium.plugins.marker_cluster import MarkerCluster
 from folium.utilities import validate_location, if_pandas_df_convert_to_numpy
 

diff --git a/folium/plugins/feature_group_sub_group.py b/folium/plugins/feature_group_sub_group.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.map import Layer

diff --git a/folium/plugins/float_image.py b/folium/plugins/float_image.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import MacroElement
 
 from jinja2 import Template

diff --git a/folium/plugins/fullscreen.py b/folium/plugins/fullscreen.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from folium.utilities import parse_options

diff --git a/folium/plugins/heat_map.py b/folium/plugins/heat_map.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.map import Layer

diff --git a/folium/plugins/marker_cluster.py b/folium/plugins/marker_cluster.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, division, print_function
-
 from branca.element import CssLink, Figure, JavascriptLink
 
 from folium.map import Layer, Marker

diff --git a/folium/plugins/measure_control.py b/folium/plugins/measure_control.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from folium.utilities import parse_options

diff --git a/folium/plugins/minimap.py b/folium/plugins/minimap.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from folium.raster_layers import TileLayer

diff --git a/folium/plugins/mouse_position.py b/folium/plugins/mouse_position.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from folium.utilities import parse_options

diff --git a/folium/plugins/pattern.py b/folium/plugins/pattern.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink, MacroElement
 
 from folium.folium import Map

diff --git a/folium/plugins/polyline_text_path.py b/folium/plugins/polyline_text_path.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.features import MacroElement

diff --git a/folium/plugins/scroll_zoom_toggler.py b/folium/plugins/scroll_zoom_toggler.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import MacroElement
 
 from jinja2 import Template

diff --git a/folium/plugins/search.py b/folium/plugins/search.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement
 
 from jinja2 import Template

diff --git a/folium/plugins/terminator.py b/folium/plugins/terminator.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink, MacroElement
 
 from jinja2 import Template

diff --git a/folium/plugins/time_slider_choropleth.py b/folium/plugins/time_slider_choropleth.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Figure, JavascriptLink
 
 from folium.features import GeoJson

diff --git a/folium/plugins/timestamped_geo_json.py b/folium/plugins/timestamped_geo_json.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 import json
 
 from branca.element import CssLink, Figure, JavascriptLink, MacroElement

diff --git a/folium/plugins/timestamped_wmstilelayer.py b/folium/plugins/timestamped_wmstilelayer.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import CssLink, Figure, JavascriptLink
 
 from folium.map import Layer

diff --git a/folium/raster_layers.py b/folium/raster_layers.py
@@ -5,17 +5,13 @@
 
 """
 
-from __future__ import (absolute_import, division, print_function)
-
 from branca.element import Element, Figure
 
 from folium.map import Layer
 from folium.utilities import image_to_url, mercator_transform, parse_options
 
 from jinja2 import Environment, PackageLoader, Template
 
-from six import binary_type, text_type
-
 
 ENV = Environment(loader=PackageLoader('folium', 'templates'))
 
@@ -122,8 +118,6 @@ def __init__(self, tiles='OpenStreetMap', min_zoom=0, max_zoom=18,
             self.tiles = tiles
             if not attr:
                 raise ValueError('Custom tiles must have an attribution.')
-            if isinstance(attr, binary_type):
-                attr = text_type(attr, 'utf8')
             self.attr = attr