Merge pull request #290 from BibMartin/issue285

Add possibility to have unembedded GeoJSON.

Author: ocefpaf

folium/features.py

@@ -190,7 +190,6 @@ def render(self, **kwargs):
             vg.parse.spec(spec, function(chart) { chart({el:div}).update(); });}"""),  # noqa
             name='vega_parse')
 
-
 class GeoJson(MacroElement):
     def __init__(self, data, style_function=None):
         """
@@ -211,8 +210,10 @@ def __init__(self, data, style_function=None):
 
         Examples
         --------
-        >>> # Providing file.
+        >>> # Providing file that shall be embeded.
         >>> GeoJson(open('foo.json'))
+        >>> # Providing filename that shall not be embeded.
+        >>> GeoJson('foo.json')
         >>> # Providing dict.
         >>> GeoJson(json.load(open('foo.json')))
         >>> # Providing string.
@@ -224,33 +225,43 @@ def __init__(self, data, style_function=None):
         """
         super(GeoJson, self).__init__()
         self._name = 'GeoJson'
-        if 'read' in dir(data):
+        if hasattr(data,'read'):
+            self.embed = True
             self.data = json.load(data)
-        elif type(data) is dict:
+        elif isinstance(data,dict):
+            self.embed = True
             self.data = data
+        elif isinstance(data, text_type) or isinstance(data, binary_type):
+            if data.lstrip()[0] in '[{': # This is a GeoJSON inline string
+                self.embed = True
+                self.data = json.loads(data)
+            else:  # This is a filename
+                self.embed = False
+                self.data = data
         else:
-            self.data = json.loads(data)
-
-        if 'features' not in self.data.keys():
-            # Catch case when GeoJSON is just a single Feature or a geometry.
-            if not (isinstance(self.data, dict) and 'geometry' in self.data.keys()):
-                # Catch case when GeoJSON is just a geometry.
-                self.data = {'type' : 'Feature', 'geometry' : self.data}
-            self.data = {'type' : 'FeatureCollection', 'features' : [self.data]}
+            raise ValueError('Unhandled data type.')
 
         if style_function is None:
             style_function = lambda x: {}
         self.style_function = style_function
 
         self._template = Template(u"""
             {% macro script(this, kwargs) %}
-                var {{this.get_name()}} = L.geoJson({{this.style_data()}})
+                var {{this.get_name()}} = L.geoJson(
+                    {% if this.embed %}{{this.style_data()}}{% else %}"{{this.data}}"{% endif %})
                     .addTo({{this._parent.get_name()}})
                     .setStyle(function(feature) {return feature.properties.style;});
             {% endmacro %}
             """)  # noqa
 
     def style_data(self):
+        if 'features' not in self.data.keys():
+            # Catch case when GeoJSON is just a single Feature or a geometry.
+            if not (isinstance(self.data, dict) and 'geometry' in self.data.keys()):
+                # Catch case when GeoJSON is just a geometry.
+                self.data = {'type' : 'Feature', 'geometry' : self.data}
+            self.data = {'type' : 'FeatureCollection', 'features' : [self.data]}
+
         for feature in self.data['features']:
             feature.setdefault('properties',{}).setdefault('style',{}).update(
                 self.style_function(feature))