Squash commits.

Author: jtbaker

folium/features.py

@@ -799,85 +799,39 @@ def get_bounds(self):
         ]
 
 
-class GeoJsonTooltip(Tooltip):
-    """
-    Create a tooltip that uses data from either geojson or topojson.
-
-    Parameters
-    ----------
-    fields: list or tuple.
-        Labels of GeoJson/TopoJson 'properties' or GeoPandas GeoDataFrame
-        columns you'd like to display.
-    aliases: list/tuple of strings, same length/order as fields, default None.
-        Optional aliases you'd like to display in the tooltip as field name
-        instead of the keys of `fields`.
-    labels: bool, default True.
-        Set to False to disable displaying the field names or aliases.
-    localize: bool, default False.
-        This will use JavaScript's .toLocaleString() to format 'clean' values
-        as strings for the user's location; i.e. 1,000,000.00 comma separators,
-        float truncation, etc.
-        Available for most of JavaScript's primitive types (any data you'll
-        serve into the template).
-    style: str, default None.
-        HTML inline style properties like font and colors. Will be applied to
-        a div with the text in it.
-    sticky: bool, default True
-        Whether the tooltip should follow the mouse.
-    **kwargs: Assorted.
-        These values will map directly to the Leaflet Options. More info
-        available here: https://leafletjs.com/reference-1.5.1#tooltip
+class GeoJsonDetail(MacroElement):
 
-    Examples
-    --------
-    # Provide fields and aliases, with Style.
-    >>> GeoJsonTooltip(
-    >>>     fields=['CNTY_NM', 'census-pop-2015', 'census-md-income-2015'],
-    >>>     aliases=['County', '2015 Census Population', '2015 Median Income'],
-    >>>     localize=True,
-    >>>     style=('background-color: grey; color: white; font-family:'
-    >>>            'courier new; font-size: 24px; padding: 10px;')
-    >>> )
-    # Provide fields, with labels off and fixed tooltip positions.
-    >>> GeoJsonTooltip(fields=('CNTY_NM',), labels=False, sticky=False)
     """
-    _template = Template(u"""
-        {% macro script(this, kwargs) %}
-        {{ this._parent.get_name() }}.bindTooltip(
-            function(layer){
-            // Convert non-primitive to String.
-            let handleObject = (feature)=>typeof(feature)=='object' ? JSON.stringify(feature) : feature;
-            let fields = {{ this.fields|tojson }};
-            {%- if this.aliases %}
-            let aliases = {{ this.aliases|tojson }};
-            {%- endif %}
-            return '<table{% if this.style %} style={{ this.style|tojson }}{% endif%}>' +
-            String(
-                fields.map(
-                columnname=>
-                    `<tr style="text-align: left;">{% if this.labels %}
-                    <th style="padding: 4px; padding-right: 10px;">{% if this.aliases %}
-                        ${aliases[fields.indexOf(columnname)]
-                        {% if this.localize %}.toLocaleString(){% endif %}}
-                    {% else %}
-                    ${ columnname{% if this.localize %}.toLocaleString(){% endif %}}
-                    {% endif %}</th>
-                    {% endif %}
-                    <td style="padding: 4px;">${handleObject(layer.feature.properties[columnname])
-                    {% if this.localize %}.toLocaleString(){% endif %}}</td></tr>`
-                ).join(''))
-                +'</table>'
-            }, {{ this.options|tojson }});
-        {% endmacro %}
-        """)
+    Base class for GeoJsonTooltip and GeoJsonPopup to inherit methods and
+    template structure from. Not for direct usage.
 
-    def __init__(self, fields, aliases=None, labels=True,
-                 localize=False, style=None, sticky=True, **kwargs):
-        super(GeoJsonTooltip, self).__init__(
-            text='', style=style, sticky=sticky, **kwargs
-        )
-        self._name = 'GeoJsonTooltip'
+    """
+    base_template = u"""
+    function(layer){
+    let div = L.DomUtil.create('div');
+    {% if this.fields %}
+    let handleObject = feature=>typeof(feature)=='object' ? JSON.stringify(feature) : feature;
+    let fields = {{ this.fields | tojson | safe }};
+    let aliases = {{ this.aliases | tojson | safe }};
+    let table = '<table>' +
+        String(
+        fields.map(
+        (v,i)=>
+        `<tr>{% if this.labels %}
+            <th>${aliases[i]{% if this.localize %}.toLocaleString(){% endif %}}</th>
+            {% endif %}
+            <td>${handleObject(layer.feature.properties[v]){% if this.localize %}.toLocaleString(){% endif %}}</td>
+        </tr>`).join(''))
+    +'</table>';
+    div.innerHTML=table;
+    {% endif %}
+    return div
+    }
+    """
 
+    def __init__(self, fields, aliases=None, labels=True, localize=False, style=None,
+                 class_name="geojsondetail"):
+        super(GeoJsonDetail, self).__init__()
         assert isinstance(fields, (list, tuple)), 'Please pass a list or ' \
                                                   'tuple to fields.'
         if aliases is not None:
@@ -886,13 +840,12 @@ def __init__(self, fields, aliases=None, labels=True,
                                                 ' the same length.'
         assert isinstance(labels, bool), 'labels requires a boolean value.'
         assert isinstance(localize, bool), 'localize must be bool.'
-        assert 'permanent' not in kwargs, 'The `permanent` option does not ' \
-                                          'work with GeoJsonTooltip.'
-
+        self._name = "GeoJsonDetail"
         self.fields = fields
-        self.aliases = aliases
+        self.aliases = aliases if aliases is not None else fields
         self.labels = labels
         self.localize = localize
+        self.class_name = class_name
         if style:
             assert isinstance(style, str), \
                 'Pass a valid inline HTML style property string to style.'